diff options
| -rw-r--r-- | font.subx | 10 | ||||
| -rwxr-xr-x | translate | 4 | ||||
| -rwxr-xr-x | translate_emulated | 6 |
3 files changed, 12 insertions, 8 deletions
diff --git a/font.subx b/font.subx index dd822c71..66a82850 100644 --- a/font.subx +++ b/font.subx @@ -4,11 +4,15 @@ # See https://en.wikipedia.org/wiki/GNU_Unifont#The_.hex_font_format # Website: http://unifoundry.com/unifont/index.html # License: http://unifoundry.com/LICENSE.txt (GPL v2) +# +# This file can only contain: +# - 2-letter hex bytes, optionally followed by '/' and single-word comments, and +# - line comments after '#' # Each glyph consists of a 1-byte size followed by a 16-byte bitmap. -# The size can currently be only 8 or 16 (10). -# * If it's 8, the glyph is 8 pixels wide, each row consists of one byte, and +# The size can currently be only '08' or '10' (16). +# * If it's '08', the glyph is 8 pixels wide, each row consists of one byte, and # the last 8 bytes of the bitmap are ignored. -# * If it's 16, the glyph is 16 pixels wide, and each row consists of two +# * If it's '10', the glyph is 16 pixels wide, and each row consists of two # bytes. # 0x00-0x1f: unprintable ASCII diff --git a/translate b/translate index e9fec574..2ecdbf7b 100755 --- a/translate +++ b/translate @@ -71,8 +71,8 @@ fi dd if=labels of=code.img seek=$DEBUG conv=notrunc # keep this sync'd with abort.subx -## Some space for font data at another well-defined location -cat font.subx |sed 's,#.*,,' |sed 's,/[^ ]*,,' |linux/hex > a.font +## Font data at another well-defined location +cat font.subx |sed 's,/[^ ]*,,' |linux/hex > a.font if [ `stat --printf="%s" a.bin` -ge $(( ($DEBUG - $FONT) * 512 )) ] then diff --git a/translate_emulated b/translate_emulated index 3ff4b24c..ec75b5ba 100755 --- a/translate_emulated +++ b/translate_emulated @@ -12,7 +12,7 @@ export DISK=20160 # 20*16*63 512-byte sectors = almost 10MB dd if=/dev/zero of=code.img count=$DISK # code: sectors 0-8999 # font: sectors 9000-10079 (1080 sectors = space enough for 16k glyphs (1080 * 512 / 33 bytes per glyph)) -export FONT=9000 +export FONT=9000 # keep this sync'd with boot.subx # debug: sector 10080 onwards export DEBUG=10080 @@ -75,8 +75,8 @@ fi dd if=labels of=code.img seek=$DEBUG conv=notrunc # keep this sync'd with abort.subx -## Some space for font data at another well-defined location -cat font.subx |sed 's,#.*,,' |sed 's,/[^ ]*,,' |linux/hex > a.font +## Font data at another well-defined location +cat font.subx |sed 's,/[^ ]*,,' |linux/hex > a.font if [ `stat --printf="%s" a.bin` -ge $(( ($DEBUG - $FONT) * 512 )) ] then |