From 5bdd3f1eb957fa64e76b24a33051fb427c0eb13a Mon Sep 17 00:00:00 2001 From: Wengier Date: Thu, 18 Nov 2021 19:10:32 -0500 Subject: [PATCH] support ASCFONT.24/ASCFONT.24B too --- CHANGELOG | 10 +++++----- .../windows/installer/dosbox-x.reference.setup.conf | 4 ++-- dosbox-x.reference.conf | 2 +- dosbox-x.reference.full.conf | 4 ++-- src/dosbox.cpp | 4 ++-- src/ints/int_dosv.cpp | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 3caa83c2c..dd264235b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -14,11 +14,11 @@ - The code page setting of "country" option will now be ignored for PC-98, JEGA and DOS/V modes. These modes will enforce the desired code page. (Wengier) - - Added support for loading ASC16/ASCFONT.15/ASC24/ - ASCFONT.24C/ASCFONT.24D font files from the UCDOS/ - ETen Chinese DOS systems for the config options - "fontxsbcs", "fontxsbcs16" and "fontxdbcs24" in - the [dosv] section for DOS/V systems. (Wengier) + - Added support for loading the ASC16/ASCFONT.15/ + ASC24/ASCFONT.24? font files from the UCDOS/ETen + Chinese DOS systems for the options "fontxsbcs", + "fontxsbcs16" and "fontxdbcs24" in [dosv] section + of the config file for DOS/V systems. (Wengier) - Improved auto-detection of box-drawing characters when using DBCS code pages. (Wengier) - Applied UTF-8 conversions to file browse dialog diff --git a/contrib/windows/installer/dosbox-x.reference.setup.conf b/contrib/windows/installer/dosbox-x.reference.setup.conf index 161b138e1..46b4fd976 100644 --- a/contrib/windows/installer/dosbox-x.reference.setup.conf +++ b/contrib/windows/installer/dosbox-x.reference.setup.conf @@ -255,7 +255,7 @@ debuggerrun = debugger # savefile: Select the default save file to save/load states. If specified it will be used instead of the save slot. # saveremark: If set, the save state feature will ask users to enter remarks when saving a state. # forceloadstate: If set, DOSBox-X will load a saved state even if it finds there is a mismatch in the DOSBox-X version, machine type, program name and/or the memory size. -#DOSBOX-X-ADV:# compresssaveparts: If set, DOSBox-X will compress components of saved states. +#DOSBOX-X-ADV:# compresssaveparts: If set, DOSBox-X will compress components of saved states to save space. #DOSBOX-X-ADV:# skip encoding unchanged frames: Unchanged frames will not be sent to the video codec as a possible performance and bandwidth optimization. #DOSBOX-X-ADV:# capture chroma format: Chroma format to use when capturing to H.264. 'auto' picks the best quality option. #DOSBOX-X-ADV:# 4:4:4 Chroma is at full resolution. This provides the best quality, however not widely supported by editing software. @@ -685,7 +685,7 @@ pc-98 anex86 font = # fontxsbcs16: FONTX2 file used to rendering SBCS characters (8x16) in DOS/V or JEGA mode. If not specified, the default one will be used. # Loading the ASC16 and ASCFONT.15 font files (from the UCDOS and ETen Chinese DOS systems) is also supported for the DOS/V mode. # fontxsbcs24: FONTX2 file used to rendering SBCS characters (12x24) in DOS/V mode (with V-text). If not specified, the default one will be used. -# Loading the ASC24/ASCFONT.24C/ASCFONT.24D font files (the latter two from the ETen Chinese DOS system) is also supported. +# Loading the ASC24 and ASCFONT.24? font files (the latter from the ETen Chinese DOS system) is also supported for the DOS/V mode. # fontxdbcs: FONTX2 file used to rendering DBCS characters (16x16) in DOS/V or JEGA mode. If not specified, the default one will be used. # For Simplified Chinese DOS/V, loading the HZK16 font file (https://github.com/aguegu/BitmapFont/tree/master/font) is also supported. # For Traditional Chinese DOS/V, loading the STDFONT.15 font file from the ETen Chinese DOS system is also supported. diff --git a/dosbox-x.reference.conf b/dosbox-x.reference.conf index e21e57c4a..04e7d3e4c 100644 --- a/dosbox-x.reference.conf +++ b/dosbox-x.reference.conf @@ -320,7 +320,7 @@ pc-98 anex86 font = # fontxsbcs16: FONTX2 file used to rendering SBCS characters (8x16) in DOS/V or JEGA mode. If not specified, the default one will be used. # Loading the ASC16 and ASCFONT.15 font files (from the UCDOS and ETen Chinese DOS systems) is also supported for the DOS/V mode. # fontxsbcs24: FONTX2 file used to rendering SBCS characters (12x24) in DOS/V mode (with V-text). If not specified, the default one will be used. -# Loading the ASC24/ASCFONT.24C/ASCFONT.24D font files (the latter two from the ETen Chinese DOS system) is also supported. +# Loading the ASC24 and ASCFONT.24? font files (the latter from the ETen Chinese DOS system) is also supported for the DOS/V mode. # fontxdbcs: FONTX2 file used to rendering DBCS characters (16x16) in DOS/V or JEGA mode. If not specified, the default one will be used. # For Simplified Chinese DOS/V, loading the HZK16 font file (https://github.com/aguegu/BitmapFont/tree/master/font) is also supported. # For Traditional Chinese DOS/V, loading the STDFONT.15 font file from the ETen Chinese DOS system is also supported. diff --git a/dosbox-x.reference.full.conf b/dosbox-x.reference.full.conf index 8585710a1..e73e7d610 100644 --- a/dosbox-x.reference.full.conf +++ b/dosbox-x.reference.full.conf @@ -247,7 +247,7 @@ debuggerrun = debugger # savefile: Select the default save file to save/load states. If specified it will be used instead of the save slot. # saveremark: If set, the save state feature will ask users to enter remarks when saving a state. # forceloadstate: If set, DOSBox-X will load a saved state even if it finds there is a mismatch in the DOSBox-X version, machine type, program name and/or the memory size. -# compresssaveparts: If set, DOSBox-X will compress components of saved states. +# compresssaveparts: If set, DOSBox-X will compress components of saved states to save space. # skip encoding unchanged frames: Unchanged frames will not be sent to the video codec as a possible performance and bandwidth optimization. # capture chroma format: Chroma format to use when capturing to H.264. 'auto' picks the best quality option. # 4:4:4 Chroma is at full resolution. This provides the best quality, however not widely supported by editing software. @@ -665,7 +665,7 @@ pc-98 show graphics layer on initialize = true # fontxsbcs16: FONTX2 file used to rendering SBCS characters (8x16) in DOS/V or JEGA mode. If not specified, the default one will be used. # Loading the ASC16 and ASCFONT.15 font files (from the UCDOS and ETen Chinese DOS systems) is also supported for the DOS/V mode. # fontxsbcs24: FONTX2 file used to rendering SBCS characters (12x24) in DOS/V mode (with V-text). If not specified, the default one will be used. -# Loading the ASC24/ASCFONT.24C/ASCFONT.24D font files (the latter two from the ETen Chinese DOS system) is also supported. +# Loading the ASC24 and ASCFONT.24? font files (the latter from the ETen Chinese DOS system) is also supported for the DOS/V mode. # fontxdbcs: FONTX2 file used to rendering DBCS characters (16x16) in DOS/V or JEGA mode. If not specified, the default one will be used. # For Simplified Chinese DOS/V, loading the HZK16 font file (https://github.com/aguegu/BitmapFont/tree/master/font) is also supported. # For Traditional Chinese DOS/V, loading the STDFONT.15 font file from the ETen Chinese DOS system is also supported. diff --git a/src/dosbox.cpp b/src/dosbox.cpp index ad270995a..9a19d2a78 100644 --- a/src/dosbox.cpp +++ b/src/dosbox.cpp @@ -1463,7 +1463,7 @@ void DOSBOX_SetupConfigSections(void) { Pbool->SetBasic(true); Pbool = secprop->Add_bool("compresssaveparts", Property::Changeable::WhenIdle,true); - Pbool->Set_help("If set, DOSBox-X will compress components of saved states."); + Pbool->Set_help("If set, DOSBox-X will compress components of saved states to save space."); /* will change to default true unless this causes compatibility issues with other users or their editing software */ Pbool = secprop->Add_bool("skip encoding unchanged frames",Property::Changeable::WhenIdle,false); @@ -2083,7 +2083,7 @@ void DOSBOX_SetupConfigSections(void) { Pstring = secprop->Add_path("fontxsbcs24",Property::Changeable::OnlyAtStart,""); Pstring->Set_help("FONTX2 file used to rendering SBCS characters (12x24) in DOS/V mode (with V-text). If not specified, the default one will be used.\n" - "Loading the ASC24/ASCFONT.24C/ASCFONT.24D font files (the latter two from the ETen Chinese DOS system) is also supported."); + "Loading the ASC24 and ASCFONT.24? font files (the latter from the ETen Chinese DOS system) is also supported for the DOS/V mode."); Pstring->SetBasic(true); Pstring = secprop->Add_path("fontxdbcs",Property::Changeable::OnlyAtStart,""); diff --git a/src/ints/int_dosv.cpp b/src/ints/int_dosv.cpp index 3864e7cf7..b1423688b 100644 --- a/src/ints/int_dosv.cpp +++ b/src/ints/int_dosv.cpp @@ -222,7 +222,7 @@ static bool LoadFontxFile(const char *fname, int height, bool dbcs) { fclose(mfile); return true; } - } else if (sz == SBCS24_LEN && height == 24) { + } else if ((sz == SBCS24_LEN || sz == 16384) && height == 24) { fread(jfont_sbcs_24, sizeof(uint8_t), SBCS24_LEN, mfile); fclose(mfile); return true;