From 277c704145fc53d03e29c11ca1f20c6de294897e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 4 Aug 2022 20:34:18 +0000 Subject: optex (4aug22) git-svn-id: svn://tug.org/texlive/trunk@64050 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/optex/base/README | 4 ++ Master/texmf-dist/doc/optex/base/optex-doc.pdf | Bin 1415023 -> 1437685 bytes Master/texmf-dist/doc/optex/base/optex-doc.tex | 2 +- Master/texmf-dist/doc/optex/base/optex-math.tex | 46 ++++++++++++--------- Master/texmf-dist/doc/optex/base/optex-userdoc.tex | 21 ++++++++++ 5 files changed, 53 insertions(+), 20 deletions(-) (limited to 'Master/texmf-dist/doc') diff --git a/Master/texmf-dist/doc/optex/base/README b/Master/texmf-dist/doc/optex/base/README index 866708c535d..0cd39b8770e 100644 --- a/Master/texmf-dist/doc/optex/base/README +++ b/Master/texmf-dist/doc/optex/base/README @@ -22,6 +22,10 @@ doc/ ... PDF version of the OpTeX documentation and sources. History: +<1.08> Aug 2022: + Sorting rules for German, French, Polish, Hungarian, ... added. + Font files for Montserrat, STIX, XITS, STIXtwo, Overlock added. + Minor improvements and bug fixing. <1.07> May 2022: Tikz's \foreach works only in its environment. \lipsum syntax enlarged by dot after paragraph num, example: \lipusm[3.]. diff --git a/Master/texmf-dist/doc/optex/base/optex-doc.pdf b/Master/texmf-dist/doc/optex/base/optex-doc.pdf index 3539a3fdfe5..bf9f70a3267 100644 Binary files a/Master/texmf-dist/doc/optex/base/optex-doc.pdf and b/Master/texmf-dist/doc/optex/base/optex-doc.pdf differ diff --git a/Master/texmf-dist/doc/optex/base/optex-doc.tex b/Master/texmf-dist/doc/optex/base/optex-doc.tex index 72a21336c13..785a181b1da 100644 --- a/Master/texmf-dist/doc/optex/base/optex-doc.tex +++ b/Master/texmf-dist/doc/optex/base/optex-doc.tex @@ -21,7 +21,7 @@ \tit Format Based on Plain \TeX/ and OPmac\fnotemark1 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\hfill Version 1.07 +\hfill Version 1.08 \centerline{\it Petr Olšák, 2020, 2021, 2022} diff --git a/Master/texmf-dist/doc/optex/base/optex-math.tex b/Master/texmf-dist/doc/optex/base/optex-math.tex index 030a919dbfb..ab127ea7622 100644 --- a/Master/texmf-dist/doc/optex/base/optex-math.tex +++ b/Master/texmf-dist/doc/optex/base/optex-math.tex @@ -205,7 +205,10 @@ Ord atoms are printed without spaces between them. The spaces are not cumulated, so the rule about spaces mentioned above is only a rough idea. The exact rule for horizontal spaces is given for each pairs of atoms in the table here. The symbol 0 means no space, 1 thin space, 2 medium space, -and 3 means thick space. +and 3 means thick space.\fnote +{The table presented here is built into \TeX. On the other hand, +\LuaTeX/ allows to set arbitrary spaces between arbitrary pairs, +see section 7.5.2 in the \LuaTeX/ manual.} \hangindent=-8.7cm \hangafter-2 The Bin atom is automatically transformed to the @@ -714,7 +717,7 @@ previous listing of math alphabets and sets as default: Moreover, it defines the alphabet selectors at user level (see section 1.3.3 of the \OpTeX/ manual). For example \begtt \typosize[10/12] -\_def\_marm {\_inmath{\_rmavariables \_rmdigits}} % \_mamrm is used in \rm +\_def\_marm {\_inmath{\_rmavariables \_rmdigits}} % \_marm is used in \rm \endtt % `\_inmath` runs its parameter only in math mode and sets the math alphabets. @@ -750,9 +753,7 @@ And the result from `\input print-unimath.opm` looks like the following ten pages. Unsupported characters can be replaced by characters from other Unicode math -font, see -\ulink[http://petr.olsak.net/optex/optex-tricks.html\#addumathfont]{OpTeX trick 0030} -or section~\ref[newfam]. +font, see section~\ref[newfam]. \label[listA]\wlabel{} @@ -984,7 +985,7 @@ and `$1+2+\unicodecdots + n$`. You get $1,2,\unicodeellipsis, n$ and $1+2+\unicodecdots + n$. If you feel that this is better, then you can set: `\let\dots=\unicodeellipsis \let\cdots=\unicodecdots`. -The Unicode fonts includes compact variants `\unicodevdots` $\unicodevdots$, +The Unicode fonts include compact variants `\unicodevdots` $\unicodevdots$, `\unicodeddots` $\unicodeddots$ and `\unicodeadots` $\unicodeadots$ too. @@ -1574,17 +1575,28 @@ used). So, the default `\_boldmath` macro defined by \OpTeX/ looks like: \let\_boldmath=\_boldunimath % this is done when Unicode math is initialized \endtt -\secc[newfam] Example of using additional math font - -The font `bbold10.tfm` includes double stroked characters, for example, -double stroked plus, double stroked Greek letters and digits. -Try to run `pdftex testfont`, then answer the question about the name of the -font: `bbold10` and then type command `\table\end`. The `testfont.pdf` is -printed with the table of characters of this font. -Most of these characters cannot be found in Unicode math fonts. +\secc[newfam] Using additional math fonts \new \OpTeX/ -We show an example of how to add this font to the collection of used math fonts. +The main Unicode math font is loaded by `\loadmath` and `\loadboldmath` +(typically processed when `\fontfam[]` is declared). Moreover, +you can load {\em additional Unicode math fonts} and you can combine +characters from main math font and these additional fonts. This can be +usable if the main math font doesn't include all desired characters or you +dislike some character shapes from main font. \OpTeX/ enables to load +additional math fonts by `\addUmathfont` and characters from additional +fonts can be declared by `\resetmathchars`. See the section 2.16 of \OpTeX/ +documentation for more details about this. + +The rest of this section includes an example which shows another task: how +to combine main Unicode math font with old 8-bit math font `bbold10.tfm`. +This font includes double stroked characters, for example, double stroked +plus, double stroked Greek letters and digits. Try to run `pdftex testfont`, +then answer the question about the name of the font: `bbold10` and then type +command `\table\end`. The `testfont.pdf` is printed with the table of +characters of this font. Most of these characters cannot be found in Unicode +math fonts. + We can re-define the `\_normalmath` macro by: \begtt \typosize[10/12] \addto\_normalmath {\_loadmathfamily 5 bbold } @@ -1660,10 +1672,6 @@ We have to settle for normal version of the font in the `\_boldmath` macro: \addto \_boldmath {\_loadmathfamily 5 bbold } \endtt -Another approach of using more Unicode math fonts in a single formula is -shown in -\ulink[http://petr.olsak.net/optex/optex-tricks.html\#addumathfont]{OpTeX trick 0030}. - \sec Index Control sequences listed at pages \pgref[listA]--\pgref[listB] are not diff --git a/Master/texmf-dist/doc/optex/base/optex-userdoc.tex b/Master/texmf-dist/doc/optex/base/optex-userdoc.tex index 92d2d970e9d..23609f7bad6 100644 --- a/Master/texmf-dist/doc/optex/base/optex-userdoc.tex +++ b/Master/texmf-dist/doc/optex/base/optex-userdoc.tex @@ -2018,6 +2018,27 @@ if you really need such feature. The `\sec` macro is reserved for sections but original Plain \TeX/ declares this control sequence for math secant\fnote{Use \code{$\\secant(x)$} to get $\secant(x)$.}. +\sec Related documents + +\begitems +* \ulink[http://petr.olsak.net/ftp/olsak/optex/optex-math.pdf] + {Typesetting math with \OpTeX} -- + More details about math typesetting. +* \ulink[http://petr.olsak.net/ftp/olsak/optex/tex-nutshell.pdf] + {\TeX/ in a Nutshell} -- + Summary about \TeX/ principles, \TeX/ primitive commands etc. +* \ulink[http://petr.olsak.net/ftp/olsak/optex/op-catalog.pdf] + {\OpTeX/ catalog} -- + All fonts collected to `\fontfam` families are shown here. +* \ulink[http://petr.olsak.net/ftp/olsak/optex/omls.pdf] + {OMLS} -- + \OpTeX/ Markup Language Standard. +* \ulink[http://petr.olsak.net/optex/optex-tricks.html] + {\OpTeX/ - tips, tricks, howto} -- + Tips of macro codes for various purposes. + +\enditems + \enddocument -- cgit v1.2.3