【新增】双优化模式支持

Author: PJ-568

README.en.md

@@ -53,8 +53,6 @@ This font also optimizes the mapping of commonly used graphic symbols in termina
   Here, `┌` is mapped to the letter `r`, `┬` to `T`, `┘` to `J`, etc.
   Such mappings maximize display improvement while minimizing the use of additional glyphs (:-D).
 
-  ![font-cengluan performance in btop](assets/btop.png)
-
 ### Character Width Display Optimization
 
 In conventional text display scenarios:
@@ -69,19 +67,31 @@ However, PC Screen Font 2 (PSF2) is a fixed-width bitmap font format that does n
 - If all characters are displayed with a width of one unit: full-width characters only show the left half, with the right half displayed as the [32nd character](#the-32nd-character);
 - If all characters are displayed with a width of two units: all half-width characters occupy two columns, but visually they are only one unit wide, resulting in [large gaps between two half-width characters](assets/display_old_old.png).
 
-Given the high difficulty of finding or designing "tall and narrow half-width monospaced Chinese fonts" or "adapted full-width English letter fonts", the old solution of font-cengluan mapped all English letters, Arabic numerals, ASCII punctuation, etc., to full-width characters in the UTF-8 high range; the result was [still excessive spacing between half-width characters](assets/display_old.png).
+Given the high difficulty of finding or designing "tall, thin half-width monospaced Chinese character fonts" or "compatible full-width English letter fonts", font-cengluan adopts two design approaches:
+
+1. Map all English letters, Arabic numerals, ASCII punctuation, and similar characters to full-width characters in the UTF-8 high range;
+   the spacing between half-width characters remains slightly large.
+
+   ![Full-width font-cengluan performance in btop](assets/btop_old.png)
 
-In the current solution, all half-width characters are scaled by an integer factor of two, while full-width characters are displayed at the original scaling ratio with complementary blank rows above and below.
+2. Display all half-width characters with integer scaling doubled, while full-width characters are displayed at their original scaling ratio with padded blank lines above and below.
 
-![Half-width characters extended, full-width characters complemented](assets/Half-width_characters_extended__full-width_characters_complemented.svg)
+   ![Half-width scaling, full-width complement](assets/Half-width_characters_extended__full-width_characters_complemented.svg)
+   ![Half-width scaling, full-width complement font-cengluan performance in btop](assets/btop.png)
 
 Although each full-width character is still separated on the right by a [32nd character](#the-32nd-character), font-cengluan achieves a relatively balanced visual appearance overall.
 
 ### The 32nd Character
 
 In Linux TTY, the 32nd character of the default font is `U+20`, i.e., a space. This character is used to fill positions in the background where no character is present.
 
-## Building the Font
+## Get the Font
+
+### Downloading the Font
+
+- [Download the font](https://github.com/PJ-568/font-cengluan/releases/latest)
+
+### Building the Font
 
 1. Clone the repository:
 

README.md

@@ -56,8 +56,6 @@ cengluan 是一个为 Linux 设计的中文 TTY 字体，旨在在不安装诸
   其中，`┌` 被映射为字母 `r`，`┬` 被映射为字母 `T`，`┘` 被映射为字母 `J` 等。
   此类映射在尽量不占用更多字形的情况下最大程度地改善了显示效果（:-D）。
 
-  ![font-cengluan 在 btop 下的表现](assets/btop.png)
-
 ### 字宽显示优化
 
 在常规情景的文本显示中：
@@ -73,21 +71,31 @@ cengluan 是一个为 Linux 设计的中文 TTY 字体，旨在在不安装诸
 - 所有字符以宽一个单位显示：全角字符仅显示左半截，右半截显示为字体中的[第三十二个字符](#第三十二个字符)；
 - 所有字符以宽二个单位显示：所有半角字符占满两行，但视觉宽仅一单位，导致[两个半角字符间有大空隙](assets/display_old_old.png)。
 
-鉴于寻找和设计“瘦高半角等宽汉字等字体”或“适配的全角英文字母等字体”的高难度。
-旧方案下 font-cengluan 将所有英文字母、阿拉伯数字、ASCII 标点符号等字映射为 UTF-8 高位的全角字符；
-结果[半角字符之间的间隔仍过大](assets/display_old.png)。
+鉴于寻找和设计“瘦高半角等宽汉字等字体”或“适配的全角英文字母等字体”的高难度，font-cengluan 采取两种设计方案：
+
+1. 将所有英文字母、阿拉伯数字、ASCII 标点符号等字映射为 UTF-8 高位的全角字符；
+   结果半角字符之间的间隔仍略大。
+
+   ![全全角 font-cengluan 在 btop 下的表现](assets/btop_old.png)
 
-当前方案下，将所有半角字符整数缩放二倍显示，全角字符在补全上下空行的情况下以原缩放比例显示。
+2. 将所有半角字符整数缩放二倍显示，全角字符在补全上下空行的情况下以原缩放比例显示。
 
-![半角放大、全角补全](assets/Half-width_characters_extended__full-width_characters_complemented.svg)
+   ![半角放大、全角补全](assets/Half-width_characters_extended__full-width_characters_complemented.svg)
+   ![半角放大、全角补全 font-cengluan 在 btop 下的表现](assets/btop.png)
 
 虽每个全角字符右侧仍被一个[第三十二个字符](#第三十二个字符)隔开，font-cengluan 在总体视觉上达到相对平衡。
 
 ### 第三十二个字符
 
 Linux TTY 默认第字体的三十二个字符为 `U+20`，既空格。这个位置的字符被用来填充背景中没有字符的位置。
 
-## 构建字体
+## 获取字体
+
+### 下载
+
+- [下载最新版本](https://github.com/PJ-568/font-cengluan/releases/latest)
+
+### 构建
 
 1. 克隆仓库：
 

VERSION

@@ -1 +1 @@
-3.0.0
+3.1.0

assets/btop_old.png

@@ -1,36 +1,58 @@
 #!/bin/bash
 
 path=$(pwd)
-brand="cengluan"
+
+# 品牌名称，可通过第一个参数覆盖
+if [ $# -ge 1 ]; then
+  case "$1" in
+    -h|--help)
+      echo "用法: $0 [品牌名称]"
+      echo "生成指定品牌的字体文件。"
+      echo "如果不提供参数，默认使用 'cengluan'。"
+      exit 0
+      ;;
+    *)
+      brand="$1"
+      ;;
+  esac
+else
+  brand="cengluan"
+fi
 
 # 创建必要的目录
 mkdir -p $path/temp
 mkdir -p $path/output
 
-# 下载 fusion-pixel-12px-monospaced-zh_hans 的压缩包
-download_url="https://github.com/TakWolf/fusion-pixel-font/releases/download/2026.01.04/fusion-pixel-font-12px-monospaced-bdf-v2026.01.04.zip"
-wget "$download_url" -O $path/temp/font.zip
+# 检查字体包是否已经存在
+if [ ! -f "$path/temp/fusion-pixel-12px-monospaced-zh_hans.bdf" ]; then
+  # 下载 fusion-pixel-12px-monospaced-zh_hans 的压缩包
+  download_url="https://github.com/TakWolf/fusion-pixel-font/releases/download/2026.01.04/fusion-pixel-font-12px-monospaced-bdf-v2026.01.04.zip"
+  wget "$download_url" -O $path/temp/font.zip
 
-# 检查下载是否成功
-if [ $? -ne 0 ]; then
-  echo "错误: 下载文件失败。"
-  exit 1
-fi
+  # 检查下载是否成功
+  if [ $? -ne 0 ]; then
+    echo "错误: 下载文件失败。"
+    exit 1
+  fi
 
-# 解压下载的压缩包到 $path/temp
-unzip $path/temp/font.zip -d $path/temp
+  # 解压下载的压缩包到 $path/temp
+  unzip $path/temp/font.zip -d $path/temp
 
-# 检查解压是否成功
-if [ $? -ne 0 ]; then
-  echo "错误: 解压文件失败。"
-  exit 1
-fi
+  # 检查解压是否成功
+  if [ $? -ne 0 ]; then
+    echo "错误: 解压文件失败。"
+    exit 1
+  fi
 
-# 列出解压后的目录内容
-ls $path/temp/
+  # 列出解压后的目录内容
+  ls $path/temp/
+else
+  echo "字体包已存在，跳过下载和解压。"
+fi
 
 # 运行 Python 脚本
 python3 $path/build_font_from_bdf.py "$path/temp/fusion-pixel-12px-monospaced-zh_hans.bdf" > $path/output/$brand.txt
+python3 $path/build_font_from_bdf_new.py "$path/temp/fusion-pixel-12px-monospaced-zh_hans.bdf" > $path/output/$brand-new.txt
 # python3 $path/build_font_from_bdf.py "$path/temp/fusion-pixel-12px-monospaced-zh_hant.bdf" > $path/output/$brand-zh_hant.txt
 
 # 检查脚本执行是否成功
@@ -39,22 +61,26 @@ if [ $? -ne 0 ]; then
   exit 1
 fi
 
-# 下载并编译 psftools
-wget https://www.seasip.info/Unix/PSF/psftools-1.0.14.tar.gz -O $path/temp/psftools-1.0.14.tar.gz
-tar -xf $path/temp/psftools-1.0.14.tar.gz -C $path/temp/
-cd $path/temp/psftools-1.0.14
-./configure
-make
-cd $path/
-
-# 检查压缩是否成功
-if [ $? -ne 0 ]; then
-  echo "错误: 下载并编译 psftools失败。"
-  exit 1
+# 检查 psftools 是否已经编译
+if [ ! -f "$path/temp/psftools-1.0.14/tools/txt2psf" ]; then
+  # 下载并编译 psftools
+  wget https://www.seasip.info/Unix/PSF/psftools-1.0.14.tar.gz -O $path/temp/psftools-1.0.14.tar.gz
+  tar -xf $path/temp/psftools-1.0.14.tar.gz -C $path/temp/
+  cd $path/temp/psftools-1.0.14 && \
+  ./configure && \
+  make
+  if [ $? -ne 0 ]; then
+    echo "错误: 下载并编译 psftools失败。"
+    exit 1
+  fi
+  cd $path/
+else
+  echo "psftools 已编译，跳过下载和编译。"
 fi
 
 # 将 txt 文件转换为 psf 文件
 $path/temp/psftools-1.0.14/tools/txt2psf $path/output/$brand.txt $path/output/$brand.psf
+$path/temp/psftools-1.0.14/tools/txt2psf $path/output/$brand-new.txt $path/output/$brand-new.psf
 # $path/temp/psftools-1.0.14/tools/txt2psf $path/output/$brand-zh_hant.txt $path/output/$brand-zh_hant.psf
 
 # 检查转换是否成功
@@ -65,6 +91,7 @@ fi
 
 # 压缩 psf 文件
 gzip -c $path/output/$brand.psf > $path/output/$brand.psfu.gz
+gzip -c $path/output/$brand-new.psf > $path/output/$brand-new.psfu.gz
 # gzip -c $path/output/$brand-zh_hant.psf > $path/output/$brand-zh_hant.psfu.gz
 
 # 检查压缩是否成功

assets/display.png

@@ -35,7 +35,7 @@
 Flags: 1
 Length: 512
 Width: {width}
-Height: {height * 2}''', end='')
+Height: {height}''', end='')
 
 def PrintNonChineseCharacter(index):
     count = index
@@ -51,7 +51,7 @@ def PrintNonChineseCharacter(index):
             count += 1
     return count
 
-def PrintCharacters(Characters, count, is_fullwidth_cha = False):
+def PrintCharacters(Characters, count):
     Character = Characters[0] # 取第一个字符作为展示字
     try:
         # 将字符编码为对应编码
@@ -83,27 +83,11 @@ def PrintCharacters(Characters, count, is_fullwidth_cha = False):
                 pixels[-bottom - h + i + v_offset][left + j] = ("#" if o_pixels[i][j] else "-")
 
         # 打印像素矩阵
-        if is_fullwidth_cha: # 全角字符：一倍打印，上下补全
-            blank_row = "".join("-" for i in range(width))
-            for i in range(height // 2):
-                print(blank_row + " \\")
-            for row_h in range(top_gap, height + 1 - bottom_gap):
-                row = "".join(pixels[row_h])
-                print(row + " \\")
-            for i in range(height // 2 - 1):
-                print(blank_row + " \\")
-            print(blank_row)
-        else: # 半角字符：去掉右半边，把左半边缩放两倍打印
-            for row_h in range(top_gap, height + 1 - bottom_gap):
-                row = "".join(pixels[row_h])
-                row = row[:len(row)//2] # 去掉右半边
-                row = "".join(c * 2 for c in row) # 左右缩放两倍
-                if row_h < height:
-                    print(row + " \\")
-                    print(row + " \\")
-                else:
-                    print(row + " \\")
-                    print(row)
+        for l in range(top_gap, height + 1 - bottom_gap):
+            ll = "".join(pixels[l])
+            if l < height :
+                ll = ll + " \\"
+            print(ll)
 
         # 打印字符的 Unicode 编码
         print("Unicode: ", end="")
@@ -129,5 +113,5 @@ def PrintCharacters(Characters, count, is_fullwidth_cha = False):
         s = line.split() # 分开拼音和汉字
         if len(s) >= 2:
             hanzis = s[1] # 取汉字那一条
-            PrintCharacters(hanzis, count, True)
-            count += 1
+            PrintCharacters(hanzis, count)
+            count += 1