From 136c3e9ad9673ec28f15fa6b5ef324bde730ac43 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 16 Nov 2023 21:01:53 +0000 Subject: optex (16nov23) git-svn-id: svn://tug.org/texlive/trunk@68873 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/optex/base/README | 8 + Master/texmf-dist/doc/optex/base/omls.tex | 2 +- Master/texmf-dist/doc/optex/base/optex-doc.pdf | Bin 1525711 -> 1585608 bytes Master/texmf-dist/doc/optex/base/optex-doc.tex | 4 +- Master/texmf-dist/doc/optex/base/optex-userdoc.tex | 143 +++- Master/texmf-dist/tex/optex/base/basic-macros.opm | 19 +- Master/texmf-dist/tex/optex/base/bib-iso690.opm | 51 +- Master/texmf-dist/tex/optex/base/bib-simple.opm | 12 +- Master/texmf-dist/tex/optex/base/cite-bib.opm | 6 +- Master/texmf-dist/tex/optex/base/colors.opm | 4 + Master/texmf-dist/tex/optex/base/f-clara.opm | 24 + Master/texmf-dist/tex/optex/base/f-culmus.opm | 25 + Master/texmf-dist/tex/optex/base/f-fraunces.opm | 69 ++ Master/texmf-dist/tex/optex/base/f-heuristica.opm | 5 +- Master/texmf-dist/tex/optex/base/f-oldstandard.opm | 22 + Master/texmf-dist/tex/optex/base/fams-ini.opm | 21 +- Master/texmf-dist/tex/optex/base/fonts-catalog.opm | 27 +- Master/texmf-dist/tex/optex/base/fonts-resize.opm | 2 +- Master/texmf-dist/tex/optex/base/fonts-select.opm | 38 +- .../texmf-dist/tex/optex/base/hisyntax-python.opm | 6 +- Master/texmf-dist/tex/optex/base/if-macros.opm | 29 +- Master/texmf-dist/tex/optex/base/keyval.opm | 25 +- Master/texmf-dist/tex/optex/base/lang-data.opm | 32 +- Master/texmf-dist/tex/optex/base/lang-decl.opm | 2 +- Master/texmf-dist/tex/optex/base/lists.opm | 9 +- Master/texmf-dist/tex/optex/base/makeindex.opm | 11 +- Master/texmf-dist/tex/optex/base/math-macros.opm | 4 +- Master/texmf-dist/tex/optex/base/math-preload.opm | 2 +- Master/texmf-dist/tex/optex/base/optex-tricks.opm | 756 +++++++++++++++++++++ Master/texmf-dist/tex/optex/base/optex.ini | 2 +- Master/texmf-dist/tex/optex/base/optex.lua | 6 +- Master/texmf-dist/tex/optex/base/others.opm | 43 +- Master/texmf-dist/tex/optex/base/parameters.opm | 14 +- Master/texmf-dist/tex/optex/base/references.opm | 13 +- Master/texmf-dist/tex/optex/base/table.opm | 5 +- .../texmf-dist/tex/optex/base/unimath-macros.opm | 31 +- Master/texmf-dist/tex/optex/base/usebib.opm | 620 ++++++++++++----- Master/texmf-dist/tex/optex/demo/op-biblist.bib | 2 +- Master/texmf-dist/tex/optex/demo/op-letter-he.tex | 37 + Master/texmf-dist/tex/optex/demo/op-slides.tex | 2 +- Master/texmf-dist/tex/optex/pkg/minim.opm | 24 +- Master/texmf-dist/tex/optex/pkg/vlna.opm | 7 +- 42 files changed, 1853 insertions(+), 311 deletions(-) create mode 100644 Master/texmf-dist/tex/optex/base/f-clara.opm create mode 100644 Master/texmf-dist/tex/optex/base/f-culmus.opm create mode 100644 Master/texmf-dist/tex/optex/base/f-fraunces.opm create mode 100644 Master/texmf-dist/tex/optex/base/f-oldstandard.opm create mode 100644 Master/texmf-dist/tex/optex/base/optex-tricks.opm create mode 100644 Master/texmf-dist/tex/optex/demo/op-letter-he.tex diff --git a/Master/texmf-dist/doc/optex/base/README b/Master/texmf-dist/doc/optex/base/README index 0d83e186c3c..3dab8b68f15 100644 --- a/Master/texmf-dist/doc/optex/base/README +++ b/Master/texmf-dist/doc/optex/base/README @@ -22,6 +22,14 @@ doc/ ... PDF version of the OpTeX documentation and sources. History: +<1.13> Nov 2023: + \usebib completely reimplemented, libranian package not needed from now. + Selected OpTeX tricks are automatically loaded when a relevant macro is used. + Font file for variable font Fraunces added. + Clara serif and more font files added. + Hebrew data, font family and Hebrew example added. + More robust key-value scanner. + Minor improvements and minor bug fixes. <1.12> May 2023: Support for right-to-left (Hebrew) typesseting introduced. More features in math.opm style. diff --git a/Master/texmf-dist/doc/optex/base/omls.tex b/Master/texmf-dist/doc/optex/base/omls.tex index a7ac9edd01e..f97a39a5227 100644 --- a/Master/texmf-dist/doc/optex/base/omls.tex +++ b/Master/texmf-dist/doc/optex/base/omls.tex @@ -387,7 +387,7 @@ beginning of the line. The list of `%%:` declarators follows: defining a behavior of unknown control sequences can be here. These definitions can depend on the converted document and on the output format and they can be given in the configuration files. -* `%%:app ` -- behaves like `%%;to` but the +* `%%:app ` -- behaves like `%%:to` but the cnv-program name instead output format is given here. * `%%:do ` -- does an `` if `` is output format or used cnv\hbox{-}program name. The `` syntax depends diff --git a/Master/texmf-dist/doc/optex/base/optex-doc.pdf b/Master/texmf-dist/doc/optex/base/optex-doc.pdf index ae67b499dd2..aebe78c6343 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 d42979a76e0..d780ceeeefb 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.12 +\hfill Version 1.13 \centerline{\it Petr Olšák, 2020, 2021, 2022, 2023} @@ -90,8 +90,10 @@ document \ulink[http://petr.olsak.net/ftp/olsak/optex/tex-nutshell.pdf] \insertoutline{CONTENTS} \outlines{0} +{\baselineskip=13.4pt \notoc\nonum \sec Contents \maketoc +\par} \thisoutline {USER DOCUMENTATION} diff --git a/Master/texmf-dist/doc/optex/base/optex-userdoc.tex b/Master/texmf-dist/doc/optex/base/optex-userdoc.tex index 4ae414cfbc1..61157b0d31d 100644 --- a/Master/texmf-dist/doc/optex/base/optex-userdoc.tex +++ b/Master/texmf-dist/doc/optex/base/optex-userdoc.tex @@ -1,4 +1,4 @@ -%% This is part of the OpTeX project, see http://petr.olsak.net/optex +% This is part of the OpTeX project, see http://petr.olsak.net/optex % This file is read from optex-doc.tex % Use: optex optex-doc (three times) to create whole documentation. @@ -705,7 +705,8 @@ The list of items is surrounded by \^`\begitems` and \^`\enditems` commands. The asterisk (`*`) is active within this environment and it starts one item. The item style can be chosen by the \^`\style` parameter written after \^`\begitems`: -\begtt +\def\otrickd{\ulink[http://petr.olsak.net/optex/optex-tricks.html\#deflists]{OpTeX trick 0108}} +\begtt \catcode`|=0 \style o % small bullet \style O % big bullet (default) \style - % hyphen char @@ -717,6 +718,7 @@ The item style can be chosen by the \^`\style` parameter written after \^`\begit \style A % items of type A), B), C), ... \style x % small rectangle \style X % big rectangle +\style d % definition list, use *{word}, see |otrickd \endtt For example: @@ -1574,7 +1576,7 @@ The default parameters are \begtt \circleparams={\ratio=1 \fcolor=\Yellow \lcolor=\Red \lwidth=0.5bp - \shadow=N \ignoremargins=N \hhkern=2pt \vvkern=2pt} + \shadow=N \overlapmargins=N \hhkern=2pt \vvkern=2pt} \endtt \new @@ -1648,8 +1650,8 @@ articles or books: \"Chapter", \"Table" and \"Figure". These phrases need to be in used language and it depends on the previously used language selectors `\lang`. \OpTeX/ declares these words only for few languages: \new -Czech, German, Spanish, French, Greek, Italian, Polish, Russian, Slovak and -English, If you need to use these words in other languages or you want to +Czech, German, Spanish, French, Greek, Italian, Polish, Russian, Slovak, Hebrew +and English, If you need to use these words in other languages or you want to auto-generate more words in your macros, then you can declare it by \~`\sdef` or \^`\_langw` commands as shown in section~\ref[langphrases]. @@ -1780,7 +1782,8 @@ because there are 150 paragraphs with neutral text prepared for you. The \^`\lipsum` macro is equivalent to \^`\lorem`. Example: \^`\lipsum[1-150]` prints all prepared paragraphs. -If the dot follows the argument before closing `]` (for example \^`\lipsum[3.]`) +If the dot follows the argument before closing `]` (for example \^`\lipsum[3.]` +or \^`\lipsum[3.1]`) then only first sentence from given paragraph is printed. \secc Logos @@ -1826,6 +1829,130 @@ put it as the first command in your document: \useOpTeX % we are using OpTeX format, no LaTeX :) \endtt +\secc \OpTeX/ tricks +%%%%%%%%%%%%%%%%%% + +The page \ulink[https://petr.olsak.net/optex/optex-tricks.html]{\OpTeX/ tricks} +shows many other features of \OpTeX/. They are of different nature and they +are typically implemented by short chunks of macro code presented at the +page. + +Selected macros defiend as an \OpTeX/ trick can be used directly from your +document without copying the code chunks into your macros. +It is because these macros are \"registered" in \OpTeX/ (by \^`\_regtrick` +internaly) and if you use such a macro then \OpTeX/ automatically loads the +appropriate code chunk from an external file. These macros are listed here. More +information about them are accesible via the external links. + +{\typosize[9/11] +\def\oturl{https://petr.olsak.net/optex/optex-tricks.html} +\def\tpg[#1]{\edef\tpgurl{\oturl\##1}} +\def\t#1{\ea\tA\ea{\string#1}\edef\tmp{\csstring#1}\iindex{\tmp}\dest[cs:\tmp]} +\def\tA#1{\ea\ulink\ea[\tpgurl]{#1}} + +\medskip +\tpg[algol]\t\algol\ enables to create pseudocode listings. + +\tpg[beglua]\t\beglua, \t\begLUA, \t\logginglua\ writing LUA codes as LUA codes. + +\tpg[cancel]\t\cancel\ prints a given text and the line/cross line over the text. + +\tpg[begfile]\t\createfile, \t\begfile, \t\endfile\ +writes a code from the document to the given file. + +\tpg[colortab]\t\colortab\ +colored cells in the table. + +\tpg[correctvsize]\t\correctvsize\ +sets `\vsize` to fit lines exactly to pages. + +\tpg[booktabs]\t\crtop, \t\crmid, \t\crbot\ +specific design of tables: only horozontal rules with different thickness. + +\tpg[colorlin]\t\crx\ +alternating colored lines in tables. + +\tpg[directoutput]\t\directoutput\ +puts boxes to standalone pages adatped to the box dimesions. + +\tpg[easylist]\t\easylist\ +the depth of list is given by the number of `*`. + +\tpg[fullcite]\t\fcread, \t\fullcite\ +citations by full bibliographic records. + +\tpg[greyblock]\t\framedblocks\ +redefines \^`\begblock`, \^`\endblock` to create blocks in frames splittable to pages. + +\tpg[ignoreinspic]\t\ignoreinspic\ +the \^`\inspic` commands stop loading images, they are replaced by gray frames. + +\tpg[import]\t\import\ +allows to have subsets of document input files in separate directories. + +\tpg[ispageodd]\t\ispageodd\ +tests, if the current point is at odd page regardless of asynchronous processing. + +\tpg[perpage]\t\incrpp. \t\thepp, \t\thepplast, \t\truepage\ +does per-page counting of objects. + +\tpg[keystrokes]\t\keystoke\ +prints given text in a keystroke-like frame. + +\tpg[longtable]\t\longtable\ +alows to break a table to more pages and repeates header. + +\tpg[lot]\t\makeLOF, \t\makeLOT, \t\captionF, \t\captionT\ +create list of tables and list of figures similar to \^`\maketoc`. + +\tpg[linnum]\t\pstart, \t\pend\ +dispalys line numbers of the marked text in the margin. + +\tpg[shadedframe]\t\shadedframe\ +colored rectangular frames with simple shadows. + +\tpg[roundframe]\t\roundframe\ +colored frames with rounded corners and many options. + +\tpg[scaleto]\t\scaleto, \t\scaletof\ +text font size changed to the desired width. + +\tpg[runsystem]\t\runsystem\ +runs the given external system command. + +\tpg[seccc]\t\seccc, \t\iniseccc\ +implements new level of subsubsections. + +\tpg[dayw]\t\sethours, \t\setminutes, \t\setseconds, \t\setweekday\ +printing time, date, and day of week. + +\tpg[multilist]\ea\ulink\ea[\oturl\#multilist]{\string\style\space m}, \t\keepstyle\ +creates lists with items numbered like subsections. + +\tpg[tabs]\t\settabs, \t\tabs\ +macros emulate tabulators of old typewriters. + +\tpg[pglists]\t\showpglists\ +shows good organized list of nodes of given pages to the log file. + +\tpg[tnodes]\t\tabnodes\ +positions of table items are nodes, they can be used for drawing. + +\tpg[tnote]\t\tnote\ +creates notes for table data printed just after the table. + +\tpg[ttlineref]\t\ttlineref\ +verbatim lines referenced in text. + +\tpg[tablevcent]\t\vcent, \t\vbot\ +prints paragraphs in tables verticaly centered or placed at bottom. + +\tpg[twoblocks]\t\twoblocks\ +allows printing bilingual texts in two columns veritically aligned. + + +} + \sec Summary %%%%%%%%%%%% @@ -1919,8 +2046,8 @@ documentation. \^`\afterfi` `{}\fi` expands to `\fi`.\nl \^`\basefilename` \^`\currfile` returns the name of the file currently read.\nl \^`\bp`` {}` expands \TeX/ dimension to decimal number in `bp` without unit.\nl -\^`\casesof` ` ` expands to a given case by meaning of the ``. - See also \^`\xcasesof`.\nl +\^`\casesof` ` ` expands to a given case by the given ``. + See also \^`\qcasesof`, \^`\xcasesof`.\nl \~`\_codedecl`` {}` is used at beginning of macro files.\nl \~`\colordef`` \macro {}` declares `\macro` as color switch.\nl \^`\cs` `{}` expands `\`.\nl diff --git a/Master/texmf-dist/tex/optex/base/basic-macros.opm b/Master/texmf-dist/tex/optex/base/basic-macros.opm index 92275056787..f2047cadf0f 100644 --- a/Master/texmf-dist/tex/optex/base/basic-macros.opm +++ b/Master/texmf-dist/tex/optex/base/basic-macros.opm @@ -1,6 +1,6 @@ %% This is part of the OpTeX project, see http://petr.olsak.net/optex -\_codedecl \sdef {Basic macros for OpTeX <2023-01-22>} % preloaded in format +\_codedecl \sdef {Basic macros for OpTeX <2023-11-11>} % preloaded in format \_doc ------------------------------ \`\bgroup`, \`\egroup`, \`\empty`, \`\space`, and \`\null` @@ -56,12 +56,20 @@ \_public \sdef \sxdef \slet ; \_doc ------------------------------ - \`\adef` `{}{}` puts the as active character and defines it - as `{}`. You can declare a macro with parameters too. For example - `\adef @#1{...#1...}`. + \`\adef` `{}` defines active `` as and then + puts the as active character. I.e. the `` can include the + as non-active charter (if it is non-active before `\adef`). + For example `\adef ?{\,?}`. + If the character is special, you can escape it, for example `\adef\%{...}`. + The space can be declared by `\adef{ }{}`. + You can declare a macro with parameters too, for example + `\adef @#1{...#1...}`. You can use prefixes `\protected`, `\global`, + `\long` before `\adef`, they behave like prefixes before `\def`. \_cod ------------------------------ -\_def \_adef #1{\_catcode`#1=13 \_begingroup \_lccode`\~=`#1\_lowercase{\_endgroup\_def~}} +\_def\_adef#1#2#{\_adefA{#1}{#2}} +\_def\_adefA#1#2#3{\_ea\_def\_directlua{tex.cprint(13,"\_luaescapestring{\_csstring#1}")}#2{#3}% + \_catcode`#1=13 } \_public \adef ; \_doc ------------------------------ @@ -142,6 +150,7 @@ \_endcode % ------------------------------------- +2023-11-11: \adef reimplemented, \protected, \long, \global allowed before \adef 2023-01-22: \trycs: afterfi used for second parameter 2022-11-22: \_banner definition moved here 2022-11-18: \ahead introduced diff --git a/Master/texmf-dist/tex/optex/base/bib-iso690.opm b/Master/texmf-dist/tex/optex/base/bib-iso690.opm index fcdbd5d48dd..5595d658770 100644 --- a/Master/texmf-dist/tex/optex/base/bib-iso690.opm +++ b/Master/texmf-dist/tex/optex/base/bib-iso690.opm @@ -1,6 +1,6 @@ % This is part of the OpTeX project, see http://petr.olsak.net/optex -\_codedecl \_undefined {BIB style (iso690) <2023-04-22>} % loaded on demand by \usebib +\_codedecl \_undefined {BIB style (iso690) <2023-09-13>} % loaded on demand by \usebib \_ifx\_optexbibstyle\_undefined \_errmessage {This file can be read by: \_string\usebib/? (iso690) bibfiles command only} @@ -116,7 +116,7 @@ \_bibmark=\_ea{\_tmp}% } \_def\_createbibmark #1;#2,#3;#4,#5\_fin{% #1=year #2=LastName #3=FirstName #4=nextAuthor - #2\_ifx^#4^\_else \_Mtext{bib.etal}\_fi, #1% + #2\_ifx^#4^\_else \_Mtext{bib.etal}\_fi \_ifx^#1^\_else, #1\_fi } \_doc ----------------------------- @@ -150,25 +150,11 @@ \_fi\_fi } - \_doc ----------------------------- - Non-standard field names. - \_cod ----------------------------- - -\_CreateField {ednote} -\_CreateField {citedate} -\_CreateField {numbering} -\_CreateField {isbn} -\_CreateField {issn} -\_CreateField {doi} -\_CreateField {url} -\_CreateField {bibmark} - \_doc ----------------------------- Sorting. \_cod ----------------------------- -\_SortingOrder{name,year}{lfvj} -\_SpecialSort {key} +\_fieldalias {key} {sortedby} \_doc ----------------------------- Supporting macros. @@ -305,9 +291,21 @@ \_bprintb [url] {\_preurl\_url{##1}. }{}% } \_sdef{_print:phdthesis}{\_def\_thesistype{\_Mtext{bib.phdthesis}}\_cs{_print:thesis}} -\_sdef{_print:mastershesis}{\_def\_thesistype{\_Mtext{bib.masthesis}}\_cs{_print:thesis}} +\_sdef{_print:mastersthesis}{\_def\_thesistype{\_Mtext{bib.masthesis}}\_cs{_print:thesis}} \_sdef{_print:bachelorsthesis}{\_def\_thesistype{\_Mtext{bib.bachthesis}}\_cs{_print:thesis}} +\_sdef{_print:online}{% + \_bprintb [!author] {\_doauthor1{##1}\:\ }{}% + \_bprintb [title] {{\_em##1}\_bprintc\_titlepost{\:\ *}\_bprintv[howpublished]{}{\:}\ }% + {\_bibwarning}% + \_bprinta [howpublished] {[*].\ }{}% + \_bprinta [ednote] {\_prepareednote*\_bprintv[citedate]{}{.}\ }{}% + \_bprinta [year] {}{}% + \_bprinta [accessed] {\_docitedate*///\_relax.\ }{\_bibwarning}% + \_bprintb [doi] {\_predoi DOI \_ulink[http://dx.doi.org/##1]{##1}.\ }{}% + \_bprintb [url] {\_preurl\_url{##1}. }{\_bibwarning}% +} + \_sdef{_print:generic}{% \_bprintb [!author] {\_doauthor1{##1}\:\ }{\_bibwarning}% \_bprintb [title] {{\_em##1}\_bprintc\_titlepost{\:\ *}\_bprintv[howpublished]{}{\:}\ }% @@ -784,6 +782,12 @@ There are nearly equivalent entries: `@BACHELORSTHESIS`, `@MASTERSTHESIS` and automatically. The type field is optional in this case. If it is used then it has precedence before the default setting. +\secccc The @ONLINE entry + +It is intended for online publications. + +Fields: author, title(!), howpublished, ednote, publisher, accessed, doi, url(!), note. + \secccc The @MISC entry It is intended for various usage. @@ -835,19 +839,20 @@ yearprint value) is also used in the text-oriented bib-marks when `\nonumcitations` is set. If you have some problems with name sorting, you can use the hidden field -`key`, which is used for sorting instead of the \"Lastname Firstname(s)" -of authors. If the `key` field is unset then the \"Lastname Firstname(s)" +`sortedby` (or `key` field with the same effect). +It can be used for sorting instead of the \"Lastname Firstname(s)" +of the first author. If the `sortedby` field is unset then the \"Lastname Firstname(s)" is used for sorting normally. Example: \begtt author = "Světla Čmejrková", -key = "Czzmejrkova Svetla", +sortedby = "Czzmejrkova Svetla", \endtt This entry is now sorted between C and D. The norm recommends placing the auto-citations at the top of the list of -references. You can do this by setting `key = "@"`, to each entry with your +references. You can do this by setting `sortedby = "@"`, to each entry with your name because the `@` character is sorted before `A`. @@ -928,6 +933,8 @@ Other options in the option field are silently ignored. \_endinput +2023-09-13 ... \_createbibmark: no comma if year is missing +2023-06-23 ... @ONLINE entry introduced 2023-04-22 ... incollection: typo corrected 2023-03-25 ... \_createbibmark introduced 2022-05-10 ... \. -> \:, collision with \oldaccents fixed. diff --git a/Master/texmf-dist/tex/optex/base/bib-simple.opm b/Master/texmf-dist/tex/optex/base/bib-simple.opm index e61e94d7e26..c70bb12be7e 100644 --- a/Master/texmf-dist/tex/optex/base/bib-simple.opm +++ b/Master/texmf-dist/tex/optex/base/bib-simple.opm @@ -1,6 +1,6 @@ %% This is part of the OpTeX project, see http://petr.olsak.net/optex -\_codedecl \_undefined {BIB style (simple) <2023-04-22>} % loaded on demand by \usebib +\_codedecl \_undefined {BIB style (simple) <2023-09-13>} % loaded on demand by \usebib \_ifx\_optexbibstyle\_undefined \_errmessage {This file can be read by: \_string\usebib/? (simple) bibfiles command only} @@ -39,7 +39,7 @@ \_edef\_tmp{\_ea\_createbibmark\_expanded{\_tmp;\_authlist;,;,;,;}\_fin}\_fi \_bibmark=\_ea{\_tmp}% } -\_def\_createbibmark#1;#2,#3\_fin{#2, #1} +\_def\_createbibmark#1;#2,#3\_fin{#2\_ifx^#1^\_else, #1\_fi} \_def\_preurl{\_hfil\_break} \_def\_Inclause{In:~} @@ -156,6 +156,14 @@ \_bprinta [institution] {*.\ }{}% \_bprintb [url] {\_preurl\_url{##1}. }{}% } +\_sdef{_print:online}{% + \_bprinta [!author] {*.\ }{}% + \_bprintb [title] {{\_em##1}\:\ }{}% + \_bprinta [howpublished] {*.\ }{}% + \_bprinta [institution] {*.\ }{}% + \_bprinta [series] {*.\ }{}% + \_bprintb [url] {\_preurl\_url{##1}. }{\_bibwarning}% +} \_sdef{_print:misc}{% \_bprinta [!author] {*.\ }{}% \_bprintb [title] {{\_em##1}\:\ }{}% diff --git a/Master/texmf-dist/tex/optex/base/cite-bib.opm b/Master/texmf-dist/tex/optex/base/cite-bib.opm index 9dc32a2632a..805b84de030 100644 --- a/Master/texmf-dist/tex/optex/base/cite-bib.opm +++ b/Master/texmf-dist/tex/optex/base/cite-bib.opm @@ -1,4 +1,4 @@ -%% This is part of the OpTeX project, see http://petr.olsak.net/optex +% This is part of the OpTeX project, see http://petr.olsak.net/optex \_codedecl \cite {Cite, Biblioraphy <2021-04-13>} % preloaded in format @@ -97,7 +97,7 @@ \_cod ----------------------------- \_def\_citeA #1#2,{\_if#1,\_else - \_if *#1\_addcitelist{*}\_ea\_skiptorelax \_fi + \_if *#1\_addcitelist{*}\_sxdef{_bib:\_bibp*}{}\_ea\_skiptorelax \_fi \_ifcsname _bib:\_bibp#1#2\_endcsname \_else \_addcitelist{#1#2}% \_opwarning{{\_the\_bibpart} \_noexpand\cite [#1#2] unknown. Try to TeX me again}\_openref @@ -125,7 +125,7 @@ distinguished by , the \`\_addcitelist``{