From 9db8d2c4164df3a98e7ddc4764696eb07eb33e1d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 21 Dec 2020 22:21:37 +0000 Subject: optex (21dec20) git-svn-id: svn://tug.org/texlive/trunk@57197 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/luatex/optex/README | 33 +- Master/texmf-dist/doc/luatex/optex/optex-doc.pdf | Bin 1279767 -> 1326904 bytes Master/texmf-dist/doc/luatex/optex/optex-doc.tex | 2 +- Master/texmf-dist/doc/luatex/optex/optex-math.tex | 4 + .../texmf-dist/doc/luatex/optex/optex-techdoc.tex | 4 + .../texmf-dist/doc/luatex/optex/optex-userdoc.tex | 71 ++-- Master/texmf-dist/tex/luatex/optex/base/alloc.opm | 16 +- .../tex/luatex/optex/base/basic-macros.opm | 2 +- .../tex/luatex/optex/base/bib-iso690.opm | 91 ++--- .../tex/luatex/optex/base/bib-simple.opm | 23 +- .../texmf-dist/tex/luatex/optex/base/cite-bib.opm | 16 +- Master/texmf-dist/tex/luatex/optex/base/doc.opm | 9 + Master/texmf-dist/tex/luatex/optex/base/f-antt.opm | 2 +- .../tex/luatex/optex/base/f-baskerville.opm | 2 +- .../tex/luatex/optex/base/f-comicneue.opm | 23 ++ .../texmf-dist/tex/luatex/optex/base/f-dejavu.opm | 31 ++ .../tex/luatex/optex/base/f-ebgaramond.opm | 16 +- .../tex/luatex/optex/base/f-garamondl.opm | 26 ++ .../tex/luatex/optex/base/f-gfsbodoni.opm | 7 +- .../texmf-dist/tex/luatex/optex/base/f-heros.opm | 124 ++++--- .../texmf-dist/tex/luatex/optex/base/f-kerkis.opm | 6 +- .../texmf-dist/tex/luatex/optex/base/f-kpfonts.opm | 45 +++ .../tex/luatex/optex/base/f-libertine.opm | 8 +- .../tex/luatex/optex/base/f-libertinus.opm | 36 ++ Master/texmf-dist/tex/luatex/optex/base/f-lido.opm | 14 +- .../texmf-dist/tex/luatex/optex/base/f-lmfonts.opm | 5 + .../tex/luatex/optex/base/f-merriweather.opm | 33 ++ .../tex/luatex/optex/base/f-poltawski.opm | 34 ++ .../texmf-dist/tex/luatex/optex/base/f-roboto.opm | 59 ++++ .../tex/luatex/optex/base/f-sourcepro.opm | 39 +++ .../tex/luatex/optex/base/f-technika.opm | 2 +- .../tex/luatex/optex/base/f-xcharter.opm | 2 +- .../texmf-dist/tex/luatex/optex/base/fams-ini.opm | 90 ++++- .../tex/luatex/optex/base/fonts-catalog.opm | 10 +- .../tex/luatex/optex/base/fonts-opmac.opm | 12 +- .../tex/luatex/optex/base/fonts-resize.opm | 30 +- .../tex/luatex/optex/base/fonts-select.opm | 377 ++++++++++++++------- .../texmf-dist/tex/luatex/optex/base/graphics.opm | 41 +-- .../texmf-dist/tex/luatex/optex/base/hi-syntax.opm | 2 +- .../tex/luatex/optex/base/hyperlinks.opm | 4 +- .../tex/luatex/optex/base/hyphen-lan.opm | 2 +- .../texmf-dist/tex/luatex/optex/base/if-macros.opm | 82 ++++- Master/texmf-dist/tex/luatex/optex/base/keyval.opm | 82 +++++ .../texmf-dist/tex/luatex/optex/base/languages.opm | 44 ++- .../texmf-dist/tex/luatex/optex/base/makeindex.opm | 2 +- .../tex/luatex/optex/base/math-macros.opm | 13 +- .../tex/luatex/optex/base/math-unicode.opm | 4 +- .../tex/luatex/optex/base/more-macros.opm | 15 +- Master/texmf-dist/tex/luatex/optex/base/optex.ini | 25 +- Master/texmf-dist/tex/luatex/optex/base/output.opm | 10 +- .../tex/luatex/optex/base/parameters.opm | 8 +- .../tex/luatex/optex/base/plain-macros.opm | 20 +- .../tex/luatex/optex/base/references.opm | 2 +- .../texmf-dist/tex/luatex/optex/base/sections.opm | 4 +- Master/texmf-dist/tex/luatex/optex/base/slides.opm | 31 +- Master/texmf-dist/tex/luatex/optex/base/styles.opm | 3 +- Master/texmf-dist/tex/luatex/optex/base/table.opm | 17 +- .../tex/luatex/optex/base/unimath-codes.opm | 11 +- Master/texmf-dist/tex/luatex/optex/base/usebib.opm | 169 +++++---- .../texmf-dist/tex/luatex/optex/base/verbatim.opm | 2 +- .../tex/luatex/optex/demo/op-biblist.bib | 298 ++++++++++++++++ .../texmf-dist/tex/luatex/optex/demo/op-slides.tex | 7 +- .../texmf-dist/tex/luatex/optex/pkg/plain-at.opm | 4 +- 63 files changed, 1678 insertions(+), 528 deletions(-) create mode 100644 Master/texmf-dist/tex/luatex/optex/base/f-comicneue.opm create mode 100644 Master/texmf-dist/tex/luatex/optex/base/f-dejavu.opm create mode 100644 Master/texmf-dist/tex/luatex/optex/base/f-garamondl.opm create mode 100644 Master/texmf-dist/tex/luatex/optex/base/f-kpfonts.opm create mode 100644 Master/texmf-dist/tex/luatex/optex/base/f-libertinus.opm create mode 100644 Master/texmf-dist/tex/luatex/optex/base/f-merriweather.opm create mode 100644 Master/texmf-dist/tex/luatex/optex/base/f-poltawski.opm create mode 100644 Master/texmf-dist/tex/luatex/optex/base/f-roboto.opm create mode 100644 Master/texmf-dist/tex/luatex/optex/base/f-sourcepro.opm create mode 100644 Master/texmf-dist/tex/luatex/optex/base/keyval.opm create mode 100644 Master/texmf-dist/tex/luatex/optex/demo/op-biblist.bib (limited to 'Master') diff --git a/Master/texmf-dist/doc/luatex/optex/README b/Master/texmf-dist/doc/luatex/optex/README index 09029521498..365ab41391e 100644 --- a/Master/texmf-dist/doc/luatex/optex/README +++ b/Master/texmf-dist/doc/luatex/optex/README @@ -19,32 +19,49 @@ doc/ ... PDF version of the OpTeX documentation and sources. History: -<0.17> optex.lua introduced (instead external ltluatex.lua) +<0.18> Dec. 2020 + Font support for next 9 families added. + Font selection system improved. + Documentation (especially about font selection system) corrected. + Macros supporting key=value included to the format. + \foreach macro improved. + Concept of multilang in bib rewritten. + \opwarning format changed (line numbers are printed too). + Several bugs fixed. +<0.17> Nov. 2020 + optex.lua introduced (instead external ltluatex.lua) hyph.patterns are loaded directly by \patterns, not using lua code \commentchars introduced (comments which are able to interrupt verbatim mode) -<0.16> callback.register_x introduced, namespaces for packages corrected +<0.16> Oct. 2020 + callback.register_x introduced, namespaces for packages corrected kerkis and EBGaramond fontfiles added little corrections optex-math manual: Index added -<0.15> Release for Overleaf - TL2020. +<0.15> Jun. 2020 + Release for Overleaf - TL2020. More vertical space above in \chap and \secc. -<0.14> Typeseting Math with OpTeX: new document added. +<0.14> Jun. 2020 + Typeseting Math with OpTeX: new document added. Math macros corrected. In-line verbatim in section titles allowed. \eqbox implemented. "\mnote up", "\displaylines to" (new features implemented) -<0.13> \table have more features: \tabskip, \table to, \table pxto, \vspan +<0.13> May 2020 + \table have more features: \tabskip, \table to, \table pxto, \vspan The \eqalign reimplemented to be more flexible. The boundary character ":" introduced in the \table. \| undefined in 8bit math: bug fixed. \isnextchar: \let\tmp=#1 -> \let\tmp= #1 -<0.12> The external macro qrcode.opm introduced +<0.12> May 2020 + The external macro qrcode.opm introduced New directory structure: base/, demo/, pkg/, doc/ introduced. \load macro introduced \newif: bug fixed, other bug fixed. -<0.11> \phi, \varpi in Unicode: bug fixed +<0.11> Apr. 2020 + \phi, \varpi in Unicode: bug fixed \mathstyles introduced. -<0.10> Technical documentation added +<0.10> Apr. 2020 + Technical documentation added \_famdecl instedad \_fontdecl in font family files (incompatible change). <0.09> Syntax highlighting implemented. <0.08> \numberedpar implmented. \emergencystretch=20pt added as default. diff --git a/Master/texmf-dist/doc/luatex/optex/optex-doc.pdf b/Master/texmf-dist/doc/luatex/optex/optex-doc.pdf index 62be299a6c7..2c54019fe36 100644 Binary files a/Master/texmf-dist/doc/luatex/optex/optex-doc.pdf and b/Master/texmf-dist/doc/luatex/optex/optex-doc.pdf differ diff --git a/Master/texmf-dist/doc/luatex/optex/optex-doc.tex b/Master/texmf-dist/doc/luatex/optex/optex-doc.tex index ce043bcbec8..227718cc297 100644 --- a/Master/texmf-dist/doc/luatex/optex/optex-doc.tex +++ b/Master/texmf-dist/doc/luatex/optex/optex-doc.tex @@ -20,7 +20,7 @@ \tit Format Based on Plain \TeX/ and OPmac\fnotemark1 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\hfill Version 0.17 +\hfill Version 0.18 \centerline{\it Petr Olšák, 2020} diff --git a/Master/texmf-dist/doc/luatex/optex/optex-math.tex b/Master/texmf-dist/doc/luatex/optex/optex-math.tex index 97d475af44f..29f56f68223 100644 --- a/Master/texmf-dist/doc/luatex/optex/optex-math.tex +++ b/Master/texmf-dist/doc/luatex/optex/optex-math.tex @@ -1632,6 +1632,10 @@ 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 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/luatex/optex/optex-techdoc.tex b/Master/texmf-dist/doc/luatex/optex/optex-techdoc.tex index a22e6baab26..1e95d269b75 100644 --- a/Master/texmf-dist/doc/luatex/optex/optex-techdoc.tex +++ b/Master/texmf-dist/doc/luatex/optex/optex-techdoc.tex @@ -111,6 +111,10 @@ We define first bundle of basic macros. The second bundle of \OpTeX/ macros is here. \printdoc more-macros.opm +\sec Using key=value format in parameters +\printdoctail keyval.opm +\printdoc keyval.opm + \sec Plain \TeX/ macros All macros from plain \TeX/ are rewritten here. Differences are mentioned in the documentation below. diff --git a/Master/texmf-dist/doc/luatex/optex/optex-userdoc.tex b/Master/texmf-dist/doc/luatex/optex/optex-userdoc.tex index 6083eef7ea6..1e94712426b 100644 --- a/Master/texmf-dist/doc/luatex/optex/optex-userdoc.tex +++ b/Master/texmf-dist/doc/luatex/optex/optex-userdoc.tex @@ -99,7 +99,7 @@ automatically mirrored in such case, it means that is replaced by and vice versa. \OpTeX/ declares following paper formats: a4, a4l (landscape~a4), -a5, a5l, b5, letter and user can declare another own format by `\sdef`: +a5, a5l, a3, a3l, b5, letter and user can declare another own format by `\sdef`: \begtt \sdef{_pgs:b5l}{(250,176)mm} @@ -222,7 +222,7 @@ by using the `up` keyword: \~`\mnote`` up{}`. You can set such to each \^`\mnote` manually in final printing in order to margin notes do not overlap. The positive value of shifts the note up and negative value shifts it down. For example -\^`\mnote`` up 2\badselineskip{}` shifts this marginal note two lines up. +\^`\mnote`` up 2\baselineskip{}` shifts this marginal note two lines up. \sec Fonts @@ -257,7 +257,8 @@ modifier which negates the previous feature is used. So `{\caps \rm First text \it Second text}` gives {\caps \rm First text \it Second text}. -\new +The font modifier without following variant selector does not change the font +actually, it only prepares data used by next variant selectors. There is one special variant selector \^`\currvar` which does not change the selected variant but reloads the font due to (maybe newly specified) font modifier(s). @@ -334,8 +335,9 @@ before \^`\typoscale` command. \scalemain \typoscale[800/800] % reduces from main values, no from current. \endtt -The size of the current font can be changed by the command -\^`\thefontsize[]` or can be rescaled by +The \^`\typosize` and \^`\typoscale` macros initialize the font family by `\rm`. +You can re-size only the current font by the command +\^`\thefontsize[]` or the font can be rescaled by \^`\thefontscale[]`. These macros don't change math fonts sizes nor baselineskip. @@ -445,7 +447,7 @@ paragraphs indented. If a title is so long then it breaks to more lines in the output. It is better to hint the breakpoints because \TeX/ does not interpret the meaning of the title. -User can put the \^`\nl` (it means newline) macro to the breakpoints. +User can put the \^`\nl` (means newline) to the breakpoints. If you want to arrange a title to more lines in your source file then you can use `^^J` at the end of each line (except the last one). @@ -467,7 +469,7 @@ figures. The user can declare more numbered objects. If the user writes the \^`\eqmark` as the last element of the display mode then this equation is numbered. The equation number is printed in brackets. This number -resets in each section by default. +is reset in each section by default. If the \^`\eqalignno` is used, then user can put \^`\eqmark` to the last column before `\cr`. For example: @@ -614,8 +616,8 @@ If the command \^`\hyperlinks` ` ` is used at the beginning the document, then the following objects are hyperlinked in the PDF output: \begitems -* numbers generated by \^`\ref` or \^`\pgref`, -* numbers of chapters, sections and subsections in the table of contents, +* numbers and texts generated by \^`\ref` or \^`\pgref`, +* numbers of chapters, sections, subsections and page numbers in the table of contents, * numbers or marks generated by \~`\cite` command (bibliography references), * texts printed by \~`\url` or \~`\ulink` commands. \enditems @@ -640,10 +642,10 @@ color. Example: \def\_citeborder {0 0 1} % links to references: blue frame \endtt -By default these macros are not defined. It means that no frames are created. +By default, these macros are not defined. It means that no frames are created. The hyperlinked footnotes can be activated by \^`\fnotelinks` ` ` -where footnote marks in text have `` and the same footnote marks +where footnote marks in the text have `` and the same footnote marks in footnotes have . You can define relevant borders \^`\_fntborder` and \^`\_fnfborder` analogically as \^`\_pgborder` (for example). @@ -654,7 +656,7 @@ active text linked to the \^`\dest` can be created by the `toc`, `pg`, `cite`, `ref` or another special for your purpose. These commands create internal links only when \^`\hyperlinks` is declared. -The \^`\url` macro prints its parameter in \^`\tt` font and creates a potential +The \^`\url` macro prints its parameter in \~`\tt` font and creates a potential breakpoints in it (after slash or dot, for example). If \^`\hyperlinks` declaration is used then the parameter of \^`\url` is treated as an external URL link. An example: `\url{http://www.olsak.net}` creates \url{http://www.olsak.net}. @@ -984,7 +986,7 @@ in-line verbatim surrounded by an \^`\activettchar` or processed by the \~`\code command. The \^`\everytt` is applied to all \^`\begtt...`\^`\endtt` environments (if it is not -decared in a group). There are tips for such global `\everytt` definitions here: +declared in a group). There are tips for such global `\everytt` definitions here: \begtt \adef!{\char9251 } \everytt={\typosize[9/11]} % setting font size for verbatim @@ -1057,8 +1059,8 @@ codes. Automatic syntax highlighting is possible, for example \OpTeX/ implements C, Python, \TeX/, HTML and XML syntax highlighting. More languages can be declared, see the section~\ref[hisyntax]. -If the code is read by \^`\verbinput` and it uses two characters at the front -of the lines as a comment lines, +If the code is read by \^`\verbinput` and there are comment lines prefixed +by two characters then you can set them by \~`\commentchars```. Such comments are fully interpreted by \TeX/ (i.e. not verbatim). Section~\ref[verb] (page \pgref[commentchars]) says more about this feature. @@ -1092,7 +1094,7 @@ If you are using a special macro in section or chapter titles and you need different behavior of such macro in other cases then use \^`\regmacro{}{}{}`. The parameters are applied locally in given cases. The \^`\regmacro` can be -used repeatedly: then the parameters are accumulated (for more macros). +used repeatedly: then its parameters are accumulated (for more macros). If a parameter is empty then original definition is used in given case. For example: @@ -1102,7 +1104,7 @@ For example: % another variants: \regmacro {\def\mylogo{\hbox{\Red My\Black LoGo}}} % used in TOC {\def\mylogo{\hbox{{\it My}\/LoGo}}} % used in running heads - {\def\mylogo{MyLoGo}} % used in outlines + {\def\mylogo{MyLoGo}} % used in PDF outlines \endtt \secc Making the index @@ -1156,7 +1158,7 @@ Example: {\em Linear space} (or {\em vector space}) is a nonempty set of... \endtt -The number of the parts of one index entry is unlimited. Note, that you can +The number of the parts of one index entry (separated by `/`) is unlimited. Note, that you can spare your typing by the comma in the \~`\ii` parameter. The previous example is equivalent to `\ii linear/space \ii vector/space`~. @@ -1202,11 +1204,11 @@ Only \"pure words" can be propagated to the index by the \~`\ii` command. It means that there cannot be any macro, \TeX/ primitive, math selector etc. But there is another possibility to create such complex index entry. Use \"pure equivalent" in the \~`\ii` parameter and map this equivalent to the -real word which is printed in the index by the \^`\iis` command. Example: +real word which is printed in the index. Such mapping is done by +\^`\iis` command. Example: \begtt -The \ii chiquadrat $\chi$-quadrat method is -... +The \ii chiquadrat $\chi$-quadrat method is ... If the \ii relax `\relax` command is used then \TeX/ is relaxing. ... \iis chiquadrat {$\chi$-quadrat} @@ -1293,7 +1295,7 @@ The usage is: \usebib/c (