diff options
Diffstat (limited to 'macros/latex')
35 files changed, 1312 insertions, 1080 deletions
diff --git a/macros/latex/contrib/hep-paper/bibliography.bib b/macros/latex/contrib/hep-paper/bibliography.bib index 5b295b1c37..d63b733947 100644 --- a/macros/latex/contrib/hep-paper/bibliography.bib +++ b/macros/latex/contrib/hep-paper/bibliography.bib @@ -1,4 +1,4 @@ -@manual{hep-paper, +@article{hep-paper, title = "The |hep-paper| package", subtitle = "Publications in High Energy Physics", author = "Jan Hajer", @@ -15,18 +15,34 @@ eprintclass = "janhajer", eprint = "hep-paper", } -@manual{cleveref, +@article{kvoptions, +title = "The |kvoptions| package", +subtitle = "Key value format for package options", +author = "Heiko Oberdiek", +year = "2004", +eprinttype = "ctan", +eprint = "kvoptions", +related = "kvoptions-1", +} + +@manual{kvoptions-1, +eprinttype = "github", +eprintclass = "ho-tex", +eprint = "kvoptions", +} + +@article{cleveref, title = "The |cleveref| package", subtitle = "Intelligent cross-referencing", author = "Toby Cubitt", date = "2006", -url = "http://www.dr-qubit.org/cleveref.html", +url = "http://dr-qubit.org/cleveref", eprinttype = "ctan", eprint = "cleveref", } -@manual{foreign, -title = "The |foreign| package for \LaTeX2e", +@article{foreign, +title = "The |foreign| package for \hologo{LaTeX2e}", subtitle = "Systematic treatment of \enquote{foreign} words in documents", author = "Philip G. Ratcliffe", date = "2012", @@ -34,7 +50,7 @@ eprinttype = "ctan", eprint = "foreign", } -@manual{geometry, +@article{geometry, title = "The |geometry| package", subtitle = "Flexible and complete interface to document dimensions", author = "David Carlisle and Hideo Umeki", @@ -50,7 +66,7 @@ eprintclass = "davidcarlisle", eprint = "geometry", } -@manual{a4wide, +@article{a4wide, title = "The |a4wide| package", subtitle = "\enquote{Wide} a4 layout", author = "Alexander Holt and Jean-François Lamy", @@ -60,7 +76,7 @@ eprint = "a4wide", note = "depreciated and not used", } -@manual{microtype, +@article{microtype, title = "The |microtype| package", subtitle = "Subliminal refinements towards typographical perfection", author = "Robert Schlicht", @@ -69,8 +85,8 @@ eprinttype = "ctan", eprint = "microtype", } -@manual{authblk, -title = "A \LaTeX\ Package to Prepare Author and Affiliation Blocks", +@article{authblk, +title = "A \hologo{LaTeX} Package to Prepare Author and Affiliation Blocks", subtitle = "Support for footnote style author/affiliation", author = "Patrick W. Daly", date = "2001", @@ -78,24 +94,24 @@ eprinttype = "ctan", eprint = "authblk", } -@manual{bm, +@article{bm, title = "The |bm| package", subtitle = "Access bold symbols in maths mode", author = "David Carlisle and Frank Mittelbach", -collaboration = "\LaTeX\ Team", +collaboration = "\hologo{LaTeX} Team", date = "1993", eprinttype = "ctan", eprint = "bm", } -@manual{empheq, +@article{empheq, title = "The |empheq| package", author = "Lars Madsen and Morten Høgholm and Will Robertson and Joseph Wright", eprinttype = "ctan", eprint = "empheq", } -@manual{mathtools, +@article{mathtools, title = "The |mathtools| package", subtitle = "Mathematical tools to use with |amsmath|", author = "Lars Madsen and Morten Høgholm and Will Robertson and Joseph Wright", @@ -104,29 +120,29 @@ eprinttype = "ctan", eprint = "mathtools", } -@manual{amsmath, +@article{amsmath, title = "The |amsmath| package", -subtitle = "AMS mathematical facilities for \LaTeX", -author = "\LaTeX", -collaboration = "\LaTeX\ Team", +subtitle = "AMS mathematical facilities for \hologo{LaTeX}", +author = "\hologo{LaTeX}", +collaboration = "\hologo{LaTeX} Team", date = "1994", -url = "http://www.ams.org/tex/amslatex.html", +url = "https://ams.org/tex/amslatex", eprinttype = "ctan", eprint = "amsmath", } -@manual{amsfonts, +@article{amsfonts, title = "The |amsfonts| package", -subtitle = "\TeX\ fonts from the American Mathematical Society", +subtitle = "\hologo{TeX} fonts from the American Mathematical Society", author = "Michael Downes and David M. Jones and Frank Mittelbach and Rainer Schöpf", collaboration = "American Mathematical Society", date = "1995", -url = "http://www.ams.org/tex/amsfonts.html", +url = "https://ams.org/tex/amsfonts", eprinttype = "ctan", eprint = "amsfonts", } -@manual{amssymb, +@article{amssymb, title = "The |amssymb| package", author = "Michael Downes and David M. Jones and Frank Mittelbach and Rainer Schöpf", collaboration = "American Mathematical Society", @@ -135,7 +151,7 @@ eprinttype = "ctan", eprint = "amsfonts", } -@manual{slashed, +@article{slashed, title = "The |slashed| package", subtitle = "Put a slash through characters", author = "David Carlisle", @@ -144,7 +160,7 @@ eprinttype = "ctan", eprint = "slashed", } -@manual{physics, +@article{physics, title = "The |physics| package", subtitle = "Macros supporting the Mathematics of Physics", author = "Sergio C. de la Barrera", @@ -153,7 +169,7 @@ eprinttype = "ctan", eprint = "physics", } -@manual{units, +@article{units, title = "The |units| and |nicefrac| packages", subtitle = "Typeset units", author = "Axel Reichert", @@ -162,16 +178,17 @@ eprinttype = "ctan", eprint = "units", } -@manual{subcaption, +@article{subcaption, title = "The |subcaption| package", subtitle = "Support for sub-captions", author = "Axel Sommerfeldt", date = "2007", eprinttype = "ctan", eprint = "subcaption", +related = "caption-1", } -@manual{caption, +@article{caption, title = "The |caption| package", subtitle = "Customising captions in floating environments", author = "Axel Sommerfeldt", @@ -188,9 +205,9 @@ eprint = "caption", } -@manual{biblatex, +@article{biblatex, title = "The |biblatex| Package", -subtitle = "Sophisticated Bibliographies in \LaTeX", +subtitle = "Sophisticated Bibliographies in \hologo{LaTeX}", author = "Philipp Lehman and Joseph Wright and Audrey Boruvka and Philip Kime", date = "2006", eprinttype = "ctan", @@ -204,11 +221,11 @@ eprintclass = "plk", eprint = "biblatex", } -@manual{hyperref, -title = "Hypertext marks in \LaTeX: a manual for |hyperref|", -subtitle = "Extensive support for hypertext in \LaTeX", +@article{hyperref, +title = "Hypertext marks in \hologo{LaTeX}: a manual for |hyperref|", +subtitle = "Extensive support for hypertext in \hologo{LaTeX}", author = "Sebastian Rahtz and Heiko Oberdiek", -collaboration = "\LaTeX3 Project", +collaboration = "\hologo{LaTeX3} Project", date = "1995", eprinttype = "ctan", eprint = "hyperref", @@ -221,7 +238,7 @@ eprintclass = "latex3", eprint = "hyperref", } -@manual{graphicx, +@article{graphicx, title = "Packages in the \enquote{graphics} bundle", subtitle = "Enhanced support for graphics", author = "David Carlisle and Sebastian Rahtz", @@ -230,16 +247,16 @@ eprinttype = "ctan", eprint = "graphicx", } -@manual{booktabs, +@article{booktabs, title = "The |booktabs| package", -subtitle = "Publication quality tables in \LaTeX", +subtitle = "Publication quality tables in \hologo{LaTeX}", author = "Danie Els and Simon Fear", date = "1995", eprinttype = "ctan", eprint = "booktabs", } -@manual{multirow, +@article{multirow, title = "The |multirow|, |bigstrut| and |bigdelim| packages", subtitle = "Create tabular cells spanning multiple rows", author = "Piet van Oostrum and Jerry Leichter", @@ -248,8 +265,8 @@ eprinttype = "ctan", eprint = "multirow", } -@manual{fixmath, -title = "The |fixmath| package for \LaTeX2\epsilon", +@article{fixmath, +title = "The |fixmath| package for \hologo{LaTeX2e}", subtitle = "Make maths comply with ISO 31-0:1992 to ISO 31-13:1992", author = "Walter Schmidt", date = "2000", @@ -257,7 +274,7 @@ eprinttype = "ctan", eprint = "fixmath", } -@manual{alphabeta, +@article{alphabeta, title = "The |alphabeta| package", subtitle = "LICR macros and encoding definition files for Greek", author = "Günter Milde", @@ -266,17 +283,21 @@ eprinttype = "ctan", eprint = "greek-fontenc", } -@manual{arxiv-collector, -title = "arxiv-collector", +@article{arxiv-collector, +title = "|arxiv-collector|", +subtitle = "A little Python script to collect \hologo{LaTeX} sources for upload to the arXiv", author = "Dougal Sutherland", +date = "2018", eprinttype = "github", eprintclass = "dougalsutherland", eprint = "arxiv-collector", } -@manual{biber, -title = "biber", +@article{biber, +title = "\hologo{biber}", +subtitle = "Backend processor for Bib\hologo{LaTeX}", author = "François Charette and Philip Kime", +date = "2009", eprinttype = "github", eprintclass = "plk", eprint = "biber", @@ -288,30 +309,30 @@ eprinttype = "sourceforge", eprint = "biblatex-biber", } -@manual{lmodern, +@article{lmodern, title = "Latin Modern Family of Fonts", subtitle = "Latin modern fonts in outline formats", date = "2003", author = "B. Jackowski and J.M. Nowacki", -url = "http://www.gust.org.pl/projects/e-foundry/latin-modern", +url = "http://gust.org.pl/projects/e-foundry/latin-modern", eprinttype = "ctan", eprint = "lm", } -@manual{ifluatex, +@article{ifluatex, title = "The |ifluatex| package", subtitle = "Provides the |\textbackslash ifluatex| switch", author = "Heiko Oberdiek", -collaboration = "\LaTeX\ Team", +collaboration = "\hologo{LaTeX} Team", date = "2007", eprinttype = "ctan", eprint = "ifluatex", } -@manual{ifxetex, +@article{ifxetex, title = "The |iftex| package", -subtitle = "Am I running under XeTeX?", -collaboration = "\LaTeX\ Team", +subtitle = "Am I running under \hologo{XeTeX}?", +collaboration = "\hologo{LaTeX} Team", author = "Will Robertson", date = "2006", eprinttype = "ctan", @@ -325,47 +346,49 @@ eprintclass = "latex3", eprint = "iftex", } -@manual{fontspec, +@article{fontspec, title = "The |fontspec| package", author = "Will Robertson and Khaled Hosny", eprinttype = "ctan", eprint = "fontspec", } -@manual{fontenc, +@article{fontenc, title = "The |fontenc| package", subtitle = "Standard package for selecting font encodings", -collaboration = "\LaTeX\ Team", -author = "\LaTeX\ Team", +collaboration = "\hologo{LaTeX} Team", +author = "Frank Mittelbach and Robin Fairbairns and Werner Lemberg", +date = "1995", eprinttype = "ctan", eprint = "fontenc", } -@manual{inputenc, +@article{inputenc, title = "The |inputenc| package", subtitle = "Accept different input encodings", -collaboration = "\LaTeX\ Team", +collaboration = "\hologo{LaTeX} Team", author = "Frank Mittelbach and Alan Jeffrey", +date = "1989", eprinttype = "ctan", eprint = "inputenc", } -@manual{textcomp, +@article{textcomp, title = "The |textcomp| package", -subtitle = "\LaTeX\ support for the Text Companion fonts", -collaboration = "\LaTeX\ Team", +subtitle = "\hologo{LaTeX} support for the Text Companion fonts", +collaboration = "\hologo{LaTeX} Team", author = "Sebastian Rahtz", date = "1995", eprinttype = "ctan", eprint = "textcomp", } -@manual{enumitem, +@article{enumitem, title = "Customizing lists with the |enumitem| package", subtitle = "Control layout of itemize, enumerate, description", author = "Javier Bezos", date = "2003", -url = " http://www.texnia.com/enumitem.html", +url = "https://texnia.com/enumitem.html", eprinttype = "ctan", eprint = "enumitem", related = "enumitem-1", @@ -377,7 +400,7 @@ eprintclass = "jbezos", eprint = "enumitem", } -@manual{atbegshi, +@article{atbegshi, title = "The |atbegshi| package", subtitle = "Execute stuff at |shipout| time", author = "Heiko Oberdiek", @@ -393,7 +416,7 @@ eprintclass = "ho-tex", eprint = "atbegshi", } -@manual{picture, +@article{picture, title = "The |picture| package", subtitle = "Dimens for picture macros", author = "Heiko Oberdiek", @@ -409,7 +432,7 @@ eprintclass = "ho-tex", eprint = "picture", } -@manual{varwidth, +@article{varwidth, title = "The |varwidth| package", subtitle = "A variable-width minipage", author = "Donald Arseneau", @@ -418,7 +441,7 @@ eprinttype = "ctan", eprint = "varwidth", } -@manual{csquotes, +@article{csquotes, title = "The |csquotes| Package", subtitle = "Context sensitive quotation facilities", author = "Philipp Lehman and Joseph Wright", @@ -427,9 +450,9 @@ eprinttype = "ctan", eprint = "csquotes", } -@manual{babel, +@article{babel, title = "|Babel| Localization and internationalization", -subtitle = "Multilingual support for Plain \TeX\ or \LaTeX", +subtitle = "Multilingual support for Plain \hologo{TeX} or \hologo{LaTeX}", author = "Johannes Braams and Javier Bezos and at al.", date = "1989", eprinttype = "ctan", @@ -443,14 +466,14 @@ eprintclass = "latex3", eprint = "babel", } -@manual{polyglossia, +@article{polyglossia, title = "The |polyglossia| package", author = "Arthur Reutenauer and François Charette and Elie Roux and Bastien Roucariès and Jürgen Spitzmüller", eprinttype = "ctan", eprint = "polyglossia", } -@manual{parskip, +@article{parskip, title = "The |parskip| package", subtitle = "Layout with zero |\textbackslash parindent|, non-zero |\textbackslash parskip|", author = "Robin Fairbairns and Frank Mittelbach and H. Partl", @@ -467,24 +490,24 @@ eprint = "fmitex", } -@manual{fntguide, -title = "\LaTeX2\epsilon\ font selection", -subtitle = "Docmentation of \LaTeX\ font commands", -collaboration = "\LaTeX\ Team", -author = "\LaTeX\ Team", +@article{fntguide, +title = "\hologo{LaTeX2e}\ font selection", +subtitle = "Docmentation of \hologo{LaTeX} font commands", +collaboration = "\hologo{LaTeX} Team", +author = "\hologo{LaTeX} Team", date = "1995", eprinttype = "ctan", eprint = "fntguide", } -@manual{euenc, +@article{euenc, title = "The Experimental Unicode `EUx’ Encodings", author = "Will Robertson and Elie Roux and Khaled Hosny", eprinttype = "ctan", eprint = "euenc", } -@manual{soul, +@article{soul, title = "The |soul| package", subtitle = "Hyphenation for letterspacing, underlining, and more", author = "Melchior Franz", @@ -493,7 +516,7 @@ eprinttype = "ctan", eprint = "soul", } -@manual{glossaries, +@article{glossaries, title = "The |glossaries| package", subtitle = "Create glossaries and lists of acronyms", author = "Nicola Talbot", @@ -502,7 +525,7 @@ eprinttype = "ctan", eprint = "glossaries", } -@manual{glossaries-extra, +@article{glossaries-extra, title = "The |glossaries-extra| package", subtitle = "An extension to the |glossaries| package", author = "Dickimaw Books, Nicola Talbot", @@ -511,34 +534,34 @@ eprinttype = "ctan", eprint = "glossaries-extra", } -@manual{xparse, +@article{xparse, title = "The |xparse| package", subtitle = "A generic document command parser", author = "Frank Mittelbach and Chris Rowley and David Carlisle", -collaboration = "\LaTeX3 Project", +collaboration = "\hologo{LaTeX3} Project", date = "1999", eprinttype = "ctan", eprint = "xparse", } -@manual{pdftexcmds, +@article{pdftexcmds, title = "The |pdftexcmds| package", -subtitle = "LuaTeX support for pdfTeX utility functions", +subtitle = "\hologo{LuaTeX} support for \hologo{pdfTeX} utility functions", author = "Heiko Oberdiek", date = "2007", eprinttype = "ctan", eprint = "pdftexcmds", } -@manual{fix-cm, +@article{fix-cm, title = "The |fix-cm| package", author = "Frank Mittelbach and David Carlisle and Chris Rowley and Walter Schmidt", eprinttype = "ctan", eprint = "fix-cm", } -@manual{revtex, -title = "The |revtex| package", +@article{revtex, +title = "The REV\hologo{TeX} package", subtitle = "Styles for various Physics Journals", author = "Mark Doyle and Arthur Ogawa", collaboration = "American Physical Society", @@ -548,27 +571,27 @@ eprinttype = "ctan", eprint = "revtex", } -@manual{encguide, -title = "\LaTeX\ font encodings", -subtitle = "Documentation of \LaTeX\ font encodings", +@article{encguide, +title = "\hologo{LaTeX} font encodings", +subtitle = "Documentation of \hologo{LaTeX} font encodings", author = "Frank Mittelbach and Robin Fairbairns and Werner Lemberg", -collaboration = "\LaTeX3 Project Team", +collaboration = "\hologo{LaTeX3} Project Team", date = "1995", eprinttype = "ctan", eprint = "encguide", } -@manual{sfmath, +@article{sfmath, title = "The |sfmath| package", subtitle = "Sans-serif mathematics", author = "Olaf Dietrich", date = "2005", -url = "http://dtrx.de/od/tex/sfmath.html", +url = "https://dtrx.de/od/tex/sfmath", eprinttype = "ctan", eprint = "sfmath", } -@manual{relsize, +@article{relsize, title = "The |relsize| package", subtitle = "Set the font size relative to the current font size", author = "Donald Arseneau and Matt Swift", @@ -577,12 +600,101 @@ eprinttype = "ctan", eprint = "relsize", } -@manual{everyhook, +@article{everyhook, title = "The |everyhook| package", -subtitle = "Hooks for standard \TeX\ token lists", +subtitle = "Hooks for standard \hologo{TeX} token lists", author = "Stephen Checkoway", date = "2010", eprinttype = "ctan", eprint = "everyhook", } + +@article{sansmathfonts, +title = "The |sansmathfonts| package", +subtitle = "Correct placement of accents in sans-serif maths", +author = "Ariel Barton", +date = "2013", +eprinttype = "ctan", +eprint = "sansmathfonts", +} + +@article{xspace, +title = "The |xspace| package", +subtitle = "Define commands that appear not to eat spaces", +author = "David Carlisle and Morten Høgholm", +collaboration = "\hologo{LaTeX} Team", +date = "1993", +eprinttype = "ctan", +eprint = "xspace", +} + +@article{ragged2e, +title = "The |ragged2e|-package", +subtitle = "Alternative versions of \enquote{ragged}-type commands", +author = "Martin Schröder", +date = "1996", +eprinttype = "ctan", +eprint = "ragged2e", +related = "ragged2e-1", +} + +@manual{ragged2e-1, +eprinttype = "gitlab", +eprintclass = "hagenbuch", +eprint = "ragged2e", +} + +@article{url, +title = "The |url| package", +subtitle = "Verbatim with URL-sensitive line breaks", +author = "Donald Arseneau", +date = "1996", +eprinttype = "ctan", +eprint = "url", +} + +@article{jhep, +title = "The |JHEP| package", +author = "SISSA Medialab", +collaboration = "SISSA Medialab", +date = "1997", +url = "https://jhep.sissa.it/jhep/help/JHEP_TeXclass.jsp", +} + +@article{jcap, +title = "The |JCAP| package", +author = "SISSA Medialab", +collaboration = "SISSA Medialab", +date = "2002", +url = "https://jcap.sissa.it/jcap/help/JCAP_TeXclass.jsp", +} + +@article{bbm-macros, +title = "A package for using the |bbm| fonts in math environment", +author = "Torsten Hilbrich", +date = "1994", +eprinttype = "ctan", +eprint = "bbm-macros", +related = "bbm" +} + +@article{bbm, +title = "|bbm|", +subtitle = "\enquote{Blackboard-style} cm fonts", +author = " Gilles Robert", +date = "1993", +eprinttype = "ctan", +eprint = "bbm", +} + +@online{arxiv, +title = "arXiv", +subtitle = "free distribution service and an open archive for scholarly articles", +url = "https://arxiv.org", +author = "Paul Ginsparg", +collaboration = "arXiv Team", +year = "1991", +organization = "Cornell University", +ReportNumber = "test", +} diff --git a/macros/latex/contrib/hep-paper/hep-paper.dtx b/macros/latex/contrib/hep-paper/hep-paper.dtx index 9ba0f10dcd..5c9841bc6a 100644 --- a/macros/latex/contrib/hep-paper/hep-paper.dtx +++ b/macros/latex/contrib/hep-paper/hep-paper.dtx @@ -16,10 +16,13 @@ % \fi % % \iffalse +% %<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01] -%<package>\ProvidesPackage{hep-paper}[2020/03/01 v1.2 Publications in High Energy Physics] - +%<package>\ProvidesPackage{hep-paper}[2020/05/01 v1.3 Publications in High Energy Physics] +%<datamodel>\ProvidesFile{hep-paper.dbx}[2020/05/01 v1.3 HEP-Paper biblatex data model] +% %<*driver> + \documentclass{ltxdoc} \MacroIndent=1.5em @@ -39,26 +42,27 @@ % \vspace{2.3ex}\vskip -\parskip} % \makeatother -\newenvironment{example}[1][.5]{% - \begin{minipage}[t]{\linewidth}% - \begin{minipage}[t]{#1\linewidth} - \newcommand{\second}{% - \end{minipage}% - \begin{minipage}[t]{\linewidth-#1\linewidth}% - }% -}{\end{minipage}\end{minipage}} - \usepackage[parskip]{hep-paper} \bibliography{bibliography} \acronym{PDF}{portable document format} -\listfiles +\usepackage{hologo} +\usepackage{multicol} \usepackage{titletoc} \titlecontents{section}[0em]{\medskip\bfseries}{\thecontentslabel\hspace{.8em}}{}{\hfill\contentspage} +\newenvironment{columns}[1][.5]{% + \begin{minipage}[t]{\linewidth}% + \begin{minipage}[t]{#1\linewidth} + \newcommand{\column}{% + \end{minipage}% + \begin{minipage}[t]{\linewidth-#1\linewidth}% + }% +}{\end{minipage}\end{minipage}} + \EnableCrossrefs \CodelineIndex \RecordChanges @@ -66,10 +70,12 @@ \begin{document} \DocInput{hep-paper.dtx} \end{document} + %</driver> +% % \fi % -% \CheckSum{0} +% \CheckSum{1140} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -88,8 +94,9 @@ % Right brace \} Tilde \~} % % \changes{v1.0}{2019/01/01}{Initial version of the style file} -% \changes{v1.1}{2020/01/01}{Transition to documented \LaTeX\ source file} -% \changes{v1.2}{2020/03/01}{Inclusion of package options} +% \changes{v1.1}{2020/01/01}{Transition to documented \hologo{LaTeX} source file} +% \changes{v1.2}{2020/03/01}{Introduction of package options} +% \changes{v1.3}{2020/05/01}{Inclusion of JHEP and JCAP package options, fix incompatibility with recent subcaption package version, move biblatex datamodel into its own file} % % \GetFileInfo{hep-paper.sty} % @@ -100,8 +107,7 @@ % \author{Jan Hajer \email{jan.hajer@uclouvain.be}} % \affiliation{Centre for Cosmology, Particle Physics and Phenomenology, Université catholique de Louvain, Louvain-la-Neuve B-1348, Belgium} % \preprint{Preprint-Number} -% \date{\today} -% \date{\normalsize\filedate} +% \date{\normalfont\filedate} % % \maketitle % @@ -121,11 +127,11 @@ % | \documentclass{article}|\\ % | \usepackage{hep-paper}| % -% The most notable changes after loading the |hep-paper| package is the change of some \LaTeX\ defaults. +% The most notable changes after loading the |hep-paper| package is the change of some \hologo{LaTeX} defaults. % The paper and font sizes are set to A4 and \unit[11]{pt}, respectively. % Additionally, the paper geometry is set to the values known from the (depreciated) |a4wide| package \cite{a4wide} using the |geometry| package \cite{geometry}. -% Finally, the font is changed to |lmodern| \cite{lmodern} with |microtype| \cite{microtype} optimizations. -% \PDF hyperlinks are implemented with the |hyperref| package \cite{hyperref}. +% Furthermore, the font is changed to |lmodern| \cite{lmodern} with |microtype| \cite{microtype} optimizations. +% Finally, \PDF hyperlinks are implemented with the |hyperref| package \cite{hyperref}. % % \subsection{Options} % @@ -153,26 +159,36 @@ % % \DescribeMacro{parskip} % The |parskip| option makes use of the |parskip| package \cite{parskip} and changes how two paragraphs are separated from each other. -% The \LaTeX\ default is separation via indentation the |parskip| option switches to separation via vertical space. +% The \hologo{LaTeX} default is separation via indentation the |parskip| option switches to separation via vertical space. % \footnote{The |parskip| option is used for this document.} % % \DescribeMacro{sansserif} % The |sansserif| option switches the document including math to sans serif font shape. % % \DescribeMacro{title} -% The |title=false| option deactivates the titlepage adjustments. +% The |title=false| option deactivates the title page adjustments. % % \DescribeMacro{manualplacement} % The |manualplacement| option reactivates manual float placement. % % \DescribeMacro{bibliography} -% The |bibliography|=\meta{key} option prevents the automatic loading of the |biblatex| package \cite{biblatex} for \meta{key}=|false| or passes the \meta{key} as |style| string to the |biblatex| package. +% The |bibliography|=\meta{key} option prevents the automatic loading of the |biblatex| package \cite{biblatex} if \meta{key}=|false|. +% Otherwise the \meta{key} is passed as |style| string to the |biblatex| package. % % \DescribeMacro{glossaries} -% The |glossaries=false| option deactives the use of the |glossaries| package \cite{glossaries, glossaries-extra}. +% The |glossaries=false| option deactives the use of the |glossaries| package \cite{glossaries}. +% +% \DescribeMacro{jhep} +% The |jhep| option activates the |JHEP| \cite{jhep} compatibility mode. +% +% \DescribeMacro{jcap} +% The |jcap| option activates the |JCAP| \cite{jcap} compatibility mode. % % \DescribeMacro{revtex} -% The |revtex| option switches the |hep-paper| package into a |revtex| \cite{revtex} compatibility mode. +% The |revtex| option activates the REV\hologo{TeX} \cite{revtex} compatibility mode. +% +% \DescribeMacro{pos} +% The |pos| option activates the |PoS| compatibility mode. % % \DescribeMacro{eqnarray} % The |eqnarray| option reactivates the depreciated |eqnarray| environment. @@ -181,7 +197,6 @@ % % \subsection{Title page} % -% The \PDF meta information is set according to the |\title|\marg{text} and |\author|\marg{text} information. % \DescribeMacro{\author} % \DescribeMacro{\affiliation} % \DescribeMacro{\email} @@ -193,18 +208,21 @@ % | \author[2]{Author two \email{Email two}}|\\ % | \affiliation[1,2]{Affiliation two}| % +% \DescribeMacro{\title} +% The \PDF meta information is set according to the |\title|\marg{text} and |\author| \marg{text} information. +% % \DescribeMacro{\preprint} -% The |\preprint|\marg{numer} macro places a pre-print number in the upper right corner of the first page. +% The |\preprint|\marg{numer} macro places a pre-print number in the upper right corner of the title page. % % \DescribeEnv{abstract} -% The |abstract| environment has been adjusted to not start with an indentation. +% The |abstract| environment is adjusted to not start with an indentation. % % \subsection{Text} % -% \DescribeMacro{\enquote} % Hyphenation is provided by the |babel| package \cite{babel} and quotation commands are provided by the |csquotes| package \cite{csquotes} recommended by the |babel| package. +% \DescribeMacro{\enquote} % \DescribeMacro{\MakeOuterQuote} -% The latter package provides the convenient macro |\MakeOuterQuote{"}| allowing to simply use |"| instead of the pair |``| and |''|. +% The latter package provides the convenient macros |\enquote|\marg{text} and |\MakeOuterQuote{"}| allowing to leave the choice of quotation marks to \hologo{LaTeX} and use |"| instead of the pair |``| and |''|, respectively. % % \DescribeMacro{\eg} % \DescribeMacro{\vs} @@ -217,12 +235,12 @@ % The |\software|\oarg{version}\marg{name} macro is typeset as \software[\fileversion]{HEP-Paper}. % % \DescribeMacro{\online} -% The |\online|\marg{url}\marg{text} macro combines the features of the |\href|\marg{url}\marg{text} and the |\url|\marg{text} macros, resulting in \eg \online{https://ctan.org/pkg/hep-paper}{ctan.org/pkg/hep-paper}. +% The |\online|\marg{url}\marg{text} macro combines the features of the |\href|\marg{url} \marg{text} \cite{hyperref} and the |\url|\marg{text} \cite{url} macros, resulting in \eg \online{https://ctan.org/pkg/hep-paper}{ctan.org/pkg/hep-paper}. % -% \DescribeMacro{inlinelist} -% Using the |enumitem| package \cite{enumitem} the |inlinelist| +% The |inlinelist| and |enumdescript| environments are defined using the |enumitem| package \cite{enumitem}. % -% \begin{example} +% \DescribeMacro{inlinelist} +% \begin{columns} % |The three main points are| % % |\begin{inlinelist}| @@ -234,19 +252,17 @@ % | \item three| % % |\end{inlinelist}| -% \second +% \column % The three main points are % \begin{inlinelist} % \item one % \item two % \item three % \end{inlinelist} -% \end{example} +% \end{columns} % % \DescribeMacro{enumdescript} -% and the |enumdescript| environments are defined -% -% \begin{example}[.6] +% \begin{columns}[.6] % |\begin{enumdescript}[label=\Roman*)]| % % | \item{First} one| @@ -256,16 +272,21 @@ % | \item{Third} three| % % |\end{enumdescript}| -% \second +% \column % \begin{enumdescript}[label=\Roman*)] % \item{First} one % \item{Second} two % \item{Third} three % \end{enumdescript} -% \end{example} +% \end{columns} % % \DescribeMacro{\textsc} -% A sans serif version of \textsf{\textsc{Small Caps}} is provided. +% A sans serif version of \textsf{\textsc{Small Caps}} is provided, using the |sansmathfonts| package \cite{sansmathfonts}. +% +% \DescribeMacro{\underline} +% \DescribeMacro{\overline} +% The |\underline| macro is redefined to allow linebreaks using the |soul| package \cite{soul}. +% The |\overline| macro is extended to also \overline{overline} text outside of math environments. % % \DescribeMacro{\useparskip} % \DescribeMacro{\useparindent} @@ -274,8 +295,8 @@ % \subsubsection{References and footnotes} % % \DescribeMacro{\cref} -% References are extended with the |cleveref| package \cite{cleveref}, which allows to \eg just type |\cref|\marg{key} in order to write 'Figure 1'. -% Furthermore, the |cleveref| package allows to reference multiple objects within one |\cref|\marg{key} (similar to the |\cite|\marg{key} macro). +% References are extended with the |cleveref| package \cite{cleveref}, which allows to \eg just type |\cref|\marg{key} in order to write \enquote{Figure 1}. +% Furthermore, the |cleveref| package allows to reference multiple objects within one |\cref|\marg{key1,key2}. % % \DescribeMacro{\cite} % Citations are adjusted to not start on a new line in order to avoid the repeated use of |~\cite|\marg{key}. @@ -293,8 +314,9 @@ % \DescribeMacro{\acronym} % \DescribeMacro{\shortacronym} % \DescribeMacro{\longacronym} -% The |\acronym|\meta{*}\oarg{typeset abbreviation}\marg{abbreviation}\marg{definition}\oarg{plural\linebreak[4]definition} macro generates the singluar |\|\meta{abbreviation} and plural |\|\meta{abbreviation}|s| macros. -% The starred version does not add an \enquote{s} to the abbreviation plural. +% The |\acronym|\meta{*}\oarg{typeset abbreviation}\marg{abbreviation}\meta{*}\marg{definition}\oarg{plural\linebreak[4]definition} macro generates the singluar |\|\meta{abbreviation} and plural |\|\meta{abbreviation}|s| macros. +% % The first star prevents the addition of an \enquote{s} to the abbreviation plural. +% The second star restores the \hologo{TeX} default of swallowing subsequent white space. % The long form is only shown at the first appearance of these macros, later appearances generate the abbreviation with a hyperlink to the long form. % Capitalization at the beginning of paragraphs and sentences is ensured. % The |\shortacronym| and |\longacronym| macros only show the short or long form of their acronym. @@ -307,7 +329,8 @@ % \subsection{Math} % % The |mathtools| \cite{mathtools} and |amssymb| \cite{amsfonts} packages are loaded. -% They in turn load the |amsmath| \cite{amsmath} and |amsfonts| \cite{amsfonts} packages. +% They in turn load the \hologo{AmSLaTeX} |amsmath| \cite{amsmath} and |amsfonts| \cite{amsfonts} packages. +% Details about the font handling in \hologo{TeX} can be found in \cite{fntguide}. % \DescribeMacro{\mathbf} % Bold math, including |\mathbf| is provided by the |bm| package \cite{bm}, \ie ($ A b \Gamma \delta \mathbf A \mathbf b \mathbf \Gamma \mathbf \delta$). % Macros switching to |bfseries| such as |\section|\marg{text} are ensured to also typeset math in bold. @@ -318,32 +341,34 @@ % This behaviour conflicts \eg with the |sansserif| package option. % \DescribeMacro{\mathsf} % The math sans serif alphabet is redefined to be italic sans serif if the main text is serif and italic serif if the main text is sans serif, \ie ($\mathsf A \mathsf b \mathsf \Gamma \mathsf \delta \mathbf{\mathsf A} \mathbf{\mathsf b} \mathbf{\mathsf \Gamma} \mathbf{\mathsf \delta}$). -% Details about the font handling in \TeX\ can be found in \cite{fntguide}. % \DescribeMacro{\mathscr} % The |\mathcal| font \ie ($\mathcal{ABCD}$) is accompanied by the |\mathscr| font \ie ($\mathscr{ABCD}$). +% \DescribeMacro{\mathbb} +% The |\mathbb| font is changed by the |bbm| \cite{bbm-macros} package and adjusted depending on the |sansserif| option \ie ($\mathbb{Ab1}${\mathversion{bold}$\mathbb{Ab1}$}). % % \DescribeMacro{\nicefrac} % \DescribeMacro{\flatfrac} -% The |\frac|\marg{number}\marg{number} macro is accompanied by |\nicefrac|\linebreak[1]\marg{number}\linebreak[1]\marg{number} and |\flatfrac|\marg{number}\marg{number} -% \begin{align} -% \frac12 \ ,&& \nicefrac 12 \ ,&& \flatfrac 12\ . -% \end{align} +% The |\frac|\marg{number}\marg{number} macro is accompanied by |\nicefrac|\linebreak[1]\marg{number}\linebreak[1]\marg{number} and |\flatfrac|\marg{number}\marg{number} leading to $\frac12$, $\nicefrac 12$, and $\flatfrac 12$. % \DescribeMacro{\diag} +% % A diagonal matrix operator is defined |\diag|. % % \DescribeMacro{\mathdef} % The |\mathdef|\marg{name}\oarg{arguments}\marg{code} macro (re-)defines macros only within math mode without changing the text mode definition. +% % \DescribeMacro{\i} -% The imaginary unit $\i$ is defined using this functionality. +% \DescribeMacro{\d} +% The imaginary unit $\i$ and the differential $\d$ are defined using this functionality. % % \DescribeMacro{\numberwithin} % For longer paper it can be useful to re-number the equation in accordance with the section numbering |\numberwithin{equation}{section}|. -% \DescribeMacro{\subequations} +% \DescribeMacro{subequations} % In order to further reduce the size the of equation counter it can be useful to wrap |align| environments with multiple rows in a |subequations| environment. +% Both macros are provided by the \hologo{AmSLaTeX} package. % % \DescribeMacro{eqnarray} % The depreciated |eqnarray| environment is undefined as long this behaviour is not prevented by the |eqnarray| package option. -% The |align| environment should be used instead. +% The |split|, |multline|, |align|, |multlined|, |aligned|, |alignedat|, and |cases| environments should be used instead. % % \subsubsection{Physics} % @@ -353,7 +378,7 @@ % \sigma &= \unit[5]{fb} \ , & &\text{at \unit[5]{\sigma} C.L.} \ , & \mu &= \unit[5]{cm} \ , & l &= \text{\unit[5]{\mu m}} \ , % \label{eq:greek} % \end{align} -% and \eg to distinguish gauge $\nu$ and mass \nu\ eigenstates in models with massive light neutrinos. +% and \eg to distinguish gauge $\nu$ and mass \nu\ eigenstates in models with massive neutrinos. % Additionally, Greek letters can also be directly typed using Unicode. % % \DescribeMacro{\ev} @@ -374,10 +399,11 @@ % The |\slashed|\marg{character} macro from the |slashed| \cite{slashed} package allows to use the Dirac slash notation. % % \DescribeMacro{\overleftright} -% A better looking over left right arrow is defined $\overleftright{\partial}$. +% A better looking over left right arrow is defined \ie $\overleftright{\partial}$. +% % \DescribeMacro{\unit} % \DescribeMacro{\inv} -% The correct spacing for units, \cf \cref{eq:greek}, is provided by the macro |\unit|\oarg{value}\marg{unit} from the |units| package \cite{units} which can also be used in text mode. +% The correct spacing for units, \cf \cref{eq:greek}, is provided by the macro |\unit|\oarg{value} \marg{unit} from the |units| package \cite{units} which can also be used in text mode. % The macro |\inv|\oarg{power}\marg{text} allows to avoid math mode also for inverse units such as \unit[5]{\inv{fb}} typeset via |\unit[5]{\inv{fb}}|. % % \subsection{Floats} @@ -420,7 +446,7 @@ % \DescribeMacro{\panel} % The |panels| environment makes use of the |subcaption| package \cite{subcaption}. % It provides sub-floats and takes as mandatory argument either the number of sub-floats (default~2) or the width of the first sub-float as fraction of the |\linewidth|. -% Within the |\begin{panels}|\oarg{vert}\marg{width} environment the |\panel| macro initiates a new sub-float. +% Within the |\begin{panels}|\oarg{vertical alignment}\marg{width} environment the |\panel| macro initiates a new sub-float. % In the case that the width of the first sub-float has been given as an optional argument to the |panels| environment the |\panel|\marg{width} macro takes the width of the next sub-float as mandatory argument. % The example code is presented in \cref{tab:panels}. % @@ -438,9 +464,9 @@ % \DescribeMacro{\printbibliography} % The |biblatex| package \cite{biblatex} is loaded for bibliography management. % The user has to add the line |\bibliography|\marg{my.bib} to the preamble of the document and |\printbibliography| at the end of the document. -% The bibliography is generated by |biber| \cite{biber}. +% The bibliography is generated by \software{Biber} \cite{biber}. % |biblatex| is extended to be able to cope with the |collaboration| and |reportNumber| fields provided by \online{https://inspirehep.net}{inspirehep.net} and a bug in the volume number is fixed. -% Additionally, \online{https://ctan.org}{ctan.org}, \online{https://github.com}{github.com}, \online{https://gitlab.com}{gitlab.com}, \online{https://sourceforge.net}{sourceforge.net}, and \online{https://hepforge.org}{hepforge.org} are recognized as |eprinttype|s. +% Additionally, \online{https://ctan.org}{ctan.org}, \online{https://github.com}{github.com}, \online{https://gitlab.com}{gitlab.com}, \online{https://bitbucket.org}{bitbucket.org}, \online{https://www.launchpad.net}{launchpad.net}, \online{https://sourceforge.net}{sourceforge.net}, and \online{https://hepforge.org}{hepforge.org} are recognized as |eprinttype|s. % \DescribeMacro{erratum} % Errata can be included using the |related| feature. % @@ -459,7 +485,7 @@ % The majority of the loaded packages are fairly lightweight, the others can be deactivated with package options. % % \DescribeMacro{arxiv-collector} -% ArXiv requires the setup dependent |bbl| files instead of the original |bib| files, which causes trouble if the local \LaTeX\ version differs from the one used by arXiv. +% ArXiv.org \cite{arxiv} requires the setup dependent |bbl| files instead of the original |bib| files, which causes trouble if the local \hologo{LaTeX} version differs from the one used by arXiv. % The |arxiv-collector| python script \cite{arxiv-collector} alleviates this problem by collecting all files necessary for publication on arXiv (including figures). % % \StopEventually{ @@ -471,9 +497,12 @@ % % \section{Options} % -% Load the |kvoptions| package and define a |hep| namespace. +%<*package> + +% Load the |pdftexcmds| \cite{pdftexcmds} and |kvoptions| \cite{kvoptions} packages and define a |hep| namespace. % \DoNotIndex{\RequirePackage,\SetupKeyvalOptions} % \begin{macrocode} +\RequirePackage{pdftexcmds} \RequirePackage{kvoptions} \SetupKeyvalOptions{ family=hep, @@ -548,7 +577,7 @@ % \end{macro} % % \begin{macro}{glossaries} -% Provide the option |glossaries| able to turn of the use of the |glossaries-extra| package \cite{glossaries-extra}. +% Provide the option |glossaries| able to turn of the use of the |glossaries| package \cite{glossaries}. % \DoNotIndex{\ifhep@glossaries} % \begin{macrocode} \DeclareBoolOption[true]{glossaries} @@ -572,39 +601,94 @@ % \end{macro} % % \begin{macro}{revtex} -% Provide the option |revtex| for |revtex| \cite{revtex} compatibility mode. +% Provide the option |revtex| for REV\hologo{TeX} \cite{revtex} compatibility mode. % \begin{macrocode} \DeclareBoolOption[false]{revtex} % \end{macrocode} % \end{macro} - +% +% \begin{macro}{jhep} +% Provide the option |jhep| for |JHEP| \cite{jhep} compatibility mode. +% \begin{macrocode} +\DeclareBoolOption[false]{jhep} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{jcap} +% Provide the option |jcap| for |JCAP| \cite{jcap} compatibility mode. +% \begin{macrocode} +\DeclareBoolOption[false]{jcap} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{pos} +% Provide the option |pos| for |PoS| compatibility mode. +% \begin{macrocode} +\DeclareBoolOption[false]{pos} +% \end{macrocode} +% \end{macro} +% % \subsection{Process options} % % \begin{macrocode} \ProcessKeyvalOptions* % \end{macrocode} +% +% Set the |pos| compatibility options. +% \DoNotIndex{\ifhep@pos,\setkeys,\fi} +% \begin{macrocode} +\ifhep@pos + \setkeys{hep}{title=false, defaults} +\fi +% \end{macrocode} +% % Set the |revtex| compatibility options. -% \DoNotIndex{\ifhep@revtex,\setkeys,\fi} +% \DoNotIndex{\ifhep@revtex} % \begin{macrocode} \ifhep@revtex \setkeys{hep}{defaults, title=false, lang=american, bibliography=false} \fi % \end{macrocode} - +% +% Define the SISSA conditional. +% \begin{macrocode} +\newif\ifhep@sissa +\ifhep@jhep\hep@sissatrue +\else + \ifhep@jcap\hep@sissatrue + \else\hep@sissafalse + \fi +\fi +% \end{macrocode} +% +% Set the SISSA compatibility options. +% \begin{macrocode} +\ifhep@sissa + \setkeys{hep}{title=false, bibliography=false} + \PassOptionsToPackage{ + colorlinks=true, linktocpage=true, pdfproducer=medialab, pdfa=true, + urlcolor=blue, anchorcolor=blue, citecolor=blue, filecolor=blue, + linkcolor=blue, menucolor=blue, pagecolor=blue + }{hyperref} + \hoffset 0pt + \voffset 0pt +\fi +% \end{macrocode} % \section{Engine} % % \begin{macro}{\ifxetexorluatex} % Load the |ifluatex| \cite{ifluatex} and |ifxetex| \cite{ifxetex} packages. -% Define the |\ifxetexorluatex| conditional. +% Define the |\ifxetexorluatex| conditional checking if the package is executed by \hologo{LuaLaTeX} or \hologo{XeLaTeX}. % \DoNotIndex{\newif,\ifxetex,\xetexorluatextrue,\else,\ifluatex,\xetexorluatexfalse,\fi} % \begin{macrocode} \RequirePackage{ifluatex} \RequirePackage{ifxetex} \newif\ifxetexorluatex -\ifxetex\xetexorluatextrue\else +\ifxetex\xetexorluatextrue +\else \ifluatex\xetexorluatextrue - \else\xetexorluatexfalse + \else\xetexorluatexfalse \fi \fi % \end{macrocode} @@ -612,12 +696,23 @@ % \section{Text} % -% Load |alphabeta| package \cite{alphabeta} first in order to archive the correct behaviour. +% Load the |alphabeta| package \cite{alphabeta} first in order to archive the correct behaviour. % The |alphabeta| package provides upright Greek letters in text mode. % \begin{macrocode} \RequirePackage{alphabeta} % \end{macrocode} % +% Set the whole text to sans serif if requested. +% Load the |sansmathfonts| package \cite{sansmathfonts} first. +% Although, most fonts will later be overwritten by the |lmodern| package \cite{lmodern} some mathematical objects are ensured to be in sans serif. +% \DoNotIndex{\ifhep@serif,\renewcommand,\familydefault,\sfdefault} +% \begin{macrocode} +\ifhep@serif\else + \RequirePackage{sansmathfonts} + \renewcommand\familydefault{\sfdefault} +\fi +% \end{macrocode} +% % Pick the correct font encoding depending on the engine used and load the |fontenc| package \cite{fontenc} with this encoding. % For details of the font encoding see \cite{encguide}. % \DoNotIndex{\def,\@encoding} @@ -635,8 +730,18 @@ \RequirePackage{textcomp} \RequirePackage{microtype} % \end{macrocode} - +% % Define sans serif small caps font shapes. +% The font abbreviations are +% \begin{description}[nosep] +% \item[lmss] Latin modern sans serif font +% \item[cmss] Computer modern sans serif font +% \item[xcmss] Extended computer modern sans serif font (from the |sansmathfonts| package \cite{sansmathfonts}) +% \item[bx] Bold extended series +% \item[m] Medium weight and width series +% \item[c] Medium weight, condensed width series +% \item[sc] Caps and small caps font shape +% \end{description} % \DoNotIndex{\DeclareFontShape,\sffamily} % \begin{macrocode} \ifxetexorluatex @@ -657,22 +762,14 @@ \RequirePackage[utf8]{inputenc} \fi % \end{macrocode} - +% % Load the |babel| \cite{babel} package for hyphenation and the recommended |csquotes| package \cite{csquotes}. % \DoNotIndex{\hep@lang} % \begin{macrocode} \RequirePackage[\hep@lang]{babel} \RequirePackage{csquotes} % \end{macrocode} - -% Set the whole text to sans serif if requested. -% \DoNotIndex{\ifhep@serif,\renewcommand,\familydefault,\sfdefault} -% \begin{macrocode} -\ifhep@serif\else - \renewcommand\familydefault{\sfdefault} -\fi -% \end{macrocode} - +% % \begin{macro}{\underline} % Load the |soul| package \cite{soul} for hyphenable underlined text. % \DoNotIndex{\let} @@ -681,10 +778,10 @@ \let\underline\ul % \end{macrocode} % \end{macro} - -% \subsection{Font size} % -% Undefine previously defined font sizes and load the \LaTeX\ font size file corresponding to the font size option. +% \subsection{Font size} \label{sec:font size} +% +% Undefine previously defined font sizes and load the \hologo{LaTeX} font size file corresponding to the font size option. % \DoNotIndex{\remove@pt,\edef,\@ptsize,\expandafter,\small,\relax,\footnotesize,\scriptsize} % \begin{macrocode} \ifhep@defaults\else @@ -710,18 +807,25 @@ % Add the missing |\vs| command. % \DoNotIndex{\DeclareRobustCommand,\xperiodafter,\foreignabbrfont,\pdf@strcmp,\hep@lang@foreign} % \begin{macrocode} -\RequirePackage{pdftexcmds} -\newcommand{\hep@lang@foreign}{british} -\ifnum\pdf@strcmp{\hep@lang}{american}=0% - \renewcommand{\hep@lang@foreign}{USenglish}% -\fi -\ifnum\pdf@strcmp{\hep@lang}{USenglish}=0% - \renewcommand{\hep@lang@foreign}{USenglish}% +\ifnum\pdf@strcmp{\hep@lang}{american}=0 + \newcommand{\hep@lang@foreign}{USenglish} +\else + \ifnum\pdf@strcmp{\hep@lang}{USenglish}=0 + \newcommand{\hep@lang@foreign}{USenglish} + \else + \newcommand{\hep@lang@foreign}{british} + \fi \fi \RequirePackage[all, \hep@lang@foreign]{foreign} \DeclareRobustCommand\vs{\xperiodafter{{\foreignabbrfont{vs}}}} % \end{macrocode} % \end{macro} +% +% The |foreign| package relies on the |xspace| package \cite{xspace}. +% Ensure that |\xspace| is compatible with the |\enquote| macro from the |csquote| package. +% \begin{macrocode} +\xspaceaddexceptions{\csq@qclose@i} +% \end{macrocode} %\begin{macro}{\no} % Define the macro |\no|\marg{number} for the use of \textnumero\ with appropriate spacing. @@ -729,7 +833,7 @@ \newcommand{\no}[1]{\textnumero~#1} % \end{macrocode} % \end{macro} - +% %\begin{macro}{\software} % Define a macro for software with optional version information |\software|\linebreak[1]\oarg{version}\linebreak[1]\marg{name}, using the |relsize| package \cite{relsize}. % \DoNotIndex{\hspace,\fontdimen,\font,\smaller,\textsc} @@ -740,17 +844,17 @@ } % \end{macrocode} % \end{macro} - +% % \begin{macro}{\online} % The |\online|\marg{text}\marg{url} macro combines the features of the |\href| and the |\url| macros. % \DoNotIndex{\href,\url} % \begin{macrocode} -\newcommand{\online}[2]{\href{#1}{\url{#2}}} +\newcommand{\online}[2]{\href{#1}{\nolinkurl{#2}}} % \end{macrocode} % \end{macro} % \subsection{Lists} - +% % Load the |enumitem| package \cite{enumitem}. % \begin{macrocode} \RequirePackage[inline]{enumitem} @@ -798,6 +902,7 @@ % \section{Geometry} % % Load the |geometry| package \cite{geometry} and adjust the text width and height to the values of the |a4wide| package \cite{a4wide}. +% This step must happen after readjusting the font size in \cref{sec:font size}. % \DoNotIndex{\ifhep@defaults,\hep@paper,\geometry} % \begin{macrocode} \ifhep@defaults\else @@ -808,7 +913,7 @@ %\begin{macro}{\useparskip} %\begin{macro}{\useparindent} -% Load the |parskip| package \cite{parskip} and provide two commands switching between the two paragraph modes. +% Load the |parskip| package \cite{parskip} if requested and provide two commands switching between the two paragraph modes. % \DoNotIndex{\ifhep@parindent,\setlength,\parskip,\baselineskip,\parindent} % \begin{macrocode} \ifhep@parindent\else @@ -853,13 +958,13 @@ % \begin{macrocode} \RequirePackage{xparse} \DeclareDocumentCommand{\mathdef}{mO{0}m}{% - \expandafter\let\csname old\string#1\endcsname=#1 - \expandafter\newcommand\csname new\string#1\endcsname[#2]{#3} + \expandafter\let\csname text\string#1\endcsname=#1 + \expandafter\newcommand\csname math\string#1\endcsname[#2]{#3} \DeclareRobustCommand#1{% \ifmmode - \expandafter\let\expandafter\next\csname new\string#1\endcsname + \expandafter\let\expandafter\next\csname math\string#1\endcsname \else - \expandafter\let\expandafter\next\csname old\string#1\endcsname + \expandafter\let\expandafter\next\csname text\string#1\endcsname \fi \next }% @@ -874,10 +979,20 @@ % \end{macrocode} % \end{macro} +% \begin{macro}{\overline} +% Redefine |\overline| to be a text macro using the |soul| package \cite{soul}. +% Extend it as a math macro with the original definition from |amsmath| \cite{amsmath}. +% \begin{macrocode} +\def\overline#1{{\setul{-2ex}{}\ul{#1}}} +\DeclareRobustCommand{\over@line}[1]{\@@overline{#1}} +\mathdef{\overline}{\over@line} +% \end{macrocode} +% \end{macro} + % \begin{macro}{eqnarray} % Undefine the |eqnarray| environment. % \begin{macrocode} -\ifhep@eqnarray\else% +\ifhep@eqnarray\else \let\eqnarray\@undefined \let\endeqnarray\@undefined \fi @@ -887,9 +1002,10 @@ % \subsection{Math fonts} % % \begin{macro}{\mathbf} -% Load the |bm| package \cite{bm} for superior boldmath. +% Load the |bm| package \cite{bm} for superior boldmath after limiting the number of allocated math alphabets. % Make math symbols bold whenever they appear in bold macros such as |\section|\marg{text}. % \begin{macrocode} +\newcommand{\bmmax}{2} \RequirePackage{bm} \let\mathbf\bm \g@addto@macro\bfseries{\boldmath} @@ -900,6 +1016,15 @@ % Load the |fixmath| package \cite{fixmath} which ensures that upper Greek letters in math mode are italic. % Ensure that also math mode is sans serif using the |sfmath| package \cite{sfmath} if the option sans serif is passed to the package. % Ensure that |\mathsf| is italic as well as sans serif and sans for sans and sans serif documents, respectively. +% The font abbreviations are +% \begin{description}[nosep] +% \item[OML] \hologo{TeX} math italic font encoding +% \item[cmm] Computer modern math italic font +% \item[cmbr] Computer modern bright font +% \item[bx] Bold extended series +% \item[m] Medium weight and width series +% \item[it] Italic font shape +% \end{description} % \begin{macrocode} \ifhep@serif \RequirePackage{fixmath} @@ -907,6 +1032,7 @@ \SetMathAlphabet{\mathsf}{bold}{OML}{cmbr}{bx}{it} \else \RequirePackage[slantedGreek]{sfmath} + \RequirePackage{sansmathfonts} \DeclareMathAlphabet{\mathsf}{OML}{cmm}{m}{it} \SetMathAlphabet{\mathsf}{bold}{OML}{cmm}{bx}{it} \fi @@ -918,11 +1044,22 @@ \RequirePackage{mathrsfs} % \end{macrocode} % \end{macro} +% \begin{macro}{\mathbb} +% Load the |bbm| package \cite{bbm-macros} for the |\mathbb| math blackboard style font in (sans-) serif. +% \begin{macrocode} +\RequirePackage{bbm} +\ifhep@serif + \let\mathbb\mathbbm +\else + \let\mathbb\mathbbmss +\fi +% \end{macrocode} +% \end{macro} % \subsection{Physics notation} % % \begin{macro}{\slashed} -% \begin{macro}{\units} +% \begin{macro}{\unit} % Load the |physics| package \cite{physics} which provides macros useful for publications in physics. % Additionally, load the |slashed| package \cite{slashed} which provides the slashed macro for Dirac notation. % Finally, load the |units| package \cite{units} which provides the |\units| and |\nicefrac| macros. @@ -941,6 +1078,13 @@ % \end{macrocode} % \end{macro} +% \begin{macro}{\d} +% Provide a differential |\d|. +% \begin{macrocode} +\AtBeginDocument{\mathdef{\d}{\dd}} +% \end{macrocode} +% \end{macro} + % \begin{macro}{\oset} % Define a new overset macro |\oset|\oarg{offset}\marg{over}\marg{base} % \begin{macrocode} @@ -960,7 +1104,7 @@ % \section{Floats} % -% Adjust the \LaTeX\ float placement defaults +% Adjust the \hologo{LaTeX} float placement defaults % \begin{macrocode} \renewcommand{\textfraction}{0.01} \setcounter{topnumber}{1} @@ -1019,14 +1163,18 @@ % \end{macrocode} % % Load the |subcaption| package \cite{subcaption}. +% Provide old |\subcaption@minipage| macro. % \begin{macrocode} -\RequirePackage[subrefformat = parens]{subcaption} +\RequirePackage[subrefformat=parens]{subcaption} \captionsetup{font=small} \captionsetup[sub]{font=small} +\providecommand*\subcaption@minipage[2]{% + \minipage#1{#2}\setcaptionsubtype\relax% +} % \end{macrocode} % \begin{environment}{panels} % \begin{macro}{\panel} -% Load the |subcaption| package \cite{subcaption} and define the |panels| environment as well as the |\panel| macro. +% Define the |panels| environment and the |\panel| macro. % \begin{macrocode} \newenvironment{panels}[2][b]{% % \end{macrocode} @@ -1058,15 +1206,15 @@ % \end{macro} % \end{environment} -% Reajust the captions to the revtex class. +% Reajust the captions to the revtex class using the |ragged2e| package \cite{ragged2e}. % \begin{macrocode} \ifhep@revtex - \renewcommand{\figurename}{Figure} - \renewcommand{\tablename}{Table} \RequirePackage{ragged2e} \DeclareCaptionFormat{revtex}{#1#2\justifying{#3}} - \captionsetup{font = small, format = revtex} - \captionsetup[sub]{font = footnotesize, format = plain} + \captionsetup{font=small, format=revtex} + \captionsetup[sub]{font=footnotesize, format=plain} + \renewcommand{\figurename}{Figure} + \renewcommand{\tablename}{Table} \fi % \end{macrocode} @@ -1088,7 +1236,7 @@ \RequirePackage{graphicx} \providecommand{\tikzsetnextfilename}[1]{} \newcommand{\graphic}[2][1]{\tikzsetnextfilename{#2}{% - \centering\includegraphics[width=#1\linewidth]{#2}% + \centering\includegraphics[width=#1\linewidth]{#2}\par% }} % \end{macrocode} % \end{macro} @@ -1119,7 +1267,7 @@ % \end{macrocode} % \end{macro} % \begin{macro}{\email} -% Provide macro for the email of authors used as |\author{|$\langle name\rangle$| \email{|$\langle email\rangle$|}}|. +% Define a macro for the email of authors used as |\author{|$\langle name\rangle$| \email{|$\langle email\rangle$|}}|. % \begin{macrocode} \AtEndOfClass{\newcommand{\email}[1]{% \unskip\thanks{\online{mailto:#1}{#1}} @@ -1153,8 +1301,7 @@ % \subsection{Preprint} % % \begin{macro}{\preprint} -% Places a preprint number in the top right corner of the first page. -% This code uses the |varwidth| \cite{varwidth}, |atbegshi| \cite{atbegshi}, and |picture| \cite{picture} packages. +% Define the |\preprint| macro using the |varwidth| package \cite{varwidth}. % \begin{macrocode} \let\@preprint\relax \newcommand\preprint[1]{\long\gdef\@preprint{#1}} @@ -1164,13 +1311,23 @@ \textsc{\small\@preprint}% \end{varwidth}% } +% \end{macrocode} +% \end{macro} + +% \begin{macro}{\maketitle} +% Places a preprint number in the top right corner of the title page using the |atbegshi| \cite{atbegshi} and |picture| \cite{picture} packages. +% \begin{macrocode} \RequirePackage{atbegshi} \RequirePackage{picture} -\AtBeginShipoutFirst{% - \put( - \textwidth+\oddsidemargin-\widthof{\@preprint@box}, - -2pt-\topmargin-\heightof{\@preprint@box} - ){\normalfont\@preprint@box} +\let\old@maketitle\maketitle +\renewcommand{\maketitle}{% + \old@maketitle% + \AtBeginShipoutFirst{% + \put( + \textwidth+\oddsidemargin-\widthof{\@preprint@box}, + -2pt-\topmargin-\heightof{\@preprint@box} + ){\normalfont\@preprint@box} + } } % \end{macrocode} % \end{macro} @@ -1180,8 +1337,10 @@ % \begin{environment}{abstract} % Adjust the |abstract| environment to not start with indentation. % \begin{macrocode} -\let\old@abstract\abstract -\renewcommand\abstract{\old@abstract\noindent\ignorespaces} +\@ifundefined{abstract}{}{% + \let\old@abstract\abstract% + \renewcommand\abstract{\old@abstract\noindent\ignorespaces}% +} % \end{macrocode} % \end{environment} % End of check for |title| option. @@ -1191,143 +1350,272 @@ % \section{Bibliography} % -% Check if bibliography management is requested using the |pdftexcmds| package \cite{pdftexcmds}. +% Check if bibliography management is requested. % \begin{macrocode} \ifnum\pdf@strcmp{\hep@bibliography}{false}=0\else % \end{macrocode} % % \begin{macro}{\bibliography} -% Load the |biblatex| package \cite{biblatex} with a JHEP like bibliography style. +% Load the |biblatex| package \cite{biblatex} with the datamodel defined in \cref{sec:data model}. +% \begin{macrocode} +\RequirePackage[style=\hep@bibliography, datamodel=hep-paper]{biblatex} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{hep-paper} +% Define a new sorting template that sorts only multi key |\cite| entries according to their date and leaves the rest of the bibliography entries in the order they appear in the text. +% Provide the |\DeclareSortingTemplate| macro for older |biblatex| installations. +% \begin{macrocode} +\providecommand{\DeclareSortingTemplate}{\DeclareSortingScheme} +\DeclareSortingTemplate{hep-paper}{ + \sort{\citeorder} + \sort[final]{ + \field{sortkey} + } + \sort{ + \field{sortyear} + \field{year} + \literal{9999} + } + \sort{ + \field{month} + } + \sort{ + \field{eprint} + \field{doi} + } + \sort{ + \field{sorttitle} + \field{title} + } + \sort{ + \field{subtitle} + \field{volume} + } +} +% \end{macrocode} +% \end{macro} +% +% Use the new sorting scheme and abbreviat all first names. % \begin{macrocode} -\RequirePackage[style=\hep@bibliography]{biblatex} \ExecuteBibliographyOptions{ - sorting=none, + sorting=hep-paper, giveninits=true } % \end{macrocode} +% +% \begin{macro}{erratum} +% Add new bibliography string \enquote{Erratum} for the use in the |relatedtype| field. +% \begin{macrocode} +\NewBibliographyString{erratum} +\DefineBibliographyStrings{english}{erratum={Erratum}} +% \end{macrocode} % \end{macro} -% Read the collaboration and pre-print information if present. -% Move letters from the volume field to the journal field. +% +% \begin{macro}{\printbibliography} +% Allow the bibliography to be printed sloppy +% \begin{macrocode} +\let\old@printbibliography\printbibliography +\renewcommand{\printbibliography}{\sloppy\old@printbibliography} +% \end{macrocode} +% \end{macro} + +% \subsection{Sourcemap} +% +% \begin{macro}{\reg@exp@one} +% \begin{macro}{\reg@exp@two} +% \begin{macro}{\reg@exp@url} +% Define regular expressions in order to deal with inconsistent journal title and volume naming as well as URL protocols. +% \begin{macrocode} +\newcommand{\reg@exp@one}{\regexp{\A(\p{L}+)?\d+(\p{L}+)?\Z}} +\newcommand{\reg@exp@two}{\regexp{\A(\p{L}+)?(\d+)(\p{L}+)?\Z}} +\newcommand{\reg@exp@url}{\regexp{\A(ht|f)tp(s)?:\/\/}} +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\DeclareSourcemap} +% Use the |\DeclareSourcemap| feature. % \begin{macrocode} -\newcommand{\@reg@exp}{\regexp{\A(\p{L}+)?\d+(\p{L}+)?\Z}} -\newcommand{\@reg@exp@}{\regexp{\A(\p{L}+)?(\d+)(\p{L}+)?\Z}} \DeclareSourcemap{% - \maps[datatype=bibtex,overwrite=true]{% + \maps[datatype=bibtex, overwrite=true]{% +% \end{macrocode} +% \begin{macro}{collaboration} +% Read the collaboration information if present. +% \begin{macrocode} \map{% - \step[fieldsource=Collaboration,final=true]% - \step[fieldset=usere,origfieldval,final=true] + \step[fieldsource=Collaboration, final=true]% + \step[fieldset=collaboration, origfieldval, final=true] }% +% \end{macrocode} +% \end{macro} +% \begin{macro}{reportnumber} +% Read the pre-print information if present. +% \begin{macrocode} \map{% - \step[fieldsource=reportNumber,final=true]% - \step[fieldset=userf,origfieldval,final=true] + \step[fieldsource=reportNumber, final=true]% + \step[fieldset=reportnumber, origfieldval, final=true] }% +% \end{macrocode} +% \end{macro} +% \begin{macro}{journal} +% Move letters from the volume field to the journal field. +% \begin{macrocode} \map[overwrite]{ - \step[fieldsource=volume, match=\@reg@exp, final] - \step[fieldsource=volume, match=\@reg@exp@, replace={$2}] + \step[fieldsource=volume, match=\reg@exp@one, final] + \step[fieldsource=volume, match=\reg@exp@two, replace={$2}] \step[fieldsource=journal, fieldtarget=journaltitle] \step[fieldset=journaltitle, fieldvalue={\space$1$2}, append=true] } +% \end{macrocode} +% \end{macro} +% \begin{macro}{url} +% Remove the protocol from URL. +% \begin{macrocode} + \map{ + \step[fieldsource=url, final=true] + \step[fieldset=protocollessurl, origfieldval, final=true] + \step[fieldsource=protocollessurl, match=\reg@exp@url, replace={}] + } }% } % \end{macrocode} - -% Override the author information with collaboration information if present. +% \end{macro} +% \end{macro} +% +% \begin{macro}{In:} +% Remove spurious \enquote{In:} if no journal is present. % \begin{macrocode} -\renewbibmacro*{author}{% - \iffieldundef{usere}{\printnames{author}}{\textbf{\printfield{usere}}}% +\renewbibmacro*{in:}{% + \iffieldundef{journaltitle}{}{\printtext{\bibstring{in}\intitlepunct}}% } % \end{macrocode} - -% Remove spurious `In:' if no journal is present. +% \end{macro} +% +% \begin{macro}{url} +% Show URLs without the protocol. % \begin{macrocode} -\renewbibmacro*{in:}{% - \iffieldundef{journal}{}{\printtext{\bibstring{in}\intitlepunct}}% +\DeclareFieldFormat{url}{% + \mkbibacro{URL}\addcolon\space\online{#1}{\thefield{protocollessurl}}% } % \end{macrocode} - +% \end{macro} +% +% \begin{macro}{collaboration} +% Override the author information with collaboration information if present. +% \begin{macrocode} +\renewbibmacro*{author}{% + \iffieldundef{collaboration}{% + \printnames{author}}{\textbf{\printfield{collaboration}}% + }% +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\letbibmacro} % Provide the |\letbibmacro| macro for old |biblatex| installations. % \begin{macrocode} \providecommand{\letbibmacro}[2]{\csletcs{abx@macro@#1}{abx@macro@#2}} % \end{macrocode} - +% \end{macro} +% +% \begin{macro}{reportnumber} % Add the pre-print information if present. % \begin{macrocode} \letbibmacro{doi+eprint+url-old}{doi+eprint+url} \renewbibmacro*{doi+eprint+url}{% \usebibmacro{doi+eprint+url-old} - \iffieldundef{userf}{}{\textls[0]{% + \iffieldundef{reportnumber}{}{\textls[0]{% \newunitpunct\textnumero\intitlepunct% - \textsc{\small\printfield{userf}}% + \textsc{\small\printfield{reportnumber}}% }}% } % \end{macrocode} +% \end{macro} -% Add CTAN as a pre-print option +% \subsection{Eprints} +% +% \begin{macro}{\bib@online} +% Private |\bib@online| macro % \begin{macrocode} -\DeclareFieldFormat{eprint:ctan}{% - CTAN\addcolon\space\ifhyperref{% - \href{https://ctan.org/pkg/#1}{\nolinkurl{#1}}% - }{\nolinkurl{#1}}% +\newcommand{\bib@online}[2]{% + \ifhyperref{\online{#1}{#2}}{\nolinkurl{#2}}% } -\DeclareFieldAlias{eprint:CTAN}{eprint:ctan} % \end{macrocode} - -% Add GitHub as a pre-print option +% \end{macro} +% +% \begin{macro}{\new@eprint} +% Private |\new@eprint| macro % \begin{macrocode} -\DeclareFieldFormat{eprint:github}{% - GitHub\addcolon\space\ifhyperref{\href{% - https://github.com/\thefield{eprintclass}/#1% - }{\nolinkurl{\thefield{eprintclass}/#1}}% - }{\nolinkurl{\thefield{eprintclass}/#1}}% +\NewDocumentCommand{\new@eprint}{smm}{ + \DeclareFieldFormat{eprint:#2}{% + \newcommand{\@path}{\IfBooleanT{#1}{\thefield{eprintclass}/}##1}% + #2\addcolon\space\bib@online{#3/\@path}{\@path}% + }% } -\DeclareFieldAlias{eprint:GitHub}{eprint:github} % \end{macrocode} - -% Add GitLab as a pre-print option +% \end{macro} +% +% \begin{macro}{CTAN} +% Add CTAN as a eprint option % \begin{macrocode} -\DeclareFieldFormat{eprint:gitlab}{% - GitLab\addcolon\space\ifhyperref{\href{% - https://gitlab.com/\thefield{eprintclass}/#1% - }{\nolinkurl{\thefield{eprintclass}/#1}}% - }{\nolinkurl{\thefield{eprintclass}/#1}}% -} -\DeclareFieldAlias{eprint:GitLab}{eprint:gitlab} +\new@eprint{CTAN}{https://ctan.org/pkg} +\DeclareFieldAlias{eprint:ctan}{eprint:CTAN} % \end{macrocode} - -% Add SourceForge as a pre-print option +% \end{macro} +% +% \begin{macro}{GitHub} +% Add GitHub as a eprint option % \begin{macrocode} -\DeclareFieldFormat{eprint:sourceforge}{% - SourceForge\addcolon\space\ifhyperref{% - \href{https://sourceforge.net/projects/#1}{\nolinkurl{#1}}% - }{\nolinkurl{#1}}% -} -\DeclareFieldAlias{eprint:SourceForge}{eprint:sourceforge} +\new@eprint*{GitHub}{https://github.com} +\DeclareFieldAlias{eprint:github}{eprint:GitHub} % \end{macrocode} - -% Add HEPForge as a pre-print option +% \end{macro} +% +% \begin{macro}{GitLab} +% Add GitLab as a eprint option % \begin{macrocode} -\DeclareFieldFormat{eprint:hepforge}{% - HEPForge\addcolon\space\ifhyperref{% - \href{https://#1/hepforge.org/}{\nolinkurl{#1}}% - }{\nolinkurl{#1}}% -} -\DeclareFieldAlias{eprint:HEPForge}{eprint:hepforge} +\new@eprint*{GitLab}{https://gitlab.com} +\DeclareFieldAlias{eprint:gitlab}{eprint:GitLab} % \end{macrocode} - -% Add new bibliography string \enquote{Erratum} for the use in the |relatedtype| field. +% \end{macro} +% +% \begin{macro}{Bitbucket} +% Add Bitbucket as a eprint option % \begin{macrocode} -\NewBibliographyString{erratum} -\DefineBibliographyStrings{english}{erratum={Erratum:}} +\new@eprint*{Bitbucket}{https://bitbucket.org} +\DeclareFieldAlias{eprint:bitbucket}{eprint:Bitbucket} % \end{macrocode} - -% \begin{macro}{\printbibliography} -% Allow the bibliography to be printed sloppy +% \end{macro} +% +% \begin{macro}{Launchpad} +% Add Launchpad as a eprint option % \begin{macrocode} -\let\old@printbibliography\printbibliography -\renewcommand{\printbibliography}{\sloppy\old@printbibliography} +\new@eprint{Launchpad}{https://launchpad.net} +\DeclareFieldAlias{eprint:launchpad}{eprint:Launchpad} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{SourceForge} +% Add SourceForge as a eprint option +% \begin{macrocode} +\new@eprint{SourceForge}{https://sourceforge.net/projects} +\DeclareFieldAlias{eprint:launchpad}{eprint:SourceForge} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{HEPForge} +% Add HEPForge as a eprint option +% \begin{macrocode} +\DeclareFieldFormat{eprint:hepforge}{% + HEPForge\addcolon\space\bib@online{https://#1/hepforge.org}{#1}% +} +\DeclareFieldAlias{eprint:HEPForge}{eprint:hepforge} % \end{macrocode} % \end{macro} % + % End check for bibliography option. % \begin{macrocode} \fi @@ -1361,7 +1649,11 @@ \pdfstringdefDisableCommands{\let\footnote\@gobble} \pdfstringdefDisableCommands{\let\\\@gobble} } -\AtBeginShipout{\hypersetup{pdftitle={\@title}}} +\ifhep@revtex + \AtBeginShipout{\hypersetup{pdftitle={\@title}}} +\else + \AtBeginDocument{\hypersetup{pdftitle={\@title}}} +\fi \ifhep@title \AtBeginDocument{\hypersetup{pdfauthor=\AB@authlist}} \else @@ -1373,43 +1665,15 @@ % Improve reference using the |cleveref| package \cite{cleveref}. % % \begin{macrocode} -\RequirePackage[noabbrev, capitalize, nameinlink]{cleveref} +\RequirePackage[noabbrev, nameinlink]{cleveref} +\newcommand{\creflastconjunction}{, and\nobreakspace} \crefname{enumi}{point}{points} \Crefname{enumi}{Point}{Points} % \end{macrocode} % \end{macro} -% \begin{macro}{\refstepcounter@...} -% Adjust the |cleveref| |\refstepcounter@noarg| and |\refstepcounter@optarg| to use the |\@currentlabel| in order to fix problems with |\subref|. -% \begin{macrocode} -\def\refstepcounter@noarg#1{% - \cref@old@refstepcounter{#1}% - \cref@constructprefix{#1}{\cref@result}% - \@ifundefined{cref@#1@alias}% - {\def\@tempa{#1}}% - {\def\@tempa{\csname cref@#1@alias\endcsname}}% - \protected@edef\cref@currentlabel{% - [\@tempa][\arabic{#1}][\cref@result]% - \noexpand\@currentlabel% - }% changed -} - -\def\refstepcounter@optarg[#1]#2{% - \cref@old@refstepcounter{#2}% - \cref@constructprefix{#2}{\cref@result}% - \@ifundefined{cref@#1@alias}% - {\def\@tempa{#1}}% - {\def\@tempa{\csname cref@#1@alias\endcsname}}% - \protected@edef\cref@currentlabel{% - [\@tempa][\arabic{#2}][\cref@result]% - \noexpand\@currentlabel% changed - }% -} -% \end{macrocode} -% \end{macro} - %\begin{macro}{\no@break@before} -% Provide macro able to prevent line breaks. +% Define a macro able to prevent line breaks. % \DoNotIndex{\no@break@before,\ifvmode,\ifhmode,\ifdim,\lastskip,\unskip,\nobreakspace} % \begin{macrocode} \newcommand\no@break@before{% @@ -1431,6 +1695,7 @@ \AtBeginDocument{\renewcommand\ref{\no@break@before\labelcref}} % \end{macrocode} % \end{macro} +% ! Bug ! in equations the additional brackets from the cleveref macro conflict with the traditional |(\ref|\marg{key}|)| approach % \begin{macro}{\eqref} % Adjust |\eqref|\marg{key} in order to prevent preceding line breaks and to enable the possibility to reference multiple equations at once. @@ -1461,7 +1726,7 @@ % \begin{macro}{\eqcrefname} % Define the |\eqcrefname| macro for named equation types. % \begin{macrocode} -\DeclareDocumentCommand{\eqcrefname}{mmo}{ +\NewDocumentCommand{\eqcrefname}{mmo}{ \crefname{#1}{#2}{\IfValueTF{#3}{#3}{#2s}} \creflabelformat{#1}{(##2##1##3)} } @@ -1477,7 +1742,7 @@ % \end{macrocode} % \end{macro} -% \subsection{Citation macros} +% \subsection{Citations} % % \begin{macro}{\cite} % Adjust |\cite|\marg{key} in order to prevent preceding line breaks. @@ -1496,8 +1761,8 @@ \NewBibliographyString{refname} \NewBibliographyString{refsname} \DefineBibliographyStrings{english}{% - refname = {Reference}, - refsname = {References} + refname = {reference}, + refsname = {references} } % \end{macrocode} % \begin{macro}{\ccite} @@ -1505,7 +1770,7 @@ % Define \emph{clever} citation macros. % \begin{macrocode} \DeclareCiteCommand{\ccite}{% - \ifnum\thecitetotal=1% + \ifnum\thecitetotal=1 \bibstring{refname}% \else% \bibstring{refsname}% @@ -1562,40 +1827,60 @@ }} % \end{macrocode} -% \begin{macro}{\if@begin@of@sentence} +% \begin{macro}{\begin@sentence} % Mark the beginning of a paragraph as if it would follow a full stop using the |everyhook| package \cite{everyhook}. -% Provide a macro checking for the beginning of a sentence by examining the length of the preceeding space. (This breaks if |\frenchspacing| is activated) % \begin{macrocode} -\usepackage[excludeor]{everyhook} -\PushPostHook{par}{{\spacefactor=3000}} +\RequirePackage[excludeor]{everyhook} +\newcommand{\begin@sentence}{1001} +\PushPostHook{par}{{\spacefactor=\begin@sentence}} +% \end{macrocode} +% \end{macro} + +% \begin{macro}{\frenchspacing} +% Adjust the |\frenchspacing| macro to be compatibel with this idea. +% \begin{macrocode} +\def\frenchspacing{% + \sfcode`\.\begin@sentence \sfcode`\?\begin@sentence + \sfcode`\!\begin@sentence \sfcode`\:\begin@sentence + \sfcode`\;\@m \sfcode`\,\@m +} +% \end{macrocode} +% \end{macro} + +% \begin{macro}{\if@begin@of@sentence} +% Provide a macro checking for the beginning of a sentence by examining the length of the preceeding space. +% \begin{macrocode} \newcommand{\if@begin@of@sentence}[2]{\leavevmode\protecting{% \ifboolexpr{ test {\ifnumcomp{\spacefactor}{=}{3000}} or% - test {\ifnumcomp{\spacefactor}{=}{2000}}% + test {\ifnumcomp{\spacefactor}{=}{2000}} or% + test {\ifnumcomp{\spacefactor}{=}{\begin@sentence}}% }{#1}{#2}% }} % \end{macrocode} % \end{macro} % \begin{macro}{\acronym} -% The |\acronym|\meta{*}\oarg{typeset abbreviation}\marg{abbreviation}\marg{definition}\oarg{plural\linebreak[4] definition} macro is defined. +% The |\acronym|\meta{*}\oarg{typeset abbreviation}\marg{abbreviation}\meta{*}\marg{definition}\oarg{plural\linebreak[4] definition} macro is defined. % \begin{enumerate}[nosep, label=\#\arabic*] % \item star for omitting the \enquote{s} in the short plural % \item optional typeset abbreviation % \item mandatory abbreviation +% \item star for restoring the \hologo{TeX} default for space after text macros % \item mandatory long form % \item optional plural long form % \end{enumerate} % \begin{macrocode} -\DeclareDocumentCommand{\acronym}{sommo}{ +\NewDocumentCommand{\acronym}{somsmo}{ \newabbreviation[ - longplural=\IfNoValueTF{#5}{#4s}{#5}, + longplural=\IfNoValueTF{#6}{#5s}{#6}, \glsshortpluralkey=\IfBooleanTF{#1}{#3}{\IfNoValueTF{#2}{#3s}{#2s}} - ]{#3}{\IfNoValueTF{#2}{#3}{#2}}{#4} + ]{#3}{\IfNoValueTF{#2}{#3}{#2}}{#5} % \end{macrocode} % Provide the singular acronym macro. % \begin{macrocode} \expandafter\newcommand\csname#3\endcsname{% - \if@begin@of@sentence{\cGls{#3}}{\cgls{#3}}\@\xspace% + \if@begin@of@sentence{\cGls{#3}}{\cgls{#3}}% + \IfBooleanTF{#4}{}{\@\xspace}% } % \end{macrocode} % Expand the singular acronym macro in \PDF labels. @@ -1607,13 +1892,14 @@ % Provide the singular acronym macro in math mode. % \begin{macrocode} \expandafter\mathdef\csname#3\endcsname{% - \text{\glsxtrshort{#3}}\glsunset{#3}% + \text{\glsxtrshort{#3}}\@gls@increment@currcount{#3}% } % \end{macrocode} % Provide the plural acronym macro. % \begin{macrocode} \expandafter\newcommand\csname#3s\endcsname{% - \if@begin@of@sentence{\cGlspl{#3}}{\cglspl{#3}}\@\xspace% + \if@begin@of@sentence{\cGlspl{#3}}{\cglspl{#3}}% + \IfBooleanTF{#4}{}{\@\xspace}% } % \end{macrocode} % Expand the plural acronym macro in \PDF labels. @@ -1625,7 +1911,7 @@ % Provide the plural acronym macro in math mode. % \begin{macrocode} \expandafter\mathdef\csname#3s\endcsname{% - \text{\glsxtrshortpl{#3}}\glsunset{#3}% + \text{\glsxtrshortpl{#3}}\@gls@increment@currcount{#3}% } } % \end{macrocode} @@ -1634,14 +1920,13 @@ % \begin{macro}{\shortacronym} % The |\shortacronym| never expands into the long form. % \begin{macrocode} -\DeclareDocumentCommand{\shortacronym}{somm}{ - \newabbreviation[ - \glsshortpluralkey=\IfBooleanTF{#1}{#3}{\IfNoValueTF{#2}{#3s}{#2s}} - ]{#3}{\IfNoValueTF{#2}{#3}{#2}}{#4} +\NewDocumentCommand{\shortacronym}{somsmo}{ % \end{macrocode} % Provide the singular acronym macro. % \begin{macrocode} - \expandafter\newcommand\csname#3\endcsname{\cgls*{#3}\@\xspace} + \expandafter\newcommand\csname#3\endcsname{% + \IfNoValueTF{#2}{#3}{#2}\IfBooleanTF{#4}{}{\@\xspace}% + } % \end{macrocode} % Expand the singular acronym macro in \PDF labels. % \begin{macrocode} @@ -1651,11 +1936,16 @@ % \end{macrocode} % Provide the singular acronym macro in math mode. % \begin{macrocode} - \expandafter\mathdef\csname#3\endcsname{\text{\glsxtrshort*{#3}}} + \expandafter\mathdef\csname#3\endcsname{% + \text{\IfNoValueTF{#2}{#3}{#2}}% + } % \end{macrocode} % Provide the plural acronym macro. % \begin{macrocode} - \expandafter\newcommand\csname#3s\endcsname{\cglspl*{#3}\@\xspace} + \expandafter\newcommand\csname#3s\endcsname{% + \IfBooleanTF{#1}{#3}{\IfNoValueTF{#2}{#3s}{#2s}}% + \IfBooleanTF{#4}{}{\@\xspace}% + } % \end{macrocode} % Expand the plural acronym macro in \PDF labels. % \begin{macrocode} @@ -1665,8 +1955,9 @@ % \end{macrocode} % Provide the plural acronym macro in math mode. % \begin{macrocode} - \expandafter\mathdef\csname#3s\endcsname{\text{\glsxtrshortpl*{#3}}}% - \glsunset{#3} + \expandafter\mathdef\csname#3s\endcsname{% + \text{\IfBooleanTF{#1}{#3}{\IfNoValueTF{#2}{#3s}{#2s}}}% + }% } % \end{macrocode} % \end{macro} @@ -1674,31 +1965,32 @@ % \begin{macro}{\longacronym} % The |\longacronym| never shows the abbreviated form. % \begin{macrocode} -\DeclareDocumentCommand{\longacronym}{sommo}{ +\NewDocumentCommand{\longacronym}{somsmo}{ % \end{macrocode} % Provide the singular acronym macro. % \begin{macrocode} \expandafter\newcommand\csname#3\endcsname{% - \if@begin@of@sentence{\MakeUppercase#4}{#4}\@\xspace% + \if@begin@of@sentence{\MakeUppercase#5}{#5}% + \IfBooleanTF{#4}{}{\@\xspace}% } % \end{macrocode} % Expand the singular acronym macro in \PDF labels. % \begin{macrocode} - \pdfstringdefDisableCommands{\expandafter\def\csname#3\endcsname{#4 }} + \pdfstringdefDisableCommands{\expandafter\def\csname#3\endcsname{#5 }} % \end{macrocode} % Provide the plural acronym macro. % \begin{macrocode} \expandafter\newcommand\csname#3s\endcsname{% \if@begin@of@sentence{% - \IfNoValueTF{#5}{\MakeUppercase#4s}{\MakeUppercase#5}% + \IfNoValueTF{#6}{\MakeUppercase#5s}{\MakeUppercase#6}% }{% - \IfNoValueTF{#5}{#4s}{#5}}\@\xspace% + \IfNoValueTF{#6}{#5s}{#6}}\IfBooleanTF{#4}{}{\@\xspace}% } % \end{macrocode} % Expand the plural acronym macro in \PDF labels. % \begin{macrocode} \pdfstringdefDisableCommands{\expandafter\def\csname#3s\endcsname{% - \IfNoValueTF{#5}{#4s}{#5} }% + \IfNoValueTF{#6}{#5s}{#6} }% } } % \end{macrocode} @@ -1732,11 +2024,60 @@ % \end{macrocode} % \end{macro} % \end{macro} +% +% \begin{macro}{abstract} +% Adjust the |abstract| environment to reset all acronym counters. +% \begin{macrocode} +\@ifundefined{abstract}{}{% + \let\end@old@abstract\endabstract% + \renewcommand\endabstract{\glsresetall\end@old@abstract}% +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\tableofcontents} +% Adjust the |\tableofcontents| macro to never show the long form of acronyms. +% \begin{macrocode} +\let\old@table@of@contents\tableofcontents +\renewcommand\tableofcontents{% + \glsunsetall\old@table@of@contents\glsresetall% +} +% \end{macrocode} +% \end{macro} +% % End of glossaries if. % \begin{macrocode} \fi % \end{macrocode} % +%</package> +% +% \section{Biblatex datamodel file} \label{sec:data model} +% +%<*datamodel> + +% \begin{macro}{reportnumber} +% \begin{macro}{collaboration} +% \begin{macro}{protocollessurl} +% Define the |dbx| file containing the |hep-paper| datamodel. +% \begin{macrocode} +\DeclareDatamodelFields[type=field, datatype=literal]{ + reportnumber, + collaboration, +} +\DeclareDatamodelFields[type=field, datatype=uri]{protocollessurl} +\DeclareDatamodelEntryfields{ + reportnumber, + collaboration, + protocollessurl, +} +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% +%</datamodel> +% % \Finale \endinput @@ -1744,3 +2085,32 @@ % \PrintIndex % makeindex -s gglo.ist -o hep-paper.gls hep-paper.glo % makeindex -s gglo.ist -o hep-paper.ind hep-paper.idx + +% \begin{macro}{\refstepcounter@...} +% Adjust the |cleveref| |\refstepcounter@noarg| and |\refstepcounter@optarg| to use the |\@currentlabel| in order to fix problems with |\subref|. +% \begin{macrocode} +\def\refstepcounter@noarg#1{% + \cref@old@refstepcounter{#1}% + \cref@constructprefix{#1}{\cref@result}% + \@ifundefined{cref@#1@alias}% + {\def\@tempa{#1}}% + {\def\@tempa{\csname cref@#1@alias\endcsname}}% + \protected@edef\cref@currentlabel{% + [\@tempa][\arabic{#1}][\cref@result]% + \noexpand\@currentlabel% + }% changed +} + +\def\refstepcounter@optarg[#1]#2{% + \cref@old@refstepcounter{#2}% + \cref@constructprefix{#2}{\cref@result}% + \@ifundefined{cref@#1@alias}% + {\def\@tempa{#1}}% + {\def\@tempa{\csname cref@#1@alias\endcsname}}% + \protected@edef\cref@currentlabel{% + [\@tempa][\arabic{#2}][\cref@result]% + \noexpand\@currentlabel% changed + }% +} +% \end{macrocode} +% \end{macro} diff --git a/macros/latex/contrib/hep-paper/hep-paper.ins b/macros/latex/contrib/hep-paper/hep-paper.ins index b88c8423a5..881f9745b5 100644 --- a/macros/latex/contrib/hep-paper/hep-paper.ins +++ b/macros/latex/contrib/hep-paper/hep-paper.ins @@ -28,7 +28,10 @@ and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. \endpreamble -\generate{\file{hep-paper.sty}{\from{hep-paper.dtx}{package}}} +\generate{ + \file{hep-paper.sty}{\from{hep-paper.dtx}{package}} + \file{hep-paper.dbx}{\from{hep-paper.dtx}{datamodel}} +} \Msg{*********************************************************} \Msg{*} diff --git a/macros/latex/contrib/hep-paper/hep-paper.pdf b/macros/latex/contrib/hep-paper/hep-paper.pdf Binary files differindex 29b7c506ae..4142b2afe7 100644 --- a/macros/latex/contrib/hep-paper/hep-paper.pdf +++ b/macros/latex/contrib/hep-paper/hep-paper.pdf diff --git a/macros/latex/contrib/lwarp/README.txt b/macros/latex/contrib/lwarp/README.txt index d4c0b0a650..992bd5efd0 100644 --- a/macros/latex/contrib/lwarp/README.txt +++ b/macros/latex/contrib/lwarp/README.txt @@ -1,5 +1,5 @@ -LaTeX lwarp package v0.84 README.txt +LaTeX lwarp package v0.85 README.txt Files included are: diff --git a/macros/latex/contrib/lwarp/lwarp.dtx b/macros/latex/contrib/lwarp/lwarp.dtx index f073d2bc36..8d1bb36cd3 100644 --- a/macros/latex/contrib/lwarp/lwarp.dtx +++ b/macros/latex/contrib/lwarp/lwarp.dtx @@ -16,7 +16,7 @@ % \iffalse %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01] %<package>\ProvidesPackage{lwarp} -%<package> [2020/04/24 v0.84 Allows LaTeX to directly produce HTML5 output.] +%<package> [2020/05/01 v0.85 Allows LaTeX to directly produce HTML5 output.] % %<*driver> \documentclass{ltxdoc} @@ -1570,6 +1570,12 @@ Or, use a short name for the \TOC\ entry without the math, or use \cs{texorpdfst \end{itemize} } +\newcommand{\limitsacro}{% +Define acronymn formats using \cs{textbf} instead +\watchout[formats] +of \cs{bfseries} etc. +} + \newcommand{\limitschemfig}{% If using \cs{polymerdelim} to add delimiters to a \cs{chemfig}, wrap both inside a single \env{lateximage}: @@ -2999,7 +3005,7 @@ This boolean may be tested by the user for later use. %<*package> % \fi % -% \CheckSum{44148} +% \CheckSum{44178} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -3126,6 +3132,7 @@ This boolean may be tested by the user for later use. % \changes{v0.82}{2020/03/25}{\ 2020/03/25} % \changes{v0.83}{2020/03/27}{\ 2020/03/27} % \changes{v0.84}{2020/04/24}{\ 2020/04/24} +% \changes{v0.85}{2020/05/01}{\ 2020/05/01} @@ -3348,6 +3355,16 @@ This boolean may be tested by the user for later use. % % \begin{description} % \needspace{2\baselineskip} +% \item[v0.85:] \pkg{fontspec} +% \begin{itemize} +% \item \pkg{fontspec}: Fixed core font change macros for world languages. +% \margintag{packages} +% \item \pkg{acro}: Due to v3 changes, when defining acronym formats, +% \watchout[\pkg{acro} formats] +% use \cs{textbf} instead of \cs{bfseries}, etc. +% \item Fixed \pkg{idxlayout}, \pkg{mathtools}, \pkg{titlesec}, \pkg{url}. +% \end{itemize} +% \needspace{2\baselineskip} % \item[v0.84:] Previous/next page links, numerous fixes. % \begin{itemize} % \item Added documentation of \env{BlockClass} and \cs{InlineClass} @@ -10093,6 +10110,10 @@ This boolean may be tested by the user for later use. % \limitsfixme % % +% \subsubsection{\pkg{acro} package} +% \limitsacro +% \trouble{acro=\pkg{acro}} +% % \subsubsection{\pkg{chemfig} package} % % \limitschemfig @@ -13919,6 +13940,7 @@ This boolean may be tested by the user for later use. % ^^A % ^^A % +% \DescribePackage{fontspec} % Load \pkg{fontspec} if necessary: % \changes{v0.50}{2018/02/24}{Fix: Load \pkg{fontspec} if necessary.} % \begin{macrocode} @@ -19014,7 +19036,7 @@ src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.6/MathJax.js?config=TeX- -- Copyright 2016-2020 Brian Dunn -printversion = "v0.84" +printversion = "v0.85" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () @@ -21217,12 +21239,13 @@ end -- not --version % Break ligatures and use upright apostrophes in \HTML\ tags. % % \cs{protect} is in case the tag appears in \TOC, \LOF, \LOT. +% \changes{v0.85}{2020/04/30}{Fix: Added print macros for \pkg{fontspec}.} % \begin{macrocode} \newcommand*{\LWR@htmltagc}[1]{% \LWR@traceinfo{LWR@htmltagc !\detokenize{#1}!}% \begingroup% \LWR@FBcancel% -\ifmmode\else\protect\LWR@origttfamily\fi% +\ifmmode\else\protect\LWR@print@normalfont\protect\LWR@origttfamily\fi% \protect\LWR@origtextless% \LWR@isolate{#1}% \protect\LWR@origtextgreater% @@ -21395,13 +21418,14 @@ end -- not --version % \begin{macro}{\LWR@htmlclosecomment} % \changes{v0.47}{2018/01/25}{Add \cs{mbox} to prevent line breaks.} % \changes{v0.63}{2018/11/30}{Fix: Break ligature for \pkg{luatexko}.} +% \changes{v0.85}{2020/04/29}{Fix: Added print macros for \pkg{fontspec}.} % \begin{macrocode} \newcommand*{\LWR@htmlopencomment}{% {% % \LWR@traceinfo{LWR@htmlopencomment}% \begingroup% \LWR@FBcancel% -\ifmmode\else\protect\LWR@origttfamily\fi% +\ifmmode\else\protect\LWR@print@normalfont\protect\LWR@origttfamily\fi% \LWR@print@mbox{\LWR@origtextless{}!-\/-}% \endgroup% }% @@ -21412,7 +21436,7 @@ end -- not --version % \LWR@traceinfo{LWR@htmlclosecomment}% \begingroup% \LWR@FBcancel% -\ifmmode\else\protect\LWR@origttfamily\fi% +\ifmmode\else\protect\LWR@print@normalfont\protect\LWR@origttfamily\fi% \LWR@print@mbox{-\/-\LWR@origtextgreater}% \endgroup% }% @@ -21424,13 +21448,14 @@ end -- not --version % \begin{macro}{\LWR@htmlcomment} \marg{comment} % % \changes{v0.28}{2017/04/13}{Breaks ligatures in \HTML\ comments.} -% +% \changes{v0.85}{2020/04/29}{Fix: Added print macros for \pkg{fontspec}.} % \begin{macrocode} \newcommand{\LWR@htmlcomment}[1]{% \LWR@htmlopencomment{}% {% -\LWR@origttfamily% break ligatures -#1% + \LWR@print@normalfont% + \LWR@origttfamily% break ligatures + #1% }% \LWR@htmlclosecomment{}} % \end{macrocode} @@ -26516,8 +26541,10 @@ end -- not --version % \end{macrocode} % \changes{v0.50}{2018/03/02}{Improved column alignment.} % \changes{v0.54}{2018/04/06}{Improved column alignment.} +% \changes{v0.85}{2020/04/29}{Fix: Added print macros for \pkg{fontspec}.} % \begin{macrocode} % \LWR@print@normalsize% +\LWR@print@normalfont% \LWR@origttfamily% \LWR@print@small% % \end{macrocode} @@ -38151,17 +38178,24 @@ color:\LWR@origpound\LWR@tempcolor% % \changes{v0.48}{2018/02/02}{Improved font control.} % \changes{v0.50}{2018/02/20}{Robustify macros.} % \changes{v0.72}{2019/05/24}{Use \cs{LWR@formatted} for \cs{bfseries}, etc.} +% \changes{v0.85}{2020/04/29}{Fix: Added print macros for \pkg{fontspec}.} % % \begin{macro}{\mdseries} % \begin{macrocode} -\newrobustcmd*{\LWR@HTML@mdseries}{\renewcommand*{\LWR@f@series}{md}} +\newrobustcmd*{\LWR@HTML@mdseries}{% + \LWR@print@mdseries% + \renewcommand*{\LWR@f@series}{md}% +} \LWR@formatted{mdseries} % \end{macrocode} % \end{macro} % \begin{macro}{\bfseries} % \begin{macrocode} -\newrobustcmd*{\LWR@HTML@bfseries}{\renewcommand*{\LWR@f@series}{bf}} +\newrobustcmd*{\LWR@HTML@bfseries}{% + \LWR@print@bfseries% + \renewcommand*{\LWR@f@series}{bf}% +} \LWR@formatted{bfseries} % \end{macrocode} % \end{macro} @@ -38169,7 +38203,10 @@ color:\LWR@origpound\LWR@tempcolor% % \begin{macro}{\ebweight} From \pkg{nfssext-cfr}. % \changes{v0.72}{2019/05/26}{\pkg{nfssext-cfr}: Added.} % \begin{macrocode} -\newrobustcmd*{\LWR@HTML@ebweight}{\renewcommand*{\LWR@f@series}{eb}} +\newrobustcmd*{\LWR@HTML@ebweight}{% + \LWR@print@ebweight% + \renewcommand*{\LWR@f@series}{eb}% +} \LWR@formatted{ebweight} % \end{macrocode} % \end{macro} @@ -38177,49 +38214,75 @@ color:\LWR@origpound\LWR@tempcolor% % \begin{macro}{\lgweight} From \pkg{nfssext-cfr}. % \changes{v0.72}{2019/05/26}{\pkg{nfssext-cfr}: Added.} % \begin{macrocode} -\newrobustcmd*{\LWR@HTML@lgweight}{\renewcommand*{\LWR@f@series}{lg}} +\newrobustcmd*{\LWR@HTML@lgweight}{% + \LWR@print@lgweight% + \renewcommand*{\LWR@f@series}{lg}% +} \LWR@formatted{lgweight} % \end{macrocode} % \end{macro} % \begin{macro}{\rmfamily} % \begin{macrocode} -\newrobustcmd*{\LWR@HTML@rmfamily}{\renewcommand*{\LWR@f@family}{rm}} +\newrobustcmd*{\LWR@HTML@rmfamily}{% + \LWR@print@rmfamily% + \renewcommand*{\LWR@f@family}{rm}% +} \LWR@formatted{rmfamily} % \end{macrocode} % \end{macro} % \begin{macro}{\sffamily} % \begin{macrocode} -\newrobustcmd*{\LWR@HTML@sffamily}{\renewcommand*{\LWR@f@family}{sf}} +\newrobustcmd*{\LWR@HTML@sffamily}{% + \LWR@print@sffamily% + \renewcommand*{\LWR@f@family}{sf}% +} \LWR@formatted{sffamily} % \end{macrocode} % \end{macro} % \begin{macro}{\ttfamily} % \begin{macrocode} -\newrobustcmd*{\LWR@HTML@ttfamily}{\renewcommand*{\LWR@f@family}{tt}} +\newrobustcmd*{\LWR@HTML@ttfamily}{% + \LWR@print@ttfamily% + \renewcommand*{\LWR@f@family}{tt}% +} \LWR@formatted{ttfamily} % \end{macrocode} % \end{macro} - +% +% +% The following use \cs{AtBeginDocument} due to the +% \LaTeX\ core \cs{reinstall@nfss@defs}, which redefines these +% \cs{AtBeginDocument}. See \cmds{texdoc source2e}. +% % \begin{macro}{\upshape} % \begin{macrocode} -\newrobustcmd*{\LWR@HTML@upshape}{\renewcommand*{\LWR@f@shape}{up}} +\newrobustcmd*{\LWR@HTML@upshape}{% + \LWR@print@upshape% + \renewcommand*{\LWR@f@shape}{up}% +} \AtBeginDocument{\LWR@formatted{upshape}} % \end{macrocode} % \end{macro} % \begin{macro}{\itshape} % \begin{macrocode} -\newrobustcmd*{\LWR@HTML@itshape}{\renewcommand*{\LWR@f@shape}{it}} +\newrobustcmd*{\LWR@HTML@itshape}{% + \LWR@print@itshape% + \renewcommand*{\LWR@f@shape}{it}% +} \AtBeginDocument{\LWR@formatted{itshape}} % \end{macrocode} % \end{macro} % \begin{macro}{\scshape} % \begin{macrocode} -\newrobustcmd*{\LWR@HTML@scshape}{\renewcommand*{\LWR@f@shapecaps}{sc}} +\newrobustcmd*{\LWR@HTML@scshape}{% + \LWR@print@scshape% + \renewcommand*{\LWR@f@shapecaps}{sc}% +} \AtBeginDocument{\LWR@formatted{scshape}} % \end{macrocode} % \end{macro} @@ -38230,7 +38293,10 @@ color:\LWR@origpound\LWR@tempcolor% \@ifundefined{ulcshape}{ \LetLtxMacro\ulcshape\upshape }{} -\newrobustcmd*{\LWR@HTML@ulcshape}{\renewcommand*{\LWR@f@shapecaps}{ulc}} +\newrobustcmd*{\LWR@HTML@ulcshape}{% + \LWR@print@ulcshape% + \renewcommand*{\LWR@f@shapecaps}{ulc}% +} \AtBeginDocument{\LWR@formatted{ulcshape}} % \end{macrocode} % \end{macro} @@ -38242,6 +38308,7 @@ color:\LWR@origpound\LWR@tempcolor% \LetLtxMacro\sishape\scshape }{} \newrobustcmd*{\LWR@HTML@sishape}{% + \LWR@print@sishape% \renewcommand*{\LWR@f@shape}{it} \renewcommand*{\LWR@f@shapecaps}{sc}% } @@ -38252,7 +38319,10 @@ color:\LWR@origpound\LWR@tempcolor% % \begin{macro}{\slshape} % \changes{v0.62}{2018/11/11}{Added.} % \begin{macrocode} -\newrobustcmd*{\LWR@HTML@slshape}{\renewcommand*{\LWR@f@shape}{sl}} +\newrobustcmd*{\LWR@HTML@slshape}{% + \LWR@print@slshape% + \renewcommand*{\LWR@f@shape}{sl}% +} \AtBeginDocument{\LWR@formatted{slshape}} % \end{macrocode} % \end{macro} @@ -40249,6 +40319,8 @@ color:\LWR@origpound\LWR@tempcolor% % \DescribePackage{acro} % \pkg{acro} is patched for use by \pkg{lwarp}. % +% \limitsacro +% % \changes{v0.48}{2018/02/02}{\pkg{acro}: Added.} % % \codehtml @@ -40281,6 +40353,9 @@ color:\LWR@origpound\LWR@tempcolor% % \changes{v0.76}{2019/10/07}{\pkg{acro}: Updated for v2.10.} % \begin{macrocode} \ExplSyntaxOn +\@ifpackagelater{acro}{2020/04/29}% +{}% v3 or later +{% before v3 \@ifpackagelater{acro}{2019/09/23}% {% v2.10 or later \cs_gset_protected:Npn \__acro_typeset:nn #1#2 @@ -40377,6 +40452,7 @@ color:\LWR@origpound\LWR@tempcolor% \group_end: } }% before v2.10 +}% before v3 \ExplSyntaxOff % \end{macrocode} @@ -45448,7 +45524,7 @@ s% % \codehtml % % \begin{macrocode} -\LWR@ProvidesPackagePass{chemgreek}[2016/02/10] +\LWR@ProvidesPackagePass{chemgreek}[2020/01/16] % \end{macrocode} % \begin{macrocode} @@ -52215,7 +52291,8 @@ solid {\FancyVerbRuleColor{\LWR@origpound\LWR@tempcolor}} ; % space \providecommand*{\multfootsep}{,} % \end{macrocode} % -% Using \pkg{cleveref}: +% Using \pkg{cleveref}. +% \cs{labelcref} only prints the number of the object, not its type. % \begin{macrocode} \providecommand*{\footref}[1]{\labelcref{#1}} % \end{macrocode} @@ -55190,16 +55267,24 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak} % % \begin{macrocode} \newcommand{\LWR@indexprenote}{} +% \end{macrocode} +% +% \cs{AtBeginDocument} to help with package load order. +% \changes{v0.85}{2020/04/29}{\pkg{idxlayout}: Fixed: \cs{AtBeginDocument} for load order.} +% \begin{macrocode} +\AtBeginDocument{ + \preto\printindex{ -\preto\printindex{ - -\LWR@orignewpage -\LWR@startpars + \LWR@orignewpage + \LWR@startpars -\LWR@indexprenote + \LWR@indexprenote + } } - +% \end{macrocode} +% +% \begin{macrocode} \newcommand{\setindexprenote}[1]{\renewcommand{\LWR@indexprenote}{#1}} \newcommand*{\noindexprenote}{\renewcommand{\LWR@indexprenote}{}} @@ -58845,8 +58930,11 @@ do not attempt to patch lwarp's version of `hyperref'.)\MessageBreak} \CustomizeMathJax{ \newcommand{\ArrowBetweenLines}[1][\Updownarrow]{#1}% no starred } - -\CustomizeMathJax{\newcommand{\shortintertext}[1]{\\ \text{#1}\notag \\}} +% \end{macrocode} +% +% \changes{v0.85}{2020/05/01}{\pkg{mathtools}: Fixed: \cs{shortintertext}.} +% \begin{macrocode} +\CustomizeMathJax{\newcommand{\shortintertext}[1]{\text{#1}\notag \\}} \CustomizeMathJax{\newcommand{\vdotswithin}[1]{\hspace{.5em}\vdots}} \CustomizeMathJax{\newcommand{\shortvdotswithin}[1]{ & \hspace{.5em}\vdots \\}} @@ -61742,7 +61830,13 @@ do not attempt to patch lwarp's version of `nameref'.)\MessageBreak \newcommand*{\LWR@nccmath@eqs}[2][]{\begin{eqnarray}#2\end{eqnarray}} \begin{warpMathJax} -\CustomizeMathJax{\renewcommand{\intertext}[2][]{\\ \text{#2}\notag \\}} +% \end{macrocode} +% +% \changes{v0.85}{2020/05/01}{\pkg{mathtools}: Fixed: \cs{shortintertext}.} +% \begin{macrocode} +\CustomizeMathJax{\renewcommand{\intertext}[2][]{\text{#2}\notag \\}} +% \end{macrocode} +% \begin{macrocode} \CustomizeMathJax{\newenvironment{fleqn}[1][]{}{}} \CustomizeMathJax{\newenvironment{ceqn}{}{}} \CustomizeMathJax{\newenvironment{darray}[2][c]{\begin{array}[#1]{#2}}{\end{array}}} @@ -72956,10 +73050,28 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % % % Discard all options for \pkg{lwarp-titlesec}: - +% % \codehtml +% +% \changes{v0.85}{2020/04/30}{\pkg{titlesec}: \optn{pagestyles} option.} % \begin{macrocode} -\LWR@ProvidesPackageDrop{titlesec}[2016/03/21] +\PackageInfo{lwarp}{Using the lwarp version of package `titlesec'.}% +\ProvidesPackage{lwarp-titlesec}[2016/03/21] + +\newbool{LWR@loadtitleps} +\boolfalse{LWR@loadtitleps} + +\DeclareOption{pagestyles}{ + \booltrue{LWR@loadtitleps} +} + +\DeclareOption*{} + +\ProcessOptions\relax + +\ifbool{LWR@loadtitleps}{ + \RequirePackage{lwarp-titleps} +}{} % \end{macrocode} % \begin{noindmacro}{\titlelabel} \marg{label-format} @@ -75388,6 +75500,7 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % % \changes{v0.52}{2018/03/29}{\pkg{url}: Added.} % \changes{v0.80}{2020/02/06}{\pkg{url}: Creates hyperlinks.} +% \changes{v0.85}{2020/05/01}{\pkg{url}: Fixed print mode.} % % \codehtml % @@ -75406,9 +75519,10 @@ remember to convert PDF images to SVG using 'lwarpmk pdftosvg *-fig.pdf', % ^^A \LWR@url@origUrl@FormatString% % % \begin{macrocode} -\renewcommand*{\Url@FormatString}{% +\newcommand*{\LWR@HTML@Url@FormatString}{% \expandafter\LWR@url@orig@url\expandafter{\Url@String}% } +\LWR@formatted{Url@FormatString} % \end{macrocode} % % \iffalse diff --git a/macros/latex/contrib/lwarp/lwarp.pdf b/macros/latex/contrib/lwarp/lwarp.pdf Binary files differindex eea09fbc8e..44912c4d03 100644 --- a/macros/latex/contrib/lwarp/lwarp.pdf +++ b/macros/latex/contrib/lwarp/lwarp.pdf diff --git a/macros/latex/contrib/lwarp/lwarpmk.lua b/macros/latex/contrib/lwarp/lwarpmk.lua index a6239409bc..b2e06788aa 100755 --- a/macros/latex/contrib/lwarp/lwarpmk.lua +++ b/macros/latex/contrib/lwarp/lwarpmk.lua @@ -2,7 +2,7 @@ -- Copyright 2016-2020 Brian Dunn -printversion = "v0.84" +printversion = "v0.85" requiredconfversion = "2" -- also at *lwarpmk.conf function printhelp () diff --git a/macros/latex/contrib/univie-ling/README b/macros/latex/contrib/univie-ling/README index 8f87c4fe2b..3992b6e1a2 100644 --- a/macros/latex/contrib/univie-ling/README +++ b/macros/latex/contrib/univie-ling/README @@ -80,6 +80,13 @@ also have a look at the example files. == CHANGES == +V. 1.10 (2020-05-01): + - univie-ling-wlg.cls: + * fix encoding incompatibilities. + - univie-ling.bbx: + * only print origyear (not full origdate) in label. + * fix title capitalization in inbook, mvbook and mvcollection types. + V. 1.9 (2019-01-21) - univie-ling.bbx: correct fix of duplicate editorstrg parentheses. diff --git a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx index 86bc01fbda..c41cc4ff75 100644 --- a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx +++ b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx @@ -36,7 +36,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesFile{univie-ling.bbx}[2019/01/21 v1.9 biblatex bibliography style] +\ProvidesFile{univie-ling.bbx}[2019/01/22 v1.10dev biblatex bibliography style] % Load base style (authoryear) \RequireBibliographyStyle{authoryear} @@ -116,7 +116,17 @@ \iffieldundef{pubstate}{% \iffieldundef{labelyear}{}{% \printlabeldateextra% - \iffieldundef{origyear}{}{\addspace\mkbibbrackets{\printorigdate}}% + \iffieldundef{origyear}{}{% + \addspace\mkbibbrackets{% + \iffieldundef{origmonth}{% + \printorigdate}{% + \printfield{origyear}% + \iffieldundef{origenddate}{}{% + \bibdaterangesep\printfield{origendyear}% + }% + }% + }% + }% \clearfield{year}% }% }{% @@ -567,7 +577,7 @@ % FIELD FORMATS % -\DeclareFieldFormat[article,book,collection,incollection,inproceedings,thesis,unpublished]{titlecase}{\MakeSentenceCase*{#1}}% +\DeclareFieldFormat[article,book,mvbook,inbook,collection,mvcollection,incollection,inproceedings,thesis,unpublished]{titlecase}{\MakeSentenceCase*{#1}}% \DeclareFieldFormat[article,inbook,incollection,inproceedings,patent,thesis,unpublished]{title}{#1} diff --git a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx index aeed54c5bd..3a7815e0c6 100644 --- a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx +++ b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx @@ -34,7 +34,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesFile{univie-ling.cbx}[2019/01/21 v1.9 biblatex citation style] +\ProvidesFile{univie-ling.cbx}[2019/01/22 v1.10dev biblatex citation style] \RequireCitationStyle{authoryear} @@ -70,7 +70,17 @@ {\printtext[bibhyperref]{% \printfield{labelyear}% \printfield{extradate}}% - \iffieldundef{origyear}{}{\addspace\mkbibbrackets{\printorigdate}}% + \iffieldundef{origyear}{}{% + \addspace\mkbibbrackets{% + \iffieldundef{origmonth}{% + \printorigdate}{% + \printfield{origyear}% + \iffieldundef{origenddate}{}{% + \bibdaterangesep\printfield{origendyear}% + }% + }% + }% + }% }% } diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf Binary files differindex 44743fba7e..a0b21eae63 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf +++ b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex index 2e5b42d01e..26a611ffcd 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex +++ b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex @@ -63,7 +63,7 @@ \author{\texorpdfstring{Jrgen Spitzmller% \thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jrgen Spitzmller}} -\date{Version 1.9, 2019/01/21} +\date{Version 1.10, 2020/05/01} \maketitle @@ -315,6 +315,7 @@ Templates are provided as well: \section{Release History} \begin{description} + \item 2020/05/01 (v.\,1.10) No change to this class. \item 2019/01/21 (v.\,1.9) No change to this class. \item 2019/01/15 (v.\,1.8) No change to this class. \item 2018/11/07 (v.\,1.7) No change to this class. diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf Binary files differindex d0d41dec34..78f1ef1fb5 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf +++ b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex index 859ac65c0d..c691588972 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex +++ b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex @@ -59,7 +59,7 @@ \author{\texorpdfstring{Jrgen Spitzmller% \thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jrgen Spitzmller}} -\date{Version 1.9, 2019/01/21} +\date{Version 1.10, 2020/05/01} \maketitle @@ -339,6 +339,7 @@ Templates are provided as well: \section{Release History} \begin{itemize} + \item 2020/05/01 (v.\,1.10) No change to this class. \item 2019/01/21 (v.\,1.9) No change to this class. \item 2019/01/15 (v.\,1.8) Fix encoding of German declaration string. \item 2018/11/07 (v.\,1.7) No change to this class. diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf Binary files differindex f7cdd4f59e..471763d75c 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf +++ b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex index 1ee24a3dad..4c43f624ce 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex +++ b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex @@ -59,7 +59,7 @@ \author{\texorpdfstring{Jrgen Spitzmller% \thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jrgen Spitzmller}} -\date{Version 1.9, 2019/01/21} +\date{Version 1.10, 2020/05/01} \maketitle @@ -363,6 +363,7 @@ Templates are provided as well: \section{Release History} \begin{itemize} + \item 2020/05/01 (v.\,1.10) No change to this class. \item 2019/01/21 (v.\,1.9) No change to this class. \item 2019/01/15 (v.\,1.8) Fix title abbreviations (MA, BA). \item 2018/11/07 (v.\,1.7) No change to this class. diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf Binary files differindex 57659d94f6..d9bac596d1 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf +++ b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex index 6c491d7d2d..34fc150c1e 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex +++ b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex @@ -59,7 +59,7 @@ \author{\texorpdfstring{Jrgen Spitzmller% \thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jrgen Spitzmller}} -\date{Version 1.9, 2019/01/21} +\date{Version 1.10, 2020/05/01} \maketitle @@ -212,10 +212,11 @@ A template is provided as well: \url{https://github.com/jspitz/univie-ling/raw/m \section{Release History} \begin{itemize} - \item 2019/01/21 (v.\,1.9) No change to this class. - \item 2019/01/15 (v.\,1.8) No change to this class. - \item 2018/11/07 (v.\,1.7) No change to this class. - \item 2018/11/04 (v.\,1.6) Remove \jmacro{subexamples} environment as this is now provided by \textsf{covington}. + \item 2020/05/01 (v.\,1.10) Fix encoding incompatibilities. + \item 2019/01/21 (v.\,1.9) No change to this class. + \item 2019/01/15 (v.\,1.8) No change to this class. + \item 2018/11/07 (v.\,1.7) No change to this class. + \item 2018/11/04 (v.\,1.6) Remove \jmacro{subexamples} environment as this is now provided by \textsf{covington}. \item 2018/09/03 (v.\,1.5) \begin{itemize} \item Introduce \jmacro{subexamples} environment. diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls index c065ef81b7..b135db0976 100644 --- a/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls +++ b/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls @@ -31,7 +31,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{univie-ling-expose}[2019/01/21 v1.9 Univie Linguistic Exposes (JSp)] +\ProvidesPackage{univie-ling-expose}[2019/05/01 v1.10 Univie Linguistic Exposes (JSp)] \RequirePackage{xkeyval} diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls index fd63517941..c190660feb 100644 --- a/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls +++ b/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls @@ -31,7 +31,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{univie-ling-paper}[2019/01/21 v1.9 Univie Linguistic Papers (JSp)] +\ProvidesPackage{univie-ling-paper}[2019/05/01 v1.10 Univie Linguistic Papers (JSp)] \RequirePackage{xkeyval} diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls index c0e25d7e53..b43242a9ed 100644 --- a/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls +++ b/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls @@ -31,7 +31,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{univie-ling-thesis}[2019/01/21 v1.9 Univie Linguistic Theses (JSp)] +\ProvidesPackage{univie-ling-thesis}[2019/05/01 v1.10 Univie Linguistic Theses (JSp)] \RequirePackage{xkeyval} diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls index ec2a665e22..f24a6c12bf 100644 --- a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls +++ b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls @@ -194,9 +194,9 @@ \deftranslation[to=English]{corrauthors}{Corresponding authors} \deftranslation[to=German]{edby}{Hg.\,v.} \deftranslation[to=English]{edby}{Ed.\,by} -\deftranslation[to=German]{imp-editor}{Eigentmer, Herausgeber und Verleger} +\deftranslation[to=German]{imp-editor}{Eigent\"umer, Herausgeber und Verleger} \deftranslation[to=English]{imp-editor}{Owner, editor and publisher} -\deftranslation[to=German]{univie-address}{Sensengasse 3a\\1090 Wien\\sterreich} +\deftranslation[to=German]{univie-address}{Sensengasse 3a\\1090 Wien\\\"Osterreich} \deftranslation[to=English]{univie-address}{Sensengasse 3a\\1090 Vienna\\Austria} \deftranslation[to=German]{edboard}{Redaktion} \deftranslation[to=English]{edboard}{Editorial board} @@ -206,7 +206,7 @@ \deftranslation[to=English]{contact}{Contact} \deftranslation[to=German]{appform}{Die \emph{Wiener Linguistische Gazette} erscheint in loser Folge im Open-Access-Format.\\ - Alle Ausgaben ab Nr. 72 (2005) sind online verfgbar.} + Alle Ausgaben ab Nr. 72 (2005) sind online verf\"ugbar.} \deftranslation[to=English]{appform}{The \versal{WLG} journal is published in loose sequence and in open access format.\\ All issues as of 72 (2005) are available online.} @@ -912,8 +912,8 @@ pdfborder={0 0 0} % Varioref: \RequirePackage[ngerman]{varioref} \AtBeginDocument{% -\renewcommand\reftextafter{auf der \reftextvario{folgenden}{nchsten} Seite}% -\renewcommand\reftextfaceafter{auf der \reftextvario{folgenden}{nchsten} Seite}% +\renewcommand\reftextafter{auf der \reftextvario{folgenden}{n\"achsten} Seite}% +\renewcommand\reftextfaceafter{auf der \reftextvario{folgenden}{n\"achsten} Seite}% \renewcommand\reftextbefore{auf der \reftextvario{vorhergehenden}{vorangegangenen} Seite}% \renewcommand\reftextfacebefore{auf der \reftextvario{vorhergehenden}{vorangegangenen} Seite}% \renewcommand\reftextfaraway[1]{auf S.~\pageref{#1}}% diff --git a/macros/latex/contrib/xcjk2uni/README.md b/macros/latex/contrib/xcjk2uni/README.md index 26676edd3f..8f9535728f 100644 --- a/macros/latex/contrib/xcjk2uni/README.md +++ b/macros/latex/contrib/xcjk2uni/README.md @@ -19,12 +19,10 @@ Set the current encoding. The default encoding is GBK. \CJKchartouni{<character>} Convert a single CJK character to its Unicode. -It requires two steps of expansion. \CJKsfdtouni{<plane>}{<slot>} Convert the .sfd coordinate to its Unicode. -It requires two steps of expansion. You can read the package manual (in Chinese) for more detailed explanations. @@ -38,7 +36,7 @@ Issues and pull requests are welcome. Copyright and Licence --------------------- - Copyright (C) 2013-2014, 2016, 2018 by Qing Lee <sobenlee@gmail.com> + Copyright (C) 2013-2014, 2016, 2018-2020 by Qing Lee <sobenlee@gmail.com> ---------------------------------------------------------------------- This work may be distributed and/or modified under the @@ -51,7 +49,7 @@ Copyright and Licence and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later. - This work has the LPPL maintenance status `maintained'. + This work has the LPPL maintenance status "maintained". The Current Maintainer of this work is Qing Lee. diff --git a/macros/latex/contrib/xcjk2uni/xCJK2uni.dtx b/macros/latex/contrib/xcjk2uni/xCJK2uni.dtx index 860d37f915..7a87a2a2b5 100644 --- a/macros/latex/contrib/xcjk2uni/xCJK2uni.dtx +++ b/macros/latex/contrib/xcjk2uni/xCJK2uni.dtx @@ -25,12 +25,10 @@ Set the current encoding. The default encoding is GBK. \CJKchartouni{<character>} Convert a single CJK character to its Unicode. -It requires two steps of expansion. \CJKsfdtouni{<plane>}{<slot>} Convert the .sfd coordinate to its Unicode. -It requires two steps of expansion. You can read the package manual (in Chinese) for more detailed explanations. @@ -44,7 +42,7 @@ Issues and pull requests are welcome. Copyright and Licence --------------------- - Copyright (C) 2013-2014, 2016, 2018-2019 by Qing Lee <sobenlee@gmail.com> + Copyright (C) 2013-2014, 2016, 2018-2020 by Qing Lee <sobenlee@gmail.com> ---------------------------------------------------------------------- This work may be distributed and/or modified under the @@ -57,7 +55,7 @@ Copyright and Licence and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later. - This work has the LPPL maintenance status `maintained'. + This work has the LPPL maintenance status "maintained". The Current Maintainer of this work is Qing Lee. @@ -89,7 +87,7 @@ Copyright and Licence \preamble - Copyright (C) 2013-2014, 2016, 2018-2019 by Qing Lee <sobenlee@gmail.com> + Copyright (C) 2013-2014, 2016, 2018-2020 by Qing Lee <sobenlee@gmail.com> -------------------------------------------------------------------------- This work may be distributed and/or modified under the @@ -102,7 +100,7 @@ Copyright and Licence and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later. - This work has the LPPL maintenance status `maintained'. + This work has the LPPL maintenance status "maintained". The Current Maintainer of this work is Qing Lee. @@ -192,7 +190,7 @@ Copyright and Licence %<package>\NeedsTeXFormat{LaTeX2e} %<package>\RequirePackage{expl3} %<make>\input expl3-generic % -%<+package|make|def>\GetIdInfo$Id: xCJK2uni.dtx 21b29fd 2019-04-07 23:27:31 +0800 Qing Lee <sobenlee@gmail.com> $ +%<+package|make|def>\GetIdInfo$Id: xCJK2uni.dtx daef005 2020-05-01 21:09:45 +0800 Qing Lee <sobenlee@gmail.com> $ %<package|make|def> {Convert CJK character to Unicode.} %<*driver> \def\ctxaux#1#2#3{\def\ctxversion{v#2}}\ctxaux @@ -202,7 +200,7 @@ Copyright and Licence %<make>\cs_if_exist:NF \ProvidesExplFile %<make> { %<make> \group_begin: -%<make> \cs_set_nopar:Npn \ProvidesExplFile #1#2#3#4 +%<make> \cs_set:Npn \ProvidesExplFile #1#2#3#4 %<make> { \iow_log:x { File:~#1~#2~v#3~#4 } } %<make> \exp_after:wN \group_end: %<make> } @@ -214,7 +212,7 @@ Copyright and Licence %<JIS>\ProvidesExplFile{xCJK2uni-UJIS.def} %<KS>\ProvidesExplFile{xCJK2uni-UKS.def} %<*driver|package|make|def> - {\ExplFileDate}{0.8}{\ExplFileDescription} + {\ExplFileDate}{1.0}{\ExplFileDescription} %</driver|package|make|def> %<*driver> \documentclass{ctxdoc} @@ -226,7 +224,7 @@ Copyright and Licence %</driver> % \fi % -% \CheckSum{585} +% \CheckSum{532} % \GetFileId{xCJK2uni.sty} % % \title{\bfseries\pkg{xCJK2uni} 宏包} @@ -264,8 +262,7 @@ Copyright and Licence % \begin{syntax} % \cs{CJKchartouni} \Arg{单个CJK文字} % \end{syntax} -% 将文字转换成 $16$ 进制形式的 Unicode。例如 |\CJKchartouni{一}| 将得到 |4E00|。 -% 将它展开两次就可以得到结果。 +% 将文字转换成 Unicode。例如 |\CJKchartouni{一}| 将得到 \texttt{\number\string"4E00 }。 % \end{function} % % \begin{function}[EXP]{\CJKsfdtouni} @@ -273,8 +270,8 @@ Copyright and Licence % \cs{CJKsfdtouni} \Arg{plane} \Arg{slot} % \end{syntax} % \meta{plane} 表示由 \file{.sfd} 文件定义的子字体的编号，\meta{slot} 表示在 -% 子字体中的位置，这个命令将得到该坐标位置的 Unicode。将它展开两次就可以得到结果。 -% 如果在当前编码下，该坐标位置不合法，将展开为空。 +% 子字体中的位置，这个命令将得到该坐标位置的 Unicode。 +% 如果在当前编码下，该坐标位置不合法，将展开为空并报错。 % \end{function} % % \end{documentation} @@ -300,7 +297,7 @@ Copyright and Licence 'l3kernel'~and~'l3packages'\\\\ using~your~TeX~package~manager~or~from~CTAN. } -\@ifpackagelater { expl3 } { 2019/03/05 } { } +\@ifpackagelater { expl3 } { 2020/03/06 } { } { \msg_error:nn { xCJK2uni } { l3-too-old } } % \end{macrocode} % @@ -330,7 +327,7 @@ Copyright and Licence % % \begin{macro}{\@@_set_enc:nnnnnn} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_set_enc:nnnnnn #1#2#3#4#5#6 +\cs_new_protected:Npn \@@_set_enc:nnnnnn #1#2#3#4#5#6 { \seq_gput_right:Nn \c_@@_encoding_seq {#1} \prop_gput:Nnn \c_@@_sfd_prop {#1} {#2} @@ -366,25 +363,63 @@ Copyright and Licence % % \begin{macro}{\@@_enc_map:nn} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_enc_map:nn #1#2 +\cs_new_protected:Npn \@@_enc_map:nn #1#2 { \int_set_eq:Nc \l_@@_i_min_int { c_@@_ #1 _i_min_int } \int_set_eq:Nc \l_@@_ii_min_int { c_@@_ #1 _ii_min_int } \int_set_eq:Nc \l_@@_gap_begin_int { c_@@_ #1 _gap_begin_int } \int_set_eq:Nc \l_@@_gap_end_int { c_@@_ #1 _gap_end_int } \int_set_eq:Nc \l_@@_plane_int { c_@@_ #1 _plane_int } - \cs_if_exist:cF { CJKtu_ #1 _sfd_map:nn } - { \group_begin: \file_input:n { xCJK2uni-#2.def } \group_end: } - \cs_set_eq:Nc \CJKtu_sfd_map:nn { CJKtu_ #1 _sfd_map:nn } + \cs_if_exist:cF { CJKtu_ #1 _index_map:n } + { \@@_input_sfd_map:n {#2} } + \cs_set_eq:Nc \@@_index_map:n { CJKtu_ #1 _index_map:n } + } +\cs_new_protected:Npn \@@_input_sfd_map:n #1 + { + \group_begin: + \ExplSyntaxOn + \file_input:n { xCJK2uni-#1.def } + \group_end: } % \end{macrocode} % \end{macro} % -% \begin{macro}{\@@_use_enc_map:n} +% \begin{macro}[int]{\CJKtu_index_map:n} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_use_enc_map:n #1 +\cs_new:Npn \CJKtu_index_map:n #1 + { \CJKtu_unicode:n { \@@_index_map:n {#1} } } +\cs_new_eq:NN \CJKtu_unicode:n \use:n +\cs_new_eq:NN \@@_index_map:n \use_none:n +% \end{macrocode} +% \end{macro} +% +% \begin{macro}[int]{\CJKtu_index_map:nn} +% \begin{macrocode} +\cs_new_protected:Npn \CJKtu_index_map:nn #1 + { + \exp_args:Ncc \@@_index_map_aux:NNn + { CJKtu_ #1 _index_map:n } { c_@@_ #1 _intarray } + } +\cs_new_protected:Npn \@@_index_map_aux:NNn #1#2 { - \prop_get:NxNTF \c_@@_sfd_prop {#1} \l_@@_sfd_tl + \cs_new:Npn #1 ##1 { \intarray_item:Nn #2 { ##1 + 1 } } + \intarray_const_from_clist:Nn #2 + } +% \end{macrocode} +% \end{macro} +% +% \begin{macro}[int]{\CJKtu_sfd_map:nn} +% \begin{macrocode} +\cs_new:Npn \CJKtu_sfd_map:nn #1#2 + { \CJKtu_index_map:n { ( #1 - 1 ) * 256 + (#2) } } +% \end{macrocode} +% \end{macro} +% +% \begin{macro}[int]{\CJKtu_use_enc_map:n} +% \begin{macrocode} +\cs_new_protected:Npn \CJKtu_use_enc_map:n #1 + { + \prop_get:NnNTF \c_@@_sfd_prop {#1} \l_@@_sfd_tl { \@@_enc_map:nn {#1} { \l_@@_sfd_tl } } { \msg_error:nnx { xCJK2uni } { invalid-encoding } {#1} } } @@ -394,7 +429,7 @@ Copyright and Licence Only~\seq_use:Nnnn \c_@@_encoding_seq { ~and~ } { ,~ } { ,~and~ } ~ are~supported. } -\prg_generate_conditional_variant:Nnn \prop_get:NnN { Nx } { TF } +\cs_generate_variant:Nn \CJKtu_use_enc_map:n { x } % \end{macrocode} % \end{macro} % @@ -407,36 +442,12 @@ Copyright and Licence \@@_set_enc:nnnnnn { GBK } { UGBK } { "81 } { "40 } { "7E } { "80 } % \end{macrocode} % -% \begin{macro}{\@@_sfd_to_unicode:nn} -% \begin{macrocode} -\cs_new_nopar:Npn \@@_sfd_to_unicode:nn #1#2 - { - \exp:w \exp_last_unbraced:Nf - \@@_get_unicode:w \CJKtu_sfd_map:nn {#1} {#2} \exp_end: - } -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\@@_get_unicode:w} -% \begin{macrocode} -\cs_new_nopar:Npn \@@_get_unicode:w #1 \exp_end: - { - \tl_if_empty:nTF {#1} - { \exp_end: } - { \@@_get_unicode_aux:w #1 \q_stop } - } -\cs_new_nopar:Npn \@@_get_unicode_aux:w #1 \or: #2 \q_stop - { \or: #2 \exp_end: #1 } -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\@@_char_to_unicode:n} +% \begin{macro}[int]{\CJKtu_char_to_unicode:n} % \begin{macrocode} \group_begin: \char_set_catcode_active:n { "7F } -\cs_new_nopar:Npn \@@_char_to_unicode:n #1 +\cs_new:Npn \CJKtu_char_to_unicode:n #1 { - \exp:w \int_compare:nNnTF { \tl_count:n {#1} } = 2 { \CJKtu_byte:NN #1 } { @@ -445,23 +456,23 @@ Copyright and Licence { \@@_encoding_error: } } } -\cs_new_nopar:Npn \@@_byte:wNwnw ^^7f #1 ^^7f #2 ^^7f +\cs_new:Npn \@@_byte:wNwnw ^^7f #1 ^^7f #2 ^^7f { \CJKtu_byte_map:nn { `#1 } {#2} } -\cs_new_nopar:Npn \@@_byte:Nwnw #1 ^^7f #2 ^^7f +\cs_new:Npn \@@_active_byte:Nwnw #1 ^^7f #2 ^^7f { \CJKtu_byte_map:nn { `#1 } {#2} } % \end{macrocode} % \end{macro} % % \begin{macro}[int]{\CJKtu_bookmarks_hook:} % \begin{macrocode} -\cs_new_protected_nopar:Npn \CJKtu_bookmarks_hook: +\cs_new_protected:Npn \CJKtu_bookmarks_hook: { - \cs_set_eq:NN ^^7f \@@_byte:Nwnw - \cs_set_eq:NN \CJK@XX \CJKtu_byte:NN - \cs_set_eq:NN \CJKchar \@@_byte:wnn - \cs_set_eq:NN \CCTchar \CJKtu_byte:nn - \cs_set_eq:NN \@CCTSetChar \@@_CCT_byte:NNN - \cs_set_eq:NN \@@_get_unicode:n \@@_UTF_xvi_be:n + \cs_set_eq:NN ^^7f \@@_active_byte:Nwnw + \cs_set_eq:NN \CJK@XX \CJKtu_byte:NN + \cs_set_eq:NN \CJKchar \@@_byte:wnn + \cs_set_eq:NN \CCTchar \CJKtu_byte:nn + \cs_set_eq:NN \@CCTSetChar \@@_CCT_byte:NNN + \cs_set_eq:NN \CJKtu_unicode:n \@@_UTF_xvi_be_octal:n } \group_end: % \end{macrocode} @@ -470,9 +481,9 @@ Copyright and Licence % \begin{macro}[int]{\CJKtu_byte:NN} % \begin{macro}{\@@_CCT_byte:NNN} % \begin{macrocode} -\cs_new_nopar:Npn \CJKtu_byte:NN #1#2 +\cs_new:Npn \CJKtu_byte:NN #1#2 { \CJKtu_byte:nn { `#1 } { `#2 } } -\cs_new_nopar:Npn \@@_CCT_byte:NNN #1#2#3 +\cs_new:Npn \@@_CCT_byte:NNN #1#2#3 { \CJKtu_byte:nn { `#1 } { `#3 } } % \end{macrocode} % \end{macro} @@ -480,13 +491,13 @@ Copyright and Licence % % \begin{macro}{\@@_byte:wnn} % \begin{macrocode} -\cs_new_nopar:Npn \@@_byte:wnn #1# { \CJKtu_byte:nn } +\cs_new:Npn \@@_byte:wnn #1# { \CJKtu_byte:nn } % \end{macrocode} % \end{macro} % % \begin{macro}[int]{\CJKtu_byte:nn} % \begin{macrocode} -\cs_new_nopar:Npn \CJKtu_byte:nn #1#2 +\cs_new:Npn \CJKtu_byte:nn #1#2 { \int_compare:nTF { \l_@@_i_min_int <= #1 <= \l_@@_i_max_int } { @@ -501,11 +512,8 @@ Copyright and Licence } { \@@_encoding_error: } } -\cs_new_nopar:Npn \@@_encoding_error: - { - \msg_expandable_error:nn { xCJK2uni } { encoding-error } - \exp_end: - } +\cs_new:Npn \@@_encoding_error: + { \msg_expandable_error:nn { xCJK2uni } { encoding-error } } \msg_new:nnn { xCJK2uni } { encoding-error } { Wrong~encoding~scheme. } % \end{macrocode} @@ -513,9 +521,9 @@ Copyright and Licence % % \begin{macro}[int]{\CJKtu_byte_map:nn} % \begin{macrocode} -\cs_new_nopar:Npn \CJKtu_byte_map:nn #1#2 +\cs_new:Npn \CJKtu_byte_map:nn #1#2 { - \exp_args:Nf \@@_index_map:n + \exp_args:Nf \CJKtu_index_map:n { \int_eval:n { @@ -529,38 +537,21 @@ Copyright and Licence % \end{macrocode} % \end{macro} % -% \begin{macro}{\@@_index_map:n} +% \begin{macro}{\@@_UTF_xvi_be_octal:n} % \begin{macrocode} -\cs_new_nopar:Npn \@@_index_map:n #1 +\cs_new:Npn \@@_UTF_xvi_be_octal:n #1 + { \exp_args:Nf \@@_UTF_xvi_be_octal_aux:n { \int_eval:n {#1} } } +\cs_new:Npn \@@_UTF_xvi_be_octal_aux:n #1 { - \@@_get_unicode:n - { - \CJKtu_sfd_map:nn - { \int_div_truncate:nn {#1} { 256 } + 1 } - { \int_mod:nn {#1} { 256 } } - } - } -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\@@_get_unicode:n} -% \begin{macrocode} -\cs_new_nopar:Npn \@@_get_unicode:n #1 - { \exp_last_unbraced:Nf \@@_get_unicode:w #1 \exp_end: } -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\@@_UTF_xvi_be:n} -% \begin{macrocode} -\cs_new_nopar:Npn \@@_UTF_xvi_be:n #1 - { \exp_args:Nf \@@_UTF_xvi_aux:n { \int_eval:n { "#1 } } } -\cs_new_nopar:Npn \@@_UTF_xvi_aux:n #1 - { - \HyPsd@DecimalToOctalFirst + \@@_UTF_xvi_be_octal:nn { \int_div_truncate:nn {#1} { 256 } } - \HyPsd@DecimalToOctalSecond { \int_mod:nn {#1} { 256 } } } +\cs_new:Npn \@@_UTF_xvi_be_octal:nn #1#2 + { + \HyPsd@DecimalToOctalFirst {#1} + \HyPsd@DecimalToOctalSecond {#2} + } % \end{macrocode} % \end{macro} % @@ -589,29 +580,31 @@ Copyright and Licence % % \begin{macro}{\useCJKencmap,\CJKchartouni,\CJKsfdtouni} % \begin{macrocode} -\cs_new_eq:NN \useCJKencmap \@@_use_enc_map:n -\cs_new_eq:NN \CJKchartouni \@@_char_to_unicode:n -\cs_new_eq:NN \CJKsfdtouni \@@_sfd_to_unicode:nn +\cs_new_eq:NN \useCJKencmap \CJKtu_use_enc_map:x +\cs_new_eq:NN \CJKchartouni \CJKtu_char_to_unicode:n +\cs_new_eq:NN \CJKsfdtouni \CJKtu_sfd_map:nn % \end{macrocode} % \end{macro} % % \begin{macro}{\@@_initial:N} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_initial:N #1 +\cs_new_protected:Npn \@@_initial:N #1 { \tl_if_exist:NTF #1 { \prop_get:NxNTF \c_@@_sfd_prop {#1} \l_@@_sfd_tl { \@@_enc_map:nn {#1} { \l_@@_sfd_tl } } - { \@@_use_enc_map:n { GBK } } + { \CJKtu_use_enc_map:n { GBK } } } - { \@@_use_enc_map:n { GBK } } + { \CJKtu_use_enc_map:n { GBK } } } +\prg_generate_conditional_variant:Nnn \prop_get:NnN { Nx } { TF } % \end{macrocode} % \end{macro} % % \begin{macrocode} -\exp_args:Nc \@@_initial:N { CJK @ @ @ enc } +\group_begin: \exp_args:NNc \group_end: +\@@_initial:N { CJK @ @ @ enc } % \end{macrocode} % % \begin{macrocode} @@ -641,7 +634,7 @@ Copyright and Licence { \lua_now:e { - kpse.set_program_name("kpsewhich") ~ + kpse.set_program_name("luatex") ~ local ~ sfd = kpse.find_file("UGBK.sfd", "subfont~definition~files") ~ if ~ sfd ~ then ~ tex.write(sfd) ~ @@ -650,7 +643,7 @@ Copyright and Licence } } { - \sys_shell_get:nnNTF { kpsewhich ~ UGBK.sfd } { } \l_tmpa_str + \sys_get_shell:nnNTF { kpsewhich ~ UGBK.sfd } { } \l_tmpa_str { \str_gset_eq:NN \g_@@_path_str \l_tmpa_str } { \msg_fatal:nnnn { xCJK2uni } { file-not-found } { GBK } { UGBK.sfd } } } @@ -694,7 +687,7 @@ Copyright and Licence % % \begin{macro}{\@@_write_file:nnn} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_write_file:nnn #1#2#3 +\cs_new_protected:Npn \@@_write_file:nnn #1#2#3 { \group_begin: \seq_put_right:No \l_file_search_path_seq { \g_@@_path_str } @@ -704,19 +697,14 @@ Copyright and Licence \seq_clear:N \l_@@_sfd_plane_seq \@@_write_sfd_map_header:n {#1} \ior_str_map_inline:Nn \g_@@_sfd_ior - { \str_if_eq:nnT {##1} { 00 ~ 0x0000_0x00FF } { \ior_map_break: } } + { \str_if_eq:nnT { ##1 } { 00 ~ 0x0000_0x00FF } { \ior_map_break: } } \ior_str_map_inline:Nn \g_@@_sfd_ior { - \tl_if_blank:nTF {##1} - { - \ior_map_break:n - { - \@@_write_sfd_map_trailer:n {#1} - \@@_write_cmap_file:n {#2} - } - } - { \@@_read_sfd_line:nnn {##1} {#1} {#2} } + \tl_if_blank:nT { ##1 } { \ior_map_break: } + \@@_read_sfd_line:nn { ##1 } {#2} } + \@@_write_sfd_map_trailer:n {#1} + \@@_write_cmap_file:n {#2} \iow_close:N \g_@@_sfd_cmap_iow \ior_close:N \g_@@_sfd_ior \seq_clear:N \l_@@_sfd_plane_seq @@ -732,19 +720,18 @@ Copyright and Licence % % \begin{macro}{\@@_read_sfd_line:n,\@@_read_sfd_line:nn} % \begin{macrocode} -\cs_new_protected_nopar:Npx \@@_read_sfd_line:nnn #1#2#3 +\cs_new_protected:Npx \@@_read_sfd_line:nn #1 { - \exp_not:N \@@_read_sfd_line:nwnn #1 - \c_backslash_str \exp_not:N \q_nil \exp_not:N \q_stop {#2} {#3} + \exp_not:N \@@_read_sfd_line:nwn #1 + \c_backslash_str \exp_not:N \q_nil \exp_not:N \q_stop } -\use:x +\use:e { - \cs_new_protected_nopar:Npn \exp_not:N \@@_read_sfd_line:nwnn - ##1 0 \token_to_str:N x ##2 \c_backslash_str ##3 \exp_not:N \q_stop - ##4##5 + \cs_new_protected:Npn \exp_not:N \@@_read_sfd_line:nwn + #1 0 \token_to_str:N x #2 \c_backslash_str #3 \exp_not:N \q_stop { - \exp_not:N \@@_read_sfd_line:nnnnn - {##1} { 0 \token_to_str:N x } {##2} {##4} {##5} + \exp_not:N \@@_read_sfd_line:nnnn + {#1} { 0 \token_to_str:N x } {#2} } } % \end{macrocode} @@ -752,48 +739,22 @@ Copyright and Licence % % \begin{macro}{\@@_read_sfd_line:nnnnn} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_read_sfd_line:nnnnn #1#2#3#4#5 +\cs_new_protected:Npn \@@_read_sfd_line:nnnn #1#2#3#4 { \tl_if_blank:nF {#1} { \seq_if_empty:NF \l_@@_sfd_plane_seq - { - \iow_now:Nx \g_@@_sfd_map_iow - { - \c_@@_indent_str \c_@@_indent_str - \token_to_str:N \fi: \iow_newline: - \c_@@_indent_str \c_right_brace_str - } - \@@_write_cmap_file:n {#5} - } - \@@_write_plane_map:nn {#1} {#4} + { \@@_write_cmap_file:n {#4} } \tl_set:Nx \l_@@_sfd_plane_tl { \tl_trim_spaces:n {#1} } + \@@_write_plane_map:n { \l_@@_sfd_plane_tl } } \seq_set_split:Nnn \l_@@_sfd_line_seq {#2} {#3} \seq_concat:NNN \l_@@_sfd_plane_seq \l_@@_sfd_plane_seq \l_@@_sfd_line_seq \iow_now:Nx \g_@@_sfd_map_iow { - \c_@@_indent_str \c_@@_indent_str \c_@@_indent_str - \seq_use:Nn \l_@@_sfd_line_seq { ~ \or: } ~ - \token_to_str:N \or: - } - } -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\@@_write_plane_map:nn} -% \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_write_plane_map:nn #1#2 - { - \iow_now:Nx \g_@@_sfd_map_iow - { - \cs_new_nopar:cpn { ~ @@_ #2 _sfd_map_ \int_eval:n {#1} :n ~ } ~ - \c_hash_str 1 \iow_newline: - \c_@@_indent_str \c_left_brace_str \iow_newline: \c_@@_indent_str \c_@@_indent_str - \exp_not:N \if_case:w \tex_numexpr:D - \c_hash_str 1 ~ \token_to_str:N \scan_stop: + " \seq_use:Nn \l_@@_sfd_line_seq { ~ , ~ " } ~ , } } % \end{macrocode} @@ -801,7 +762,7 @@ Copyright and Licence % % \begin{macro}{\@@_write_cmap_file:n} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_write_cmap_file:n #1 +\cs_new_protected:Npn \@@_write_cmap_file:n #1 { \tl_clear:N \l_@@_cmap_block_tl \int_zero:N \l_@@_sfd_index_int @@ -809,13 +770,13 @@ Copyright and Licence \@@_write_cmap_header:nn { C #1 } { \l_@@_sfd_plane_tl } \iow_now:Nx \g_@@_sfd_cmap_iow { - \iow_newline: - 1~begincodespacerange \iow_newline: + \iow_newline: + 1~begincodespacerange \iow_newline: \c_@@_indent_str < 00 > ~ < \int_to_Hex:n { \seq_count:N \l_@@_sfd_plane_seq - 1 } - > \iow_newline: + > \iow_newline: endcodespacerange } \seq_map_function:NN \l_@@_sfd_plane_seq \@@_write_cmap_body:n @@ -823,9 +784,9 @@ Copyright and Licence { \iow_now:Nx \g_@@_sfd_cmap_iow { - \iow_newline: + \iow_newline: \int_mod:nn { \l_@@_sfd_index_int } { 100 } ~ - beginbfchar \iow_newline: + beginbfchar \iow_newline: \l_@@_cmap_block_tl endbfchar } @@ -838,18 +799,18 @@ Copyright and Licence % % \begin{macro}{\@@_write_cmap_body:n} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_write_cmap_body:n #1 +\cs_new_protected:Npn \@@_write_cmap_body:n #1 { \int_case:nnTF { \l_@@_sfd_index_int } { { 99 } { } { 199 } { } } { \iow_now:Nx \g_@@_sfd_cmap_iow { - \iow_newline: - 100 ~ beginbfchar \iow_newline: + \iow_newline: + 100 ~ beginbfchar \iow_newline: \l_@@_cmap_block_tl < \int_to_Hex:n { \l_@@_sfd_index_int } > ~ - <#1> \iow_newline: + <#1> \iow_newline: endbfchar } \tl_clear:N \l_@@_cmap_block_tl @@ -860,7 +821,7 @@ Copyright and Licence < \int_compare:nNnF \l_@@_sfd_index_int > { 15 } { 0 } \int_to_Hex:n { \l_@@_sfd_index_int } - > ~ <#1> \iow_newline: + > ~ <#1> \iow_newline: } } \int_incr:N \l_@@_sfd_index_int @@ -872,20 +833,13 @@ Copyright and Licence % \begin{macrocode} \group_begin: \char_set_catcode_other:N \% -\cs_new_protected_nopar:Npn \@@_write_sfd_map_header:n #1 +\cs_new_protected:Npn \@@_write_sfd_map_header:n #1 { \iow_now:Nx \g_@@_sfd_map_iow { - %<*#1> \iow_newline: - \cs_new_nopar:cpn { ~ CJKtu_#1_sfd_map:nn ~ } ~ \c_hash_str 1 - \iow_newline: \c_@@_indent_str \c_left_brace_str \iow_newline: - \c_@@_indent_str \c_@@_indent_str - \token_to_str:N \cs_if_exist_use:cF - \iow_newline: \c_@@_indent_str \c_@@_indent_str \c_@@_indent_str - { ~ @@_#1_sfd_map_ ~ \exp_not:N \int_eval:n { \c_hash_str 1 } ~ :n ~} - \iow_newline: \c_@@_indent_str \c_@@_indent_str \c_@@_indent_str - { ~ \exp_not:N \use_none:n } \iow_newline: - \c_@@_indent_str \c_right_brace_str + %<*#1> \iow_newline: + \exp_not:N \CJKtu_index_map:nn { ~ #1 ~ } \iow_newline: + \c_@@_indent_str \c_left_brace_str } } % \end{macrocode} @@ -893,22 +847,30 @@ Copyright and Licence % % \begin{macro}{\@@_write_sfd_map_trailer:n} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_write_sfd_map_trailer:n #1 +\cs_new_protected:Npn \@@_write_sfd_map_trailer:n #1 { \iow_now:Nx \g_@@_sfd_map_iow { - \c_@@_indent_str \c_@@_indent_str - \token_to_str:N \fi: \iow_newline: - \c_@@_indent_str \c_right_brace_str \iow_newline: + \c_@@_indent_str \c_right_brace_str \iow_newline: %</#1> } } % \end{macrocode} % \end{macro} % +% \begin{macro}{\@@_write_plane_map:n} +% \begin{macrocode} +\cs_new_protected:Npn \@@_write_plane_map:n #1 + { + \iow_now:Nx \g_@@_sfd_map_iow + { %% ~ <#1> } + } +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\@@_write_cmap_header:nn} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_write_cmap_header:nn #1#2 +\cs_new_protected:Npn \@@_write_cmap_header:nn #1#2 { \iow_now:Nx \g_@@_sfd_cmap_iow { @@ -919,17 +881,17 @@ Copyright and Licence %%Title:~(TeX-#1-#2-0~TeX~#1-#2~0) \iow_newline: %%Version:~1.000 \iow_newline: %%EndComments \iow_newline: \iow_newline: - /CIDInit~/ProcSet~findresource~begin \iow_newline: \iow_newline: - 12~dict~begin \iow_newline: \iow_newline: - begincmap \iow_newline: \iow_newline: - /CIDSystemInfo~3~dict~dup~begin \iow_newline: - \c_@@_indent_str /Registry~(TeX)~def \iow_newline: - \c_@@_indent_str /Ordering~(#1-#2)~def \iow_newline: - \c_@@_indent_str /Supplement~0~def \iow_newline: - end~def \iow_newline: \iow_newline: - /CMapName~/TeX-#1-#2-0~def \iow_newline: - /CMapVersion~1.000~def \iow_newline: - /CMapType~2~def \iow_newline: \iow_newline: + /CIDInit~/ProcSet~findresource~begin \iow_newline: \iow_newline: + 12~dict~begin \iow_newline: \iow_newline: + begincmap \iow_newline: \iow_newline: + /CIDSystemInfo~3~dict~dup~begin \iow_newline: + \c_@@_indent_str /Registry~(TeX)~def \iow_newline: + \c_@@_indent_str /Ordering~(#1-#2)~def \iow_newline: + \c_@@_indent_str /Supplement~0~def \iow_newline: + end~def \iow_newline: \iow_newline: + /CMapName~/TeX-#1-#2-0~def \iow_newline: + /CMapVersion~1.000~def \iow_newline: + /CMapType~2~def \iow_newline: \iow_newline: /WMode~0~def } } @@ -938,16 +900,16 @@ Copyright and Licence % % \begin{macro}{\@@_write_cmap_trailer:} % \begin{macrocode} -\cs_new_protected_nopar:Npx \@@_write_cmap_trailer: +\cs_new_protected:Npx \@@_write_cmap_trailer: { \iow_now:Nn \g_@@_sfd_cmap_iow { - \iow_newline: - endcmap \iow_newline: - CMapName~currentdict~/CMap~defineresource~pop \iow_newline: - end \iow_newline: - end \iow_newline: \iow_newline: - %%EndResource \iow_newline: + \iow_newline: + endcmap \iow_newline: + CMapName~currentdict~/CMap~defineresource~pop \iow_newline: + end \iow_newline: + end \iow_newline: \iow_newline: + %%EndResource \iow_newline: %%EOF } } diff --git a/macros/latex/contrib/xcjk2uni/xCJK2uni.ins b/macros/latex/contrib/xcjk2uni/xCJK2uni.ins deleted file mode 100644 index 31967db2ee..0000000000 --- a/macros/latex/contrib/xcjk2uni/xCJK2uni.ins +++ /dev/null @@ -1,139 +0,0 @@ -%% -%% This is file `xCJK2uni.ins', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% xCJK2uni.dtx (with options: `install') -%% -%% Copyright (C) 2013-2014, 2016, 2018-2019 by Qing Lee <sobenlee@gmail.com> -%% -------------------------------------------------------------------------- -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either -%% version 1.3c of this license or (at your option) any later -%% version. This version of this license is in -%% http://www.latex-project.org/lppl/lppl-1-3c.txt -%% and the latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of -%% LaTeX version 2005/12/01 or later. -%% -%% This work has the LPPL maintenance status `maintained'. -%% -%% The Current Maintainer of this work is Qing Lee. -%% -%% -------------------------------------------------------------------------- -%% - -\input ctxdocstrip % - -\preamble - - Copyright (C) 2013-2014, 2016, 2018-2019 by Qing Lee <sobenlee@gmail.com> --------------------------------------------------------------------------- - - This work may be distributed and/or modified under the - conditions of the LaTeX Project Public License, either - version 1.3c of this license or (at your option) any later - version. This version of this license is in - http://www.latex-project.org/lppl/lppl-1-3c.txt - and the latest version of this license is in - http://www.latex-project.org/lppl.txt - and version 1.3 or later is part of all distributions of - LaTeX version 2005/12/01 or later. - - This work has the LPPL maintenance status `maintained'. - - The Current Maintainer of this work is Qing Lee. - --------------------------------------------------------------------------- - -\endpreamble -\postamble - - This package consists of the file xCJK2uni.dtx, - and the derived files xCJK2uni.pdf, - xCJK2uni.sty, - xCJK2uni.ins, - xCJK2uni-make.tex, - xCJK2uni-sfd.def, - xCJK2uni-UBg5plus.def, - xCJK2uni-UBig5.def, - xCJK2uni-UGB.def, - xCJK2uni-UGBK.def, - xCJK2uni-UJIS.def, - xCJK2uni-UKS.def, - c****.cmap, and - README.md. -\endpostamble - -\generate - { - \usedir{tex/latex/xcjk2uni} - \file{xCJK2uni.sty} {\from{\jobname.dtx}{package}} - \file{xCJK2uni-make.tex} {\from{\jobname.dtx}{make}} - \nopreamble\nopostamble - \usedir{doc/latex/xcjk2uni} - \file{README.md} {\from{\jobname.dtx}{readme}} - } - -\let\input\@@input -\def\CJKtuend{\ExplSyntaxOff} -\input xCJK2uni-make % -\let\input\skip@input - -\generate - { - \usedir{tex/latex/xcjk2uni} - \usepostamble\emptypostamble - \file{xCJK2uni-UBig5.def} - { - \from{\jobname.dtx} {def,Bg5} - \from{xCJK2uni-sfd.def} {Bg5} - } - \file{xCJK2uni-UBg5plus.def} - { - \from{\jobname.dtx} {def,Bg5+} - \from{xCJK2uni-sfd.def} {Bg5+} - } - \file{xCJK2uni-UGB.def} - { - \from{\jobname.dtx} {def,GB} - \from{xCJK2uni-sfd.def} {GB} - } - \file{xCJK2uni-UGBK.def} - { - \from{\jobname.dtx} {def,GBK} - \from{xCJK2uni-sfd.def} {GBK} - } - \file{xCJK2uni-UJIS.def} - { - \from{\jobname.dtx} {def,JIS} - \from{xCJK2uni-sfd.def} {JIS} - } - \file{xCJK2uni-UKS.def} - { - \from{\jobname.dtx} {def,KS} - \from{xCJK2uni-sfd.def} {KS} - } - } - -\endbatchfile -%% -%% This package consists of the file xCJK2uni.dtx, -%% and the derived files xCJK2uni.pdf, -%% xCJK2uni.sty, -%% xCJK2uni.ins, -%% xCJK2uni-make.tex, -%% xCJK2uni-sfd.def, -%% xCJK2uni-UBg5plus.def, -%% xCJK2uni-UBig5.def, -%% xCJK2uni-UGB.def, -%% xCJK2uni-UGBK.def, -%% xCJK2uni-UJIS.def, -%% xCJK2uni-UKS.def, -%% c****.cmap, and -%% README.md. -%% -%% End of file `xCJK2uni.ins'. diff --git a/macros/latex/contrib/xcjk2uni/xCJK2uni.pdf b/macros/latex/contrib/xcjk2uni/xCJK2uni.pdf Binary files differindex d2ba50e042..b143ba1467 100644 --- a/macros/latex/contrib/xcjk2uni/xCJK2uni.pdf +++ b/macros/latex/contrib/xcjk2uni/xCJK2uni.pdf diff --git a/macros/latex/contrib/xpinyin/README.md b/macros/latex/contrib/xpinyin/README.md index 7c11c0fb0a..b9f5f5c6cc 100644 --- a/macros/latex/contrib/xpinyin/README.md +++ b/macros/latex/contrib/xpinyin/README.md @@ -20,7 +20,7 @@ Issues and pull requests are welcome. Copyright and Licence --------------------- - Copyright (C) 2012-2019 by Qing Lee <sobenlee@gmail.com> + Copyright (C) 2012-2020 by Qing Lee <sobenlee@gmail.com> ---------------------------------------------------------------------- This work may be distributed and/or modified under the @@ -33,7 +33,7 @@ Copyright and Licence and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later. - This work has the LPPL maintenance status `maintained'. + This work has the LPPL maintenance status "maintained". The Current Maintainer of this work is Qing Lee. diff --git a/macros/latex/contrib/xpinyin/xpinyin.dtx b/macros/latex/contrib/xpinyin/xpinyin.dtx index 8d50b231f2..b23d96db64 100644 --- a/macros/latex/contrib/xpinyin/xpinyin.dtx +++ b/macros/latex/contrib/xpinyin/xpinyin.dtx @@ -26,7 +26,7 @@ Issues and pull requests are welcome. Copyright and Licence --------------------- - Copyright (C) 2012-2019 by Qing Lee <sobenlee@gmail.com> + Copyright (C) 2012-2020 by Qing Lee <sobenlee@gmail.com> ---------------------------------------------------------------------- This work may be distributed and/or modified under the @@ -39,7 +39,7 @@ Copyright and Licence and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later. - This work has the LPPL maintenance status `maintained'. + This work has the LPPL maintenance status "maintained". The Current Maintainer of this work is Qing Lee. @@ -81,7 +81,7 @@ Copyright and Licence \preamble - Copyright (C) 2012-2019 by Qing Lee <sobenlee@gmail.com> + Copyright (C) 2012-2020 by Qing Lee <sobenlee@gmail.com> -------------------------------------------------------------------------- This work may be distributed and/or modified under the @@ -94,7 +94,7 @@ Copyright and Licence and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later. - This work has the LPPL maintenance status `maintained'. + This work has the LPPL maintenance status "maintained". The Current Maintainer of this work is Qing Lee. @@ -167,12 +167,12 @@ Copyright and Licence %</internal> %<package>\NeedsTeXFormat{LaTeX2e} %<package>\RequirePackage{expl3} -%<+package>\GetIdInfo$Id: xpinyin.dtx 81bb941 2019-04-07 23:27:58 +0800 Qing Lee <sobenlee@gmail.com> $ +%<+package>\GetIdInfo$Id: xpinyin.dtx 789567a 2020-05-01 21:10:07 +0800 Qing Lee <sobenlee@gmail.com> $ %<package> {Automatically add pinyin to Chinese characters} %<package>\ProvidesExplPackage{\ExplFileName} -%<package> {\ExplFileDate}{2.7}{\ExplFileDescription} +%<package> {\ExplFileDate}{2.8}{\ExplFileDescription} %<database>\ProvidesFile{xpinyin-database.def}% -%<database> [2019/04/07 v2.7 xpinyin database] +%<database> [2020/05/01 v2.8 xpinyin database] %<*driver> \documentclass{ctxdoc} \usepackage{xpinyin} @@ -186,7 +186,7 @@ Copyright and Licence %</driver> % \fi % -% \CheckSum{696} +% \CheckSum{694} % \GetFileId{xpinyin.sty} % % \title{\bfseries\pkg{xpinyin} 宏包} @@ -359,14 +359,14 @@ Copyright and Licence % \begin{syntax} % format = \Arg{format} % \end{syntax} -% 设置拼音的其它格式，例如颜色等，缺省值为空。 +% 设置拼音的其他格式，例如颜色等，缺省值为空。 % \end{function} % % \begin{function}{multiple} % \begin{syntax} % multiple = \Arg{format} % \end{syntax} -% 设置多音字拼音的其它格式，缺省值为空。可以通过这个选项来提醒校正多音字的拼音。例如 +% 设置多音字拼音的其他格式，缺省值为空。可以通过这个选项来提醒校正多音字的拼音。例如 % 本文档设置多音字拼音的颜色是红色（需要载入 \pkg{color} 宏包）： % \begin{frameverb} % \xpinyinsetup{multiple={\color{red}}} @@ -467,7 +467,7 @@ Copyright and Licence % % \begin{macro}{\@@_UTF_char:nn} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_UTF_char:nn #1#2 +\cs_new_protected:Npn \@@_UTF_char:nn #1#2 { \cs_if_exist:cF { u8:#1 } { \tl_const:cn { u8:#1 } {#2} } @@ -478,14 +478,14 @@ Copyright and Licence % % \begin{macro}{\@@_GBK_char:nn} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_GBK_char:nn #1#2 +\cs_new_protected:Npn \@@_GBK_char:nn #1#2 { \@@_UTF_char:nn {#1} {#2} \exp_args:Nx \@@_GBK_char_aux:nn { \tl_head:n {#1} } {#1} } -\cs_new_protected_nopar:Npn \@@_GBK_char_aux:nn #1#2 +\cs_new_protected:Npn \@@_GBK_char_aux:nn #1#2 { \exp_args:Nf \@@_GBK_char_aux:nnn { \int_eval:n { `#1 } } {#1} {#2} } -\cs_new_protected_nopar:Npn \@@_GBK_char_aux:nnn #1#2#3 +\cs_new_protected:Npn \@@_GBK_char_aux:nnn #1#2#3 { \cs_if_exist:cF { @@_UTF_ #1 :w } { @@ -505,9 +505,9 @@ Copyright and Licence \char_set_catcode_active:n {#1} } } -\cs_new_protected_nopar:Npn \@@_GBK_char_def:nnn #1#2#3 +\cs_new_protected:Npn \@@_GBK_char_def:nnn #1#2#3 { - \cs_new_protected_nopar:cpn { @@_UTF_ #2 :w } #1 + \cs_new_protected:cpn { @@_UTF_ #2 :w } #1 { \use:c { u8: \tl_to_str:n { #3#1 } } } } \tl_new:N \c_@@_reset_UTF_catcode_tl @@ -518,7 +518,7 @@ Copyright and Licence % \begin{macrocode} \group_begin: \char_set_catcode_active:n { 126 } -\cs_new_protected_nopar:Npn \@@_save_UTF_cs:Nn #1#2 +\cs_new_protected:Npn \@@_save_UTF_cs:Nn #1#2 { \group_begin: \char_set_lccode:nn { 126 } {#2} @@ -592,7 +592,7 @@ Copyright and Licence % % \begin{macro}{\@@_make_pinyin_box:nnn} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_make_pinyin_box:nnn #1#2#3 +\cs_new_protected:Npn \@@_make_pinyin_box:nnn #1#2#3 { \@@_leavevmode: \hbox_overlap_right:n @@ -637,9 +637,9 @@ Copyright and Licence % % \begin{macro}{\@@_CJKsymbol:n} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_CJKsymbol:n #1 +\cs_new_protected:Npn \@@_CJKsymbol:n #1 { \@@_CJKsymbol:xn { \@@_to_unicode:n {#1} } {#1} } -\cs_new_protected_nopar:Npn \@@_CJKsymbol:nn #1#2 +\cs_new_protected:Npn \@@_CJKsymbol:nn #1#2 { \@@_make_pinyin_box:nnn {#1} {#2} { \use:c { c_@@_ #1 _tl } } \@@_save_CJKsymbol:n {#2} @@ -691,7 +691,7 @@ Copyright and Licence % % \begin{macro}{\@@_CJKglue:} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_CJKglue: +\cs_new_protected:Npn \@@_CJKglue: { \skip_horizontal:n { \l_@@_hsep_tl } } % \end{macrocode} % \end{macro} @@ -733,7 +733,7 @@ Copyright and Licence % % \begin{macro}{\@@_restore_footnote:} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_restore_footnote: +\cs_new_protected:Npn \@@_restore_footnote: { \bool_if:NF \l_@@_footnote_bool { \tl_put_left:Nn \@parboxrestore { \l_@@_restore_footnote_tl } } @@ -760,19 +760,19 @@ Copyright and Licence % % \begin{macro}{\@@_single_aux:nn} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_single_aux:nn #1#2 +\cs_new_protected:Npn \@@_single_aux:nn #1#2 { \@@_replace_CJKsymbol_single:n {#2} #1 \group_end: } -\cs_new_protected_nopar:Npn \@@_replace_CJKsymbol_single_aux:n #1 +\cs_new_protected:Npn \@@_replace_CJKsymbol_single_aux:n #1 { \bool_if:NF \l_@@_enable_bool { \@@_replace_CJKsymbol: } - \cs_set_protected_nopar:Npn \CJKsymbol ##1 + \cs_set_protected:Npn \CJKsymbol ##1 { \@@_single_CJKsymbol:nn {##1} {#1} } } -\cs_new_protected_nopar:Npn \@@_single_CJKsymbol:nn #1#2 +\cs_new_protected:Npn \@@_single_CJKsymbol:nn #1#2 { \@@_make_pinyin_box:xnn { \@@_to_unicode:n {#1} } {#1} { \@@_pinyin:n {#2} } @@ -783,7 +783,7 @@ Copyright and Licence % % \begin{macro}{\@@_replace_CJKsymbol_aux:} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_replace_CJKsymbol_aux: +\cs_new_protected:Npn \@@_replace_CJKsymbol_aux: { \cs_set_eq:NN \@@_save_CJKsymbol:n \CJKsymbol \cs_set_eq:NN \CJKsymbol \@@_CJKsymbol:n @@ -793,14 +793,14 @@ Copyright and Licence % % \begin{macro}{\@@_restore_CJKsymbol_aux:} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_restore_CJKsymbol_aux: +\cs_new_protected:Npn \@@_restore_CJKsymbol_aux: { \cs_set_eq:NN \CJKsymbol \@@_save_CJKsymbol:n } % \end{macrocode} % \end{macro} % % \begin{macro}{\@@_select_font_xetex:} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_select_font_xetex: +\cs_new_protected:Npn \@@_select_font_xetex: { \cs_if_exist_use:cF { \l_@@_coor_tl } { @@ -818,7 +818,7 @@ Copyright and Licence % % \begin{macro}{\@@_select_font_aux:} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_select_font_aux: +\cs_new_protected:Npn \@@_select_font_aux: { \fontsize { \l_@@_ratio_tl \tex_dimexpr:D \f@size pt \scan_stop: } @@ -832,21 +832,21 @@ Copyright and Licence % % \begin{macro}{\@@_to_unicode_xetex:n} % \begin{macrocode} -\cs_new_nopar:Npn \@@_to_unicode_xetex:n #1 +\cs_new:Npn \@@_to_unicode_xetex:n #1 { \int_to_arabic:n { `#1 } } % \end{macrocode} % \end{macro} % % \begin{macro}{\@@_UTF_to_unicode:n,\@@_UTFchar_to_unicode:n} % \begin{macrocode} -\cs_new_nopar:Npn \@@_UTF_to_unicode:n #1 +\cs_new:Npn \@@_UTF_to_unicode:n #1 { \int_to_arabic:n { \exp_args:No \int_from_hex:n { \CJK@plane } * "100 + #1 } } -\cs_new_nopar:Npn \@@_UTFchar_to_unicode:n #1 +\cs_new:Npn \@@_UTFchar_to_unicode:n #1 { \int_to_arabic:n { \@@_UTF_viii_to_unicode:NNNw #1 \q_stop } } -\cs_new_nopar:Npn \@@_UTF_viii_to_unicode:NNNw #1#2#3#4 \q_stop +\cs_new:Npn \@@_UTF_viii_to_unicode:NNNw #1#2#3#4 \q_stop { \tl_if_empty:nTF {#4} { ( `#1 - "E0 ) * "1000 + ( `#2 - "80 ) * "40 + ( `#3 - "80 ) } @@ -857,16 +857,16 @@ Copyright and Licence % % \begin{macro}{\@@_GBK_to_unicode:n,\@@_GBKchar_to_unicode:n} % \begin{macrocode} -\cs_new_nopar:Npn \@@_GBK_to_unicode:n #1 - { \int_to_arabic:n { " \CJKtu_sfd_map:nn { \CJK@plane } {#1} } } -\cs_new_nopar:Npn \@@_GBKchar_to_unicode:n #1 - { \int_to_arabic:n { " \CJKchartouni {#1} } } +\cs_new:Npn \@@_GBK_to_unicode:n + { \CJKtu_sfd_map:nn { \CJK@plane } } +\cs_new:Npn \@@_GBKchar_to_unicode:n + { \CJKtu_char_to_unicode:n } % \end{macrocode} % \end{macro} % % \begin{macro}{\@@_adjust_xeCJK_hook:} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_adjust_xeCJK_hook: +\cs_new_protected:Npn \@@_adjust_xeCJK_hook: { \cs_new_eq:NN \@@_select_font: \@@_select_font_xetex: \cs_new_eq:NN \@@_to_unicode:n \@@_to_unicode_xetex:n @@ -891,7 +891,7 @@ Copyright and Licence } } \cs_new_eq:NN \@@_leavevmode: \prg_do_nothing: - \cs_new_protected_nopar:Npx \@@_CJKsymbol_hook: + \cs_new_protected:Npx \@@_CJKsymbol_hook: { \exp_not:N \makexeCJKinactive \cs_if_exist_use:NF \xeCJK_select_font: @@ -903,7 +903,7 @@ Copyright and Licence % % \begin{macro}{\@@_adjust_CJK_hook:} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_adjust_CJK_hook: +\cs_new_protected:Npn \@@_adjust_CJK_hook: { \bool_if:NTF \g_@@_GBK_bool { @@ -941,15 +941,15 @@ Copyright and Licence % % \begin{macro}{\@@_adjust_CJKpunct_hook:} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_adjust_CJKpunct_hook: +\cs_new_protected:Npn \@@_adjust_CJKpunct_hook: { - \cs_new_protected_nopar:Npn \@@_restore_CJKsymbol: + \cs_new_protected:Npn \@@_restore_CJKsymbol: { \int_compare:nNnTF { \CJKpunct@punctstyle } = { \CJKpunct@ps@plain } { \@@_restore_CJKsymbol_aux: } { \cs_set_eq:NN \CJKosymbol \@@_save_CJKsymbol:n } } - \cs_new_protected_nopar:Npn \@@_replace_CJKsymbol: + \cs_new_protected:Npn \@@_replace_CJKsymbol: { \int_compare:nNnTF { \CJKpunct@punctstyle } = { \CJKpunct@ps@plain } { \@@_replace_CJKsymbol_aux: } @@ -958,14 +958,14 @@ Copyright and Licence \cs_set_eq:NN \CJKosymbol \@@_CJKsymbol:n } } - \cs_new_protected_nopar:Npn \@@_replace_CJKsymbol_single:n ##1 + \cs_new_protected:Npn \@@_replace_CJKsymbol_single:n ##1 { \int_compare:nNnTF { \CJKpunct@punctstyle } = { \CJKpunct@ps@plain } { \@@_replace_CJKsymbol_single_aux:n { ##1 } } { \bool_if:NF \l_@@_enable_bool { \cs_set_eq:NN \@@_save_CJKsymbol:n \CJKosymbol } - \cs_set_protected_nopar:Npn \CJKosymbol ####1 + \cs_set_protected:Npn \CJKosymbol ####1 { \@@_single_CJKsymbol:nn { ####1 } { ##1 } } } } @@ -991,7 +991,7 @@ Copyright and Licence % % \begin{macro}{\@@_pinyin:n} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_pinyin:n #1 +\cs_new_protected:Npn \@@_pinyin:n #1 { \@@_pinyin_init: \bool_set_true:N \l_@@_first_bool @@ -1003,7 +1003,7 @@ Copyright and Licence % % \begin{macro}{\@@_pinyin_aux:n} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_pinyin_aux:n #1 +\cs_new_protected:Npn \@@_pinyin_aux:n #1 { \quark_if_recursion_tail_stop_do:nn {#1} { @@ -1039,7 +1039,7 @@ Copyright and Licence % % \begin{macro}{\@@_tone:nn} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_tone:nn #1#2 +\cs_new_protected:Npn \@@_tone:nn #1#2 { \use:c { @@_num_to_tone_ #1 :Nn } {#1} {#2} } \cs_generate_variant:Nn \@@_tone:nn { V } % \end{macrocode} @@ -1047,7 +1047,7 @@ Copyright and Licence % % \begin{macro}{\@@_replace_v:n} % \begin{macrocode} -\cs_new_nopar:Npn \@@_replace_v:n #1 +\cs_new:Npn \@@_replace_v:n #1 { \str_if_eq:nnTF {#1} { v } { @@ -1062,7 +1062,7 @@ Copyright and Licence % % \begin{macro}{\@@_pinyin_init:} % \begin{macrocode} -\cs_new_nopar:Npn \@@_pinyin_init: +\cs_new:Npn \@@_pinyin_init: { \tl_clear:N \l_@@_pre_tl \tl_clear:N \l_@@_post_tl \tl_clear:N \l_@@_item_tl \tl_clear:N \l_@@_tone_tl @@ -1100,19 +1100,19 @@ Copyright and Licence % % \begin{macro}{\@@_num_to_tone:Nn} % \begin{macrocode} -\cs_new_protected_nopar:Npn \@@_num_to_tone:Nn #1#2 +\cs_new_protected:Npn \@@_num_to_tone:Nn #1#2 { \if_case:w \int_eval:n { #2 - 1 } \exp_stop_f: \= {#1} \or: \'{#1} \or: \v {#1} \or: \` {#1} \else: #1 \fi: } \tl_map_inline:nn { a o e u } { \cs_new_eq:cN { @@_num_to_tone_ #1 :Nn } \@@_num_to_tone:Nn } -\cs_new_nopar:Npn \@@_num_to_tone_i:Nn #1#2 +\cs_new:Npn \@@_num_to_tone_i:Nn #1#2 { \if_case:w \int_eval:n { #2 - 1 } \exp_stop_f: ī \or: í \or: ǐ \or: ì \else: i \fi: } -\cs_new_protected_nopar:Npn \@@_num_to_tone_v:Nn #1#2 +\cs_new_protected:Npn \@@_num_to_tone_v:Nn #1#2 { \str_case:onTF { \l_@@_pre_tl } { { l } { } { n } { } { L } { } { N } { } } @@ -1150,10 +1150,10 @@ Copyright and Licence % % \begin{macro}[int]{\xpinyin_customary:nnn,\xpinyin_multiple:nnn} % \begin{macrocode} -\cs_new_protected_nopar:Npn \xpinyin_customary:nnn #1#2#3 - { \cs_gset_nopar:cpn { c_@@_ #2 _tl } {#3} } -\cs_new_protected_nopar:Npn \xpinyin_multiple:nnn #1#2#3 - { \cs_gset_nopar:cpn { c_@@_multiple_ #2 _clist } {#3} } +\cs_new_protected:Npn \xpinyin_customary:nnn #1#2 + { \cs_gset_nopar:cpn { c_@@_ #2 _tl } } +\cs_new_protected:Npn \xpinyin_multiple:nnn #1#2 + { \cs_gset_nopar:cpn { c_@@_multiple_ #2 _clist } } % \end{macrocode} % \end{macro} % diff --git a/macros/latex/contrib/xpinyin/xpinyin.ins b/macros/latex/contrib/xpinyin/xpinyin.ins deleted file mode 100644 index bc0657b87a..0000000000 --- a/macros/latex/contrib/xpinyin/xpinyin.ins +++ /dev/null @@ -1,132 +0,0 @@ -%% -%% This is file `xpinyin.ins', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% xpinyin.dtx (with options: `install') -%% -%% Copyright (C) 2012-2019 by Qing Lee <sobenlee@gmail.com> -%% -------------------------------------------------------------------------- -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either -%% version 1.3c of this license or (at your option) any later -%% version. This version of this license is in -%% http://www.latex-project.org/lppl/lppl-1-3c.txt -%% and the latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of -%% LaTeX version 2005/12/01 or later. -%% -%% This work has the LPPL maintenance status `maintained'. -%% -%% The Current Maintainer of this work is Qing Lee. -%% -%% -------------------------------------------------------------------------- -%% - -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname directlua\endcsname\relax - \begingroup - \newlinechar=10 % - \errmessage{^^J - ********************************************^^J - * LuaTeX is required to unpack this package.^^J - ********************************************^^J - } - \endgroup - \csname @@end\expandafter\endcsname\expandafter\end -\fi - -\input ctxdocstrip % - -\let\MetaPrefix\relax - -\preamble - - Copyright (C) 2012-2019 by Qing Lee <sobenlee@gmail.com> --------------------------------------------------------------------------- - - This work may be distributed and/or modified under the - conditions of the LaTeX Project Public License, either - version 1.3c of this license or (at your option) any later - version. This version of this license is in - http://www.latex-project.org/lppl/lppl-1-3c.txt - and the latest version of this license is in - http://www.latex-project.org/lppl.txt - and version 1.3 or later is part of all distributions of - LaTeX version 2005/12/01 or later. - - This work has the LPPL maintenance status `maintained'. - - The Current Maintainer of this work is Qing Lee. - --------------------------------------------------------------------------- - -\endpreamble - -\postamble - - This package consists of the file xpinyin.dtx, - and the derived files xpinyin.sty, - xpinyin.pdf, - xpinyin.ins, - xpinyin.lua, - xpinyin.db, - xpinyin-database.def and - README.md. -\endpostamble - -\declarepostamble\emptypostamble -\endpostamble - -\def\MetaPrefix{-- } - -\generate - { - \usedir{source/latex/xpinyin} - \usepostamble\emptypostamble - \file{xpinyin.lua} {\from{\jobname.dtx}{lua}} - } - -\let\MetaPrefix\DoubleperCent - -\directlua - { - if not kpse.find_file("xpinyin.db") then - dofile(kpse.find_file("xpinyin.lua")) - end - } -\generate - { - \usedir{tex/latex/xpinyin} - \usepostamble\emptypostamble - \file{xpinyin-database.def} - { - \from{\jobname.dtx} {database} - \from{xpinyin.db} {} - } - } - -\generate - { - \usedir{tex/latex/xpinyin} - \file{xpinyin.sty} {\from{\jobname.dtx}{package}} - \nopreamble\nopostamble - \usedir{doc/latex/xpinyin} - \file{README.md} {\from{\jobname.dtx}{readme}} - } - -\endbatchfile -%% -%% This package consists of the file xpinyin.dtx, -%% and the derived files xpinyin.sty, -%% xpinyin.pdf, -%% xpinyin.ins, -%% xpinyin.lua, -%% xpinyin.db, -%% xpinyin-database.def and -%% README.md. -%% -%% End of file `xpinyin.ins'. diff --git a/macros/latex/contrib/xpinyin/xpinyin.pdf b/macros/latex/contrib/xpinyin/xpinyin.pdf Binary files differindex e3ab9f27a2..125f64ac81 100644 --- a/macros/latex/contrib/xpinyin/xpinyin.pdf +++ b/macros/latex/contrib/xpinyin/xpinyin.pdf diff --git a/macros/latex/contrib/zhnumber/README.md b/macros/latex/contrib/zhnumber/README.md index a8ac1b7a7c..48cd3d5733 100644 --- a/macros/latex/contrib/zhnumber/README.md +++ b/macros/latex/contrib/zhnumber/README.md @@ -38,7 +38,7 @@ Issues and pull requests are welcome. Copyright and Licence --------------------- - Copyright (C) 2012, 2014-2019 by Qing Lee <sobenlee@gmail.com> + Copyright (C) 2012, 2014-2020 by Qing Lee <sobenlee@gmail.com> ---------------------------------------------------------------------- This work may be distributed and/or modified under the @@ -51,7 +51,7 @@ Copyright and Licence and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later. - This work has the LPPL maintenance status `maintained'. + This work has the LPPL maintenance status "maintained". The Current Maintainer of this work is Qing Lee. diff --git a/macros/latex/contrib/zhnumber/zhnumber.dtx b/macros/latex/contrib/zhnumber/zhnumber.dtx index 05472f8fd1..d5ed4bdd22 100644 --- a/macros/latex/contrib/zhnumber/zhnumber.dtx +++ b/macros/latex/contrib/zhnumber/zhnumber.dtx @@ -44,7 +44,7 @@ Issues and pull requests are welcome. Copyright and Licence --------------------- - Copyright (C) 2012, 2014-2019 by Qing Lee <sobenlee@gmail.com> + Copyright (C) 2012, 2014-2020 by Qing Lee <sobenlee@gmail.com> ---------------------------------------------------------------------- This work may be distributed and/or modified under the @@ -57,7 +57,7 @@ Copyright and Licence and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later. - This work has the LPPL maintenance status `maintained'. + This work has the LPPL maintenance status "maintained". The Current Maintainer of this work is Qing Lee. @@ -83,7 +83,7 @@ Copyright and Licence \preamble - Copyright (C) 2012, 2014-2019 by Qing Lee <sobenlee@gmail.com> + Copyright (C) 2012, 2014-2020 by Qing Lee <sobenlee@gmail.com> -------------------------------------------------------------------------- This work may be distributed and/or modified under the @@ -96,7 +96,7 @@ Copyright and Licence and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later. - This work has the LPPL maintenance status `maintained'. + This work has the LPPL maintenance status "maintained". The Current Maintainer of this work is Qing Lee. @@ -120,18 +120,18 @@ Copyright and Licence %</install> %<*internal> \usedir{source/latex/zhnumber} - \file{zhnumber.ins} {\from{\jobname.dtx}{install}} + \file{zhnumber.ins} {\from{\jobname.dtx}{install}} %</internal> %<*install> \usedir{tex/latex/zhnumber} - \file{zhnumber.sty} {\from{\jobname.dtx}{package}} + \file{zhnumber.sty} {\from{\jobname.dtx}{package}} \usedir{tex/latex/zhnumber/config} - \file{zhnumber-utf8.cfg} {\from{\jobname.dtx}{config,utf8}} - \file{zhnumber-big5.cfg} {\from{\jobname.dtx}{config,big5}} - \file{zhnumber-gbk.cfg} {\from{\jobname.dtx}{config,gbk}} + \file{zhnumber-utf8.cfg} {\from{\jobname.dtx}{config,utf8}} + \ctxfile{Big5}{zhnumber-big5.cfg} {\from{\jobname.dtx}{config,big5}} + \ctxfile{GBK}{zhnumber-gbk.cfg} {\from{\jobname.dtx}{config,gbk}} \nopreamble\nopostamble \usedir{doc/latex/zhnumber} - \file{README.md} {\from{\jobname.dtx}{readme}} + \file{README.md} {\from{\jobname.dtx}{readme}} } \endbatchfile @@ -141,7 +141,7 @@ Copyright and Licence %</internal> %<package>\NeedsTeXFormat{LaTeX2e} %<package>\RequirePackage{expl3} -%<+package|config>\GetIdInfo$Id: zhnumber.dtx 311c61d 2019-04-07 23:29:51 +0800 Qing Lee <sobenlee@gmail.com> $ +%<+package|config>\GetIdInfo$Id: zhnumber.dtx c4664c6 2020-05-01 21:10:24 +0800 Qing Lee <sobenlee@gmail.com> $ %<package> {Typesetting numbers with Chinese glyphs} %<config&utf8> {Chinese numerals with UTF8 encoding} %<config&big5> {Chinese numerals with Big5 encoding} @@ -150,7 +150,7 @@ Copyright and Licence %<config&utf8>\ProvidesExplFile{\ExplFileName-utf8.cfg} %<config&big5>\ProvidesExplFile{\ExplFileName-big5.cfg} %<config&gbk>\ProvidesExplFile{\ExplFileName-gbk.cfg} -%<package|config> {\ExplFileDate}{2.7}{\ExplFileDescription} +%<package|config> {\ExplFileDate}{2.8}{\ExplFileDescription} %<*driver> \documentclass{ctxdoc} \begin{document} @@ -161,7 +161,7 @@ Copyright and Licence %</driver> % \fi % -% \CheckSum{1186} +% \CheckSum{1189} % \GetFileId{zhnumber.sty} % % \title{\bfseries\pkg{zhnumber} 宏包} @@ -400,7 +400,7 @@ Copyright and Licence % \begin{syntax} % null = <\TFF> % \end{syntax} -% 缺省状态下，除了 \tn{zhdigits} 外，其它的格式转换命令，将 0 映射成零，如果需要将 0 映射 +% 缺省状态下，除了 \tn{zhdigits} 外，其他的格式转换命令，将 0 映射成零，如果需要将 0 映射 % 成〇，可以使用这个选项。 % \end{function} % @@ -437,7 +437,7 @@ Copyright and Licence % 其中 |-| 设置负，|-0| 设置〇，|dot| 设置小数的点，|and| 和 |parts| 分别设置分数 % 的“又”和“分之”，|E|$n$ 设置 $10^n$，|F|$n$ 设置数字 $n$ 的大写，|T|$n$ 设置 % 数字 $n$ 的天干，|D|$n$ 设置数字 $n$ 的地支，而 |GZ|$n$ 设置数字 $n$ 的干支。 -% 其它的选项同字面意思，不再赘述。例如 +% 其他的选项同字面意思，不再赘述。例如 % \begin{verbatim}[frame=single] % \zhnumsetup{2={两}} % \end{verbatim} @@ -664,7 +664,7 @@ Copyright and Licence % \begin{macro}[int]{\@zhnum} % 用于支持 |\pagenumbering{zhnum}|。 % \begin{macrocode} -\cs_new_nopar:Npn \@zhnum { \zhnum_int:n } +\cs_new:Npn \@zhnum { \zhnum_int:n } % \end{macrocode} % \end{macro} % @@ -906,7 +906,7 @@ Copyright and Licence % \begin{macro}[int]{\@zhdig} % 用于支持 |\pagenumbering{zhdig}|。 % \begin{macrocode} -\cs_new_nopar:Npn \@zhdig #1 { \zhnum_digits_null:f { \int_eval:n {#1} } } +\cs_new:Npn \@zhdig #1 { \zhnum_digits_null:f { \int_eval:n {#1} } } % \end{macrocode} % \end{macro} % @@ -933,9 +933,9 @@ Copyright and Licence % \begin{macro}[int]{\zhnum_digits_zero:n,\zhnum_digits_null:n} % 快捷方式。 % \begin{macrocode} -\cs_new_nopar:Npn \zhnum_digits_zero:n +\cs_new:Npn \zhnum_digits_zero:n { \zhnum_digits:Nn \BooleanTrue } -\cs_new_nopar:Npn \zhnum_digits_null:n +\cs_new:Npn \zhnum_digits_null:n { \zhnum_digits:Nn \BooleanFalse } \cs_generate_variant:Nn \zhnum_digits_null:n { V , v , f } % \end{macrocode} @@ -1012,14 +1012,14 @@ Copyright and Licence % \begin{macro}{\zhtoday} % 输出当天日期。 % \begin{macrocode} -\cs_new_nopar:Npn \zhtoday +\cs_new:Npn \zhtoday { \@@_date_aux:Vnn \tex_year:D \tex_month:D \tex_day:D } % \end{macrocode} % \end{macro} % % \begin{macro}{\@@_date_aux:nnn} % \begin{macrocode} -\cs_new_nopar:Npn \@@_date_aux:nnn +\cs_new:Npn \@@_date_aux:nnn { \bool_if:NTF \l_@@_time_bool { \@@_date_aux:NNnnnn \zhnum_digits_null:n \zhnum_int:n { } } @@ -1152,7 +1152,7 @@ Copyright and Licence % \begin{macro}{\zhcurrtime} % 输出当前时间。 % \begin{macrocode} -\cs_new_nopar:Npn \zhcurrtime +\cs_new:Npn \zhcurrtime { \@@_time_aux:nn { \int_div_truncate:nn \tex_time:D { 60 } } @@ -1163,7 +1163,7 @@ Copyright and Licence % % \begin{macro}{\@@_time_aux:nn,\@@_time_aux:Nnnn} % \begin{macrocode} -\cs_new_nopar:Npn \@@_time_aux:nn +\cs_new:Npn \@@_time_aux:nn { \bool_if:NTF \l_@@_time_bool { \@@_time_aux:Nnnn \zhnum_int:n { } } @@ -1453,7 +1453,7 @@ Copyright and Licence % } % 将 \texttt{prop} 表转化到单独的 \texttt{tl} 变量。 % \begin{macrocode} -\cs_new_protected_nopar:Npn \zhnum_parse_config: +\cs_new_protected:Npn \zhnum_parse_config: { \prop_map_function:NN \l_@@_cfg_map_prop \zhnum_check_simp:nn \prop_map_function:NN \l_@@_cfg_map_ganzhi_prop \zhnum_assgin_ganzhi:nn @@ -1485,7 +1485,7 @@ Copyright and Licence } { \tl_set:cn { l_@@_ #2 _tl } {#1} } } -\cs_new_protected_nopar:Npn \zhnum_assgin_const: +\cs_new_protected:Npn \zhnum_assgin_const: { \prop_map_function:NN \l_@@_cfg_map_prop \zhnum_check_financial:nn \zhnum_set_alias: @@ -1506,7 +1506,7 @@ Copyright and Licence { c_@@_ #1 _tl } { \exp_not:c { l_@@_ #1 _tl } } } } -\cs_new_protected_nopar:Npn \zhnum_set_zero: +\cs_new_protected:Npn \zhnum_set_zero: { \tl_set:cx { l_@@_0_tl } { @@ -1514,7 +1514,7 @@ Copyright and Licence { \exp_not:o \l_@@_null_tl } { \exp_not:v { l_@@_0_tl } } } } -\cs_new_protected_nopar:Npn \zhnum_set_week_day: +\cs_new_protected:Npn \zhnum_set_week_day: { \tl_set:Nx \l_@@_mon_tl { \exp_not:N \c_@@_weekday_tl \exp_not:v { l_@@_1_tl } } @@ -1565,7 +1565,7 @@ Copyright and Licence % 一些易于使用的别名。 % \begin{macrocode} \cs_new_eq:NN \zhnum_set_alias:NN \cs_new_eq:NN -\cs_new_protected_nopar:Npx \zhnum_set_alias: +\cs_new_protected:Npx \zhnum_set_alias: { \zhnum_set_alias:NN \exp_not:N \c_@@_zero_tl \exp_not:c { c_@@_ 0 _tl } @@ -1677,9 +1677,9 @@ Copyright and Licence } \cs_new_eq:NN \zhnum_reset_config: \zhnum_parse_config: \else: - \cs_new_protected_nopar:Npn \zhnum_set_catcode: + \cs_new_protected:Npn \zhnum_set_catcode: { \bool_if:NT \l_@@_active_char_bool { \zhnum_set_active: } } - \cs_new_protected_nopar:Npn \zhnum_set_active: + \cs_new_protected:Npn \zhnum_set_active: { \str_case:onTF { \l_@@_encoding_str } { @@ -1706,7 +1706,7 @@ Copyright and Licence \bool_if:NT \l_@@_active_char_bool { _active } } } - \cs_new_protected_nopar:Npn \zhnum_reset_config: + \cs_new_protected:Npn \zhnum_reset_config: { \zhnum_load_cfg:o { \l_@@_encoding_str } } \bool_new:N \l_@@_active_char_bool \bool_set_true:N \l_@@_active_char_bool @@ -1723,7 +1723,7 @@ Copyright and Licence { UTF8 , GBK , Big5 } { \str_set:Nx \l_@@_encoding_str - { \str_fold_case:V \l_keys_choice_tl } + { \exp_args:No \str_lowercase:n { \l_keys_choice_tl } } \zhnum_load_cfg:o { \l_@@_encoding_str } } , encoding .default:n = { GBK } , @@ -1897,12 +1897,14 @@ Copyright and Licence \zhnum_set_financial_map:nn { null } { 零 } \zhnum_set_financial_map:nn { 0 } { 零 } \zhnum_set_financial_map:nn { 1 } { 壹 } -\zhnum_set_financial_map:nn { 2 } { 貳 } %<*!big5> +\zhnum_set_financial_map:nnn { 2 } { simp } { 贰 } +\zhnum_set_financial_map:nnn { 2 } { trad } { 貳 } \zhnum_set_financial_map:nnn { 3 } { simp } { 叁 } \zhnum_set_financial_map:nnn { 3 } { trad } { 叄 } %</!big5> %<*big5> +\zhnum_set_financial_map:nn { 2 } { 貳 } \zhnum_set_financial_map:nn { 3 } { 參 } %</big5> \zhnum_set_financial_map:nn { 4 } { 肆 } diff --git a/macros/latex/contrib/zhnumber/zhnumber.ins b/macros/latex/contrib/zhnumber/zhnumber.ins deleted file mode 100644 index d403166319..0000000000 --- a/macros/latex/contrib/zhnumber/zhnumber.ins +++ /dev/null @@ -1,89 +0,0 @@ -%% -%% This is file `zhnumber.ins', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% zhnumber.dtx (with options: `install') -%% -%% Copyright (C) 2012, 2014-2019 by Qing Lee <sobenlee@gmail.com> -%% -------------------------------------------------------------------------- -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either -%% version 1.3c of this license or (at your option) any later -%% version. This version of this license is in -%% http://www.latex-project.org/lppl/lppl-1-3c.txt -%% and the latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of -%% LaTeX version 2005/12/01 or later. -%% -%% This work has the LPPL maintenance status `maintained'. -%% -%% The Current Maintainer of this work is Qing Lee. -%% -%% -------------------------------------------------------------------------- -%% - -\input ctxdocstrip % - -\preamble - - Copyright (C) 2012, 2014-2019 by Qing Lee <sobenlee@gmail.com> --------------------------------------------------------------------------- - - This work may be distributed and/or modified under the - conditions of the LaTeX Project Public License, either - version 1.3c of this license or (at your option) any later - version. This version of this license is in - http://www.latex-project.org/lppl/lppl-1-3c.txt - and the latest version of this license is in - http://www.latex-project.org/lppl.txt - and version 1.3 or later is part of all distributions of - LaTeX version 2005/12/01 or later. - - This work has the LPPL maintenance status `maintained'. - - The Current Maintainer of this work is Qing Lee. - --------------------------------------------------------------------------- - -\endpreamble -\postamble - - This package consists of the file zhnumber.dtx, - and the derived files zhnumber.pdf, - zhnumber.sty, - zhnumber-utf8.cfg, - zhnumber-gbk.cfg, - zhnumber-big5.cfg, - zhnumber.ins and - README.md. -\endpostamble - -\generate - { - \usedir{tex/latex/zhnumber} - \file{zhnumber.sty} {\from{\jobname.dtx}{package}} - \usedir{tex/latex/zhnumber/config} - \file{zhnumber-utf8.cfg} {\from{\jobname.dtx}{config,utf8}} - \file{zhnumber-big5.cfg} {\from{\jobname.dtx}{config,big5}} - \file{zhnumber-gbk.cfg} {\from{\jobname.dtx}{config,gbk}} - \nopreamble\nopostamble - \usedir{doc/latex/zhnumber} - \file{README.md} {\from{\jobname.dtx}{readme}} - } - -\endbatchfile -%% -%% This package consists of the file zhnumber.dtx, -%% and the derived files zhnumber.pdf, -%% zhnumber.sty, -%% zhnumber-utf8.cfg, -%% zhnumber-gbk.cfg, -%% zhnumber-big5.cfg, -%% zhnumber.ins and -%% README.md. -%% -%% End of file `zhnumber.ins'. diff --git a/macros/latex/contrib/zhnumber/zhnumber.pdf b/macros/latex/contrib/zhnumber/zhnumber.pdf Binary files differindex 7a3936c5ff..3010ea379d 100644 --- a/macros/latex/contrib/zhnumber/zhnumber.pdf +++ b/macros/latex/contrib/zhnumber/zhnumber.pdf |