summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-01-05 22:57:58 +0000
committerKarl Berry <karl@freefriends.org>2014-01-05 22:57:58 +0000
commit1899ca043c36f94224898b8cad0f2cbaf633ab21 (patch)
tree27a96fd3c4f5dcc61bb010d4e4e597f95f2806a9
parentc81e0a4eecfaa071e03d673821d5b93f957c70ca (diff)
cnltx (5jan14)
git-svn-id: svn://tug.org/texlive/trunk@32583 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/bibtex/bib/cnltx/cnltx.bib227
-rw-r--r--Master/texmf-dist/doc/latex/cnltx/README4
-rw-r--r--Master/texmf-dist/doc/latex/cnltx/cnltx_en.pdfbin758577 -> 762276 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cnltx/cnltx_en.tex130
-rw-r--r--Master/texmf-dist/tex/latex/cnltx/cnltx-base.sty51
-rw-r--r--Master/texmf-dist/tex/latex/cnltx/cnltx-doc.cls8
-rw-r--r--Master/texmf-dist/tex/latex/cnltx/cnltx-example.sty123
-rw-r--r--Master/texmf-dist/tex/latex/cnltx/cnltx-listings.sty16
-rw-r--r--Master/texmf-dist/tex/latex/cnltx/cnltx-tools.sty2
-rw-r--r--Master/texmf-dist/tex/latex/cnltx/cnltx.bbx37
-rw-r--r--Master/texmf-dist/tex/latex/cnltx/cnltx.cbx37
-rw-r--r--Master/texmf-dist/tex/latex/cnltx/cnltx.dbx37
-rw-r--r--Master/texmf-dist/tex/latex/cnltx/cnltx.sty2
13 files changed, 551 insertions, 123 deletions
diff --git a/Master/texmf-dist/bibtex/bib/cnltx/cnltx.bib b/Master/texmf-dist/bibtex/bib/cnltx/cnltx.bib
index 1f71ef2ce1b..8edb0502182 100644
--- a/Master/texmf-dist/bibtex/bib/cnltx/cnltx.bib
+++ b/Master/texmf-dist/bibtex/bib/cnltx/cnltx.bib
@@ -1,3 +1,30 @@
+% --------------------------------------------------------------------------
+% the CNLTX bundle
+%
+% LaTeX source code and output
+%
+% --------------------------------------------------------------------------
+% Clemens Niederberger
+% Web: https://github.com/cgnieder/cnltx/
+% E-Mail: contact@mychemistry.eu
+% --------------------------------------------------------------------------
+% Copyright 2013-2014 Clemens Niederberger
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% 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 Clemens Niederberger.
+% --------------------------------------------------------------------------
+% If you have any ideas, questions, suggestions or bugs to report, please
+% feel free to contact me.
+% --------------------------------------------------------------------------
@package{pkg:abbrevs,
title = {abbrevs},
author = {Matt Swift},
@@ -64,6 +91,20 @@
version = {2.13},
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},
+ 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},
+ url = {http://mirror.ctan.org/graphics/asymptote/}
+}
@package{pkg:babel,
title = {babel} ,
author = {Johannes Braams} ,
@@ -87,6 +128,27 @@
version = {2.7a} ,
url = {http://mirror.ctan.org/macros/latex/contrib/biblatex/}
}
+@package{pkg:bigfoot,
+ title = {bigfoot},
+ author = {David Kastrup},
+ date = {2006-07-15},
+ version = {1.25},
+ url = {http://mirror.ctan.org/macros/latex/contrib/bigfoot}
+}
+@package{pkg:booktabs,
+ title = {booktabs} ,
+ author = {Simon Fear} ,
+ date = {2005-04-14} ,
+ version = {1.61803} ,
+ 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} ,
+ url = {http://mirror.ctan.org/macros/latex/contrib/bpchem/}
+}
@package{pkg:catchfile,
title = {catchfile} ,
author = {Heiko Oberdiek} ,
@@ -94,13 +156,34 @@
version = {1.6} ,
url = {http://mirror.ctan.org/macros/latex/contrib/oberdiek/}
}
+@package{pkg:chemcompounds,
+ title = {chemcompounds} ,
+ author = {Stefan Schenk} ,
+ date = {2006-12-01} ,
+ version = {1.1.3} ,
+ url = {http://mirror.ctan.org/macros/latex/contrib/chemcompounds/}
+}
+@package{pkg:chemcono,
+ title = {chemcono} ,
+ author = {Stefan Schulz} ,
+ date = {1999-09-09} ,
+ version = {1.3} ,
+ url = {http://mirror.ctan.org/macros/latex/contrib/chemcono/}
+}
@package{pkg:chemfig,
title = {chemfig} ,
author = {Christian Tellechea} ,
- date = {2012-11-16} ,
- version = {1.0g} ,
+ date = {2013-11-28} ,
+ version = {1.0h} ,
url = {http://mirror.ctan.org/macros/generic/chemfig/}
}
+@bundle{bnd:chemmacros,
+ title = {chemmacros} ,
+ author = {Clemens Niederberger} ,
+ date = {2013-11-20} ,
+ version = {4.1c} ,
+ url = {http://mirror.ctan.org/macros/latex/contrib/chemmacros/}
+}
@package{pkg:chngcntr,
title = {chngcntr} ,
author = {Peter Wilson} ,
@@ -123,6 +206,13 @@
version = {0.3a} ,
url = {https://bitbucket.org/cgnieder/cnpkgdoc/}
}
+@package{pkg:cprotect,
+ title = {cprotect},
+ author = {Bruno Le Floch},
+ date = {2011-01-27},
+ version = {1.0e},
+ url = {http://mirror.ctan.org/macros/latex/contrib/cprotect/}
+}
@package{pkg:endnotes,
title = {endnotes} ,
author = {John Lavagnino} ,
@@ -131,6 +221,13 @@
version = {NA} ,
url = {http://mirror.ctan.org/macros/latex/contrib/endnotes}
}
+@package{pkg:enotez,
+ title = {enotez},
+ author = {Clemens Niederberger},
+ version = {0.7b},
+ date = {2013-10-31},
+ url = {http://mirror.ctan.org/macros/latex/contrib/enotez}
+}
@package{pkg:enumitem,
title = {enumitem},
author = {Javier Bezos},
@@ -197,8 +294,8 @@
@bundle{bnd:exsheets,
title = {exsheets} ,
author = {Clemens Niederberger} ,
- date = {2013-07-17} ,
- version = {0.9i} ,
+ date = {2013-11-20} ,
+ version = {0.11} ,
url = {http://mirror.ctan.org/macros/latex/contrib/exsheets/}
}
@package{pkg:exsol,
@@ -208,6 +305,13 @@
version = {0.6},
url = {http://mirror.ctan.org/macros/latex/contrib/exsol/}
}
+@package{pkg:fixfoot,
+ title = {fixfoot},
+ author = {Robin Fairbairns},
+ date = {2007-12-12},
+ version = {0.3a} ,
+ url = {http://mirror.ctan.org/macros/latex/contrib/fixfoot}
+}
@package{pkg:fnpct,
title = {fnpct} ,
author = {Clemens Niederberger} ,
@@ -223,6 +327,20 @@
date = {2005-09-27} ,
url = {http://mirror.ctan.org/macros/latex/unpacked/}
}
+@package{pkg:footmisc,
+ title = {footmisc},
+ author = {Robin Fairbairns},
+ date = {2011-06-06},
+ version = {5.5b},
+ url = {http://mirror.ctan.org/macros/latex/contrib/footmisc}
+}
+@package{pkg:footnote,
+ title = {footnote},
+ author = {Mark Wooding},
+ date = {1997-01-28},
+ version = {1.13},
+ url = {http://mirror.ctan.org/macros/latex/contrib/footnote}
+}
@package{pkg:fourier,
title = {fourier} ,
author = {Michel Bovani} ,
@@ -230,6 +348,13 @@
version = {1.3} ,
url = {http://mirror.ctan.org/fonts/fourier-gut/}
}
+@package{pkg:geometry,
+ title = {geometry} ,
+ author = {Hideo Umeki} ,
+ date = {2010-09-12} ,
+ version = {5.6} ,
+ url = {http://mirror.ctan.org/macros/latex/contrib/geometry/}
+}
@package{pkg:glossaries,
title = {glossaries},
author = {Nicola L.C. Talbot},
@@ -300,6 +425,13 @@
version = {1.3a} ,
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} ,
+ url = {http://mirror.ctan.org/macros/latex/base/}
+}
@bundle{bnd:koma-script,
title = {\KOMAScript} ,
sorttitle = {KOMA-Script} ,
@@ -370,6 +502,13 @@
version = {1.22},
url = {http://mirror.ctan.org/macros/latex/contrib/oberdiek/}
}
+@package{pkg:manyfoot,
+ title = {manyfoot},
+ author = {Alexander I. Rozhenko},
+ date = {2005-09-11},
+ version = {1.10},
+ url = {http://mirror.ctan.org/macros/latex/contrib/manyfoot}
+}
@package{pkg:marginnote,
title = {marginnote} ,
author = {Markus Kohm} ,
@@ -433,6 +572,13 @@
version = {n.n.},
url = {http://mirror.ctan.org/macros/latex/contrib/multienum/}
}
+@package{pkg:musixtex,
+ title = {musixtex},
+ author = {Daniel Taupin and Ross Mitchell and Andreas Egler},
+ version = {1.15},
+ date = {2011-04-01},
+ url = {http://mirror.ctan.org/macros/musixtex/}
+}
@package{pkg:newtx,
title = {newtx} ,
author = {Michael Sharpe} ,
@@ -455,6 +601,21 @@
version = {4.2},
url = {http://mirror.ctan.org/macros/latex/contrib/nomencl/}
}
+@package{pkg:parnotes,
+ title = {parnotes},
+ author = {Micheal Hughes},
+ date = {2012-03-01},
+ version = {1},
+ url = {http://mirror.ctan.org/macros/latex/contrib/parnotes}
+}
+@package{pkg:pagenote,
+ title = {pagenote},
+ author = {Robert Wilson},
+ maintainer = {Will Robertson},
+ date = {2009-09-03},
+ version = {1.1a},
+ url = {http://mirror.ctan.org/macros/latex/contrib/pagenote}
+}
@package{pkg:pdftexcmds,
title = {pdftexcmds} ,
author = {Heiko Oberdiek} ,
@@ -507,9 +668,23 @@
version = {3.04},
url = {http://mirror.ctan.org/macros/latex/contrib/probsoln/}
}
+@package{pkg:psfrag,
+ title = {psfrag},
+ author = {Michael C.\@ Grant and David Carlisle},
+ date = {1998-04-11},
+ version = {3},
+ url = {http://mirror.ctan.org/graphics/psfrag/}
+}
+@package{pkg:pstricks,
+ title = {pstricks},
+ author = {Timothy van Zandt and Dennis Girou and Herbert Vo\ss},
+ date = {2013},
+ version = {2.46},
+ url = {http://mirror.ctan.org/graphics/pstricks/}
+}
@package{pkg:ragged2e,
title = {ragged2e} ,
- author = {Martin Schröder} ,
+ author = {Martin Schr\"oder} ,
sortname = {Martin Schroeder} ,
date = {2009-05-21} ,
version = {2.1} ,
@@ -543,6 +718,13 @@
date = {2013-07-31} ,
url = {http://mirror.ctan.org/macros/latex/contrib/siunitx}
}
+@package{pkg:snotez,
+ title = {snotez},
+ author = {Clemens Niederberger},
+ version = {0.2},
+ date = {2013-04-04},
+ url = {http://mirror.ctan.org/macros/latex/contrib/snotez/}
+}
@package{pkg:superiors,
title = {superiors},
author = {Michael Sharpe},
@@ -550,6 +732,13 @@
version = {1.02},
url = {http://mirror.ctan.org/macros/latex/contrib/superiors/}
}
+@package{pkg:tablefootnote,
+ title = {tablefootnote},
+ author = {H.-Martin M\"unch},
+ date = {2012-01-14},
+ version = {1.0g},
+ url = {http://mirror.ctan.org/macros/latex/contrib/tablefootnote/}
+}
@package{pkg:textgreek,
title = {textgreek} ,
author = {Leonard Michlmayr} ,
@@ -557,6 +746,27 @@
version = {0.7} ,
url = {http://mirror.ctan.org/macros/latex/contrib/textgreek/}
}
+@package{pkg:tkz-base,
+ title = {tkz-base},
+ author = {Alain Matthes},
+ date = {2011-06-02},
+ version = {1.16},
+ url = {http://mirror.ctan.org/macros/latex/contrib/tkz}
+}
+@package{pkg:tkz-euclide,
+ title = {tkz-euclide},
+ author = {Alain Matthes},
+ date = {2011-06-03},
+ version = {1.16c},
+ url = {http://mirror.ctan.org/macros/latex/contrib/tkz}
+}
+@package{pkg:tkz-fct,
+ title = {tkz-fct},
+ author = {Alain Matthes},
+ date = {2011-06-02},
+ version = {1.16c},
+ url = {http://mirror.ctan.org/macros/latex/contrib/tkz}
+}
@package{pkg:translations,
title = {translations} ,
author = {Clemens Niederberger} ,
@@ -613,4 +823,11 @@
version = {1.13} ,
url = {http://mirror.ctan.org/macros/latex/required/tools/}
}
+@bundle{bnd:yafoot,
+ title = {yafoot},
+ author = {Hiroshi Nakashima},
+ date = {1999-07-14},
+ version = {1.0},
+ 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 ac81de19dfb..2bf6be22b0e 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.9 2013/11/22
+the CNLTX bundle v0.10 2014/01/02
LaTeX tools and documenting facilities
@@ -8,7 +8,7 @@ Clemens Niederberger
Web: https://github.com/cgnieder/cnltx/
E-Mail: contact@mychemistry.eu
--------------------------------------------------------------------------
-Copyright 2013 Clemens Niederberger
+Copyright 2013-2014 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 a776f8d595e..cb9ca7ba24b 100644
--- a/Master/texmf-dist/doc/latex/cnltx/cnltx_en.pdf
+++ b/Master/texmf-dist/doc/latex/cnltx/cnltx_en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/cnltx/cnltx_en.tex b/Master/texmf-dist/doc/latex/cnltx/cnltx_en.tex
index e061be42bb3..9fbaff05a8a 100644
--- a/Master/texmf-dist/doc/latex/cnltx/cnltx_en.tex
+++ b/Master/texmf-dist/doc/latex/cnltx/cnltx_en.tex
@@ -1,8 +1,8 @@
-% !arara: pdflatex: { shell: on }
-% arara: pdflatex
+% arara: pdflatex: { shell: on }
+% !arara: pdflatex
% arara: biber
-% arara: pdflatex
-% arara: pdflatex
+% !arara: pdflatex
+% !arara: pdflatex
% --------------------------------------------------------------------------
% the CNLTX bundle
%
@@ -13,7 +13,7 @@
% Web: https://github.com/cgnieder/cnltx/
% E-Mail: contact@mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2013 Clemens Niederberger
+% Copyright 2013-2014 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -115,15 +115,11 @@
},
add-silent-cmds = {
@foo,
- ab,AB,
- at,
- carlisle,
- cd,
- circled,circlenumber,
- cnltx,
- foo,
- foothree,
+ ab,AB, at,
+ carlisle, cd, chead, circled,circlenumber, cnltx,
+ foo, foothree,
GetTranslation,
+ KOMAoptions,
lipsum,
minusone,multoffourrm,
nohyperpage,
@@ -877,6 +873,10 @@ Both environments can be influenced by options:
Code that is inserted between a source code and the corresponding output
when printed below each other. This option has no effect on the
\env{sourcecode} environment.
+ \keybool{outside}\Default{false}
+ \sinceversion{0.10}If \code{true} the output of an example is put outside
+ of the frame in the input stream. This can be useful if the example code
+ contains a floating environment for example.
\end{options}
The same example again, this time using \option{side-by-side} (which is the
@@ -901,6 +901,14 @@ customize it:
\keyval{frame-options}{\pkg{mdframed} options}{}
\Default{backgroundcolor=cnltxbg,linecolor=cnltx,roundcorner=5pt}
Overwrite the settings with new ones.
+ \keyval{add-local-frame}{\pkg{mdframed} options}
+ \sinceversion{0.10}Add \pkg{mdframed} options to the environment where the
+ option is used only. This is
+ basically \beginenv*\Marg{\env{mdframed}}\Oarg{style=cnltx,\meta{options}}.
+ \keyval{local-frame}{\pkg{mdframed} options}
+ \sinceversion{0.10}replace the default \pkg{mdframed} options to the
+ environment where the option is used only. This is
+ basically \beginenv*\Marg{\env{mdframed}}\oarg{options}.
\end{options}
The source code is formatted using the great \pkg{listings}
@@ -935,10 +943,16 @@ section~\vref{sec:listings-sourcecode}.
Overwrite existing options with new ones. This can be used to build an own
style from scratch. \emph{This redefines the \code{cnltx} \pkg{listings}
style which will affect all sourcecode environments!}
- \keyval{sourcecode-options}{\pkg{listings} options}
+ \keyval{add-sourcecode-options}{\pkg{listings} options}
\sinceversion{0.4}These options are added to the \pkg{listings} options of
the source code environments without redefing the main style. Hence it
- can be used to locally add options to a source code environment.
+ can be used to locally add options to a source code environment. This is
+ basically \cs*{lstset}\Marg{style=cnltx,\meta{options}}.
+ \keyval{sourcecode-options}{\pkg{listings} options}
+ \sinceversion{0.10}These options are added to the \pkg{listings} options
+ of the source code environments without redefing or using the main style.
+ Hence it can be used to locally add options to a source code environment.
+ This is basically \cs*{lstset}\marg{options}.
\keyval{add-envs}{list of environment names}\Default
Like \option{add-cmds} but for environment names.
\keyval{add-silent-envs}{list of environment names}
@@ -972,7 +986,7 @@ code file externally and input the compiled \PDF.
\end{example}
\end{sourcecode}
-This needs \code{shellescape} enabled. The default compilation program is
+This needs \code{shell-escape} enabled. The default compilation program is
\prg{pdflatex} which will compile the file two times. The process can be
customized with the following options:
@@ -992,6 +1006,8 @@ customized with the following options:
with \option{program}.
\keyval{file-ext}{extension}\Default{pdf}
The file extension of the included file of a compiled example.
+ \keybool{add-frame}\Default{true}
+ \sinceversion{0.10}If \code{true} every output page will get a frame.
\end{options}
The compiled document will be input with \cs*{includegraphics}, each page
@@ -1057,9 +1073,13 @@ have it as a floating figure. This is also possible by using the option
Set the standard floating parameters that are used if
\keyis-{float}{true}. The default is actually the expansion of
\cs*{fps@figure} and not directly \code{tbp}.
+ \keyval{float-env}{name}\Default{figure}
+ \sinceversion{0.10}The floating environment used when the option
+ \option{float} is used.
\keyval{caption}{text}\Default
\meta{text} will be used as caption. If left blank no caption will be
- typeset. Implicitly sets \keyis-{float}{true}.
+ typeset. If you want to add a \cs*{label} you can use it in this option.
+ Implicitly sets \keyis-{float}{true}.
\end{options}
Please note that \option{float} only has an effect if \keyis-{compile}{true}
has been set.
@@ -1783,7 +1803,7 @@ passing an option as class option.
Class option that preloads part of my custom preamble.
\end{options}
-Using the option will include the following code:
+Using the option will include the following code:\changedversion{0.10}
\begin{sourcecode}
\RequirePackage{ifxetex,ifluatex}
@@ -1839,7 +1859,10 @@ Using the option will include the following code:
\renewcommand*\partformat{%
\textcolor{cnltx}{\partname~\thepart\autodot}}
\deffootnote{2em}{1em}{\llap{\thefootnotemark. }}%
- \pagestyle{headings}
+ \RequirePackage{scrlayer-scrpage}
+ \chead{\rightmark}
+ \KOMAoptions{automark}
+ \pagestyle{scrheadings}
\setcapindent{1.5em}
\setkomafont{caption}{\cnltx@caption@font}
\setkomafont{captionlabel}{\cnltx@captionlabel@font}
@@ -2424,13 +2447,13 @@ the other packages and classes.
\end{commands}
\subsubsection{Programming Tools}
-
+\paragraph{Message Handling}
\begin{commands}
\command{cnltx\at create\at message}%
[\sarg\marg{prefix}\marg{package/class
name}\Marg{\choices{Error,Warning,WarningNoLine,Info}} \marg{detailed
error message}]
- \changedversion{0.7}Create error and warning massaging commands
+ \changedversion{0.7}Create error and warning messaging commands
\cs*{\meta{prefix}@\choices{error,warning,warningnoline,info}}\marg{message}.
The starred version creates messages for a class the un-starred version
messages for a package. All commands have one argument which takes the
@@ -2438,21 +2461,23 @@ the other packages and classes.
\command{cnltx\at create\at generic\at message}%
[\sarg\marg{prefix}\marg{package/class
name}\Marg{\choices{Error,Warning,WarningNoLine,Info}}]
- \sinceversion{0.7}Create error and warning massaging commands
+ \sinceversion{0.7}Create error and warning messaging commands
\cs*{\meta{prefix}@\choices{error,warning,warningnoline,info}}\marg{message}.
The starred version creates messages for a class the un-starred version
messages for a package. All commands have one argument which takes the
message \emph{except for the error command which gets two arguments}, the
first for the short version and the second for the detailed message.
\meta{prefix} will be all lowercase in the generated command.
- \expandable\command{cnltx\at par}
- Expands to \cs*{par}. Sometimes you need to smuggle a \cs*{par} in a
- short macro \ldots
+\end{commands}
+
+\paragraph{Conditionals}
+\begin{commands}
\expandable\command{iftest}[\marg{test directive}\marg{true}\marg{false}]
\sinceversion{0.7}Checks if \meta{test directive} is true and either
places \meta{true} or \meta{false} in the input stream. \meta{test
directive} should be a \TeX\ test like
- \cs*{ifx}\meta{token1}\meta{token2}.\\
+ \cs*{ifx}\meta{token1}\meta{token2}, \ie, demand an \cs*{else} and
+ \cs*{fi}.\\
This is a command in the spirit of \pkg{etoolbox}'s \cs*{ifbool} that does
the same for a boolean \meta{bool} defined with
\cs*{newif}\cs*{if\meta{bool}} or \cs*{newbool}\marg{bool}. It
@@ -2462,7 +2487,8 @@ the other packages and classes.
\sinceversion{0.7}Checks if \meta{test directive} is not true and either
places \meta{not true} or \meta{not false} in the input stream. Test
directive should be a \TeX\ test like
- \cs*{ifx}\meta{token1}\meta{token2}.\\
+ \cs*{ifx}\meta{token1}\meta{token2}, \ie, demand an \cs*{else} and
+ \cs*{fi}.\\
This is a command in the spirit of \pkg{etoolbox}'s \cs*{notbool} that does
the same for a boolean \meta{bool} defined with
\cs*{newif}\cs*{if\meta{bool}} or \cs*{newbool}\marg{bool}.
@@ -2490,6 +2516,34 @@ the other packages and classes.
\sinceversion{0.9}Checks if shellescape is enabled. It returns true if
\pkg{pdftexcmds}' \cs*{pdf@shellescape} has the value~\code{1}. This is a
wrapper for \verbcode+\iftest{\ifnum\pdf@shellescape=1 }+.
+ \command{cnltx\at if\at in}[\marg{tokenlist}\marg{search}\marg{true}\marg{false}]
+ Places \meta{true} in the input stream if \meta{search} is found in
+ \meta{tokenlist} and \meta{false} if it isn't.
+ \expandable\command{cnltx\at ifstrequal}[\marg{string1}\marg{string2}%
+ \marg{true}\marg{false}]
+ \sinceversion{0.10}Tests if \meta{string1} is equal to \meta{string2} and
+ either leaves \meta{true} or \meta{false} in the input stream. This test
+ doesn't take category codes into account.
+ \command{cnltx\at ifinlist}%
+ [\marg{item}\marg{listmacro}\marg{true}\marg{false}]
+ \sinceversion{0.10}A conditional for \pkg{etoolbox} lists similar to
+ \cs*{ifinlist} where braces in items are allowed. This wraps around the
+ proposal in \pkg{etoolbox}'s documentation to redefine \cs*{do} and loop
+ through the list.
+ \command{cnltx\at ifinlistcs}%
+ [\marg{item}\marg{listcsname}\marg{true}\marg{false}]
+ \sinceversion{0.10}A conditional for \pkg{etoolbox} lists similar to
+ \cs*{ifinlistcs} where braces in items are allowed. This wraps around the
+ proposal in \pkg{etoolbox}'s documentation to redefine \cs*{do} and loop
+ through the list.
+\end{commands}
+
+\paragraph{Expansion Tools}
+\begin{commands}
+ \command{expandtwice}[\marg{code}]
+ \sinceversion{0.10}Expands \meta{code} twice in an \cs*{edef}-like
+ context. This is a wrapper for\newline
+ \cs*{unexpanded}\cs*{expandafter}\cs*{expandafter}\cs*{expandafter}.
\command{cnltx\at expandargs}[\darg{specs}\meta{control sequence}]
\sinceversion{0.7}This is a \LaTeXe\ version of expl3's
\cs*{exp\_args:N}\meta{specs}. The command expands the arguments of
@@ -2503,11 +2557,10 @@ the other packages and classes.
\item \code{f} means braced group expanded with \cs*{romannumeral}, and
\item \code{x} means braced group expanded with \cs*{edef}.
\end{itemize}
- \expandable\command{cnltx\at stripbs}
- A shortcut for \verbcode+\expandafter\@gobble\string+.
- \command{cnltx\at if\at in}[\marg{tokenlist}\marg{search}\marg{true}\marg{false}]
- Places \meta{true} in the input stream if \meta{search} is found in
- \meta{tokenlist} and \meta{false} if it isn't.
+\end{commands}
+
+\paragraph{Token List Manipulation}
+\begin{commands}
\command{cnltx\at replace\at once}[\marg{cs}\marg{search}\marg{replace}]
Replaces the first occurence of \meta{search} in the first expansion of
\meta{cs} with \meta{replace}.
@@ -2532,6 +2585,15 @@ the other packages and classes.
\command{cnltx\at gremove\at all}[\marg{cs}\marg{search}]
\sinceversion{0.9}The same as \cs{cnltx\at remove\at all} but acts
globally.
+\end{commands}
+
+\paragraph{Miscellaneous}
+\begin{commands}
+ \expandable\command{cnltx\at par}
+ Expands to \cs*{par}. Sometimes you need to smuggle a \cs*{par} in a
+ short macro \ldots
+ \expandable\command{cnltx\at stripbs}
+ A shortcut for \verbcode+\expandafter\@gobble\string+.
\command{cnltxat}
Robust command that typesets `\at' with category code 11. An @ in command
names confuses the indexing of the command names. Either one uses another
@@ -2554,7 +2616,6 @@ the other packages and classes.
\end{commands}
\subsection{Defined by \cnltxdoc}
-
\begin{commands}
\command{cnltx\at doc\at error}[\marg{message}]
Issue an error message using \cs*{ClassError}\Marg{cnltx-doc}.
@@ -2581,7 +2642,6 @@ the other packages and classes.
\end{environments}
\subsection{Defined by \cnltxexample}
-
\begin{commands}
\command{cnltx\at example\at error}[\marg{message}]
Issue an error message using \cs*{PackageError}\Marg{cnltx-example}.
@@ -2632,7 +2692,6 @@ the other packages and classes.
\end{commands}
\subsection{Defined by \cnltxlistings}
-
\begin{commands}
\command{cnltx\at listings\at error}[\marg{message}]
Issue an error message using \cs*{PackageError}\Marg{cnltx-listings}.
@@ -2673,7 +2732,6 @@ the other packages and classes.
\end{options}
\subsection{Defined by \cnltxtools}
-
\begin{commands}
\command{cnltx\at tools\at error}[\marg{message}]
Issue an error message using \cs*{PackageError}\Marg{cnltx-tools}.
diff --git a/Master/texmf-dist/tex/latex/cnltx/cnltx-base.sty b/Master/texmf-dist/tex/latex/cnltx/cnltx-base.sty
index 41d910c4bcc..9e434f56877 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 Clemens Niederberger
+% Copyright 2013-2014 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{2013/11/22}
-\def\cnltx@@version{v0.9}
+\def\cnltx@@date{2014/01/05}
+\def\cnltx@@version{v0.10}
\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}
@@ -222,10 +222,31 @@
#3%
}
-% --------------------------------------------------------------------------
+% test string equality, expandably:
+\newcommand\cnltx@ifstrequal[2]{%
+ \ifnum\pdf@strcmp{\unexpanded{#1}}{\unexpanded{#2}}=\z@
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+}
-% \newcount\pdflastximagepages
-% \def\pdfximage#1{\pdflastximagepages=\XeTeXpdfpagecount"#1"\relax}
+% a check for etoolbox's lists where items may contain braces:
+\newbool{cnltx@inlist}
+\newrobustcmd\cnltx@ifinlist@type[5]{%
+ \def\do##1{%
+ \boolfalse{cnltx@inlist}%
+ \ifstrequal{##1}{#2}
+ {\booltrue{cnltx@inlist}\listbreak}
+ {}%
+ }%
+ #1{#3}%
+ \ifbool{cnltx@inlist}
+ {#4}
+ {#5}%
+}
+\newrobustcmd*\cnltx@ifinlist{\cnltx@ifinlist@type\dolistloop}
+\newrobustcmd*\cnltx@ifinlistcs{\cnltx@ifinlist@type\dolistcsloop}
% --------------------------------------------------------------------------
% expansion helper
@@ -292,6 +313,9 @@
% expanding an environment argument or something:
\newcommand\cnltx@fullexpand@afterarg{\cnltx@expandargs(nx)}
+\providecommand*\expandtwice
+ {\unexpanded\expandafter\expandafter\expandafter}
+
% --------------------------------------------------------------------------
% tokenlist manipulation
\newcommand*\cnltx@stripbs{\expandafter\@gobble\string}
@@ -721,7 +745,8 @@
expandable => red ,
unexpandable => black ,
makeidxkey => cnltxgreen ,
- makeidxstring => black
+ makeidxstring => black ,
+ math => cnltxgreen
}
\definecolorscheme{blue}{
@@ -742,7 +767,8 @@
expandable => red ,
unexpandable => black ,
makeidxkey => cnltxyellow ,
- makeidxstring => black
+ makeidxstring => black ,
+ math => cnltxgreen
}
\definecolorscheme{formal}{
@@ -763,7 +789,8 @@
expandable => red ,
unexpandable => black ,
makeidxkey => black ,
- makeidxstring => black
+ makeidxstring => black ,
+ math => cnltxgreen
}
% set the default:
@@ -800,3 +827,9 @@ HISTORY:
\cnltx@gremove@once, \cnltx@gremove@all
- \cnltx@ifisnum now also returns <false> if the test
argument is `<num>!'
+2014/01/05 v0.10 - \expandtwice
+ - \cnltx@ifstrequal
+
+TODO:
+ `color-scheme' Option dokumentieren
+
diff --git a/Master/texmf-dist/tex/latex/cnltx/cnltx-doc.cls b/Master/texmf-dist/tex/latex/cnltx/cnltx-doc.cls
index 1354737e9da..24ec5d1cada 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 Clemens Niederberger
+% Copyright 2013-2014 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -190,7 +190,10 @@
\renewcommand*\partformat{%
\textcolor{cnltx}{\partname~\thepart\autodot}}
\deffootnote{2em}{1em}{\llap{\thefootnotemark. }}%
- \pagestyle{headings}
+ \RequirePackage{scrlayer-scrpage}
+ \chead{\rightmark}
+ \KOMAoptions{automark}
+ \pagestyle{scrheadings}
\setcapindent{1.5em}
\setkomafont{caption}{\cnltx@caption@font}
\setkomafont{captionlabel}{\cnltx@captionlabel@font}
@@ -961,6 +964,7 @@ HISTORY:
* choice if fonts are loaded
* choice if microtype is loaded
- \visualizespaces and \visiblespace
+2014/01/05 v0.10 - adapt to KOMA-Script v3.12
% --------------------------------------------------------------------------
TODO:
diff --git a/Master/texmf-dist/tex/latex/cnltx/cnltx-example.sty b/Master/texmf-dist/tex/latex/cnltx/cnltx-example.sty
index cdc72321c06..ce75c9b1cd0 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 Clemens Niederberger
+% Copyright 2013-2014 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -166,6 +166,7 @@
\newarg\darg{(}{)}
\newarg[\code]\Darg{(}{)}
\newcommand*\sarg{\textcolor{argument}{\code{*}}}
+\newcommand*\parg{\textcolor{argument}{\code{+}}}
% --------------------------------------------------------------------------
% source code examples:
@@ -278,7 +279,8 @@
% control sequences that won't be indexed:
texcsstyle = [6]\color{cs},
index = [6][texcs6],
- indexstyle = [6]\@gobble
+ indexstyle = [6]\@gobble,
+ moredelim = *[s][\color{math}]{$}{$}
}
\def\cnltx@bibtex@listings@style{
@@ -402,17 +404,21 @@
}
\def\cnltx@local@listings@options{}
+\newbool{cnltx@local@sourcecode@overwrite}
\pgfkeys{
cnltx/.cd,
- gobble/.code = \def\cnltx@gobble{#1} ,
- add-cmds/.code = \cnltx@addcmds{#1} ,
- add-silent-cmds/.code = \cnltx@addsilentcmds{#1} ,
- add-listings-options/.code = \cnltx@addlistingsoptions{#1} ,
- listings-options/.code = \lstdefinestyle{cnltx}{#1} ,
- add-envs/.code = \cnltx@addenvs{#1} ,
- add-silent-envs/.code = \cnltx@addsilentenvs{#1} ,
- sourcecode-options/.code = \def\cnltx@local@listings@options{#1} ,
+ gobble/.code = \def\cnltx@gobble{#1} ,
+ add-cmds/.code = \cnltx@addcmds{#1} ,
+ add-silent-cmds/.code = \cnltx@addsilentcmds{#1} ,
+ add-listings-options/.code = \cnltx@addlistingsoptions{#1} ,
+ listings-options/.code = \lstdefinestyle{cnltx}{#1} ,
+ add-envs/.code = \cnltx@addenvs{#1} ,
+ add-silent-envs/.code = \cnltx@addsilentenvs{#1} ,
+ add-sourcecode-options/.code = \def\cnltx@local@listings@options{#1} ,
+ sourcecode-options/.code =
+ \booltrue{cnltx@local@sourcecode@overwrite}
+ \def\cnltx@local@listings@options{#1}
}
\def\cnltx@mdframed@options
@@ -431,6 +437,9 @@
{\expandonce\cnltx@mdframed@options,\unexpanded{#1}}%
}
+\def\cnltx@local@frame@options{}
+\newbool{cnltx@local@frame@overwrite}
+
\newbool {cnltx@sidebyside}
\newbool {cnltx@codeleft}
\booltrue{cnltx@codeleft}
@@ -438,6 +447,7 @@
\newbool {cnltx@compile}
\newbool {cnltx@float}
\newbool {cnltx@pagelist}
+\newbool {cnltx@outside}% use this to allow floating material in the examples
\newsavebox\cnltx@example@box
@@ -480,6 +490,10 @@
after-output/.code = \def\cnltx@after@example@hook{#1} ,
add-frame-options/.code = \cnltx@addmdframedoptions{#1} ,
frame-options/.code = \mdfdefinestyle{cnltx}{#1} ,
+ add-local-frame/.code = \def\cnltx@local@frame@options{#1} ,
+ local-frame/.code =
+ \booltrue{cnltx@local@frame@overwrite}
+ \def\cnltx@local@frame@options{#1} ,
gobble/.code = \def\cnltx@gobble{#1} ,
max-pages/.code = \setcounter{cnltx@maxpages}{#1} ,
max-height/.code = \def\cnltx@image@max@height{#1} ,
@@ -506,10 +520,16 @@
}
\cnltx@init@float ,
float/.default = true ,
+ float-env/.code = \def\cnltx@float@type{#1} ,
caption/.code =
\booltrue{cnltx@float}%
\renewcommand\cnltx@float@caption{#1} ,
- float-pos/.code = \def\cnltx@float@pos{[#1]}\cnltx@init@float
+ float-pos/.code = \def\cnltx@float@pos{[#1]}\cnltx@init@float ,
+ outside/.is if = cnltx@outside ,
+ add-frame/.is choice ,
+ add-frame/true/.code = \def\cnltx@adjustbox@frame{frame} ,
+ add-frame/false/.code = \def\cnltx@adjustbox@frame{} ,
+ add-frame/.default = true
}
\newcommand*\cnltx@get@page@list[1]{%
@@ -608,15 +628,55 @@
\newcommand*\cnltx@example@start[1]{%
\pgfqkeys{/cnltx}{#1}%
- \cnltx@expandargs(x)\lstset{
- style=cnltx,
- \expandonce\cnltx@local@listings@options
- }%
- \ifbool{cnltx@sidebyside}
- {\mdframed[style=cnltx,nobreak=true]}
- {\mdframed[style=cnltx,nobreak=false]}%
+ \ifbool{cnltx@local@sourcecode@overwrite}
+ {%
+ \cnltx@expandargs(x)\lstset{
+ \expandonce\cnltx@local@listings@options
+ }%
+ }
+ {%
+ \cnltx@expandargs(x)\lstset{
+ style=cnltx,
+ \expandonce\cnltx@local@listings@options
+ % no idea why this is necessary:
+ % \ifcsdef{lst@gtexcs3}{}{,moretexcs=[3]}%
+ }%
+ }%
+ \ifbool{cnltx@local@frame@overwrite}
+ {%
+ \cnltx@expandargs(nxx)%
+ \ifbool{cnltx@sidebyside}
+ {%
+ \noexpand\mdframed[
+ \expandonce\cnltx@local@frame@options,
+ nobreak=true]
+ }
+ {%
+ \noexpand\mdframed[
+ \expandonce\cnltx@local@frame@options,
+ nobreak=false]
+ }%
+ }
+ {%
+ \cnltx@expandargs(nxx)%
+ \ifbool{cnltx@sidebyside}
+ {%
+ \noexpand\mdframed[
+ style=cnltx,
+ \expandonce\cnltx@local@frame@options,
+ nobreak=true]
+ }
+ {%
+ \noexpand\mdframed[
+ style=cnltx,
+ \expandonce\cnltx@local@frame@options,
+ nobreak=false]
+ }%
+ }%
}
+\newcommand*\cnltx@adjustbox@frame{frame}
+
% #1: filename
% #2: number of pages
% #3: current page
@@ -630,7 +690,7 @@
}%
\ifblank{#3}{}{%
\adjustbox{
- frame,
+ \cnltx@adjustbox@frame,
max width = \cnltx@tmpa@length ,
max height = \cnltx@image@max@height
}{%
@@ -677,7 +737,8 @@
\ifboolexpr
{
bool {cnltx@codeonly} or
- bool {cnltx@compile}
+ bool {cnltx@compile} or
+ bool {cnltx@outside}
}
{}
{% direct input of code example
@@ -753,7 +814,7 @@
}
{%
\cnltx@example@warning
- {`shellescape' or `write18' nor enabled -- I'm not compiling}%
+ {`shell-escape' or `write18' not enabled -- I'm not compiling}%
}%
\IfFileExists{#1.\cnltx@example@fileext}
{%
@@ -808,7 +869,16 @@
}
{\endmdframed}%
}%
- {\endmdframed}%
+ {%
+ \endmdframed
+ \ifbool{cnltx@outside}
+ {%
+ \cnltx@pre@example@hook
+ \cnltx@example@input{#1.code}%
+ \cnltx@after@example@hook
+ }
+ {}%
+ }%
\ignorespacesafterend
}
@@ -953,5 +1023,14 @@ HISTORY:
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'
+
+TODO:
diff --git a/Master/texmf-dist/tex/latex/cnltx/cnltx-listings.sty b/Master/texmf-dist/tex/latex/cnltx/cnltx-listings.sty
index 2ae39f065b8..abc8f2e9890 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 Clemens Niederberger
+% Copyright 2013-2014 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -675,7 +675,6 @@
eqalign,
eqalignno,
eqno,
- equation,
equiv,
errhelp,
errmessage,
@@ -1894,19 +1893,6 @@
\cnltx@ifinlist{{#1}{#2}}\cnltx@bibfile@entries{}
{\listadd\cnltx@bibfile@entries{{#1}{#2}}}%
}
-\newbool{cnltx@inlist}
-\long\protected\def\cnltx@ifinlist#1#2#3#4{%
- \def\do##1{%
- \boolfalse{cnltx@inlist}%
- \ifstrequal{##1}{#1}
- {\booltrue{cnltx@inlist}\listbreak}
- {}%
- }%
- \dolistloop{#2}%
- \ifbool{cnltx@inlist}
- {#3}
- {#4}%
-}
\def\cnltx@read@bibfile@entry#1#2#3{#1#2#3}
diff --git a/Master/texmf-dist/tex/latex/cnltx/cnltx-tools.sty b/Master/texmf-dist/tex/latex/cnltx/cnltx-tools.sty
index 8fa35c97df4..5b3ee29a4c9 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 Clemens Niederberger
+% Copyright 2013-2014 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.bbx b/Master/texmf-dist/tex/latex/cnltx/cnltx.bbx
index de65f393e8c..0c8099fb0af 100644
--- a/Master/texmf-dist/tex/latex/cnltx/cnltx.bbx
+++ b/Master/texmf-dist/tex/latex/cnltx/cnltx.bbx
@@ -1,13 +1,30 @@
-% \@ifclassloaded{cnltx-doc}{}{%
-% \GenericError
-% {(cnltx.bbx)\@spaces\@spaces\@spaces\@spaces}
-% {cnltx bibliography style error: invalid class}
-% {See the cnltx bundle documentation for explanation.}
-% {%
-% The `cnltx' bibliography style can only be used with the `cnltx-doc'
-% document class%
-% }%
-% }
+% --------------------------------------------------------------------------
+% the CNLTX bundle
+%
+% LaTeX source code and output
+%
+% --------------------------------------------------------------------------
+% Clemens Niederberger
+% Web: https://github.com/cgnieder/cnltx/
+% E-Mail: contact@mychemistry.eu
+% --------------------------------------------------------------------------
+% Copyright 2013-2014 Clemens Niederberger
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% 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 Clemens Niederberger.
+% --------------------------------------------------------------------------
+% If you have any ideas, questions, suggestions or bugs to report, please
+% feel free to contact me.
+% --------------------------------------------------------------------------
\RequirePackage{cnltx-example}
\ProvidesFile{cnltx.bbx}[\cnltx@@date\space \cnltx@@version\space \cnltx@@info]
diff --git a/Master/texmf-dist/tex/latex/cnltx/cnltx.cbx b/Master/texmf-dist/tex/latex/cnltx/cnltx.cbx
index 3d7493b3cf7..1fd3158685b 100644
--- a/Master/texmf-dist/tex/latex/cnltx/cnltx.cbx
+++ b/Master/texmf-dist/tex/latex/cnltx/cnltx.cbx
@@ -1,13 +1,30 @@
-% \@ifclassloaded{cnltx-doc}{}{%
-% \GenericError
-% {(cnltx.cbx)\@spaces\@spaces\@spaces\@spaces}
-% {cnltx citation style error: invalid class}
-% {See the cnltx bundle documentation for explanation.}
-% {%
-% The `cnltx' citation style can only be used with the `cnltx-doc'
-% document class%
-% }%
-% }
+% --------------------------------------------------------------------------
+% the CNLTX bundle
+%
+% LaTeX source code and output
+%
+% --------------------------------------------------------------------------
+% Clemens Niederberger
+% Web: https://github.com/cgnieder/cnltx/
+% E-Mail: contact@mychemistry.eu
+% --------------------------------------------------------------------------
+% Copyright 2013-2014 Clemens Niederberger
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% 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 Clemens Niederberger.
+% --------------------------------------------------------------------------
+% If you have any ideas, questions, suggestions or bugs to report, please
+% feel free to contact me.
+% --------------------------------------------------------------------------
\RequirePackage{cnltx-example}
\ProvidesFile{cnltx.cbx}[\cnltx@@date\space \cnltx@@version\space \cnltx@@info]
diff --git a/Master/texmf-dist/tex/latex/cnltx/cnltx.dbx b/Master/texmf-dist/tex/latex/cnltx/cnltx.dbx
index 94fd0e2c721..dacca354db6 100644
--- a/Master/texmf-dist/tex/latex/cnltx/cnltx.dbx
+++ b/Master/texmf-dist/tex/latex/cnltx/cnltx.dbx
@@ -1,13 +1,30 @@
-% \@ifclassloaded{cnltx-doc}{}{%
-% \GenericError
-% {(cnltx.dbx)\@spaces\@spaces\@spaces\@spaces}
-% {cnltx datamodel error: invalid class}
-% {See the cnltx bundle documentation for explanation.}
-% {%
-% The `cnltx' biblatex datamodel can only be used with the `cnltx-doc'
-% document class%
-% }%
-% }
+% --------------------------------------------------------------------------
+% the CNLTX bundle
+%
+% LaTeX source code and output
+%
+% --------------------------------------------------------------------------
+% Clemens Niederberger
+% Web: https://github.com/cgnieder/cnltx/
+% E-Mail: contact@mychemistry.eu
+% --------------------------------------------------------------------------
+% Copyright 2013-2014 Clemens Niederberger
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% 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 Clemens Niederberger.
+% --------------------------------------------------------------------------
+% If you have any ideas, questions, suggestions or bugs to report, please
+% feel free to contact me.
+% --------------------------------------------------------------------------
\RequirePackage{cnltx-example}
\DeclareDatamodelFields[type=list, datatype=name]{maintainer}
\DeclareDatamodelEntryfields[package,class,bundle]{
diff --git a/Master/texmf-dist/tex/latex/cnltx/cnltx.sty b/Master/texmf-dist/tex/latex/cnltx/cnltx.sty
index 6be04404bff..08ed2e80541 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 Clemens Niederberger
+% Copyright 2013-2014 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3