Skip to content

Unicode math improvements #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

Merged
olsak merged 4 commits into from
Aug 2, 2021
Merged

Unicode math improvements #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
29437bf
Don't set math families 2 and 3 for Unicode math
vlasakm Jul 21, 2021
978220d
Don't set `\scriptspace` for Unicode math
vlasakm Jul 24, 2021
8d9c457
Use LuaTeX style, not XeTeX style font features
vlasakm Jul 24, 2021
aafb810
Restrict optical sizes of bbold font
vlasakm Jul 25, 2021
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
4 changes: 2 additions & 2 deletions optex/base/math-macros.opm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1059,8 +1059,8 @@
\_def\_mathbox#1{{\_mathstyles{\_hbox{%
\_ifnum\_stylenum<2 \_everymath{\_currstyle}%
\_else
\_ifnum\_stylenum=2 \_def\_textmff{+ssty=0;}\_fi
\_ifnum\_stylenum=3 \_def\_textmff{+ssty=1;}\_def\_scriptmff{+ssty=1;}\_fi
\_ifnum\_stylenum=2 \_def\_textmff{ssty=1;}\_fi
\_ifnum\_stylenum=3 \_def\_textmff{ssty=2;}\_def\_scriptmff{ssty=2;}\_fi
\_typoscale[\_dobystyle{}{}{700}{500}/]\_fi #1}}}%
}
\_public \mathbox ;
Expand Down
22 changes: 9 additions & 13 deletions optex/base/math-unicode.opm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,8 @@
\_setunimathdimens
}%
\_def\_setunimathdimens{% PlainTeX sets these dimens for 10pt size only:
\_delimitershortfall=0.5\_fontdimen6\_textfont3
\_nulldelimiterspace=0.12\_fontdimen6\_textfont3
\_scriptspace=0.05\_fontdimen6\_textfont3
\_delimitershortfall=0.5\_fontdimen6\_textfont1
\_nulldelimiterspace=0.12\_fontdimen6\_textfont1
\_setbox0=\_hbox{\_everymath{}$\_fam1\_displaystyle{0\_atop0}$}%
\_Umathfractiondelsize\_displaystyle = \_dimexpr(\_ht0-\_Umathaxis\_displaystyle)*2\_relax
\_setbox0=\_box\_voidbox
Expand All @@ -114,12 +113,9 @@
loads the given Unicode-math fonts in three sizes given by the
\^`\setmathsizes` macro and sets it as the math family `<number>`.
The `<font features>` are added to the default
\`\_mfontfeatures` and to the size-dependent features `+ssty=0`
if script size is asked or `+ssty=1` if scriptscriptsize is asked.
If the math family 1 is loaded then the family 2 and 3 are set by the same
font because \TeX/ needs to read dimension information about generating
math formulae from these three math families. All information needed by
\TeX/ is collected in single Unicode-math font.\nl
\`\_mfontfeatures` and to the size-dependent features `ssty=1`
if script size is asked or `ssty=2` if scriptscriptsize is asked.
All information needed by \TeX/ is collected in single Unicode-math font.\nl
The \^`\_corrmsize` `<factor><space>` can be used just before
`\_loadumathfamily`, see section~\ref[math-preload] for more information.\nl
The \`\_textmff`, \`\_scriptmff` and \`\_sscriptmff` are additional font
Expand All @@ -133,14 +129,14 @@
\_def\_loadumathfamily #1 #2#3 {%
\_edef\_optsizesave{\_the\_optsize}%
\_optsize=\_sizemtext \_font\_mF=\_umathname{#2}{\_textmff #3} at\_optsize
\_textfont#1=\_mF \_ifnum#1=1 \_textfont2=\_mF \_textfont3=\_mF \_fi
\_textfont#1=\_mF
\_optsize=\_sizemscript \_font\_mF=\_umathname{#2}{\_scriptmff #3} at\_optsize
\_scriptfont#1=\_mF \_ifnum#1=1 \_scriptfont2=\_mF \_scriptfont3=\_mF \_fi
\_scriptfont#1=\_mF
\_optsize=\_sizemsscript \_font\_mF=\_umathname{#2}{\_sscriptmff #3} at\_optsize
\_scriptscriptfont#1=\_mF \_ifnum#1=1 \_scriptscriptfont2=\_mF \_scriptscriptfont3=\_mF \_fi
\_scriptscriptfont#1=\_mF
\_optsize=\_optsizesave \_ptmunit=\_ptunit
}
\_def\_textmff{} \_def\_scriptmff{+ssty=0;} \_def\_sscriptmff{+ssty=1;}
\_def\_textmff{ssty=0;} \_def\_scriptmff{ssty=1;} \_def\_sscriptmff{ssty=2;}

\_doc -----------------------------
Unicode math font includes all typical math alphabets together, user needs not to
Expand Down
6 changes: 2 additions & 4 deletions optex/doc/optex-math.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1576,17 +1576,15 @@
\begtt \typosize[10/12]
\addto\_normalmath {\_loadmathfamily 5 bbold }

\_regtfm bbold 0 bbold5 5.5 bbold6 6.5 bbold7 7.5 bbold8 8.5 bbold9
9.5 bbold10 11.1 bbold12 15 bbold17 * % using all bbold*.tfm
\_regtfm bbold 0 bbold5 6 bbold7 8.5 bbold10 * % using all bbold*.pfb
\_normalmath % reload the math fonts collection
\endtt
%
The string \"`bbold`" is declared by `\_regtfm` as a collection of all
`bbold*.tfm` fonts, the optical sizes are supported.

\addto\_normalmath {\_loadmathfamily 5 bbold }
\_regtfm bbold 0 bbold5 5.5 bbold6 6.5 bbold7 7.5 bbold8 8.5 bbold9
9.5 bbold10 11.1 bbold12 15 bbold17 * % using all bbold*.tfm
\_regtfm bbold 0 bbold5 6 bbold7 8.5 bbold10 * % using all bbold*.pfb
\_normalmath
\Umathchardef \bbplus 2 5 "2B
\Umathchardef \bble 3 5 "3C
Expand Down