fix FNT_DBCS; workflow upd; CrossContinents merge

might-and-magic · Jun 5, 2020 · de7471b · de7471b
1 parent e81f913
commit de7471b
Show file tree

Hide file tree

Showing 12 changed files with 900 additions and 15 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -13,3 +13,10 @@ indent_size = 4
 end_of_line = crlf
 trim_trailing_whitespace = false
 insert_final_newline = false
+
+[*.py]
+indent_style = tab
+indent_size = 4
+end_of_line = crlf
+trim_trailing_whitespace = false
+insert_final_newline = false
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@
 /tools/input/
 /tools/output/
 *.baiduyun.uploading.cfg
+/6_setup/prod/
 /6_setup/dev/**/*.*
 !/6_setup/dev/*/*/mm_i18n.nsi
 

diff --git a/non_text/scripts_datatables/zh_CN/mm8/Scripts/General/FNT_DBCS.lua b/non_text/scripts_datatables/zh_CN/mm8/Scripts/General/FNT_DBCS.lua
@@ -350,6 +350,12 @@ local function dbcsProc(d)
 		FNT.setCharWidth(fontAddr, highByte, cachedWidth)
 	end
 
+	local function setLowByteInFontAsCached()
+		FNT.setCharSpaceBefore(fontAddr, lowByte, cachedSpaceBefore)
+		FNT.setCharSpaceAfter(fontAddr, lowByte, cachedSpaceAfter)
+		FNT.setCharWidth(fontAddr, lowByte, cachedWidth)
+	end
+
 	local function lastByteCheckAndCache(currentByte)
 		-- lastByte could be:
 		-- 0: initial state
@@ -408,7 +414,7 @@ local function dbcsProc(d)
 				FNT.getCharShape(fntAddrTemp, lowByte) ..
 				string.rep("\0", (fontBottomHeightToAdd * widthTemp))
 			)
-			setHighByteInFontAsCached()
+			setLowByteInFontAsCached()
 			highByte = 0
 			-- lowByte = 0
 			-- cachedSpaceBefore = 0

diff --git a/non_text/scripts_datatables/zh_CN/mmmerge/Scripts/General/FNT_DBCS.lua b/non_text/scripts_datatables/zh_CN/mmmerge/Scripts/General/FNT_DBCS.lua
@@ -350,6 +350,12 @@ local function dbcsProc(d)
 		FNT.setCharWidth(fontAddr, highByte, cachedWidth)
 	end
 
+	local function setLowByteInFontAsCached()
+		FNT.setCharSpaceBefore(fontAddr, lowByte, cachedSpaceBefore)
+		FNT.setCharSpaceAfter(fontAddr, lowByte, cachedSpaceAfter)
+		FNT.setCharWidth(fontAddr, lowByte, cachedWidth)
+	end
+
 	local function lastByteCheckAndCache(currentByte)
 		-- lastByte could be:
 		-- 0: initial state
@@ -408,7 +414,7 @@ local function dbcsProc(d)
 				FNT.getCharShape(fntAddrTemp, lowByte) ..
 				string.rep("\0", (fontBottomHeightToAdd * widthTemp))
 			)
-			setHighByteInFontAsCached()
+			setLowByteInFontAsCached()
 			highByte = 0
 			-- lowByte = 0
 			-- cachedSpaceBefore = 0