0.2.3: merge Windows code page

.gitignore

@@ -1,6 +1,5 @@
 /.vscode
 /font-builder/src/*.otd
 /font-builder/out
-/bin/merge-otd.exe
-/bin32/merge-otd.exe
+/bin-win*/merge-otd.exe
 /release

README.md

@@ -52,12 +52,12 @@
 
 用 GCC
 ```bash
-g++ src/merge-otd.cpp src/iostream.cpp -Isrc/ -std=c++14 -O2 -o merge-otd
+g++ src/merge-otd.cpp src/iostream.cpp -Isrc/ -std=c++17 -O2 -o merge-otd
 ```
 
 或者用 Visual C++
 ```cmd
-cl src\merge-otd.cpp src\iostream.cpp /Isrc\ /std:c++14 /EHsc /O2 /Fe:merge-otd.exe
+cl src\merge-otd.cpp src\iostream.cpp /Isrc\ /std:c++17 /EHsc /O2 /Fe:merge-otd.exe
 ```
 
 ### 运行（需要 [otfcc](https://github.com/caryll/otfcc)）
@@ -66,7 +66,7 @@ cl src\merge-otd.cpp src\iostream.cpp /Isrc\ /std:c++14 /EHsc /O2 /Fe:merge-otd.
 ```bash
 otfccdump 西文字体.ttf -o base.otd
 otfccdump 中文字体.ttf -o cjk.otd
-merge-otd base.otd cjk.otd
+./merge-otd base.otd cjk.otd
 otfccbuild base.otd -O2 -o 合并之后的字体.ttf
 rm *.otd
 ```
@@ -76,7 +76,7 @@ rm *.otd
 otfccdump 需要补全的字体.ttf -o base.otd
 otfccdump 收字很全的西文字体.ttf -o latin.otd
 otfccdump 收字很全的中文字体.ttf -o cjk.otd
-merge-otd base.otd latin.otd cjk.otd
+./merge-otd base.otd latin.otd cjk.otd
 otfccbuild base.otd -O2 -o 补全之后的字体.ttf
 rm *.otd
 ```
@@ -92,7 +92,7 @@ otfccdump 基本汉字.ttf     -o 5.otd
 otfccdump 扩展汉字.ttf     -o 6.otd
 otfccdump 谚文.ttf         -o 7.otd
 otfccdump 其他CJK符号.ttf  -o 8.otd
-merge-otd base.otd 1.otd 2.otd 3.otd 4.otd 5.otd 6.otd 7.otd 8.otd
+./merge-otd base.otd 1.otd 2.otd 3.otd 4.otd 5.otd 6.otd 7.otd 8.otd
 otfccbuild base.otd -O2 -o 合并之后的字体.ttf
 rm *.otd
 ```

build-win32.bash

@@ -0,0 +1,27 @@
+#! /bin/bash
+
+VERSION=0.2.3-32bit
+
+i686-w64-mingw32-g++ src/merge-otd.cpp src/iostream.cpp -Isrc/ -std=c++17 -O3 -static -Wl,--large-address-aware -o bin-win32/merge-otd.exe
+strip bin-win32/merge-otd.exe
+
+mkdir -p release
+cd release
+
+
+R=字体合并补全工具-简体中文标准字库-$VERSION
+
+mkdir -p $R
+
+cp ../script-windows/link.url $R/主页-使用说明.url
+cp ../script-windows/fonts.url $R/获取更多字体.url
+cp ../bin-win32/{otfccbuild,otfccdump,merge-otd}.exe $R/
+cp ../script-windows/comp.bat $R/补全.bat
+cp ../script-windows/merge.bat $R/合并.bat
+cp ../script-windows/merge+comp.bat $R/合并补全.bat
+cp ../script-windows/pack-zh.bat $R/打包.bat
+cp ../font/Nowar-Sans-CJK-CN-Medium.ttf $R/cjk.ttf
+cp ../font/Nowar-Sans-LCG-Medium.ttf $R/latin.ttf
+
+7z a -mx -myx -ms=on WarFontMerger-SC2-$VERSION.7z $R/
+rar a -ma5 -m5 -s $R.rar $R/

build-win64.bash

@@ -0,0 +1,99 @@
+#! /bin/bash
+
+VERSION=0.2.3
+
+x86_64-w64-mingw32-g++ src/merge-otd.cpp src/iostream.cpp -Isrc/ -std=c++17 -O3 -static -o bin-win64/merge-otd.exe
+strip bin-win64/merge-otd.exe
+
+mkdir -p release
+cd release
+
+
+R=字体合并补全工具-简体中文压缩字库-$VERSION
+
+mkdir -p $R
+
+cp ../script-windows/link.url $R/主页-使用说明.url
+cp ../script-windows/fonts.url $R/获取更多字体.url
+cp ../bin-win64/{otfccbuild,otfccdump,merge-otd}.exe $R/
+cp ../script-windows/comp.bat $R/补全.bat
+cp ../script-windows/merge.bat $R/合并.bat
+cp ../script-windows/merge+comp.bat $R/合并补全.bat
+cp ../script-windows/pack-zh.bat $R/打包.bat
+cp ../font/Nowar-Sans-CJK-XS-Regular.ttf $R/cjk.ttf
+cp ../font/Nowar-Sans-LCG-Medium.ttf $R/latin.ttf
+
+7z a -mx -myx -ms=on WarFontMerger-SC1-$VERSION.7z $R/
+rar a -ma5 -m5 -s $R.rar $R/
+
+
+R=字体合并补全工具-简体中文标准字库-$VERSION
+
+mkdir -p $R
+
+cp ../script-windows/link.url $R/主页-使用说明.url
+cp ../script-windows/fonts.url $R/获取更多字体.url
+cp ../bin-win64/{otfccbuild,otfccdump,merge-otd}.exe $R/
+cp ../script-windows/comp.bat $R/补全.bat
+cp ../script-windows/merge.bat $R/合并.bat
+cp ../script-windows/merge+comp.bat $R/合并补全.bat
+cp ../script-windows/pack-zh.bat $R/打包.bat
+cp ../font/Nowar-Sans-CJK-CN-Medium.ttf $R/cjk.ttf
+cp ../font/Nowar-Sans-LCG-Medium.ttf $R/latin.ttf
+
+7z a -mx -myx -ms=on WarFontMerger-SC2-$VERSION.7z $R/
+rar a -ma5 -m5 -s $R.rar $R/
+
+
+R=字体合并补全工具-简体中文大字库-$VERSION
+
+mkdir -p $R
+
+cp ../script-windows/link.url $R/主页-使用说明.url
+cp ../script-windows/fonts.url $R/获取更多字体.url
+cp ../bin-win64/{otfccbuild,otfccdump,merge-otd}.exe $R/
+cp ../script-windows/comp.bat $R/补全.bat
+cp ../script-windows/merge.bat $R/合并.bat
+cp ../script-windows/merge+comp.bat $R/合并补全.bat
+cp ../script-windows/pack.bat $R/打包.bat
+cp ../font/Nowar-Sans-CJK-SC-Medium.ttf $R/cjk.ttf
+cp ../font/Nowar-Sans-LCG-Medium.ttf $R/latin.ttf
+
+7z a -mx -myx -ms=on WarFontMerger-SC3-$VERSION.7z $R/
+rar a -ma5 -m5 -s $R.rar $R/
+
+
+R=字型合併補全工具-繁體中文大字庫-$VERSION
+
+mkdir -p $R
+
+cp ../script-windows/link.url $R/主頁-使用說明\(簡體\).url
+cp ../script-windows/fonts.url $R/獲取更多字型\(簡體\).url
+cp ../bin-win64/{otfccbuild,otfccdump,merge-otd}.exe $R/
+cp ../script-windows/comp.bat $R/補全.bat
+cp ../script-windows/merge.bat $R/合併.bat
+cp ../script-windows/merge+comp.bat $R/合併補全.bat
+cp ../script-windows/pack.bat $R/打包.bat
+cp ../font/Nowar-Sans-CJK-TC-Medium.ttf $R/cjk.ttf
+cp ../font/Nowar-Sans-LCG-Medium.ttf $R/latin.ttf
+
+7z a -mx -myx -ms=on WarFontMerger-TC-$VERSION.7z $R/
+rar a -ma5 -m5 -s $R.rar $R/
+
+
+R=字型合併補全工具-傳統字形大字庫-$VERSION
+
+mkdir -p $R
+
+cp ../script-windows/link.url $R/主頁-使用說明\(簡體\).url
+cp ../script-windows/fonts.url $R/獲取更多字型\(簡體\).url
+cp ../bin-win64/{otfccbuild,otfccdump,merge-otd}.exe $R/
+cp ../script-windows/comp.bat $R/補全.bat
+cp ../script-windows/merge.bat $R/合併.bat
+cp ../script-windows/merge+comp.bat $R/合併補全.bat
+cp ../script-windows/pack.bat $R/打包.bat
+cp ../font/Nowar-Sans-CJK-CL-Medium.ttf $R/cjk.ttf
+cp ../font/Nowar-Sans-LCG-Medium.ttf $R/latin.ttf
+
+7z a -mx -myx -ms=on WarFontMerger-Classic-$VERSION.7z $R/
+rar a -ma5 -m5 -s $R.rar $R/