summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/cnltx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-11-01 20:58:55 +0000
committerKarl Berry <karl@freefriends.org>2019-11-01 20:58:55 +0000
commit4f7a2c33e49915f226131d182a2762f3467e5831 (patch)
treedd9ed85613d29b633928c23e70c00df74c70bfd3 /Master/texmf-dist/tex/latex/cnltx
parent89dbbe700a3907ad449d129bf84e04f8767b5f4d (diff)
cnltx (1nov19)
git-svn-id: svn://tug.org/texlive/trunk@52601 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/cnltx')
-rw-r--r--Master/texmf-dist/tex/latex/cnltx/cnltx-base.sty9
-rw-r--r--Master/texmf-dist/tex/latex/cnltx/cnltx-doc.cls136
-rw-r--r--Master/texmf-dist/tex/latex/cnltx/cnltx-example.sty228
-rw-r--r--Master/texmf-dist/tex/latex/cnltx/cnltx-listings.sty7
-rw-r--r--Master/texmf-dist/tex/latex/cnltx/cnltx-tools.sty2
-rw-r--r--Master/texmf-dist/tex/latex/cnltx/cnltx-translations.sty4
-rw-r--r--Master/texmf-dist/tex/latex/cnltx/cnltx.bbx97
-rw-r--r--Master/texmf-dist/tex/latex/cnltx/cnltx.cbx2
-rw-r--r--Master/texmf-dist/tex/latex/cnltx/cnltx.dbx2
-rw-r--r--Master/texmf-dist/tex/latex/cnltx/cnltx.sty2
10 files changed, 305 insertions, 184 deletions
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