From 4f7a2c33e49915f226131d182a2762f3467e5831 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 1 Nov 2019 20:58:55 +0000 Subject: cnltx (1nov19) git-svn-id: svn://tug.org/texlive/trunk@52601 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/bibtex/bib/cnltx/cnltx.bib | 451 +++++++++++---------- Master/texmf-dist/doc/latex/cnltx/README | 4 +- Master/texmf-dist/doc/latex/cnltx/cnltx_en.pdf | Bin 778786 -> 773057 bytes Master/texmf-dist/doc/latex/cnltx/cnltx_en.tex | 6 +- Master/texmf-dist/tex/latex/cnltx/cnltx-base.sty | 9 +- Master/texmf-dist/tex/latex/cnltx/cnltx-doc.cls | 136 ++++--- .../texmf-dist/tex/latex/cnltx/cnltx-example.sty | 228 +++++++---- .../texmf-dist/tex/latex/cnltx/cnltx-listings.sty | 7 +- Master/texmf-dist/tex/latex/cnltx/cnltx-tools.sty | 2 +- .../tex/latex/cnltx/cnltx-translations.sty | 4 +- Master/texmf-dist/tex/latex/cnltx/cnltx.bbx | 97 +++-- Master/texmf-dist/tex/latex/cnltx/cnltx.cbx | 2 +- Master/texmf-dist/tex/latex/cnltx/cnltx.dbx | 2 +- Master/texmf-dist/tex/latex/cnltx/cnltx.sty | 2 +- 14 files changed, 554 insertions(+), 396 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/bibtex/bib/cnltx/cnltx.bib b/Master/texmf-dist/bibtex/bib/cnltx/cnltx.bib index d38858ab3d1..c1284a6adb6 100644 --- a/Master/texmf-dist/bibtex/bib/cnltx/cnltx.bib +++ b/Master/texmf-dist/bibtex/bib/cnltx/cnltx.bib @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/cnltx/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2013-2014 Clemens Niederberger +% Copyright 2013--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -35,15 +35,15 @@ @package{pkg:accsupp, title = {accsupp} , author = {Heiko Oberdiek} , - date = {2010-01-16} , - version = {0.3} , + date = {2018-03-28} , + version = {0.5} , url = {http://mirror.ctan.org/macros/latex/contrib/oberdiek/} } @package{pkg:acro, title = {acro} , author = {Clemens Niederberger} , - date = {2013-09-24} , - version = {1.4b} , + date = {2019-09-23} , + version = {2.10} , url = {http://mirror.ctan.org/macros/latex/contrib/acro/} } @package{pkg:acromake, @@ -57,8 +57,8 @@ title = {acronym}, subtitle = {An Acronym Environment for \LaTeXe}, author = {Tobias Oetiker}, - date = {2012-10-29}, - version = {1.38}, + date = {2015-03-21}, + version = {1.41}, url = {http://mirror.ctan.org/macros/latex/contrib/acronym/} } @package{pkg:acroterm, @@ -71,8 +71,8 @@ @package{pkg:adjustbox, title = {adjustbox}, author = {Martin Scharrer}, - date = {2012-05-21}, - version = {1.0}, + date = {2019-01-04}, + version = {1.2}, url = {http://mirror.ctan.org/macros/latex/contrib/adjustbox/} } @package{pkg:amsmath, @@ -80,8 +80,8 @@ author = {{American Mathematical Society}} , sortname = {American Mathematical Society} , shorthand = {AMS} , - date = {2002-02-25} , - version = {2.0} , + date = {2018-04-05} , + version = {2.1} , url = {http://mirror.ctan.org/macros/latex/required/amsmath/} } @package{pkg:amstext, @@ -95,80 +95,87 @@ title = {answers}, author = {Mike Piff}, maintainer = {Joseph Wright}, - date = {2010-10-11}, - version = {2.13}, + date = {2014-08-24}, + version = {2.16}, url = {http://mirror.ctan.org/macros/latex/contrib/answers/} } @package{pkg:array, title = {array}, author = {Frank Mittelbach and David Carlisle}, - date = {2008-09-09}, - version = {2.4c}, + date = {2019-09-13}, + version = {2.4l}, url = {http://mirror.ctan.org/macros/latex/required/tools/} } @package{pkg:asymptote, title = {asymptote}, author = {Andy Hammerlindl and John Bowman and Tom Price}, - date = {2013}, - version = {2.23}, + date = {2019}, + version = {2.49}, url = {http://mirror.ctan.org/graphics/asymptote/} } +@package{pkg:auto-pst-pdf, + title = {auto-pst-pdf}, + author = {Will Robertson and Johannes Große}, + date = {2009-04-26}, + version = {0.6}, + url = {http://mirror.ctan.org/macros/latex/contrib/auto-pst-pdf/} +} @package{pkg:babel, title = {babel} , author = {Johannes Braams} , maintainer = {Javier Bezos} , - date = {2013-05-16} , - version = {3.9f} , + date = {2019-07-19} , + version = {3.33} , url = {http://mirror.ctan.org/macros/latex/required/babel/} } @package{pkg:bm, title = {bm} , author = {David Carlisle and Frank Mittelbach} , - date = {2004-02-26} , - version = {1.1c} , + date = {2019-07-24} , + version = {1.2d} , url = {http://mirror.ctan.org/macros/latex/required/bm/} } @package{pkg:biblatex, title = {biblatex} , author = {Philipp Lehman} , maintainer = {Joseph Wright and Audrey Boruvka and Philip Kime} , - date = {2013-07-14} , - version = {2.7a} , + date = {2019-08-07} , + version = {3.13} , url = {http://mirror.ctan.org/macros/latex/contrib/biblatex/} } @package{pkg:bigfoot, title = {bigfoot}, author = {David Kastrup}, - date = {2006-07-15}, - version = {1.25}, + date = {2015-08-30}, + version = {2.1}, url = {http://mirror.ctan.org/macros/latex/contrib/bigfoot/} } @package{pkg:bohr, title = {bohr} , author = {Clemens Niederberger} , - date = {2015-06-16} , + date = {2015-06-24} , version = {1.0} , url = {http://mirror.ctan.org/macros/latex/contrib/bohr/} } @package{pkg:booktabs, title = {booktabs} , author = {Simon Fear} , - date = {2005-04-14} , - version = {1.61803} , + date = {2016-04-29} , + version = {1.618033} , url = {http://mirror.ctan.org/macros/latex/contrib/booktabs/} } @package{pkg:bpchem, title = {bpchem} , author = {Bj\o{}rn Pedersen} , - date = {2004-11-25} , - version = {1.06} , + date = {2017-08-23} , + version = {1.1} , url = {http://mirror.ctan.org/macros/latex/contrib/bpchem/} } @package{pkg:catchfile, title = {catchfile} , author = {Heiko Oberdiek} , - date = {2011-03-01} , - version = {1.6} , + date = {2016-05-16} , + version = {1.7} , url = {http://mirror.ctan.org/macros/latex/contrib/oberdiek/} } @package{pkg:chemcompounds, @@ -188,36 +195,36 @@ @package{pkg:chemfig, title = {chemfig} , author = {Christian Tellechea} , - date = {2013-11-28} , - version = {1.0h} , + date = {2019-05-21} , + version = {1.41} , url = {http://mirror.ctan.org/macros/generic/chemfig/} } @package{pkg:chemformula, title = {chemformula} , author = {Clemens Niederberger} , - date = {2015-06-30} , - version = {4.11} , + date = {2019-09-23} , + version = {4.15f} , url = {http://mirror.ctan.org/macros/latex/contrib/chemformula/} } @package{pkg:chemgreek, title = {chemgreek} , author = {Clemens Niederberger} , - date = {2015-07-01} , - version = {1.0a} , + date = {2016-12-20} , + version = {1.1} , url = {http://mirror.ctan.org/macros/latex/contrib/chemgreek/} } @package{pkg:chemmacros, title = {chemmacros} , author = {Clemens Niederberger} , - date = {2015-02-08} , - version = {4.7} , + date = {2019-09-24} , + version = {5.8d} , url = {http://mirror.ctan.org/macros/latex/contrib/chemmacros/} } @package{pkg:chemnum, title = {chemnum} , author = {Clemens Niederberger} , - date = {2015-05-13} , - version = {1.1a} , + date = {2016-04-14} , + version = {1.2} , url = {http://mirror.ctan.org/macros/latex/contrib/chemnum/} } @package{pkg:chemstyle, @@ -231,15 +238,15 @@ title = {chngcntr} , author = {Peter Wilson} , maintainer = {Will Robertson} , - date = {2009-09-02} , - version = {1.0a} , + date = {2018-04-09} , + version = {1.1a} , url = {http://mirror.ctan.org/macros/latex/contrib/chngcntr/} } @bundle{bnd:cnltx, title = {cnltx} , author = {Clemens Niederberger} , - date = {2014-01-23} , - version = {0.10a} , + date = {2019-09-25} , + version = {0.15} , url = {http://mirror.ctan.org/macros/latex/contrib/cnltx/} } @class{cls:cnpkgdoc, @@ -281,21 +288,21 @@ @package{pkg:enotez, title = {enotez}, author = {Clemens Niederberger}, - version = {0.7b}, - date = {2013-10-31}, + version = {0.9a}, + date = {2017-04-24}, url = {http://mirror.ctan.org/macros/latex/contrib/enotez/} } @package{pkg:enumitem, title = {enumitem}, author = {Javier Bezos}, - date = {2011-09-28}, - version = {3.5.2}, + date = {2019-06-20}, + version = {3.9}, url = {http://mirror.ctan.org/macros/latex/contrib/enumitem/} } @package{pkg:environ, title = {environ}, author = {Will Robertson}, - date = {2013-04-01}, + date = {2014-05-04}, version = {0.3}, url = {http://mirror.ctan.org/macros/latex/contrib/environ/} } @@ -309,30 +316,30 @@ @package{pkg:eqexam, title = {eqexam}, author = {D. P. Story}, - date = {2011-09-01}, - version = {3.0k}, + date = {2019-01-31}, + version = {5.1.4}, url = {http://mirror.ctan.org/macros/latex/contrib/eqexam/} } @package{pkg:esami, title = {esami}, author = {Grazia Messineo and Salvatore Vassallo}, - date = {2013-03-08}, - version = {1.0}, + date = {2018-05-06}, + version = {2.5}, url = {http://mirror.ctan.org/macros/latex/contrib/esami/} } @package{pkg:etoolbox, title = {etoolbox} , author = {Philipp Lehman} , maintainer = {Joseph Wright} , - date = {2015-04-04} , - version = {2.2} , + date = {2019-09-21} , + version = {2.5h} , url = {http://mirror.ctan.org/macros/latex/contrib/etoolbox/} } @class{cls:exam, title = {exam}, author = {Philip Hirschhorn}, - date = {2015-05-07}, - version = {2.5}, + date = {2017-11-05}, + version = {2.6}, url = {http://mirror.ctan.org/macros/latex/contrib/exam/} } @package{pkg:examdesign, @@ -345,51 +352,51 @@ @package{pkg:exercise, title = {exercise}, author = {Paul Pichaureau}, - date = {2012-05-08}, - version = {1.58}, + date = {2014-10-21}, + version = {1.6}, url = {http://mirror.ctan.org/macros/latex/contrib/exercise/} } -@bundle{bnd:exsheets, +@package{pkg:exsheets, title = {exsheets} , author = {Clemens Niederberger} , - date = {2014-06-27} , - version = {0.14} , + date = {2017-02-08} , + version = {0.21i} , url = {http://mirror.ctan.org/macros/latex/contrib/exsheets/} } @package{pkg:exsol, title = {exsol}, author = {Walter Daems}, - date = {2013-05-12}, - version = {0.6}, + date = {2018-10-23}, + version = {1.4}, url = {http://mirror.ctan.org/macros/latex/contrib/exsol/} } @package{pkg:fixfoot, title = {fixfoot}, author = {Robin Fairbairns}, - date = {2007-12-12}, + date = {2010-02-19}, version = {0.3a} , url = {http://mirror.ctan.org/macros/latex/contrib/fixfoot/} } @package{pkg:fnpct, title = {fnpct} , author = {Clemens Niederberger} , - date = {2013-02-28} , - version = {0.2j} , + date = {2019-02-17} , + version = {0.4f} , url = {http://mirror.ctan.org/macros/latex/contrib/fnpct/} } @package{pkg:fontenc, - title = {fontenc} , - author = {{The \LaTeX\ team}} , - sortname = {LaTeX team} , - version = {1.99g} , - date = {2005-09-27} , - url = {http://mirror.ctan.org/macros/latex/unpacked/} + title = {fontenc} , + author = {{The \LaTeX\ team}} , + sortname = {LaTeX team} , + shorthand = {L3P} , + date = {2016-02-18} , + url = {http://mirror.ctan.org/macros/latex/base/} } @package{pkg:fontspec, title = {fontspec} , author = {Will Robertson and Khaled Hosny} , - version = {2.3c} , - date = {2013-05-20} , + version = {2.7c} , + date = {2019-03-15} , url = {http://mirror.ctan.org/macros/latex/contrib/fontspec/} } @package{pkg:footmisc, @@ -416,78 +423,77 @@ @package{pkg:geometry, title = {geometry} , author = {Hideo Umeki} , - date = {2010-09-12} , - version = {5.6} , + date = {2018-04-16} , + version = {5.8} , url = {http://mirror.ctan.org/macros/latex/contrib/geometry/} } @package{pkg:ghsystem, title = {ghsystem} , author = {Clemens Niederberger} , - date = {2014-08-08} , - version = {4.6} , + date = {2016-07-16} , + version = {4.8} , url = {http://mirror.ctan.org/macros/latex/contrib/ghsystem/} } @package{pkg:glossaries, title = {glossaries}, - author = {Nicola L.C. Talbot}, - date = {2013-04-21}, - version = {3.05}, + author = {Nicola L. C. Talbot}, + date = {2019-01-06}, + version = {4.42}, url = {http://mirror.ctan.org/macros/latex/contrib/glossaries/} } @package{pkg:graphicx, title = {graphicx} , author = {David Carlisle} , - date = {2005-11-14} , - version = {1.0f} , + date = {2017-06-01} , url = {http://mirror.ctan.org/macros/latex/required/graphics/} } @bundle{bnd:greek-fontenc, title = {greek-fontenc} , author = {G\"unter Milde} , - date = {2013-12-01} , - version = {0.11.1} , + date = {2019-07-11} , + version = {0.13.4} , url = {http://mirror.ctan.org/language/greek/greek-fontenc/} } @package{pkg:hologo, title = {hologo} , author = {Heiko Oberdiek} , - date = {2012-04-26} , - version = {1.10} , + date = {2017-05-01} , + version = {1.13} , url = {http://mirror.ctan.org/macros/latex/contrib/oberdiek/} } @package{pkg:hyperref, title = {hyperref} , author = {Heiko Oberdiek and Sebastian Rahtz} , - date = {2012-11-06} , - version = {6.83m} , + date = {2019-09-12} , + version = {6.88i} , url = {http://mirror.ctan.org/macros/latex/contrib/hyperref/} } @package{pkg:idxcmds, title = {idxcmds} , author = {Clemens Niederberger} , - date = {2013-08-31} , - version = {0.2b} , + date = {2015-08-13} , + version = {0.2c} , url = {http://mirror.ctan.org/macros/latex/contrib/idxcmds/} } @package{pkg:ifluatex, title = {ifluatex} , author = {Heiko Oberdiek} , - date = {2010-03-01} , - version = {1.3} , + date = {2016-05-16} , + version = {1.4} , url = {http://mirror.ctan.org/macros/latex/contrib/oberdiek/} } @package{pkg:ifpdf, title = {ifpdf} , - author = {Heiko Oberdiek} , - date = {2011-01-30} , - version = {2.3} , + author = {L3P} , + date = {2018-09-07} , + version = {3.3} , url = {http://mirror.ctan.org/macros/latex/contrib/oberdiek/} } @package{pkg:ifplatform, title = {ifplatform} , author = {Johannes Gro\ss e and Will Robertson} , - date = {2010-10-22} , - version = {0.4} , + date = {2017-10-13} , + version = {0.4a} , url = {http://mirror.ctan.org/macros/latex/contrib/ifplatform/} } @package{pkg:ifxetex, @@ -500,15 +506,15 @@ @package{pkg:imakeidx, title = {imakeidx} , author = {Enrico Gregorio} , - date = {2013-07-11} , - version = {1.3a} , + date = {2016-10-15} , + version = {1.3e} , url = {http://mirror.ctan.org/macros/latex/contrib/imakeidx/} } @package{pkg:inputenc, title = {inputenc} , author = {Alan Jeffrey and Frank Mittelbach} , - date = {2008-03-30} , - version = {1.1d} , + date = {2018-08-11} , + version = {1.3c} , url = {http://mirror.ctan.org/macros/latex/base/} } @bundle{bnd:koma-script, @@ -517,16 +523,16 @@ indextitle = {\KOMAScript} , indexsorttitle = {KOMA-Script} , author = {Markus Kohm}, - date = {2015-07-02} , - version = {3.18} , + date = {2019-01-14} , + version = {3.25} , url = {http://mirror.ctan.org/macros/latex/contrib/koma-script/} } @package{pkg:kpfonts, title = {kpfonts} , author = {Christophe Caignaert} , aubtitle = {The Johannes Kepler Project} , - date = {2010-08-20} , - version = {3.31} , + date = {2018-08-22} , + version = {3.33} , url = {http://mirror.ctan.org/fonts/kpfonts} } @bundle{bnd:l3experimental, @@ -534,8 +540,7 @@ author = {{The \LaTeX3 Project Team}} , shorthand = {L3P} , sortname = {LaTeX3 Project Team} , - version = {SVN 5630} , - date = {2015-07-15} , + date = {2019-09-19} , url = {http://mirror.ctan.org/macros/latex/contrib/l3experimental/} } @bundle{bnd:l3kernel, @@ -543,8 +548,7 @@ author = {{The \LaTeX3 Project Team}} , shorthand = {L3P} , sortname = {LaTeX3 Project Team} , - version = {SVN 5630} , - date = {2015-07-15} , + date = {2019-09-19} , url = {http://mirror.ctan.org/macros/latex/contrib/l3kernel/} } @bundle{bnd:l3packages, @@ -552,29 +556,28 @@ author = {{The \LaTeX3 Project Team}} , shorthand = {L3P} , sortname = {LaTeX3 Project Team} , - version = {SVN 5530} , - date = {2015-07-15} , + date = {2019-09-19} , url = {http://mirror.ctan.org/macros/latex/contrib/l3packages/} } @package{pkg:libertine, title = {libertine} , author = {Bob Tennent} , - date = {2013-09-02} , + date = {2018-10-01} , url = {http://mirror.ctan.org/fonts/libertine/} } @package{pkg:listings, title = {listings} , author = {Carsten Heinz and Brooks Moses} , maintainer = {Jobst Hoffmann} , - date = {2013-08-26} , - version = {1.5b} , + date = {2019-09-10} , + version = {1.8c} , url = {http://mirror.ctan.org/macros/latex/contrib/listings/} } @package{pkg:longtable, title = {longtable} , author = {David Carlisle} , - date = {2004-02-01} , - version = {4.11} , + date = {2019-02-06} , + version = {4.12} , url = {http://mirror.ctan.org/macros/latex/required/tools/} } @package{pkg:lscape, @@ -587,8 +590,8 @@ @package{pkg:ltxcmds, title = {ltxcmds}, author = {Heiko Oberdiek}, - date = {2011-11-09}, - version = {1.22}, + date = {2016-05-16}, + version = {1.23}, url = {http://mirror.ctan.org/macros/latex/contrib/oberdiek/} } @package{pkg:manyfoot, @@ -601,8 +604,8 @@ @package{pkg:marginnote, title = {marginnote} , author = {Markus Kohm} , - date = {2012-03-29} , - version = {1.1i} , + date = {2018-08-09} , + version = {1.4b} , url = {http://mirror.ctan.org/macros/latex/contrib/marginnote/} } @package{pkg:mathdesign, @@ -615,13 +618,13 @@ @package{pkg:mathtools, title = {mathtools} , author = {Lars Madsen and Will Robertson and Joseph Wright} , - version = {1.13} , - date = {2013-02-12} , + version = {1.22} , + date = {2019-07-31} , url = {http://mirror.ctan.org/macros/latex/contrib/mh/} } @package{pkg:mdframed, title = {mdframed} , - author = {Marco Daniel} , + author = {Marco Daniel and Elke Schubert} , date = {2013-07-01} , version = {1.9b} , url = {http://mirror.ctan.org/macros/latex/contrib/mdframed/} @@ -629,29 +632,36 @@ @class{cls:memoir, title = {memoir} , author = {Peter Wilson and Lars Madsen} , - date = {2011-03-06} , - version = {3.6j} , + date = {2018-12-12} , + version = {3.7h} , url = {http://mirror.ctan.org/macros/latex/contrib/memoir/} } @package{pkg:mfirstuc, title = {mfirstuc}, author = {Nicola L.C. Talbot}, - date = {2012-05-21}, - version = {1.05}, + date = {2017-11-14}, + version = {2.06}, url = {http://mirror.ctan.org/macros/latex/contrib/glossaries/} } +@package{pkg:mhchem, + title = {mhchem} , + author = {Martin Hensel} , + date = {2018-06-22}, + version = {4.08}, + url = {http://mirror.ctan.org/macros/latex/contrib/mhchem/} +} @package{pkg:microtype, title = {microtype} , author = {Robert Schlicht} , - date = {2013-05-23} , - version = {2.5a} , + date = {2019-02-28} , + version = {2.7b} , url = {http://mirror.ctan.org/macros/latex/contrib/microtype/} } @package{pkg:multicol, title = {multicol} , author = {Frank Mittelbach} , - date = {2011-06-27} , - version = {1.7a} , + date = {2019-03-01} , + version = {1.8w} , url = {http://mirror.ctan.org/macros/latex/required/tools/multicol/} } @package{pkg:multienum, @@ -664,15 +674,15 @@ @package{pkg:musixtex, title = {musixtex}, author = {Daniel Taupin and Ross Mitchell and Andreas Egler}, - version = {1.15}, - date = {2011-04-01}, + version = {1.29}, + date = {2018-08-04}, url = {http://mirror.ctan.org/macros/musixtex/} } @package{pkg:newtx, title = {newtx} , author = {Michael Sharpe} , - date = {2013-10-17} , - version = {1.151} , + date = {2018-05-11} , + version = {1.55} , url = {http://mirror.ctan.org/fonts/newtx/} } @package{pkg:nicefrac, @@ -686,15 +696,15 @@ title = {nomencl}, subtitle = {A Package to Create a Nomenclature}, author = {Boris Veytsman and Bernd Schandl and Lee Netherton and C.V. Radhakrishnan}, - date = {2005-09-22}, - version = {4.2}, + date = {2019-05-05}, + version = {5.2}, url = {http://mirror.ctan.org/macros/latex/contrib/nomencl/} } @package{pkg:parnotes, title = {parnotes}, author = {Micheal Hughes}, - date = {2012-03-01}, - version = {1}, + date = {2019-07-23}, + version = {3b}, url = {http://mirror.ctan.org/macros/latex/contrib/parnotes/} } @package{pkg:pagenote, @@ -705,40 +715,47 @@ version = {1.1a}, url = {http://mirror.ctan.org/macros/latex/contrib/pagenote/} } +@package{pkg:pdfcomment, + title = {pdfcomment} , + author = {Josef Kleber} , + date = {2018-11-01} , + version = {2.4a} , + url = {http://mirror.ctan.org/macros/latex/contrib/pdfcomment/} +} @package{pkg:pdftexcmds, title = {pdftexcmds} , author = {Heiko Oberdiek} , - date = {2011-11-29} , - version = {0.20} , + date = {2019-07-25} , + version = {0.30} , url = {http://mirror.ctan.org/macros/latex/contrib/oberdiek/} } @package{pkg:perpage, title = {perpage}, author = {David Kastrup}, - date = {2006-07-15}, - version = {1.12}, + date = {2014-10-25}, + version = {2.0}, url = {http://mirror.ctan.org/macros/latex/contrib/perpage/} } @package{pkg:pgf, title = {TikZ/pgf} , author = {Till Tantau} , - version = {3.0.0} , - date = {2013-12-13} , + version = {3.1.4b} , + date = {2019-08-03} , url = {http://mirror.ctan.org/graphics/pgf/} } @package{pkg:pgfopts, title = {pgfopts} , author = {Joseph Wright} , - date = {2011-06-02} , - version = {2.1} , + date = {2014-07-10} , + version = {2.1a} , url = {http://mirror.ctan.org/macros/latex/contrib/pgfopts/} } @package{pkg:pgfplots, title = {pgfplots} , author = {Christian Feuers\"anger} , sortname = {Christian Feuersaenger} , - date = {2013-10-04} , - version = {1.9} , + date = {2018-03-28} , + version = {1.16} , url = {http://mirror.ctan.org/graphics/pgf/contrib/pgfplots/} } @package{pkg:polyglossia, @@ -746,15 +763,15 @@ author = {Fran\c{c}ois Charette} , sortname = {Francois Charette} , maintainer = {Arthur Reutenauer} , - date = {2013-06-27} , - version = {1.33.4} , + date = {2019-04-04} , + version = {1.44} , url = {http://mirror.ctan.org/macros/latex/contrib/polyglossia/} } @package{pkg:probsoln, title = {probsoln}, author = {Nicola L. C. Talbot}, - date = {2012-08-23}, - version = {3.04}, + date = {2017-07-10}, + version = {3.05}, url = {http://mirror.ctan.org/macros/latex/contrib/probsoln/} } @package{pkg:psfrag, @@ -767,23 +784,30 @@ @package{pkg:pstricks, title = {pstricks}, author = {Timothy van Zandt and Dennis Girou and Herbert Vo\ss}, - date = {2013}, - version = {2.46}, + date = {2019-05-11}, + version = {2.97}, url = {http://mirror.ctan.org/graphics/pstricks/} } +@package{pkg:pxgreeks, + title = {pxgreeks}, + author = {Jean-Fran\c{c}ois Burnol}, + date = {2011-03-16}, + version = {1.0}, + url = {http://mirror.ctan.org/macros/latex/contrib/pxgreeks/} +} @package{pkg:ragged2e, title = {ragged2e} , author = {Martin Schr\"oder} , sortname = {Martin Schroeder} , - date = {2009-05-21} , - version = {2.1} , + date = {2019-07-28} , + version = {2.2} , url = {http://mirror.ctan.org/macros/latex/contrib/ms/ragged2e/} } @package{pkg:realbookchords, title = {realbookchords}, author = {Clemens Niederberger}, - date = {2013-04-29}, - version = {0.1}, + date = {2017-03-04}, + version = {0.1b}, url = {https://bitbucket.org/cgnieder/guitarchordschemes/} } @package{pkg:relsize, @@ -796,36 +820,36 @@ @package{pkg:scrlfile, title = {scrlfile} , author = {Markus Kohm} , - date = {2012-06-15} , - version = {3.12} , + date = {2019-01-14} , + version = {3.25} , url = {http://mirror.ctan.org/macros/latex/contrib/koma-script/} } @package{pkg:sepfootnotes, title = {sepfootnotes} , author = {Eduardo C. Louren\c{c}o de Lima} , - date = {2013-01-17} , - version = {0.2} , + date = {2016-07-18} , + version = {0.3c} , url = {http://mirror.ctan.org/macros/latex/contrib/sepfootnotes/} } @package{pkg:sidenotes, title = {sidenotes}, author = {Andy Thomas and Oliver Schebaum}, - date = {2012-11-09}, - version = {0.92}, + date = {2016-04-21}, + version = {1.00}, url = {http://mirror.ctan.org/macros/latex/contrib/sidenotes/} } @package{pkg:siunitx, title = {siunitx} , author = {Joseph Wright} , - version = {2.6h} , - date = {2015-07-17} , + version = {2.7s} , + date = {2018-05-17} , url = {http://mirror.ctan.org/macros/latex/contrib/siunitx/} } @package{pkg:snotez, title = {snotez}, author = {Clemens Niederberger}, - version = {0.2}, - date = {2013-04-04}, + version = {0.3}, + date = {2013-04-21}, url = {http://mirror.ctan.org/macros/latex/contrib/snotez/} } @package{pkg:songbook, @@ -838,43 +862,50 @@ @package{pkg:songs, title = {songs}, author = {Kevin W. Hamlen}, - version = {2.14}, - date = {2012-03-17}, + version = {3.1}, + date = {2018-09-21}, url = {http://mirror.ctan.org/macros/latex/contrib/songs/} } @package{pkg:splitidx, title = {splitidx}, author = {Markus Kohm}, - date = {2013-04-09}, - version = {1.2a}, + date = {2016-02-18}, + version = {1.2c}, url = {http://mirror.ctan.org/macros/latex/contrib/splitidx/} } @package{pkg:superiors, title = {superiors}, author = {Michael Sharpe}, - date = {2012-08-13}, - version = {1.02}, + date = {2019-08-18}, + version = {1.06}, url = {http://mirror.ctan.org/macros/latex/contrib/superiors/} } -@package{pkg:tasks, - title = {tasks}, - author = {Clemens Niederberger}, - date = {2014-07-03}, - version = {0.10}, - url = {http://mirror.ctan.org/macros/latex/contrib/tasks/} -} @package{pkg:tablefootnote, title = {tablefootnote}, author = {H.-Martin M\"unch}, - date = {2012-01-14}, - version = {1.0g}, + sortname = {H.-Martin Muench}, + date = {2014-01-26}, + version = {1.1c}, url = {http://mirror.ctan.org/macros/latex/contrib/tablefootnote/} } +@package{pkg:tabu, + title = {tabu}, + author = {Florent Chervet}, + date = {2019-01-12}, + version = {2.8+}, + url = {http://mirror.ctan.org/macros/latex/contrib/tabu/} +} +@package{pkg:tasks, + title = {tasks}, + author = {Clemens Niederberger}, + date = {2016-08-13}, + version = {0.12}, + url = {http://mirror.ctan.org/macros/latex/contrib/tasks/} +} @package{pkg:textcomp, title = {textcomp} , author = {Sebastian Rahtz} , - date = {1995-12-11} , - version = {1.4} , + date = {2016-02-18} , url = {http://mirrors.ctan.org/obsolete/fonts/psfonts/ts1} } @package{pkg:textgreek, @@ -887,8 +918,8 @@ @package{pkg:tkz-base, title = {tkz-base}, author = {Alain Matthes}, - date = {2011-06-02}, - version = {1.16}, + date = {2011-06-03}, + version = {1.16c}, url = {http://mirror.ctan.org/macros/latex/contrib/tkz/} } @package{pkg:tkz-euclide, @@ -901,22 +932,22 @@ @package{pkg:tkz-fct, title = {tkz-fct}, author = {Alain Matthes}, - date = {2011-06-02}, + date = {2011-06-03}, version = {1.16c}, url = {http://mirror.ctan.org/macros/latex/contrib/tkz/} } @package{pkg:translations, title = {translations} , author = {Clemens Niederberger} , - date = {2013-09-30} , - version = {1.1a} , + date = {2017-08-31} , + version = {1.7a} , url = {http://mirror.ctan.org/macros/latex/contrib/translations/} } @package{pkg:translator, title = {translator} , - author = {Till Tantau} , - date = {2010-06-12} , - version = {1.0} , + author = {Till Tantau and Joseph Wright} , + date = {2019-05-31} , + version = {1.12a} , url = {http://mirror.ctan.org/macros/contrib/beamer/base/translator/} } @package{pkg:trimspaces, @@ -929,8 +960,8 @@ @class{cls:tufte, title = {tufte-latex}, author = {Kevin Godby and Bil Kleb and Bill Wood}, - date = {2009-12-11}, - version = {3.5.0}, + date = {2010}, + version = {3.5.2}, url = {http://mirror.ctan.org/macros/latex/contrib/tufte-latex/} } @package{pkg:ulem, @@ -949,8 +980,8 @@ @package{pkg:xcolor, title = {xcolor} , author = {Uwe Kern} , - date = {2007-01-21} , - version = {2.11} , + date = {2016-05-11} , + version = {2.12} , url = {http://mirror.ctan.org/macros/latex/contrib/xcolor/} } @package{pkg:xfrac, @@ -958,8 +989,7 @@ author = {{The \LaTeX3 Project Team}} , shorthand = {L3P} , sortname = {LaTeX3 Project Team} , - date = {2014-05-04} , - version = {4728} , + date = {2019-05-28} , url = {http://mirror.ctan.org/macros/latex/contrib/l3packages/} } @package{pkg:xpatch, @@ -973,15 +1003,22 @@ title = {xspace} , author = {David Carlisle and Morten H\o{}gholm} , sortname = {David Carlisle and Morten Hoegholm} , - date = {2009-10-20} , + date = {2014-10-28} , version = {1.13} , url = {http://mirror.ctan.org/macros/latex/required/tools/} } +@package{pkg:xymtex, + title = {\XyMTeX} , + author = {Shinsaku Fujita} , + date = {2013} , + version = {5.06} , + url = {http://mirror.ctan.org/macros/latex/contrib/xymtex/} +} @bundle{bnd:yafoot, title = {yafoot}, author = {Hiroshi Nakashima}, - date = {1999-07-14}, - version = {1.0}, + date = {2018-09-03}, + version = {1.1}, url = {http://mirror.ctan.org/macros/latex/contrib/yafoot/} } diff --git a/Master/texmf-dist/doc/latex/cnltx/README b/Master/texmf-dist/doc/latex/cnltx/README index aa4361964af..caf1d9810fb 100644 --- a/Master/texmf-dist/doc/latex/cnltx/README +++ b/Master/texmf-dist/doc/latex/cnltx/README @@ -1,5 +1,5 @@ -------------------------------------------------------------------------- -the CNLTX bundle v0.13 2015/08/17 +the CNLTX bundle v0.15 2019/11/01 LaTeX tools and documenting facilities @@ -8,7 +8,7 @@ Clemens Niederberger Web: https://github.com/cgnieder/cnltx/ E-Mail: contact@mychemistry.eu -------------------------------------------------------------------------- -Copyright 2013-2015 Clemens Niederberger +Copyright 2013--2019 Clemens Niederberger This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/doc/latex/cnltx/cnltx_en.pdf b/Master/texmf-dist/doc/latex/cnltx/cnltx_en.pdf index d25b68094ad..f6981af6959 100644 Binary files a/Master/texmf-dist/doc/latex/cnltx/cnltx_en.pdf and b/Master/texmf-dist/doc/latex/cnltx/cnltx_en.pdf differ diff --git a/Master/texmf-dist/doc/latex/cnltx/cnltx_en.tex b/Master/texmf-dist/doc/latex/cnltx/cnltx_en.tex index 867a808b613..a19b36a68f0 100644 --- a/Master/texmf-dist/doc/latex/cnltx/cnltx_en.tex +++ b/Master/texmf-dist/doc/latex/cnltx/cnltx_en.tex @@ -13,7 +13,7 @@ % Web: https://github.com/cgnieder/cnltx/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2013-2015 Clemens Niederberger +% Copyright 2013--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -131,6 +131,7 @@ } } +\usepackage{csquotes} \defbibheading{bibliography}[\bibname]{\section{#1}} \makeatletter @@ -352,8 +353,7 @@ The intended use of this bundle is three-fold: and actually loads most if not all of the bundle. \item The module \cnltxbase\ is also intended as a programming tools package that will be used in other packages eventually. For example it is used by - the \pkg{cntformats} package from the \bnd{exsheets} - bundle~\cite{bnd:exsheets}. + the \pkg{cntformats} package. \item In case parts of this bundle prove useful to be used in a document the recommended way is to add \begin{sourcecode}[gobble=6] diff --git a/Master/texmf-dist/tex/latex/cnltx/cnltx-base.sty b/Master/texmf-dist/tex/latex/cnltx/cnltx-base.sty index d8c63223fdd..ca2f861446e 100644 --- a/Master/texmf-dist/tex/latex/cnltx/cnltx-base.sty +++ b/Master/texmf-dist/tex/latex/cnltx/cnltx-base.sty @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/cnltx/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2013-2015 Clemens Niederberger +% Copyright 2013--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -25,8 +25,8 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -\def\cnltx@@date{2015/08/17} -\def\cnltx@@version{v0.13} +\def\cnltx@@date{2019/11/01} +\def\cnltx@@version{v0.15} \def\cnltx@@info{LaTeX tools and documenting facilities (CN)} \ProvidesPackage{cnltx-base}[\cnltx@@date\space \cnltx@@version\space \cnltx@@info] \RequirePackage{pgfopts,etoolbox,ltxcmds,pdftexcmds} @@ -891,4 +891,5 @@ HISTORY: 2015/01/11 v0.12 - updating the bundle to CTAN - more security for \cnltx@ifisnum 2015/08/17 v0.13 - resolve long overdue issues with cnltx-doc - +2015/08/29 v0.13a - small changes in cnltx-example +2016/03/16 v0.13b - adapt bib style to biblatex v3.3 diff --git a/Master/texmf-dist/tex/latex/cnltx/cnltx-doc.cls b/Master/texmf-dist/tex/latex/cnltx/cnltx-doc.cls index 4d7339db32a..8c3fa838618 100644 --- a/Master/texmf-dist/tex/latex/cnltx/cnltx-doc.cls +++ b/Master/texmf-dist/tex/latex/cnltx/cnltx-doc.cls @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/cnltx/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2013-2015 Clemens Niederberger +% Copyright 2013--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -107,7 +107,7 @@ \pgfkeys{ cnltx/.cd, caption-font/.code = \def\cnltx@caption@font{#1} , - caption-label-font/.code = \def\cnltx@captionlabel@font{#1} + caption-label-font/.code = \def\cnltx@captionlabel@font{\cnltx@caption@font#1} } \ifbool{cnltx@load@preamble}{ @@ -119,12 +119,13 @@ {\RequirePackage{fontspec}} \RequirePackage[oldstyle]{libertine} \RequirePackage{libertinehologopatch} - \RequirePackage[supstfm=libertinesups]{superiors} + % \RequirePackage{superiors} + % \setkeys{superiors}{supstfm=libertinesups} % libertine does not have superior letters: \def\@makefnmark{% \hbox{% \cnltx@ifisnum{\@thefnmark} - {\textsu{\hspace*{\superiors@spaced}\@thefnmark}} + {\textsu{\hspace*{.04em}\@thefnmark}} {\@textsuperscript{\normalfont\@thefnmark}}% }% } @@ -191,7 +192,6 @@ {} \RequirePackage{fnpct} \expandafter\RequirePackage\expandafter[\cnltx@babel@options]{babel} - % \RequirePackage{babel} }{} \ifbool{cnltx@layout}{ @@ -429,35 +429,36 @@ } % -------------------------------------------------------------------------- % command descriptions: -\newcommand*\cnltx@command{% - \@ifstar - {\cnltx@command@star} - {\cnltx@command@nostar}% -} - -\newrobustcmd*\cnltx@command@star[1]{% - \@ifnextchar[ - {\cnltx@command@star@opt{#1}} - {\cnltx@command@star@opt{#1}[]}% -} - -\newrobustcmd*\cnltx@command@nostar[1]{% - \@ifnextchar[ - {\cnltx@command@nostar@opt{#1}} - {\cnltx@command@nostar@opt{#1}[]}% -} - -\def\cnltx@command@star@opt#1[#2]{% - \ifblank{#2} - {\item\cs*{#1}} - {\item\cs*{#1}#2}% - \cnltx@checkdefault{\hfill\newline}% -} -\def\cnltx@command@nostar@opt#1[#2]{% - \ifblank{#2} - {\item\cs{#1}} - {\item\cs{#1}#2}% - \cnltx@checkdefault{\hfill\newline}% +% #1: command in the list which places the item +% #2: formatting command taking one mandatory argument and a star form +\newrobustcmd*\cnltx@deflistitem[2]{% + \protected\csdef{\cnltx@stripbs#1}{% + \@ifstar + {\csuse{\cnltx@stripbs#1@star}} + {\csuse{\cnltx@stripbs#1@nostar}}% + }% + \protected\csdef{\cnltx@stripbs#1@star}##1{% + \@ifnextchar[%] + {\csuse{\cnltx@stripbs#1@star@opt}{##1}} + {\csuse{\cnltx@stripbs#1@star@opt}{##1}[]}% + }% + \protected\csdef{\cnltx@stripbs#1@nostar}##1{% + \@ifnextchar[%] + {\csuse{\cnltx@stripbs#1@nostar@opt}{##1}} + {\csuse{\cnltx@stripbs#1@nostar@opt}{##1}[]}% + }% + \protected\csdef{\cnltx@stripbs#1@star@opt}##1[##2]{% + \ifblank{##2} + {\item#2*{##1}} + {\item#2*{##1}##2}% + \cnltx@checkdefault{\hfill\newline}% + }% + \protected\csdef{\cnltx@stripbs#1@nostar@opt}##1[##2]{% + \ifblank{##2} + {\item#2{##1}} + {\item#2{##1}##2}% + \cnltx@checkdefault{\hfill\newline}% + }% } \newcommand\cnltx@checkdefault[1]{% @@ -490,6 +491,8 @@ {\list{}{\cmltx@list@setup}} {\endlist} +\cnltx@deflistitem{\cnltx@command}{\cs} + \newenvironment{commands} {% \let\command\cnltx@command @@ -726,11 +729,12 @@ \newrobustcmd*\cnltx@tableofcontents{% \begingroup \let\tocbasic@listhead\@gobble + \RaggedRight \tableofcontents \endgroup }% - \RequirePackage{multicol} - \AtBeginDocument{% + \RequirePackage{multicol,ragged2e} + \AfterEndPreamble{% \ifbool{cnltx@build@title}{% \ifbool{cnltx@package@name} {\cnltx@title@information} @@ -751,11 +755,14 @@ {\renewcommand\thefootnote{\@fnsymbol\c@footnote}}% \Huge \scalebox{1.5}{% - \color{cnltx}% - \cnltx@title@format - \ifbool{cnltx@package@title} - {\cnltx@package@title} - {\cnltx@package@name}% + \begin{minipage}{.6\linewidth} + \centering + \color{cnltx}% + \cnltx@title@format + \ifbool{cnltx@package@title} + {\cnltx@package@title} + {\cnltx@package@name}% + \end{minipage} }% \par\vskip.5cm\relax \large @@ -867,27 +874,29 @@ \cls{#2}\footnote{\CTANurl[#1]{#2}}% } -\AtEndPreamble{% - \RequirePackage{hyperref}% - \pdfstringdefDisableCommands{% - \def\cnltx@name[#1]#2{#1 #2, }% - \def\cnltxpackagenameformat#1{#1}% - }% - \hypersetup - { - colorlinks = true, - allcolors = link , - plainpages = false, - bookmarksopen = true, - bookmarksopenlevel = 1, - bookmarksnumbered = true, - pdfauthor = {\forlistloop{}\cnltx@package@author@pdflist}, - pdftitle = - {\cnltx@package@name\space\cnltx@package@version\space Manual}, - pdfsubject = {\cnltx@package@info}, - pdfstartview = FitH +\ifbool{cnltx@load@preamble}{% + \AtEndPreamble{% + \RequirePackage{hyperref}% + \pdfstringdefDisableCommands{% + \def\cnltx@name[#1]#2{#1 #2, }% + \def\cnltxpackagenameformat#1{#1}% }% -} + \hypersetup + { + colorlinks = true, + allcolors = link , + plainpages = false, + bookmarksopen = true, + bookmarksopenlevel = 1, + bookmarksnumbered = true, + pdfauthor = {\forlistloop{}\cnltx@package@author@pdflist}, + pdftitle = + {\cnltx@package@name\space\cnltx@package@version\space Manual}, + pdfsubject = {\cnltx@package@info}, + pdfstartview = FitH + }% + }% +}{}% \endinput @@ -945,7 +954,10 @@ HISTORY: - use \cnltx@load@modules - new commands \email, \website, \securewebsite - \expandablesymbol, \unexpandablesymbol - +2015/08/17 v0.13 - resolve long overdue issues with cnltx-doc +2015/03/11 v0.13a - wrap title in minipage in order to enable linebreaks +2016/03/17 v0.13b - ragged right toc +2017/02/04 v0.14 - load `hyperref' only with `load-preample = true' % -------------------------------------------------------------------------- TODO: diff --git a/Master/texmf-dist/tex/latex/cnltx/cnltx-example.sty b/Master/texmf-dist/tex/latex/cnltx/cnltx-example.sty index 39d066602fd..c7b39b03c77 100644 --- a/Master/texmf-dist/tex/latex/cnltx/cnltx-example.sty +++ b/Master/texmf-dist/tex/latex/cnltx/cnltx-example.sty @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/cnltx/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2013-2015 Clemens Niederberger +% Copyright 2013--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -101,10 +101,15 @@ {\cnltx@key@aux{#1}\Marg}% } - +\newlength\cnltx@choice@sep@stretch +\setlength\cnltx@choice@sep@stretch{\z@\@plus.5em} % \DeclareListParser*\cnltx@choices{|} \newrobustcmd*\choices[1]{% - \def\cnltx@choice@sep{\def\cnltx@choice@sep{|\hskip\z@}}% + \def\cnltx@choice@sep{% + \def\cnltx@choice@sep{% + \hskip\cnltx@choice@sep@stretch|\hskip\cnltx@choice@sep@stretch + }% + }% \forcsvlist{\cnltx@choice@sep\code}{#1}% } @@ -229,9 +234,8 @@ {Ä}{{\"A}}{1} {Ö}{{\"O}}{1} {Ü}{{\"U}}{1} - {ß}{{\ss}}{1} - {`}{\`{}}{1} - {'}{\textquotesingle}{1} , + {ß}{{\ss}}{1} , + upquote = true, breaklines = true, keepspaces = true, breakindent = 1em, @@ -260,9 +264,11 @@ equation,eqnarray, figure,flushleft,flushright, itemize,list, + math, otherlanguage, table,tabu,tabular }, + texcs = , keywords = , % \begin, \end: texcsstyle = [2]\color{beginend}, index = [2][texcs2], @@ -277,12 +283,12 @@ index = [4][texcs4], indexstyle = [4]\@gobble, % added environments that'll be indexed: - texcsstyle = [5]\color{env}, - index = [5][texcs5], + keywordstyle = [5]\color{env}, + index = [5][keyword5], indexstyle = [5]\indexenv, % environments that won't be indexed: - texcsstyle = [6]\color{env}, - index = [6][texcs6], + keywordstyle = [6]\color{env}, + index = [6][keyword6], indexstyle = [6]\@gobble, moredelim = *[s][\color{math}]{$}{$} } @@ -304,6 +310,7 @@ {Ö}{{\"O}}1 {Ü}{{\"U}}1 {ß}{{\ss}}1 , + upquote = true, breaklines = true, keepspaces = true, breakindent = 1em, @@ -311,6 +318,9 @@ keywordstyle = \color{bibentry} , keywordstyle = [2]\color{bibentryfield}\itshape , showstringspaces = false , + deleteindex = [3][texcs3] , + deleteindex = [5][keyword5] , + deleteindex = [6][keyword6] } \def\cnltx@makeindex@listings@style{ @@ -337,8 +347,49 @@ keywordstyle = \color{makeidxkey}\bfseries , stringstyle = \color{makeidxstring} , showstringspaces = false , + deleteindex = [3][texcs3] , + deleteindex = [5][keyword5] , + deleteindex = [6][keyword6] +} + +\def\cnltx@bash@listings@style{ + language = bash, + basicstyle = {\sourceformat\color{black}}, + % numbers = left, + % numberstyle = \tiny, + xleftmargin = 1em, + numbersep = .75em, + gobble = \cnltx@gobble , + columns = fullflexible, + literate = + {ä}{{\"a}}1 + {ö}{{\"o}}1 + {ü}{{\"u}}1 + {Ä}{{\"A}}1 + {Ö}{{\"O}}1 + {Ü}{{\"U}}1 + {ß}{{\ss}}1 , + upquote = true, + breaklines = true, + keepspaces = true, + breakindent = 1em, + commentstyle = \color{comment}, + keywordstyle = \color{black}\bfseries , + stringstyle = \color{black} , + showstringspaces = false , + morekeywords = texdoc , + deleteindex = [3][texcs3] , + deleteindex = [5][keyword5] , + deleteindex = [6][keyword6] } +\newcommand*\cnltx@prompt{} +\patchcmd\lst@NewLine + {\hbox{}} + {\hbox{}\cnltx@prompt} + {} + {} + \cnltx@expandargs(nx)\lstdefinestyle {cnltx} {\expandonce\cnltx@listings@style} @@ -351,6 +402,10 @@ {cnltx-makeindex} {\expandonce\cnltx@makeindex@listings@style} +\cnltx@expandargs(nx)\lstdefinestyle + {bash} + {\expandonce\cnltx@bash@listings@style} + \lstdefinestyle {cnltx-inline} { @@ -381,18 +436,18 @@ \def\cnltx@addenvs#1{% \cnltx@expandargs(nx)\lstdefinestyle {cnltx} - {\expandonce\cnltx@listings@style,\unexpanded{moretexcs={[5]#1}}}% + {\expandonce\cnltx@listings@style,\unexpanded{morekeywords={[5]#1}}}% \edef\cnltx@listings@style{% - \expandonce\cnltx@listings@style,\unexpanded{moretexcs={[5]#1}}% + \expandonce\cnltx@listings@style,\unexpanded{morekeywords={[5]#1}}% }% } \def\cnltx@addsilentenvs#1{% \cnltx@expandargs(nx)\lstdefinestyle {cnltx} - {\expandonce\cnltx@listings@style,\unexpanded{moretexcs={[6]#1}}}% + {\expandonce\cnltx@listings@style,\unexpanded{morekeywords={[6]#1}}}% \edef\cnltx@listings@style{% - \expandonce\cnltx@listings@style,\unexpanded{moretexcs={[6]#1}}% + \expandonce\cnltx@listings@style,\unexpanded{morekeywords={[6]#1}}% }% } @@ -512,7 +567,7 @@ \cnltx@get@page@list{#1} \booltrue{cnltx@pagelist} , runs/.code = \setcounter{cnltx@runs}{#1} , - program/.code = \def\cnltx@compilation@method{#1} , + program/.code = \def\cnltx@compilation@methods{#1} , file-ext/.code = \def\cnltx@example@fileext{#1} , exe-with/.code = \def\cnltx@compilation@options{#1} , graphics/.code = \def\cnltx@image@options{#1} , @@ -596,10 +651,17 @@ } \newcommand*\cnltx@exe{\immediate\write18} -\newcommand*\cnltx@program@pdflatex{pdflatex} -\newcommand*\cnltx@program@lualatex{lualatex} -\newcommand*\cnltx@program@xelatex {xelatex} -\newcommand*\cnltx@program@arara {arara} +\newrobustcmd*\cnltx@add@program[1]{% + \expandafter\newcommand + \expandafter*\csname cnltx@program@#1\endcsname{#1}% +} +\cnltx@add@program{pdflatex} +\cnltx@add@program{lualatex} +\cnltx@add@program{xelatex} +\cnltx@add@program{arara} +\cnltx@add@program{biber} +\cnltx@add@program{bibtex} + \newcommand*\cnltx@compile[3]{% \ifcsdef{cnltx@program@#1} {% @@ -613,9 +675,16 @@ } {\cnltx@example@error{Unknown compilation method `#1'}}% } -\newcommand*\cnltx@compilation@method{pdflatex} +\newcommand*\cnltx@compilation@methods{pdflatex} \newcommand*\cnltx@compilation@options{} +\newrobustcmd*\cnltx@compilation@process[2]{ + \cnltx@expandargs(oo)\cnltx@compile + {#2} + {\cnltx@compilation@options} + {#1}% +} + \newrobustcmd*\cnltx@get@pdfpages[1]{% \begingroup \ifxetex @@ -657,8 +726,7 @@ {% \cnltx@expandargs(x)\lstset{ \ifboolexpe{ bool {cnltx@sidebyside} and not bool {cnltx@codeonly} } - {linewidth=\cnltx@sidebysidewidth,}{}% - moretexcs=[3], moretexcs=[5], + {linewidth=\cnltx@sidebysidewidth,}{}% \expandonce\cnltx@local@listings@options }% } @@ -668,8 +736,6 @@ \ifboolexpe{ bool {cnltx@sidebyside} and not bool {cnltx@codeonly} } {linewidth=\cnltx@sidebysidewidth,}{}% \expandonce\cnltx@local@listings@options - % no idea why this is necessary: - % \ifcsdef{lst@gtexcs3}{}{,moretexcs=[3]}% }% }% \ifbool{cnltx@local@frame@overwrite} @@ -819,12 +885,11 @@ {% Compiling example `#1.tex' \arabic{cnltx@runs} time\ifnum\value{cnltx@runs}>1s\fi\space with - \cnltx@compilation@method + \cnltx@compilation@methods }% - \cnltx@expandargs(oo)\cnltx@compile - {\cnltx@compilation@method} - {\cnltx@compilation@options} - {#1.tex}% + \cnltx@expandargs(no)\forcsvlist + {\cnltx@compilation@process{#1}} + {\cnltx@compilation@methods}% } {% \cnltx@example@warning @@ -926,6 +991,7 @@ \vskip\cnltx@after@skip }% } + \newrobustcmd\newsourcecodeenv[2][]{% \cnltx@new@sourcecode@env{#1}{#2}% } @@ -950,6 +1016,12 @@ \newsourcecodeenv[side-by-side]{sidebyside} \newsourcecodeenv[code-only]{sourcecode} +\newsourcecodeenv[ + code-only, + sourcecode-options={style=bash}, + pre-code=\def\cnltx@prompt{\textasciitilde\space\$\space} +]{bash} + \newinputsourcefilecmd\inputexample \newinputsourcefilecmd[side-by-side]\inputsidebyside \newinputsourcefilecmd[code-only]\inputsourcecode @@ -958,7 +1030,6 @@ \lstinputlisting[style=cnltx,#1]{#2}% } - % -------------------------------------------------------------------------- % packages and classes: \newcommand*\packageformat{\sffamily} @@ -995,50 +1066,59 @@ % -------------------------------------------------------------------------- HISTORY: -2013/09/08 v0.1 - first working version -2013/09/10 v0.2 - added \keyis - - lot's of improvements on the source code example - environments - - disable indexing commands in PDF strings - - added hooks to the source example environments - - added possibility for internationalization - - new macro \verbcode - - added optional argument to \newarg - - new macros \Marg, \Oarg, \Darg - - option for formatting the \default command -2013/09/12 v0.3 - added \module - - added \newsourcecodeenv and \newinputsourcefilecmd - - added \inputexample, \inputsidebyside and \inputsourcecode - - renamed `example*' into `sidebyside' -2013/09/15 v0.4 - new listings style `cnltx-bibtex' -2013/09/20 v0.5 - new command \implementation - - fixed wrong indexing behaviour: keywords in the silent lists - are now correctly indexed if added with `add-cmds' or - `add-envs' -2013/09/30 v0.7 - added listings style `cnltx-makeindex' -2013/10/04 v0.7a - new command \cnltx@treat@lst@index - - changed \envidx in listings into \indexenv - - added \bnd for package bundles -2013/11/22 v0.9 - new option `compile' that allows to compile source code - examples (which need to be complete, of course) with - pdflatex and include the documents afterwards - - new options `max-pages' that determines the maximum number - of pages before a line break if documents are included with - `compile' - - new option `graphics' - - new option `runs' that specifies the number of compilation - runs of the included example - - new options `program' and `exe-with' - - new option `float', `float-pos' and `caption' -2014/01/05 v0.10 - sometimes there is a spurious `undefined control sequence - \lst@gtexcs3' error: added hack to fix this => find out - where this comes from! - - new option `add-frame' for `compile'd examples - - new command \parg for an optional + argument - - new option `outside' for non-`compiled' examples - - new option `float-env' -2014/03/11 v0.11 - \cnltx@load@modules -2014/04/09 v0.12 - improvements on the sidebyside examples +2013/09/08 v0.1 - first working version +2013/09/10 v0.2 - added \keyis + - lot's of improvements on the source code example + environments + - disable indexing commands in PDF strings + - added hooks to the source example environments + - added possibility for internationalization + - new macro \verbcode + - added optional argument to \newarg + - new macros \Marg, \Oarg, \Darg + - option for formatting the \default command +2013/09/12 v0.3 - added \module + - added \newsourcecodeenv and \newinputsourcefilecmd + - added \inputexample, \inputsidebyside and \inputsourcecode + - renamed `example*' into `sidebyside' +2013/09/15 v0.4 - new listings style `cnltx-bibtex' +2013/09/20 v0.5 - new command \implementation + - fixed wrong indexing behaviour: keywords in the silent + lists are now correctly indexed if added with `add-cmds' + or `add-envs' +2013/09/30 v0.7 - added listings style `cnltx-makeindex' +2013/10/04 v0.7a - new command \cnltx@treat@lst@index + - changed \envidx in listings into \indexenv + - added \bnd for package bundles +2013/11/22 v0.9 - new option `compile' that allows to compile source code + examples (which need to be complete, of course) with + pdflatex and include the documents afterwards + - new options `max-pages' that determines the maximum number + of pages before a line break if documents are included + with `compile' + - new option `graphics' + - new option `runs' that specifies the number of compilation + runs of the included example + - new options `program' and `exe-with' + - new option `float', `float-pos' and `caption' +2014/01/05 v0.10 - sometimes there is a spurious `undefined control sequence + \lst@gtexcs3' error: added hack to fix this => find out + where this comes from! + - new option `add-frame' for `compile'd examples + - new command \parg for an optional + argument + - new option `outside' for non-`compiled' examples + - new option `float-env' +2014/03/11 v0.11 - \cnltx@load@modules +2014/04/09 v0.12 - improvements on the sidebyside examples +2015/08/29 v0.13a - enable \choices list to stretch +2016/03/16 v0.13b - `program' may now be a csv list of programs to be + executed +2017/02/04 v0.14 - exchange literate={`}{\`{}}{1}{'}{\textquotesingle}{1} for + listings' upquote option + - new sourcecode environment `bash' +2019/11/01 v0.15 - fix `undefined control sequence \lst@gtexcs3' error + - fix `undefined control sequence \lst@gkeyword3' error + - fix `undefined control sequence \lst@gkeyword3' error TODO: diff --git a/Master/texmf-dist/tex/latex/cnltx/cnltx-listings.sty b/Master/texmf-dist/tex/latex/cnltx/cnltx-listings.sty index 7db538a102d..3661e097011 100644 --- a/Master/texmf-dist/tex/latex/cnltx/cnltx-listings.sty +++ b/Master/texmf-dist/tex/latex/cnltx/cnltx-listings.sty @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/cnltx/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2013-2015 Clemens Niederberger +% Copyright 2013--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -1635,15 +1635,18 @@ th,TH, thanks, the, + thechapter, theendnotes, theenumi,theenumii,theenumiii,theenumiv, thefootnote, thefootnotemark, thempfn, - thempfn, thempfootnote, thepage, thepart, + thesection, + thesubsection, + thesubsubsection, theta, Theta, thicklines, diff --git a/Master/texmf-dist/tex/latex/cnltx/cnltx-tools.sty b/Master/texmf-dist/tex/latex/cnltx/cnltx-tools.sty index 3b53ee0ec44..a4cc5f1e3ec 100644 --- a/Master/texmf-dist/tex/latex/cnltx/cnltx-tools.sty +++ b/Master/texmf-dist/tex/latex/cnltx/cnltx-tools.sty @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/cnltx/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2013-2015 Clemens Niederberger +% Copyright 2013--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/cnltx/cnltx-translations.sty b/Master/texmf-dist/tex/latex/cnltx/cnltx-translations.sty index 53dc2d4ed4a..9f742a861f4 100644 --- a/Master/texmf-dist/tex/latex/cnltx/cnltx-translations.sty +++ b/Master/texmf-dist/tex/latex/cnltx/cnltx-translations.sty @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/cnltx/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2013-2015 Clemens Niederberger +% Copyright 2013--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -125,4 +125,4 @@ \endinput 2014/03/11 v0.11 - first published version -2014/??/?? v0.?? - {cnltx-vs.} +2015/01/11 v0.12 - {cnltx-vs.} diff --git a/Master/texmf-dist/tex/latex/cnltx/cnltx.bbx b/Master/texmf-dist/tex/latex/cnltx/cnltx.bbx index 1fd4dc2b1bc..c5409b04e7f 100644 --- a/Master/texmf-dist/tex/latex/cnltx/cnltx.bbx +++ b/Master/texmf-dist/tex/latex/cnltx/cnltx.bbx @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/cnltx/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2013-2014 Clemens Niederberger +% Copyright 2013--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -28,8 +28,9 @@ \RequirePackage{cnltx-base} \ProvidesFile{cnltx.bbx}[\cnltx@@date\space \cnltx@@version\space \cnltx@@info] -\cnltx@load@modules{example,tools,translations} +\cnltx@load@modules{example,tools,translations,names} +\RequireBiber \RequireBibliographyStyle{alphabetic} \ExecuteBibliographyOptions{block=ragged,useprefix=true} @@ -40,9 +41,7 @@ \usebibmacro{maintainer}% \setunit{\labelnamepunct}\newblock \usebibmacro{title+subtitle}% - \printfield{version}% - \setunit{\addcomma\addspace}% - \usebibmacro{date}% + \usebibmacro{version+date}% \newunit\newblock \usebibmacro{url+urldate}% \newunit\newblock @@ -52,7 +51,7 @@ \DeclareBibliographyAlias{class}{latex} \DeclareBibliographyAlias{bundle}{latex} -\newbibmacro{title+subtitle}{% +\newbibmacro*{title+subtitle}{% \iffieldundef{title}{}{% \printfield{title}% \ifbibindex{\indexfield{title}}{}% @@ -64,6 +63,31 @@ }% } +\NewBibliographyString{version} +\NewBibliographyString{or-newer} +\DefineBibliographyStrings{english}{ + version = {version} , + or-newer = {or newer} +} + +\DefineBibliographyStrings{german}{ + version = {Version} , + or-newer = {oder neuer} +} + +\newbibmacro*{version+date}{% + \iffieldundef{version}{}{% + \bibstring{version}% + \addspace + \printfield{version}% + \addcomma\addspace + }% + \usebibmacro{date}% + \addspace + \bibstring[\mkbibparens]{or-newer}% + \setunit{\adddot\addspace}% +} + \newbibmacro*{maintainer}{% \printtext{% \ifnameundef{maintainer} @@ -79,9 +103,9 @@ }% } -\renewcommand*{\mkbibnamelast}[1]{\cnltx@write@lastname{#1}} -\renewcommand*{\mkbibnamefirst}[1]{\cnltx@write@firstname{#1}} -\renewcommand*{\mkbibnameprefix}[1]{\cnltx@write@lastname{#1}} +\renewcommand*\mkbibnamefamily[1]{\cnltx@write@lastname{#1}} +\renewcommand*\mkbibnamegiven[1]{\cnltx@write@firstname{#1}} +\renewcommand*\mkbibnameprefix[1]{\cnltx@write@lastname{#1}} \DeclareNameAlias[package]{maintainer}{default} \DeclareNameAlias[class]{maintainer}{default} @@ -100,6 +124,10 @@ \DeclareFieldFormat[class]{title}{\cls*{#1}} \DeclareFieldFormat[bundle]{title}{\bnd*{#1}} +\DeclareFieldFormat[package]{version}{#1} +\DeclareFieldFormat[class]{version}{#1} +\DeclareFieldFormat[bundle]{version}{#1} + \DeclareIndexFieldFormat[package]{title}{% \ifstrequal{#1}{\KOMAScript} {\pkgidx[KOMA-Script]{\KOMAScript}} @@ -132,34 +160,28 @@ {\bndidx{#1}}% } -\def\cnltx@onlyonefirstname#1\bibnamedelima#2\q@stop{#1} - \DeclareIndexNameFormat{cnltx}{% - \cnltx@if@in{#3}{\bibnamedelima} - {% - \usebibmacro{index:entry}{\index}{% - \ifblank{#5}{}{#5 }% - \@firstofone#1% - \ifblank{#3}{}{, \cnltx@onlyonefirstname#3\q@stop}% - \actualoperator - \ifblank{#5} - {\cnltx@write@lastname{#1}} - {\cnltx@write@lastname{#5 #1}}% - \ifblank{#3}{}{, \cnltx@write@firstname{\cnltx@onlyonefirstname#3\q@stop}}% - }% - } - {% - \usebibmacro{index:entry}{\index}{% - \ifblank{#5}{}{#5 }% - \@firstofone#1% - \ifblank{#3}{}{, #3}% - \actualoperator - \ifblank{#5} - {\cnltx@write@lastname{#1}} - {\cnltx@write@lastname{#5 #1}}% - \ifblank{#3}{}{, \cnltx@write@firstname{#3}}% - }% + \nameparts{#1}% + \expandafter\notblank\expandafter{\namepartgiven}{% + \usebibmacro{index:entry}{\index}{% + \namepartfamily, \namepartgiven + \actualoperator + \expandafter\notblank\expandafter{\namepartprefix} + {\cnltx@write@lastname\namepartprefix\space} + {}% + \cnltx@write@lastname\namepartfamily, + \cnltx@write@firstname\namepartgiven + }% + }{% + \usebibmacro{index:entry}{\index}{% + \namepartfamily + \actualoperator + \expandafter\notblank\expandafter{\namepartprefix} + {\cnltx@write@lastname\namepartprefix\space} + {}% + \cnltx@write@lastname\namepartfamily }% + }% } \DeclareIndexNameAlias{labelname}{cnltx} @@ -202,4 +224,7 @@ HISTORY: module; this is going to need tests if it really is consistent for different types of name formats (prefixes, affixes...) - +2016/03/11 v0.13b - adapt bib style to biblatex v3.3 +2017/02/04 v0.14 - new bibmacro `version+date', use said macro in the `latex' + driver +2019/11/01 v0.15 - fix problems with name format diff --git a/Master/texmf-dist/tex/latex/cnltx/cnltx.cbx b/Master/texmf-dist/tex/latex/cnltx/cnltx.cbx index 1fd3158685b..8c7d7fbfd03 100644 --- a/Master/texmf-dist/tex/latex/cnltx/cnltx.cbx +++ b/Master/texmf-dist/tex/latex/cnltx/cnltx.cbx @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/cnltx/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2013-2014 Clemens Niederberger +% Copyright 2013--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/cnltx/cnltx.dbx b/Master/texmf-dist/tex/latex/cnltx/cnltx.dbx index dacca354db6..aa1af1464cf 100644 --- a/Master/texmf-dist/tex/latex/cnltx/cnltx.dbx +++ b/Master/texmf-dist/tex/latex/cnltx/cnltx.dbx @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/cnltx/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2013-2014 Clemens Niederberger +% Copyright 2013--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/cnltx/cnltx.sty b/Master/texmf-dist/tex/latex/cnltx/cnltx.sty index 298ba37b749..8b9a9ffe03f 100644 --- a/Master/texmf-dist/tex/latex/cnltx/cnltx.sty +++ b/Master/texmf-dist/tex/latex/cnltx/cnltx.sty @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/cnltx/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2013-2015 Clemens Niederberger +% Copyright 2013--2019 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 -- cgit v1.2.3