Skip to content

Fix legacy font names #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mishan wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix legacy font names #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ae29f6
Use the kFontID names for the built-in fonts
mishan Aug 7, 2026
7b0d725
Advance multiversal to master
mishan Aug 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion multiversal
Open in desktop
Submodule multiversal updated 6 files
+10 −3 cincludes.rb
+28 −6 custom/glue.c
+30 −50 defs/FontMgr.yaml
+15 −1 defs/TimeMgr.yaml
+6 −1 generator.rb
+2 −1 multiversal.schema.json
2 changes: 1 addition & 1 deletion src/aboutbox.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ event_loop()
ForeColor(blackColor);
BackColor(whiteColor);
EraseRect(&about_box->portRect);
TextFont(helvetica);
TextFont(kFontIDHelvetica);
TextSize(24);
MoveTo(TE_LEFT, 30);
DrawText_c_string(ROMlib_executor_full_name);
Expand Down
2 changes: 1 addition & 1 deletion src/osutil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@ static void setdefaults()
LM(SPATalkB) = LM(SPATalkA) = LM(SPConfig) = 0;
LM(SPPortB) = LM(SPPortA) = baud9600 | stop10 | data8 | noParity;
LM(SPPrint) = 0;
LM(SPFont) = geneva - 1;
LM(SPFont) = kFontIDGeneva - 1;
LM(SPKbd) = 0x63;
LM(SPVolCtl) = 3;
LM(SPClikCaret) = 0x88;
Expand Down
10 changes: 5 additions & 5 deletions src/print/PSprint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1991,7 +1991,7 @@ void Executor::NeXTPrText(LONGINT n, Ptr textbufp, Point num, Point den,
int n_leading_spaces;
int run_start, run_stop;

if(thePortp->txFont != symbol)
if(thePortp->txFont != kFontIDSymbol)
{
find_run_of_symbol_chars(n, textbufp, &run_start, &run_stop);
if(run_start >= 0)
Expand All @@ -2001,7 +2001,7 @@ void Executor::NeXTPrText(LONGINT n, Ptr textbufp, Point num, Point den,
if(run_start > 0)
NeXTPrText(run_start, textbufp, num, den, thePortp);
save_font = thePortp->txFont;
thePortp->txFont = symbol;
thePortp->txFont = kFontIDSymbol;
NeXTPrText(run_stop - run_start, textbufp + run_start, num, den,
thePortp);
thePortp->txFont = save_font;
Expand Down Expand Up @@ -2051,7 +2051,7 @@ void Executor::NeXTPrText(LONGINT n, Ptr textbufp, Point num, Point den,
translated[n] = 0;
if(n)
{
if(thePortp->txFont == symbol)
if(thePortp->txFont == kFontIDSymbol)
{
int i;

Expand All @@ -2063,7 +2063,7 @@ void Executor::NeXTPrText(LONGINT n, Ptr textbufp, Point num, Point den,
#if 0
PSxshow(translated, fwidths, n);
#else
if(ROMlib_fontsubstitution && (thePortp->txFont == geneva))
if(ROMlib_fontsubstitution && (thePortp->txFont == kFontIDGeneva))
doshow(translated, n);
else if((i = numspacesin(translated)))
dowidthshow(translated, n, i, total);
Expand All @@ -2073,7 +2073,7 @@ void Executor::NeXTPrText(LONGINT n, Ptr textbufp, Point num, Point den,
if(thePortp->txFace & underline)
dopsunderline(thePortp, total,
ROMlib_fontsubstitution
&& (thePortp->txFont == geneva),
&& (thePortp->txFont == kFontIDGeneva),
translated, n);
thePortp->pnLoc.h = thePortp->pnLoc.h + total;
printport.pnLoc.h = thePortp->pnLoc.h;
Expand Down
2 changes: 1 addition & 1 deletion src/quickdraw/font.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ static void buildtable(INTEGER extra)
* right now. The trouble that the new sizes cause is in the Word 5.1
* ribbon control labels.
*/
else if(WIDTHPTR->aFID != geneva && (fondwidthtable = findfondwidths()))
else if(WIDTHPTR->aFID != kFontIDGeneva && (fondwidthtable = findfondwidths()))
{
howtobuild = FondFract;
extra = 0;
Expand Down
Loading