From 9ed2be15b632f76247ead6f36a0cbc913057fa48 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Fri, 22 May 2020 03:00:58 +0000 Subject: CTAN sync 202005220300 --- macros/luatex/optex/README | 5 + macros/luatex/optex/base/alloc.opm | 13 +- macros/luatex/optex/base/bib-iso690.opm | 2 +- macros/luatex/optex/base/bib-simple.opm | 2 +- macros/luatex/optex/base/cite-bib.opm | 6 +- macros/luatex/optex/base/colors.opm | 13 +- macros/luatex/optex/base/doc.opm | 3 +- macros/luatex/optex/base/fams-ini.opm | 20 +- macros/luatex/optex/base/graphics.opm | 10 +- macros/luatex/optex/base/hi-syntax.opm | 8 +- macros/luatex/optex/base/hisyntax-c.opm | 4 +- macros/luatex/optex/base/hyphen-lan.opm | 2 +- macros/luatex/optex/base/if-macros.opm | 7 +- macros/luatex/optex/base/languages.opm | 4 +- macros/luatex/optex/base/math-macros.opm | 109 ++++++++-- macros/luatex/optex/base/math-preload.opm | 4 +- macros/luatex/optex/base/more-macros.opm | 6 +- macros/luatex/optex/base/optex.ini | 2 +- macros/luatex/optex/base/others.opm | 6 + macros/luatex/optex/base/output.opm | 7 +- macros/luatex/optex/base/parameters.opm | 32 ++- macros/luatex/optex/base/prefixed.opm | 2 +- macros/luatex/optex/base/ref-file.opm | 2 +- macros/luatex/optex/base/sections.opm | 2 +- macros/luatex/optex/base/table.opm | 325 +++++++++++++++++++++++++---- macros/luatex/optex/base/unimath-codes.opm | 2 +- macros/luatex/optex/base/usebib.opm | 2 +- macros/luatex/optex/base/verbatim.opm | 2 +- macros/luatex/optex/demo/op-letter-cs.tex | 41 ++++ macros/luatex/optex/demo/op-letter-en.tex | 38 ++++ macros/luatex/optex/demo/op-letter.tex | 41 ---- macros/luatex/optex/demo/op-slides-bg.png | Bin 0 -> 62385 bytes macros/luatex/optex/demo/op-slides.tex | 4 +- macros/luatex/optex/demo/slides-bg.png | Bin 62385 -> 0 bytes macros/luatex/optex/doc/optex-doc.pdf | Bin 1172140 -> 1206961 bytes macros/luatex/optex/doc/optex-doc.tex | 2 +- macros/luatex/optex/doc/optex-techdoc.tex | 8 +- macros/luatex/optex/doc/optex-userdoc.tex | 92 ++++++-- 38 files changed, 645 insertions(+), 183 deletions(-) create mode 100644 macros/luatex/optex/demo/op-letter-cs.tex create mode 100644 macros/luatex/optex/demo/op-letter-en.tex delete mode 100644 macros/luatex/optex/demo/op-letter.tex create mode 100644 macros/luatex/optex/demo/op-slides-bg.png delete mode 100644 macros/luatex/optex/demo/slides-bg.png (limited to 'macros/luatex/optex') diff --git a/macros/luatex/optex/README b/macros/luatex/optex/README index 1a612e6179..caba16dda0 100644 --- a/macros/luatex/optex/README +++ b/macros/luatex/optex/README @@ -19,6 +19,11 @@ doc/ ... PDF version of the OpTeX documentation and sources. History: +<0.13> \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 New directory structure: base/, demo/, pkg/, doc/ introduced. \load macro introduced diff --git a/macros/luatex/optex/base/alloc.opm b/macros/luatex/optex/base/alloc.opm index 7e03ae77b7..d5625321a9 100644 --- a/macros/luatex/optex/base/alloc.opm +++ b/macros/luatex/optex/base/alloc.opm @@ -1,6 +1,6 @@ %% This is part of OpTeX project, see http://petr.olsak.net/optex -\_codedecl \newdimen {Allocators for registers <2020-01-23>} % loaded in format +\_codedecl \newdimen {Allocators for registers <2020-05-12>} % loaded in format \_doc ----------------------------- The limits are set first. @@ -28,7 +28,7 @@ \_countdef\_toksalloc=15 \_toksalloc=255 \_countdef\_readalloc=16 \_readalloc=-1 \_countdef\_writealloc=17 \_writealloc=-1 -\_countdef\_mathalloc=18 \_mathalloc=3 +\_countdef\_famalloc=18 \_famalloc=3 \_doc ----------------------------- The common allocation macro @@ -51,7 +51,7 @@ \_doc ----------------------------- The allocation macros \`\newcount`, \`\newdimen`, \`\newskip`, \`\newmuskip`, \`\newbox`, - \`\newtoks`, \`\newread`, \`\newwrite` and \`\newmath` + \`\newtoks`, \`\newread`, \`\newwrite` and \`\newfam` are defined here. \_cod ----------------------------- @@ -63,9 +63,9 @@ \_def\_newtoks #1{\_allocator #1{toks}\_toksdef} \_def\_newread #1{\_allocator #1{read}\_chardef} \_def\_newwrite #1{\_allocator #1{write}\_chardef} -\_def\_newmath #1{\_allocator #1{fam}\_chardef} +\_def\_newfam #1{\_allocator #1{fam}\_chardef} -\_public \newcount \newdimen \newskip \newmuskip \newbox \newtoks \newread \newwrite \newmath ; +\_public \newcount \newdimen \newskip \newmuskip \newbox \newtoks \newread \newwrite \newfam ; \_doc ----------------------------- The \`\newinsert` macro is defined differently than others. @@ -162,4 +162,7 @@ the array-like declarator of counters. } \endtt +\_endinput +2020-05-12 \newmath -> \newfam bug fixing +2020-01-23 released diff --git a/macros/luatex/optex/base/bib-iso690.opm b/macros/luatex/optex/base/bib-iso690.opm index b569de0d30..612258baee 100644 --- a/macros/luatex/optex/base/bib-iso690.opm +++ b/macros/luatex/optex/base/bib-iso690.opm @@ -361,7 +361,7 @@ Moreover, there are two optional special fields: \begitems * lang = language of the entry. The hyphenation plus autogenerated phrases and abbreviations will be typeset by this language. -* option = options by which you can control special printing of vairous fields. +* option = options by which you can control special printing of various fields. \enditems There can be only one option field per each entry with (may be) more options diff --git a/macros/luatex/optex/base/bib-simple.opm b/macros/luatex/optex/base/bib-simple.opm index 347d90bb14..f152d87acd 100644 --- a/macros/luatex/optex/base/bib-simple.opm +++ b/macros/luatex/optex/base/bib-simple.opm @@ -13,7 +13,7 @@ \_sfcode`\?=\_tmpnum \_sfcode`\!=\_tmpnum \_let\.=\_maybedot % prevents from double periods -% Formating of Author/Editor lists: +% Formatting of Author/Editor lists: \_def\_authorname{% \_ifnum\_NameCount>1 diff --git a/macros/luatex/optex/base/cite-bib.opm b/macros/luatex/optex/base/cite-bib.opm index 44f8dee055..c756a619bd 100644 --- a/macros/luatex/optex/base/cite-bib.opm +++ b/macros/luatex/optex/base/cite-bib.opm @@ -25,7 +25,7 @@ \`\ecite` `[