summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Master/texmf-dist/bibtex/bib/cnltx/cnltx.bib156
-rw-r--r--Master/texmf-dist/doc/latex/cnltx/README6
-rw-r--r--Master/texmf-dist/doc/latex/cnltx/cnltx_en.pdfbin762276 -> 774451 bytes
-rw-r--r--Master/texmf-dist/doc/latex/cnltx/cnltx_en.tex293
-rw-r--r--Master/texmf-dist/tex/latex/cnltx/cnltx-base.sty137
-rw-r--r--Master/texmf-dist/tex/latex/cnltx/cnltx-doc.cls202
-rw-r--r--Master/texmf-dist/tex/latex/cnltx/cnltx-example.sty170
-rw-r--r--Master/texmf-dist/tex/latex/cnltx/cnltx-listings.sty9
-rw-r--r--Master/texmf-dist/tex/latex/cnltx/cnltx-names.sty177
-rw-r--r--Master/texmf-dist/tex/latex/cnltx/cnltx-tools.sty129
-rw-r--r--Master/texmf-dist/tex/latex/cnltx/cnltx-translations.sty128
-rw-r--r--Master/texmf-dist/tex/latex/cnltx/cnltx.bbx73
-rw-r--r--Master/texmf-dist/tex/latex/cnltx/cnltx.sty14
13 files changed, 1051 insertions, 443 deletions
diff --git a/Master/texmf-dist/bibtex/bib/cnltx/cnltx.bib b/Master/texmf-dist/bibtex/bib/cnltx/cnltx.bib
index 8edb0502182..2ed9643e79d 100644
--- a/Master/texmf-dist/bibtex/bib/cnltx/cnltx.bib
+++ b/Master/texmf-dist/bibtex/bib/cnltx/cnltx.bib
@@ -133,7 +133,7 @@
author = {David Kastrup},
date = {2006-07-15},
version = {1.25},
- url = {http://mirror.ctan.org/macros/latex/contrib/bigfoot}
+ url = {http://mirror.ctan.org/macros/latex/contrib/bigfoot/}
}
@package{pkg:booktabs,
title = {booktabs} ,
@@ -177,13 +177,34 @@
version = {1.0h} ,
url = {http://mirror.ctan.org/macros/generic/chemfig/}
}
-@bundle{bnd:chemmacros,
+@package{pkg:chemformula,
+ title = {chemformula} ,
+ author = {Clemens Niederberger} ,
+ date = {2014-08-08} ,
+ version = {4.8} ,
+ url = {http://mirror.ctan.org/macros/latex/contrib/chemformula/}
+}
+@package{pkg:chemgreek,
+ title = {chemgreek} ,
+ author = {Clemens Niederberger} ,
+ date = {2014-08-08} ,
+ version = {0.5} ,
+ url = {http://mirror.ctan.org/macros/latex/contrib/chemgreek/}
+}
+@package{pkg:chemmacros,
title = {chemmacros} ,
author = {Clemens Niederberger} ,
- date = {2013-11-20} ,
- version = {4.1c} ,
+ date = {2014-08-08} ,
+ version = {4.6} ,
url = {http://mirror.ctan.org/macros/latex/contrib/chemmacros/}
}
+@package{pkg:chemnum,
+ title = {chemnum} ,
+ author = {Clemens Niederberger} ,
+ date = {2014-08-08} ,
+ version = {1.1} ,
+ url = {http://mirror.ctan.org/macros/latex/contrib/chemnum/}
+}
@package{pkg:chngcntr,
title = {chngcntr} ,
author = {Peter Wilson} ,
@@ -195,8 +216,8 @@
@bundle{bnd:cnltx,
title = {cnltx} ,
author = {Clemens Niederberger} ,
- date = {2013-11-20} ,
- version = {0.9} ,
+ date = {2014-01-23} ,
+ version = {0.10a} ,
url = {http://mirror.ctan.org/macros/latex/contrib/cnltx/}
}
@class{cls:cnpkgdoc,
@@ -206,6 +227,13 @@
version = {0.3a} ,
url = {https://bitbucket.org/cgnieder/cnpkgdoc/}
}
+@package{pkg:cntformats,
+ title = {cntformats},
+ author = {Clemens Niederberger},
+ date = {2014-07-03},
+ version = {0.7},
+ url = {http://mirror.ctan.org/macros/latex/contrib/cntformats/}
+}
@package{pkg:cprotect,
title = {cprotect},
author = {Bruno Le Floch},
@@ -219,14 +247,14 @@
maintainer = {Robin Fairbairns} ,
date = {2003-01-15} ,
version = {NA} ,
- url = {http://mirror.ctan.org/macros/latex/contrib/endnotes}
+ 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}
+ url = {http://mirror.ctan.org/macros/latex/contrib/enotez/}
}
@package{pkg:enumitem,
title = {enumitem},
@@ -294,8 +322,8 @@
@bundle{bnd:exsheets,
title = {exsheets} ,
author = {Clemens Niederberger} ,
- date = {2013-11-20} ,
- version = {0.11} ,
+ date = {2014-06-27} ,
+ version = {0.14} ,
url = {http://mirror.ctan.org/macros/latex/contrib/exsheets/}
}
@package{pkg:exsol,
@@ -310,14 +338,14 @@
author = {Robin Fairbairns},
date = {2007-12-12},
version = {0.3a} ,
- url = {http://mirror.ctan.org/macros/latex/contrib/fixfoot}
+ url = {http://mirror.ctan.org/macros/latex/contrib/fixfoot/}
}
@package{pkg:fnpct,
title = {fnpct} ,
author = {Clemens Niederberger} ,
date = {2013-02-28} ,
version = {0.2j} ,
- url = {http://mirror.ctan.org/macros/latex/contrib/fnpct}
+ url = {http://mirror.ctan.org/macros/latex/contrib/fnpct/}
}
@package{pkg:fontenc,
title = {fontenc} ,
@@ -327,19 +355,26 @@
date = {2005-09-27} ,
url = {http://mirror.ctan.org/macros/latex/unpacked/}
}
+@package{pkg:fontspec,
+ title = {fontspec} ,
+ author = {Will Robertson and Khaled Hosny} ,
+ version = {2.3c} ,
+ date = {2013-05-20} ,
+ url = {http://mirror.ctan.org/macros/latex/contrib/fontspec/}
+}
@package{pkg:footmisc,
title = {footmisc},
author = {Robin Fairbairns},
date = {2011-06-06},
version = {5.5b},
- url = {http://mirror.ctan.org/macros/latex/contrib/footmisc}
+ 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}
+ url = {http://mirror.ctan.org/macros/latex/contrib/footnote/}
}
@package{pkg:fourier,
title = {fourier} ,
@@ -355,6 +390,13 @@
version = {5.6} ,
url = {http://mirror.ctan.org/macros/latex/contrib/geometry/}
}
+@package{pkg:ghsystem,
+ title = {ghsystem} ,
+ author = {Clemens Niederberger} ,
+ date = {2014-08-08} ,
+ version = {4.6} ,
+ url = {http://mirror.ctan.org/macros/latex/contrib/ghsystem/}
+}
@package{pkg:glossaries,
title = {glossaries},
author = {Nicola L.C. Talbot},
@@ -369,6 +411,13 @@
version = {1.0f} ,
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} ,
+ url = {http://mirror.ctan.org/language/greek/greek-fontenc/}
+}
@package{pkg:hologo,
title = {hologo} ,
author = {Heiko Oberdiek} ,
@@ -507,7 +556,7 @@
author = {Alexander I. Rozhenko},
date = {2005-09-11},
version = {1.10},
- url = {http://mirror.ctan.org/macros/latex/contrib/manyfoot}
+ url = {http://mirror.ctan.org/macros/latex/contrib/manyfoot/}
}
@package{pkg:marginnote,
title = {marginnote} ,
@@ -542,7 +591,7 @@
author = {Peter Wilson and Lars Madsen} ,
date = {2011-03-06} ,
version = {3.6j} ,
- url = {http://mirror.ctan.org/macros/latex/contrib/memoir}
+ url = {http://mirror.ctan.org/macros/latex/contrib/memoir/}
}
@package{pkg:mfirstuc,
title = {mfirstuc},
@@ -556,7 +605,7 @@
author = {Robert Schlicht} ,
date = {2013-05-23} ,
version = {2.5a} ,
- url = {http://mirror.ctan.org/macros/latex/contrib/microtype}
+ url = {http://mirror.ctan.org/macros/latex/contrib/microtype/}
}
@package{pkg:multicol,
title = {multicol} ,
@@ -606,7 +655,7 @@
author = {Micheal Hughes},
date = {2012-03-01},
version = {1},
- url = {http://mirror.ctan.org/macros/latex/contrib/parnotes}
+ url = {http://mirror.ctan.org/macros/latex/contrib/parnotes/}
}
@package{pkg:pagenote,
title = {pagenote},
@@ -614,7 +663,7 @@
maintainer = {Will Robertson},
date = {2009-09-03},
version = {1.1a},
- url = {http://mirror.ctan.org/macros/latex/contrib/pagenote}
+ url = {http://mirror.ctan.org/macros/latex/contrib/pagenote/}
}
@package{pkg:pdftexcmds,
title = {pdftexcmds} ,
@@ -633,8 +682,8 @@
@package{pkg:pgf,
title = {TikZ/pgf} ,
author = {Till Tantau} ,
- version = {2.10} ,
- date = {2010-10-25} ,
+ version = {3.0.0} ,
+ date = {2013-12-13} ,
url = {http://mirror.ctan.org/graphics/pgf/}
}
@package{pkg:pgfopts,
@@ -670,7 +719,7 @@
}
@package{pkg:psfrag,
title = {psfrag},
- author = {Michael C.\@ Grant and David Carlisle},
+ author = {Michael C. Grant and David Carlisle},
date = {1998-04-11},
version = {3},
url = {http://mirror.ctan.org/graphics/psfrag/}
@@ -690,19 +739,26 @@
version = {2.1} ,
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},
+ url = {https://bitbucket.org/cgnieder/guitarchordschemes/}
+}
@package{pkg:scrlfile,
title = {scrlfile} ,
author = {Markus Kohm} ,
date = {2012-06-15} ,
version = {3.12} ,
- url = {http://mirror.ctan.org/macros/latex/contrib/koma-script}
+ 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} ,
- url = {http://mirror.ctan.org/macros/latex/contrib/sepfootnotes}
+ url = {http://mirror.ctan.org/macros/latex/contrib/sepfootnotes/}
}
@package{pkg:sidenotes,
title = {sidenotes},
@@ -716,7 +772,7 @@
author = {Joseph Wright} ,
version = {2.5s} ,
date = {2013-07-31} ,
- url = {http://mirror.ctan.org/macros/latex/contrib/siunitx}
+ url = {http://mirror.ctan.org/macros/latex/contrib/siunitx/}
}
@package{pkg:snotez,
title = {snotez},
@@ -725,6 +781,27 @@
date = {2013-04-04},
url = {http://mirror.ctan.org/macros/latex/contrib/snotez/}
}
+@package{pkg:songbook,
+ title = {songbook},
+ author = {Christopher Rath},
+ version = {4.5},
+ date = {2010-04-30},
+ url = {http://mirror.ctan.org/macros/latex/contrib/songbook/}
+}
+@package{pkg:songs,
+ title = {songs},
+ author = {Kevin W. Hamlen},
+ version = {2.14},
+ date = {2012-03-17},
+ url = {http://mirror.ctan.org/macros/latex/contrib/songs/}
+}
+@package{pkg:splitidx,
+ title = {splitidx},
+ author = {Markus Kohm},
+ date = {2013-04-09},
+ version = {1.2a},
+ url = {http://mirror.ctan.org/macros/latex/contrib/splitidx/}
+}
@package{pkg:superiors,
title = {superiors},
author = {Michael Sharpe},
@@ -732,6 +809,13 @@
version = {1.02},
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},
@@ -739,6 +823,13 @@
version = {1.0g},
url = {http://mirror.ctan.org/macros/latex/contrib/tablefootnote/}
}
+@package{pkg:textcomp,
+ title = {textcomp} ,
+ author = {Sebastian Rahtz} ,
+ date = {1995-12-11} ,
+ version = {1.4} ,
+ url = {http://mirrors.ctan.org/obsolete/fonts/psfonts/ts1}
+}
@package{pkg:textgreek,
title = {textgreek} ,
author = {Leonard Michlmayr} ,
@@ -751,21 +842,21 @@
author = {Alain Matthes},
date = {2011-06-02},
version = {1.16},
- url = {http://mirror.ctan.org/macros/latex/contrib/tkz}
+ 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}
+ 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}
+ url = {http://mirror.ctan.org/macros/latex/contrib/tkz/}
}
@package{pkg:translations,
title = {translations} ,
@@ -774,6 +865,13 @@
version = {1.1a} ,
url = {http://mirror.ctan.org/macros/latex/contrib/translations/}
}
+@package{pkg:translator,
+ title = {translator} ,
+ author = {Till Tantau} ,
+ date = {2010-06-12} ,
+ version = {1.0} ,
+ url = {http://mirror.ctan.org/macros/contrib/beamer/base/translator/}
+}
@package{pkg:trimspaces,
title = {trimspaces} ,
author = {Will Robertson} ,
@@ -813,7 +911,7 @@
author = {Enrico Gregorio} ,
date = {2012-10-02} ,
version = {0.3} ,
- url = {http://mirror.ctan.org/macros/latex/contrib/xpatch}
+ url = {http://mirror.ctan.org/macros/latex/contrib/xpatch/}
}
@package{pkg:xspace,
title = {xspace} ,
diff --git a/Master/texmf-dist/doc/latex/cnltx/README b/Master/texmf-dist/doc/latex/cnltx/README
index 2bf6be22b0e..e70bf85deaf 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.10 2014/01/02
+the CNLTX bundle v0.12 2015/01/11
LaTeX tools and documenting facilities
@@ -8,7 +8,7 @@ Clemens Niederberger
Web: https://github.com/cgnieder/cnltx/
E-Mail: contact@mychemistry.eu
--------------------------------------------------------------------------
-Copyright 2013-2014 Clemens Niederberger
+Copyright 2013-2015 Clemens Niederberger
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
@@ -24,7 +24,7 @@ The Current Maintainer of this work is Clemens Niederberger.
--------------------------------------------------------------------------
The cnltx bundle consists of the files
- cnltx-base.sty, cnltx-doc.cls, cnltx-example.sty, cnltx-listings.sty,
- cnltx-tools.sty, cnltx.sty,
+ cnltx-names.sty, cnltx-tools.sty, cnltx-translations.sty, cnltx.sty,
- cnltx.ist, cnltx.bib, cnltx.bbx, cnltx.cbx, cnltx.dbx,
- cnltx_en.tex, cnltx_en.pdf,
- README
diff --git a/Master/texmf-dist/doc/latex/cnltx/cnltx_en.pdf b/Master/texmf-dist/doc/latex/cnltx/cnltx_en.pdf
index cb9ca7ba24b..ba4fab65a6f 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 9fbaff05a8a..6e62c578f0e 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
% 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-2014 Clemens Niederberger
+% Copyright 2013-2015 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -64,54 +64,43 @@
% internal macros:
cnltx@babel@options,
cnltx@bibtex@listings@style,
- cnltx@caption@font,cnltx@captionlabel@font,
+ cnltx@caption@font, cnltx@captionlabel@font,
cnltx@define@colorscheme,
cnltx@gobble,
+ cnltx@ifcounter,
cnltx@ifisnum,
cnltx@ifpunctuation,
cnltx@ifsym,
- cnltx@listings@style,
+ cnltx@listings@style, cnltx@load@module, cnltx@load@modules,
+ cnltx@make@active, cnltx@make@letter, cnltx@make@other,
cnltx@makeindex@listings@style,
cnltx@mdframed@options,
+ cnltx@restore@catcode, cnltx@restore@catcodes,
+ cnltx@save@catcode, cnltx@save@catcodes,
+ cnltx@set@catcode, cnltx@set@catcodes,
cnltx@scrartcl@options,
cnltx@trailpunct,
cnltx@treat@lst@index,
% official macros:
- AD,AM,BC,
- changedversion,cls,
- cnltxacronym,
- cnltxat,cnltxbang,cnltxequal,
- code,codefont,command,cs,csidx,
- ctan,CTAN,CTANurl,
- darg,
- DeclareCounterRepresentation,
- Default,default,
- definecolorscheme,
- dsh,
- eg,env,envidx,environment,
- expandable,
- iftest,
- indexcs,
- inputexample,inputsidebyside,inputsourcecode,
- key,keybool,keychoice,keyval,
- lppl,LPPL,
- marg,Marg,module,Module,
- newabbr,newarg,
- newcounterrepresentation,
- newname,
- newnote,
- newpackagename,
- newinputsourcefilecmd,
- newsourcecodeenv,
- oarg,opt,option,
- PM,pkg,
- providecounterrepresentation,
+ AD, AM, BC,
+ changedversion, cls, cnltxacronym, cnltxat, cnltxbang, cnltxequal, code,
+ codefont, command, cs, csidx, ctan, CTAN, CTANurl,
+ darg, DeclareCounterRepresentation, Default, default, definecolorscheme,
+ dsh,
+ eg, env, envidx, environment, expandable,
+ iftest, indexcs, inputexample, inputsidebyside, inputsourcecode,
+ key, keybool, keychoice, keyval,
+ lppl, LPPL,
+ marg, Marg, module, Module,
+ name, newabbr, newarg, newcounterrepresentation, newname, newnote,
+ newpackagename, newinputsourcefilecmd, newsourcecodeenv,
+ oarg, opt, option,
+ PM, pkg, providecounterrepresentation,
renewcounterrepresentation,
- sarg,setcnltx,sinceversion,sourceformat,
- unexpandable,
- usf,usw,
- vgl,Vgl,
- zB,ZB
+ sarg, setcnltx, sinceversion, sourceformat,
+ unexpandable, usf, usw,
+ vgl, Vgl,
+ zB, ZB
},
add-silent-cmds = {
@foo,
@@ -119,6 +108,7 @@
carlisle, cd, chead, circled,circlenumber, cnltx,
foo, foothree,
GetTranslation,
+ href,
KOMAoptions,
lipsum,
minusone,multoffourrm,
@@ -153,16 +143,17 @@
\newpackagename\cnltxexample{cnltx\cnltxhyphen example}
\newpackagename\cnltxlistings{cnltx\cnltxhyphen listings}
\newpackagename\cnltxtools{cnltx\cnltxhyphen tools}
+\newpackagename\cnltxtranslations{cnltx\cnltxhyphen translations}
\newnote*\bypackage[1]{provided by \csname cnltx#1\endcsname}
\newnote*\byclass{provided by \cnltxdoc}
-\newname\oberdiek{Heiko}{Oberdiek}
-\newname\egreg{Enrico}{Gregorio}
-\newname\heinz{Carsten}{Heinz}
-\newname\moses{Brooks}{Moses}
-\newname\hoffmann{Jobst}{Hoffmann}
-\newname\daniel{Marco}{Daniel}
+\newname\oberdiek{Heiko Oberdiek}
+\newname\egreg{Enrico Gregorio}
+\newname\heinz{Carsten Heinz}
+\newname\moses{Brooks Moses}
+\newname\hoffmann{Jobst Hoffmann}
+\newname\daniel{Marco Daniel}
\usepackage{fixfoot}
\DeclareFixedFootnote\oberdiekfn{\CTANurl{oberdiek}}
@@ -266,7 +257,10 @@ files:
schemes for the \cnltxdoc\ class. All other packages and classes of the
\cnltx\ bundle load this package. This package can be used
stand-alone. \\
- \verbcode+\usepackage{cnltx-base}+
+ \verbcode+\usepackage{cnltx-base}+\\
+ The packages commands are not described in the main part of this
+ documentation but only in section~\ref{sec:defined-cnltxbase}, \ie, in the
+ appendix.
\item \cnltxdoc\ -- a class for writing package manuals. Loads
\cnltxexample\ and \cnltxtools\ and implicitly all other files of the
bundle. \\
@@ -286,6 +280,9 @@ files:
\cnltxdoc\ that are unrelated to \LaTeX\ documentation \latin{per se}.
This package can be used stand-alone. \\
\verbcode+\usepackage{cnltx-tools}+
+ \item \sinceversion{0.11}\cnltxtranslations\ -- a package that provides
+ translations needed by the other modules. It makes no sense to use this
+ package standalone although it's possible.
\item \file{cnltx.ist} -- an index style file that is used when the option
\option{add-index} for \cnltxdoc\ is activated and the option
\option{index-style} is not used.
@@ -311,8 +308,7 @@ The \cnltxbase\ package loads the following packages:
\needpackage{xcolor}~\cite{pkg:xcolor}.
The \cnltxdoc\ class loads the packages \cnltxbase, \cnltxexample,
-\needpackage{ulem}~\cite{pkg:ulem},
-\pkg{translations}~\cite{pkg:translations},
+\cnltxtranslations, \needpackage{ulem}~\cite{pkg:ulem},
\needpackage[macros/latex/required/tools]{multicol}~\cite{pkg:multicol},
\needpackage[macros/latex/contrib/ms]{ragged2e}~\cite{pkg:ragged2e},
\needpackage{marginnote}~\cite{pkg:marginnote} and
@@ -323,8 +319,8 @@ class has the option \option{load-preamble} which when used will load
additional packages, see section~\vref{sec:preamble} for details.
The \cnltxexample\ package loads the packages: \cnltxbase, \cnltxlistings,
-\cnltxtools, \needpackage{translations},
-\needpackage{mdframed}~\cite{pkg:mdframed},
+\cnltxtools, \cnltxtranslations, \needpackage{mdframed}~\cite{pkg:mdframed},
+\needpackage{textcomp}~\cite{pkg:textcomp},
\needpackage{idxcmds}~\cite{pkg:idxcmds},
\needpackage{ifxetex}~\cite{pkg:ifxetex},
\needpackage{adjustbox}~\cite{pkg:adjustbox}.
@@ -333,9 +329,12 @@ The \cnltxlistings\ package loads the packages \cnltxbase,
\needpackage{listings}~\cite{pkg:listings} and
\needpackage{catchfile}~\cite{pkg:catchfile}.
-The \cnltxtools\ package loads the packages \cnltxbase\ and
+The \cnltxtools\ package loads the packages \cnltxbase, \cnltxtranslations and
\pkg{accsupp}\oberdiekfn~\cite{pkg:accsupp}.
+\cnltxtranslations\ loads the \pkg{translations}
+package~\cite{pkg:translations}.
+
All other packages that are loaded are loaded by the mentioned packages and
not directly by any of the packages or classes of the \cnltx\ bundle. Like
all of my packages \cnltx\ implicitly relies on an up to date \TeX\
@@ -351,8 +350,8 @@ The intended use of this bundle is three-fold:
\end{sourcecode}
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. It is already used by the
- \pkg{cntformats} package from the \bnd{exsheets}
+ 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}.
\item In case parts of this bundle prove useful to be used in a document the
recommended way is to add
@@ -366,6 +365,11 @@ The intended use of this bundle is three-fold:
\usepackage[example]{cnltx}
\end{sourcecode}
would load \cnltxexample.
+ \item Parts of the bundle -- especially \cnltxbase\ -- may prove useful in
+ other packages. The loading the packages directly as indicated in
+ section~\ref{sec:license} seems the best way. After loading \cnltxbase\
+ the other modules can also be loaded with \verbcode+\cnltx@load@module+,
+ see section~\ref{sec:related-bundle} for details.
\end{itemize}
\part{Details of Available Commands, Environments and Options}
@@ -436,6 +440,13 @@ provided macros, options and the like.
\Darg{arg}.
\command{sarg}
An optional star argument, \cs{sarg}: \sarg.
+ \command{newarg}[\oarg{arg formatting}\marg{cs}\marg{left delim}\marg{right delim}]%
+ \Default{\cs{meta}}
+ \changedversion{0.2}Command used to define the argument commands:
+ \verbcode+\newarg\marg{\{}{\}}+. The optional argument determines how the
+ argument of the new command will be formatted. This is done with
+ \cs{meta} per default. \cs{Marg} is defined
+ \verbcode+\newarg[\code]\Marg{\{}{\}}+.
\command{option}[\sarg\marg{name}]
An option \meta{name}, \cs{option}\Marg{name}: \option{name}. Adds a
corresponding index entry. The starred form does not add an index entry.
@@ -492,7 +503,9 @@ world wide web.
Defines a note like \cs{sinceversion}. The syntax of the command is the
same as the one of \cs*{newcommand}. \cs{sinceversion} was defined as
follows:\\
- \verbcode+\newnote*\sinceversion[1]{Introduced in version~#1}+
+ \verbcode+\newnote*\sinceversion[1]{Introduced in version~#1}+\\
+ or actually like this:\\
+ \verbcode+\newnote*\sinceversion[1]{\GetTranslation{cnltx-introduced}~#1}+
\command{newpackagename}[\marg{cs}\marg{name}]
Define a comand \meta{cs} that prints \meta{name} formatted like \cnltx,
\ie\ in small caps and colored with the color \code{cnltx} (see
@@ -523,6 +536,12 @@ world wide web.
footnotes. The predefined directory is \code{macros/latex/contrib}. The
link address will be:\par
\code{http://mirrors.ctan.org/\meta{directory}/\meta{name}/}.
+ \command{email}[\marg{email address}]
+ \sinceversion{0.11}A wrapper for \verbcode+\href{mailto:#1}{#1}+.
+ \command{website}[\marg{web address}]
+ \sinceversion{0.11}A wrapper for \verbcode+\href{http://#1/}{#1}+.
+ \command{securewebsite}[\marg{web address}]
+ \sinceversion{0.11}A wrapper for \verbcode+\href{https://#1/}{#1}+.
\command{needpackage}[\oarg{directory}\marg{name}]
\sinceversion{0.2}A wrapper for
\verbcode+\pkg{#2}\footnote{\CTANurl[#1]{#2}}+
@@ -668,18 +687,22 @@ section~\vref{sec:envs:description} items are input via the following command:
The optional bang adds the information that an option is mandatory, \ie\
has to be set.
\command{expandable}
- \sinceversion{0.5}Adds the symbol \textcolor{expandable}{\expandablesign}
- to the left of a command in the margin to indicate that the command is
- expandable. This command should be used \emph{immediately} before
- \cs{command}.
+ \sinceversion{0.5}Adds the symbol \expandablesymbol\ to the left of a
+ command in the margin to indicate that the command is expandable. This
+ command should be used \emph{immediately} before \cs{command}.
\command{unexpandable}
- \sinceversion{0.5}Adds the symbol \textcolor{unexpandable}{\expandablesign}
- to the left of a command in the margin to indicate that the command is not
- expandable. This command should be used \emph{immediately} before
- \cs{command}.
+ \sinceversion{0.5}Adds the symbol \unexpandablesymbol\ to the left of a
+ command in the margin to indicate that the command is not expandable.
+ This command should be used \emph{immediately} before \cs{command}.
\command{expandablesign}\Default{\cs*{textasteriskcentered}}
\sinceversion{0.5}The macro that holds the sign used by \cs{expandable}
and \cs{unexpandable}.
+ \command{expandablesymbol}
+ \sinceversion{0.11}The symbol \expandablesymbol, \ie, \cs{expandablesign}
+ formatted with the color \code{expandable}.
+ \command{unexpandablesymbol}
+ \sinceversion{0.11}The symbol \unexpandablesymbol, \ie,
+ \cs{expandablesign} formatted with the color \code{unexpandable}.
\end{commands}
\begin{example}
@@ -1169,6 +1192,7 @@ manual setup could then look something like this:
\documentclass[load-preamble]{cnltx-doc}
\usepackage[T1]{fontenc}
\usepackage[utf8]{inputenc}
+ \usepackage{mypackage}
\setcnltx{
package = mypackage ,
authors = John Doe ,
@@ -1369,10 +1393,19 @@ The \cnltxtools\ package defines some additional macros which provide useful
functionality also in contexts \emph{not} documenting a \LaTeX\ package.
\begin{commands}
- \command{newname}[\marg{cs}\marg{first name}\marg{second name}]
- Defines \meta{cs} to write out the full name and add an index entry sorted
- by the last name. Also defines a starred variant of \meta{cs} that only
- writes the last name but still adds the full index entry.
+ \command{newname}[\marg{cs}\Marg{\meta{first name} \meta{last name}}]
+ Defines \meta{cs}\changedversion{0.12} to write out the full name and add
+ an index entry sorted by the last name. Also defines a starred variant of
+ \meta{cs} that only writes the last name but still adds the full index
+ entry.
+ \command{name}[\sarg\Marg{\meta{first name} \meta{last name}}]
+ \changedversion{0.12}Typesets a name according to the same specs as the
+ names defined with \cs{newname}. Also adds the name to the index. The
+ starred version only writes the name but doesn't add the name to the
+ index. Index entries either have the form \meta{last name} or
+ \code{\meta{last name}, \meta{first name}} depending on the usage of the
+ optional argument. It's safer to define a dedicated macro with
+ \cs{newname} to get consistent index entries.
\command{cnltxacronym}[\marg{pdf and sort string}\marg{acronym}]
Typesets \meta{acronym} with small caps and uses \meta{pdf and sort
string} as \PDF\ string and for sorting the index entry that is added.
@@ -1404,11 +1437,26 @@ functionality also in contexts \emph{not} documenting a \LaTeX\ package.
\begin{options}
\keyval{acronym-format}{definition}\Default{\cs*{scshape}}
Formatting of the acronyms as typeset with \cs{cnltxacronym}.
+ \keyval{name-format}{formatting commands}\Default{\#1}
+ The formatting of names created with \cs{newname} or typeset with
+ \cs{name}. Names typeset through the bibliography style \code{cnltx} are
+ also formatted according to this option. \meta{formatting commands}
+ should contain \code{\#1} for the actual name.
+ \keyval{last-name-format}{formatting commands}\Default{\cs*{textsc}\Marg{\#1}}
+ The formatting of the last names created with \cs{newname} or typeset with
+ \cs{name}. Names typeset through the bibliography style \code{cnltx} are
+ also formatted according to this option. \meta{formatting commands}
+ should contain \code{\#1} for the actual name.
+ \keyval{first-name-format}{formatting commands}\Default{\#1}
+ The formatting of first names created with \cs{newname} or typeset with
+ \cs{name}. Names typeset through the bibliography style \code{cnltx} are
+ also formatted according to this option. \meta{formatting commands}
+ should contain \code{\#1} for the actual name.
\end{options}
A short example of the usage of \cs{newname} and \cs{cnltxacronym}:
\begin{example}
- \newname\carlisle{David}{Carlisle}%
+ \newname\carlisle{David Carlisle}%
\carlisle\ is a well-known member of the \LaTeX\ community. \carlisle* is
the author of many packages such as \pkg*{longtable}. Take a look in the
index where you'll find \carlisle* mentioned.
@@ -1434,9 +1482,9 @@ reasoning is two-fold:
following a small letter as the end of a sentence and a dot after a
capital letter as a dot after an abbreviation inside of a sentence.
Usually you solve this by adding \cs*{@} in the appropriate places:
- \verbcode+e.\,g.\@+ for a intra-sentence space and \verbcode+NASA\@.+ for
+ \verbcode+e.\,g.\@+ for a intra-sentence space and \verbcode+NSA\@.+ for
a inter-sentence space. The dot added by \cnltxtools\ always will be
- followed by a intra-sentence space. If you add a dot explicitly it will
+ followed by an intra-sentence space. If you add a dot explicitly it will
be your responsibility. Per default it will then act like a dot after a
small letter.
\end{itemize}
@@ -1498,7 +1546,7 @@ All of these macros add a final dot followed by \cs*{@} \emph{except} if a dot
\minisec{German Abbreviations}\label{sec:german-abbreviations}
-The following abbreviations are not sensitive to localization are and only of
+The following abbreviations are not sensitive to localization and are only of
use in a German text. Although they're defined: \emph{please} do not use
abbreviations at the start of a sentence!
\begin{commands}
@@ -1971,7 +2019,7 @@ This document uses the following call of \pkg{biblatex}:
\usepackage[
backend=biber,
style=cnltx,
- sortlocale=en_EN,
+ sortlocale=en_US,
indexing=cite,
useprefix]{biblatex}
\addbibresource{cnltx.bib}
@@ -2001,7 +2049,7 @@ What this options does is including the following code:
\RequirePackage[
backend=biber,
style=cnltx,
- sortlocale=en_EN,
+ sortlocale=en_US,
indexing=cite,
useprefix]{biblatex}
\addbibresource{cnltx.bib}
@@ -2240,6 +2288,13 @@ the actually used color names. They are defined via the following command:
immediately clear from the examples below.
\end{commands}
+To activate a color scheme for a document it is simply selected through an
+option:
+\begin{options}
+ \keyval{color-scheme}{color scheme name}\Default{default}
+ Activate a color scheme previously defined with \cs{definecolorscheme}.
+\end{options}
+
The `default' color scheme is defined as follows:
\begin{sourcecode}
\definecolorscheme{default}{
@@ -2316,20 +2371,26 @@ Finally the `formal' color scheme is defined like this:
\section{Language Support}\label{sec:language-support}
\noindent\sinceversion{0.2}The \cnltxdoc, the \cnltxexample\ and the
-\cnltxtools\ package all rely on the \pkg{translations}
+\cnltxtools\ package as well as the \code{cnltx.ist} index style and the
+\code{cnltx} \pkg{biblatex} style all rely on the \pkg{translations}
package~\cite{pkg:translations} for providing some document language dependent
-strings. Currently only translations for English and German are provided.
-Others can be added and the existing ones changed with the following command
-provided by the \pkg{translations} package:
+strings\footnote{Actually they depend on \cnltxtranslations\ which in turn
+ loads \pkg{translations}.}. Currently only translations for English and
+German are provided. Others can be added and the existing ones changed with
+the following commands provided by the \pkg{translations} package:
\begin{commands}
\command{DeclareTranslation}[\marg{language}\marg{keyword}\marg{translation}]
- Provide translations for the string identified by the \textsc{id}
+ Define or redefine translations for the string identified by the
+ \textsc{id} \meta{keyword}.
+ \command{RenewTranslation}[\marg{language}\marg{keyword}\marg{translation}]
+ Renew translations for the string identified by the \textsc{id}
\meta{keyword}.
\end{commands}
-The defined strings are listed in table~\vref{tab:language:strings}. They are
-used in indexing strings and in different parts of the document.
+The strings defined by \cnltx\ are listed in
+table~\vref{tab:language:strings}. They are used in indexing strings and in
+different parts of the document.
\begin{table}
\centering\renewcommand\arraystretch{1.3}
@@ -2411,15 +2472,16 @@ used in indexing strings and in different parts of the document.
\section{Internal Helper Commands}
The commands in this section are only described for the sake of completeness.
-They are not meant to be used in a document. Expandable commands are marked
-with \textcolor{expandable}{\expandablesign}.
+They are not meant to be used in a document. Some of them might be useful in
+\LaTeX\ programming, though. Expandable commands are marked with
+\textcolor{expandable}{\expandablesign}.
\subsection{Defined by \cnltxbase}\label{sec:defined-cnltxbase}
Especially \cnltxbase\ defines some useful helper macros that are also used by
the other packages and classes.
-\subsubsection{Related to the Bundle}
+\subsubsection{Related to the Bundle}\label{sec:related-bundle}
\begin{commands}
\expandable\command{cnltx\at\at date}
@@ -2444,6 +2506,12 @@ the other packages and classes.
Issue a message using \cs*{PackageInfo}\Marg{cnltx-base}.
\command{cnltx\at define\at colorscheme}[\marg{name}\marg{scheme definition}]
Command that can be used to define a color scheme.
+ \command{cnltx\at load\at module}[\marg{\cnltx\ module}]
+ \sinceversion{0.11}Loads the package \code{cnltx-\meta{\cnltx\
+ module}.sty}.
+ \command{cnltx\at load\at modules}[\marg{\cnltx\ modules}]
+ \sinceversion{0.11}Maps the comma separated list \meta{\cnltx\ modules} to
+ \cs{cnltx\at load\at module}, leading and trailing spaces are trimmed.
\end{commands}
\subsubsection{Programming Tools}
@@ -2492,6 +2560,12 @@ the other packages and classes.
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}.
+ \expandable\command{cnltx\at ifcounter}[\marg{counter}\marg{true}%
+ \marg{false}]
+ \sinceversion{0.11}Checks if \meta{counter} is a counter, \ie, if the
+ control sequence names \cs*{c@\meta{counter}}, \cs*{cl@\meta{counter}},
+ \cs*{p@\meta{counter}} \emph{and} \cs*{the\meta{counter}} exist and either
+ leaves \meta{true} or \meta{false} in the input stream.
\command{cnltx\at ifnextchars}[\marg{list of
tokens}\marg{true}\marg{false}\meta{trailing token}]
\sinceversion{0.8}Tests if \meta{trailing token} is any of those in
@@ -2499,7 +2573,7 @@ the other packages and classes.
input stream without removing \meta{trailing token}.
\command{cnltx\at ifsym}[\marg{token}\marg{true}\marg{false}]
A generic version of \LaTeX's \cs*{@ifstar} that checks if \meta{token}
- follows if the input stream. If yes it is removed and \meta{true} is
+ follows in the input stream. If yes it is removed and \meta{true} is
placed in the input stream else \meta{false}.
\command{cnltx\at ifdash}[\marg{true}\marg{false}]
A wrapper for \verbcode+\cnltx@ifsym{-}+.
@@ -2507,7 +2581,7 @@ the other packages and classes.
\sinceversion{0.3}A wrapper for \verbcode+\cnltx@ifsym{!}+.
\expandable\command{cnltx\at ifisnum}[\marg{token list}\marg{true}\marg{false}]
\sinceversion{0.6}Checks if \meta{token list} is an integer zero or
- greater and leaves \meta{true} in the input stream if it is an
+ greater and leaves \meta{true} in the input stream if it is and
\meta{false} if it isn't. There is one hopefully extremely unlikely case
where the test fails: when \meta{token list} starts with
``\code{\meta{integer}\%}'' where \code{\%} has a category code different
@@ -2559,6 +2633,37 @@ the other packages and classes.
\end{itemize}
\end{commands}
+\paragraph{Category Code Stuff}
+\begin{commands}
+ \command{cnltx\at save\at catcode}[\marg{token}]
+ \sinceversion{0.11}Saves the current category code of \meta{token}.
+ \command{cnltx\at restore\at catcode}[\marg{token}]
+ \sinceversion{0.11}Restores the category code of \meta{token} as
+ previously saved with \cs{cnltx\at save\at catcode}.
+ \command{cnltx\at set\at catcode}[\marg{token}\marg{catcode}]
+ \sinceversion{0.11}Sets the category code of \meta{token} to
+ \meta{catcode}. This is a wrapper for \newline
+ \code{\cs*{catcode}`\meta{token}=\meta{catcode}\cs*{relax}}.
+ \command{cnltx\at save\at catcodes}[\marg{tokenlist}]
+ \sinceversion{0.11}Maps \cs{cnltx\at save\at catcode} to all tokens in
+ \meta{tokenlist}.
+ \command{cnltx\at restore\at catcodes}[\marg{tokenlist}]
+ \sinceversion{0.11}Maps \cs{cnltx\at restore\at catcode} to all tokens in
+ \meta{tokenlist}.
+ \command{cnltx\at set\at catcodes}[\marg{tokenlist}\marg{catcode}]
+ \sinceversion{0.11}Maps \cs{cnltx\at set\at catcode} to all tokens in
+ \meta{tokenlist}, \ie, all tokens get category code \meta{catcode}.
+ \command{cnltx\at make\at letter}[\marg{token}]
+ \sinceversion{0.11}A wrapper for \cs{cnltx\at set\at
+ catcode}\marg{token}\Marg{11}.
+ \command{cnltx\at make\at other}[\marg{token}]
+ \sinceversion{0.11}A wrapper for \cs{cnltx\at set\at
+ catcode}\marg{token}\Marg{12}.
+ \command{cnltx\at make\at active}[\marg{token}]
+ \sinceversion{0.11}A wrapper for \cs{cnltx\at set\at
+ catcode}\marg{token}\Marg{13}.
+\end{commands}
+
\paragraph{Token List Manipulation}
\begin{commands}
\command{cnltx\at replace\at once}[\marg{cs}\marg{search}\marg{replace}]
@@ -2671,13 +2776,6 @@ the other packages and classes.
\sinceversion{0.7a}This command was used to define \cs{indexcs} and
\cs{indexenv}:\\
\verbcode+\cnltx@treat@lst@index{\indexcs}{\csidx}+
- \command{newarg}[\oarg{arg formatting}\marg{cs}\marg{left delim}\marg{right delim}]%
- \Default{\cs{meta}}
- \changedversion{0.2}Command used to define the argument commands:
- \verbcode+\newarg\marg{\{}{\}}+. The optional argument determines how the
- argument of the new command will be formatted. This is done with
- \cs{meta} per default. \cs{Marg} is defined
- \verbcode+\newarg[\code]\Marg{\{}{\}}+
\command{MakePercentComment}
Sets the category code of \code{\%} to 14.
\command{cnltx\at copyablespace}
@@ -2743,13 +2841,14 @@ the other packages and classes.
Issue a message using \cs*{PackageInfo}\Marg{cnltx-tools}.
\command{cnltx\at accsupp}[\marg{actual text}\marg{additional
options}\marg{\TeX\ text}]
- A wrapper for package \pkg{accsupp}'s \cs*{BeginAccSupp}\Marg{ActualText
- = \meta{actual text}} \meta{\TeX\ text} \cs*{EndAccSupp}\marg{}.
+ A wrapper for package \pkg{accsupp}'s\newline
+ \cs*{BeginAccSupp}\Marg{ActualText = \meta{actual text}}\meta{\TeX\ text}%
+ \cs*{EndAccSupp}\marg{}.
\end{commands}
\section{List of Known \LaTeX\ Control Sequences}\label{sec:known:csnames}
-Below are listed all \emph{predefined} control sequence names that are treated
+Below all \emph{predefined} control sequence names are listed that are treated
as ``silent'' names by \cnltx, that is, those defined by \cnltxlistings.
\begin{multicols}{3}\small
@@ -2758,8 +2857,8 @@ as ``silent'' names by \cnltx, that is, those defined by \cnltxlistings.
\section{List of Known \LaTeX\ Environments}\label{sec:known:environments}
-Below are listed all \emph{predefined} control sequence names that are treated
-as ``silent'' names by \cnltx, that is, those defined by \cnltxlistings.
+Below all \emph{predefined} environment names are listed that are treated as
+``silent'' names by \cnltx, that is, those defined by \cnltxlistings.
\begin{multicols}{3}\small
\RaggedRight\listsilentenvs
diff --git a/Master/texmf-dist/tex/latex/cnltx/cnltx-base.sty b/Master/texmf-dist/tex/latex/cnltx/cnltx-base.sty
index 9e434f56877..a4be7114fd9 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-2014 Clemens Niederberger
+% Copyright 2013-2015 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{2014/01/05}
-\def\cnltx@@version{v0.10}
+\def\cnltx@@date{2015/01/11}
+\def\cnltx@@version{v0.12}
\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}
@@ -115,6 +115,15 @@
\cnltx@create@bundle@message{base}{Info}
% --------------------------------------------------------------------------
+% modules
+\newrobustcmd*\cnltx@load@module[1]{\RequirePackage{cnltx-\trim@spaces{#1}}}
+\newrobustcmd*\cnltx@load@modules[1]{\forcsvlist{\cnltx@load@module}{#1}}
+
+\newrobustcmd*\cnltx@register@module[1]{%
+ \DeclareOption{#1}{\AtEndOfPackage{\cnltx@load@module{#1}}}%
+}
+
+% --------------------------------------------------------------------------
% setup command
\newrobustcmd\setcnltx[1]{\pgfqkeys{/cnltx}{#1}}
@@ -134,6 +143,46 @@
\newcommand*\cnltx@tmpc{}
% --------------------------------------------------------------------------
+% catcode stuff:
+\DeclareListParser*{\cnltx@map@tokenlist}{}
+
+\newrobustcmd*\cnltx@save@catcodes[1]{%
+ \cnltx@map@tokenlist\cnltx@save@catcode{#1}%
+}
+\newrobustcmd*\cnltx@save@catcode[1]{%
+ \csedef{cnltx@catcode@#1}{\the\catcode`#1}%
+}
+
+\newrobustcmd*\cnltx@restore@catcodes[1]{%
+ \cnltx@map@tokenlist\cnltx@restore@catcode{#1}%
+}
+\newrobustcmd*\cnltx@restore@catcode[1]{%
+ \catcode`#1=\csname cnltx@catcode@#1\endcsname
+ \csundef{cnltx@catcode@#1}%
+}
+
+\newrobustcmd*\cnltx@set@catcodes[2]{%
+ \cnltx@map@tokenlist{\cnltx@set@catcode{#2}}{#1}%
+}
+\newrobustcmd*\cnltx@set@catcode[2]{%
+ \catcode`#1=#2\relax
+}
+
+\newrobustcmd*\cnltx@make@letter[1]{\cnltx@set@catcode{#1}{11}}
+\newrobustcmd*\cnltx@make@other[1]{\cnltx@set@catcode{#1}{12}}
+\newrobustcmd*\cnltx@make@active[1]{\cnltx@set@catcode{#1}{13}}
+
+% --------------------------------------------------------------------------
+% damit wir beim Definieren der vielen assoziierten Makros nichts
+% überschreiben:
+\newrobustcmd*\cnltx@robust@cs[1]{%
+ \expandafter\newrobustcmd\expandafter*\csname#1\endcsname
+}
+\newrobustcmd*\cnltx@new@cs[1]{%
+ \expandafter\newcommand\expandafter*\csname#1\endcsname
+}
+
+% --------------------------------------------------------------------------
% who knows what they might be good for -- well, for indexing:
\newrobustcmd*\cnltxat{@}
\let\cnltxletterat\cnltxat
@@ -163,6 +212,15 @@
\fi
}
+\newcommand*\cnltx@ifcounter[1]{%
+ \ifboolexpe{
+ test {\ifcsdef{c@#1}} and
+ test {\ifcsdef{cl@#1}} and
+ test {\ifcsdef{p@#1}} and
+ test {\ifcsdef{the#1}}
+ }%
+}
+
\newrobustcmd*\cnltx@ifsym[2]{\@ifnextchar#1{\@firstoftwo{#2}}}
\newcommand*\cnltx@ifdash{\cnltx@ifsym{-}}
\newcommand*\cnltx@ifbang{\cnltx@ifsym{!}}
@@ -176,7 +234,10 @@
% make the test character an (hopefully extremely) unlikely % with
% catcode!=14; let's make & a temporary comment char
% save both catcodes just in case someone changed the defaults:
-\edef\cnltx@tmpa{\catcode`\%=\the\catcode`\% \catcode`\&=\the\catcode`\&}
+\edef\cnltx@tmpa{
+ \catcode`\noexpand\%=\the\catcode`\%
+ \catcode`\noexpand\&=\the\catcode`\&
+}
\catcode`\%=3
\catcode`\&=14
& the test:
@@ -370,7 +431,7 @@
\newrobustcmd\cnltx@remove@all[2]{\cnltx@replace@all#1{#2}{}}
% --------------------------------------------------------------------------
-% an equivalent of \newcommand that where the macro with the optional argument
+% an equivalent of \newcommand where the macro with the optional argument
% is expandable. For this to work the newly defined macro /needs/ to eat the
% first following token!
\def\cnltx@num@to@args#1{%
@@ -801,35 +862,39 @@
% --------------------------------------------------------------------------
HISTORY:
-2013/09/08 v0.1 - first working version
-2013/09/10 v0.2 - added `cnltx-tools' to the bundle
- - extended the messaging creation to class messages
-2013/09/12 v0.3 - added index style file `cnltx.ist'
- - added color `module'
- - added \cnltx@remove@once and \cnltx@remove@all
- - added long versions of tokenlist manipulation macros
-2013/09/14 v0.4 - added \cnltx@fullexpand@afterarg
- - new colors `bibentry' and `bibentryfield'
-2013/09/20 v0.5 - added colors `expandable' and `unexpandable'
- - added \definecolorscheme
-2013/09/24 v0.6 - added \cnltx@ifisnum
-2013/09/30 v0.7 - added functionality to look for trailing punctuation
- - added colors `makeidxkey' and `makeidxstring'
- - added counter representation command facilities
- - generalized expansion helpers (by copying expl3's
- \exp_arg:N<spec> idea)
- - \iftest and \nottest
-2013/10/21 v0.8 - \cnltx@ifnextchars
-2013/11/22 v0.9 - \cnltx@modulo
- - scratch variables
- - \cnltx@ifshellescape
- - \cnltx@greplace@once, \cnltx@greplace@all,
- \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
+2013/09/08 v0.1 - first working version
+2013/09/10 v0.2 - added `cnltx-tools' to the bundle
+ - extended the messaging creation to class messages
+2013/09/12 v0.3 - added index style file `cnltx.ist'
+ - added color `module'
+ - added \cnltx@remove@once and \cnltx@remove@all
+ - added long versions of tokenlist manipulation macros
+2013/09/14 v0.4 - added \cnltx@fullexpand@afterarg
+ - new colors `bibentry' and `bibentryfield'
+2013/09/20 v0.5 - added colors `expandable' and `unexpandable'
+ - added \definecolorscheme
+2013/09/24 v0.6 - added \cnltx@ifisnum
+2013/09/30 v0.7 - added functionality to look for trailing punctuation
+ - added colors `makeidxkey' and `makeidxstring'
+ - added counter representation command facilities
+ - generalized expansion helpers (by copying expl3's
+ \exp_arg:N<spec> idea)
+ - \iftest and \nottest
+2013/10/21 v0.8 - \cnltx@ifnextchars
+2013/11/22 v0.9 - \cnltx@modulo
+ - scratch variables
+ - \cnltx@ifshellescape
+ - \cnltx@greplace@once, \cnltx@greplace@all,
+ \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
+2014/03/11 v0.11 - \cnltx@save@catcode, \cnltx@save@catcodes,
+ \cnltx@set@catcode, \cnltx@set@catcodes,
+ \cnltx@restore@catcode, \cnltx@restore@catcodes
+ - \cnltx@make@letter, \cnltx@make@other, \cnltx@make@active
+ - \cnltx@load@module, \cnltx@load@modules
+2015/01/11 v0.12 - updating the bundle to CTAN
+ - more security for \cnltx@ifisnum
diff --git a/Master/texmf-dist/tex/latex/cnltx/cnltx-doc.cls b/Master/texmf-dist/tex/latex/cnltx/cnltx-doc.cls
index 24ec5d1cada..0044576bab8 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-2014 Clemens Niederberger
+% Copyright 2013-2015 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -94,7 +94,7 @@
}
-\RequirePackage{cnltx-tools,cnltx-example,cnltx-listings,translations}
+\cnltx@load@modules{tools,names,example,listings,translations}
\newcommand*\cnltx@caption@font{\normalfont\small\sffamily}
\newcommand*\cnltx@captionlabel@font{\cnltx@caption@font\scshape}
@@ -113,6 +113,9 @@
{\RequirePackage[T1]{fontenc}}
{\RequirePackage{fontspec}}
\RequirePackage[oldstyle]{libertine}
+ \ifboolexpr{not bool{xetex} and not bool{luatex}}
+ {}
+ {}
\RequirePackage{libertinehologopatch}
\RequirePackage[supstfm=libertinesups]{superiors}
% libertine does not have superior letters:
@@ -178,7 +181,7 @@
\setmonofont[
Scale = MatchLowercase ,
Ligatures = {NoCommon,NoRequired,NoContextual}
- ]{Bitstream Vera Sans Mono}
+ ]{DejaVu Sans Mono}
}
\recalctypearea
}
@@ -199,13 +202,12 @@
\setkomafont{captionlabel}{\cnltx@captionlabel@font}
}{}
-\ifbool{cnltx@add@index}{
+\ifbool{cnltx@add@bib}{
\RequirePackage[
backend=biber,
style=cnltx,
- sortlocale=en_EN,
- indexing=cite,
- useprefix]{biblatex}
+ sortlocale=en_US,
+ indexing=cite]{biblatex}
\addbibresource{cnltx.bib}
\AtEndDocument{\printbibliography}
}{}
@@ -319,16 +321,16 @@
}
\def\cnltx@write@author@email#1][\q@stop{%
\ifblank{#1}{}
- {\footnote{\href{mailto:#1}{#1}}}%
+ {\footnote{\email{#1}}}%
}
\protected\def\cnltx@get@first@and@second@name#1 #2\q@stop{%
\ifblank{#2}
{%
- \cnltx@name[]{#1}%
+ \name*{#1}%
\listgadd\cnltx@package@author@pdflist{#1}%
}
{%
- \cnltx@name[#1]{\trim@spaces{#2}}%
+ \name*{#1 #2}%
\listgadd\cnltx@package@author@pdflist{#1 \trim@spaces{#2}}%
}%
}
@@ -596,6 +598,8 @@
\newrobustcmd*\expandable{\cnltx@expandable@ornot\cnltx@expandable}
\newrobustcmd*\unexpandable{\cnltx@expandable@ornot\cnltx@unexpandable}
+\newrobustcmd*\expandablesymbol{\textcolor{expandable}{\expandablesign}}
+\newrobustcmd*\unexpandablesymbol{\textcolor{unexpandable}{\expandablesign}}
\newrobustcmd*\cnltx@expandable@ornot[1]{%
\let\cnltx@item\item
@@ -608,14 +612,10 @@
\endgroup
}
\newcommand*\cnltx@expandable{%
- \cnltx@expandable@note{%
- \textcolor{expandable}{\expandablesign}%
- }%
+ \cnltx@expandable@note{\expandablesymbol}%
}
\newcommand*\cnltx@unexpandable{%
- \cnltx@expandable@note{%
- \textcolor{unexpandable}{\expandablesign}%
- }%
+ \cnltx@expandable@note{\unexpandablesymbol}%
}
\newcommand*\expandablesign{\textasteriskcentered}
@@ -755,7 +755,7 @@
\ifbool{cnltx@package@email}
{%
\par\vskip.5cm\relax
- \href{mailto:\cnltx@package@email}{\cnltx@package@email}%
+ \email{\cnltx@package@email}%
}{}%
\ifbool{cnltx@package@abstract}
{%
@@ -763,8 +763,10 @@
\cnltx@package@abstract
}{}%
\end{center}
- \begin{multicols}{2}[\section*{\GetTranslation{cnltx-toc}}]
- \cnltx@tableofcontents
+ \begin{multicols}{2}[{%
+ \pdfbookmark[1]{\GetTranslation{cnltx-toc}}{toc}%
+ \section*{\GetTranslation{cnltx-toc}}
+ }]\cnltx@tableofcontents
\end{multicols}%
}
@@ -825,9 +827,15 @@
% --------------------------------------------------------------------------
% hyperlinks:
\newrobustcmd*\CTANurl[2][macros/latex/contrib]{%
- on \ctan\ as \code{#2}: \url{http://mirrors.ctan.org/#1/#2/}%
+ on \ctan\ as \cnltx@weblink@font{#2}: \url{http://mirrors.ctan.org/#1/#2/}%
}
+\newcommand*\cnltx@weblink@font[1]{\texttt{#1}}
+
+\newrobustcmd*\email[1]{\cnltx@weblink@font{\href{mailto:#1}{#1}}}
+\newrobustcmd*\website[1]{\cnltx@weblink@font{\href{http://#1/}{#1}}}
+\newrobustcmd*\securewebsite[1]{\cnltx@weblink@font{\href{https://#1/}{#1}}}
+
\newrobustcmd*\needpackage[2][macros/latex/contrib]{%
\pkg{#2}\footnote{\CTANurl[#1]{#2}}%
}
@@ -858,113 +866,63 @@
}%
}
-% --------------------------------------------------------------------------
-% localization strings:
-\DeclareTranslationFallback{cnltx-default}{Default}
-\DeclareTranslation{English}{cnltx-default}{Default}
-\DeclareTranslation{German}{cnltx-default}{Voreinstellung}
-
-\DeclareTranslationFallback{cnltx-required}{required}
-\DeclareTranslation{English}{cnltx-required}{required}
-\DeclareTranslation{German}{cnltx-required}{erforderlich}
-
-\DeclareTranslationFallback{cnltx-empty}{initially empty}
-\DeclareTranslation{English}{cnltx-empty}{initially empty}
-\DeclareTranslation{German}{cnltx-empty}{zun\"achst leer}
-
-\DeclareTranslationFallback{cnltx-toc}{Table of Contents}
-\DeclareTranslation{English}{cnltx-toc}{Table of Contents}
-\DeclareTranslation{German}{cnltx-toc}{Inhaltsverzeichnis}
-
-\DeclareTranslationFallback{cnltx-license}{%
- Permission is granted to copy, distribute and/or modify this software under
- the terms of the \LPPL\ (\lppl), version 1.3 or later
- (\url{http://www.latex-project.org/lppl.txt}). The software has the status%
-}
-\DeclareTranslation{English}{cnltx-license}{%
- Permission is granted to copy, distribute and/or modify this software under
- the terms of the \LPPL\ (\lppl), version 1.3 or later
- (\url{http://www.latex-project.org/lppl.txt}). The software has the status%
-}
-\DeclareTranslation{German}{cnltx-license}{%
- Es ist erlaubt, diese Software unter den Bedingungen der \LPPL\ (\lppl),
- Version 1.3 oder sp\"ater, zu kopieren und zu verteilen
- (\url{http://www.latex-project.org/lppl.txt}). Sie hat den Status%
-}
-
-\DeclareTranslationFallback{cnltx-introduced}{Introduced in version}
-\DeclareTranslation{English}{cnltx-introduced}{Introduced in version}
-\DeclareTranslation{German}{cnltx-introduced}{Eingef\"uhrt in Version}
-
-\DeclareTranslationFallback{cnltx-changed}{Changed in version}
-\DeclareTranslation{English}{cnltx-changed}{Changed in version}
-\DeclareTranslation{German}{cnltx-changed}{Ge\"andert in Version}
-
-\DeclareTranslationFallback{cnltx-f.}{f.}
-\DeclareTranslation{English}{cnltx-f.}{f.}
-\DeclareTranslation{German}{cnltx-f.}{f.}
-
-\DeclareTranslationFallback{cnltx-ff.}{ff.}
-\DeclareTranslation{English}{cnltx-ff.}{ff.}
-\DeclareTranslation{German}{cnltx-ff.}{ff.}
-
-\DeclareTranslationFallback{cnltx-maintainer}{current maintainer}
-\DeclareTranslation{English}{cnltx-maintainer}{current maintainer}
-\DeclareTranslation{German}{cnltx-maintainer}{aktueller Maintainer}
-
-\DeclareTranslationFallback{cnltx-maintainers}{current maintainers}
-\DeclareTranslation{English}{cnltx-maintainers}{current maintainers}
-\DeclareTranslation{German}{cnltx-maintainers}{aktuelle Maintainer}
-
\endinput
% --------------------------------------------------------------------------
HISTORY:
-2013/09/08 v0.1 - first working version
-2013/09/10 v0.2 - added optional argument to \license
- - \newname got moved to `cnltx-tools'
- - added possibility for internationalization
- - new macros \needpackage and \needclass
- - option for formatting the document title
-2013/09/12 v0.3 - new class options `add-index', `load-preamble+' and
- `scrartcl'
- - new options `index-prologue' and `index-space'
- - new file `cnltx.ist'
- - added \Module
- - added optional ! to the \Default command
- - add safety net: provide necessary commands in the aux-file
- if they're not defined at begin document
-2013/09/12 v0.3a - automatic preamble detects xelatex and lualatex and selects
- the fonts accordingly
-2013/09/15 v0.4 - possiblity to add an email address for each author, written
- as footnote; they get symbols if the `load-preamble'
- options is not used
- - fixed bug in index setup mechanism
- - added biblatex entry type `package' and biblatex style
- `cnltx'
-2013/09/20 v0.5 - new commands \expandable and \unexpandable
- - new environment `cnltxquote', formatting via options
- `quote-format' and `quote-author-format'
- - changed scaling of `beramono' from `.83' to `.81' -- seems
- a better fit in relation to Linux Libertine
-2013/09/24 v0.6 - workaround for footnotes in minipages => libertine does not
- have superior letters
- - new options `abstract-format' and `abstract-width'
-2013/09/30 v0.7 - added better microtype settings to the predefined preamble
- - replaced \def's with \newcommand or \newrobustcmd
-2013/10/04 v0.7a - renamed \cnltx@package@name@format into
- \cnltxpackagenameformat
- - added \cnltxpackagenameformat to the disabled pdfstring
- commands
- - added possibility to define a opitonal argument with
- \newnote
-2013/10/21 v0.8 - disable ligatures for teletype font
- - extended preamble loading
- * choice if fonts are loaded
- * choice if microtype is loaded
- - \visualizespaces and \visiblespace
-2014/01/05 v0.10 - adapt to KOMA-Script v3.12
+2013/09/08 v0.1 - first working version
+2013/09/10 v0.2 - added optional argument to \license
+ - \newname got moved to `cnltx-tools'
+ - added possibility for internationalization
+ - new macros \needpackage and \needclass
+ - option for formatting the document title
+2013/09/12 v0.3 - new class options `add-index', `load-preamble+' and
+ `scrartcl'
+ - new options `index-prologue' and `index-space'
+ - new file `cnltx.ist'
+ - added \Module
+ - added optional ! to the \Default command
+ - add safety net: provide necessary commands in the aux-file
+ if they're not defined at begin document
+2013/09/12 v0.3a - automatic preamble detects xelatex and lualatex and selects
+ the fonts accordingly
+2013/09/15 v0.4 - possiblity to add an email address for each author, written
+ as footnote; they get symbols if the `load-preamble'
+ options is not used
+ - fixed bug in index setup mechanism
+ - added biblatex entry type `package' and biblatex style
+ `cnltx'
+2013/09/20 v0.5 - new commands \expandable and \unexpandable
+ - new environment `cnltxquote', formatting via options
+ `quote-format' and `quote-author-format'
+ - changed scaling of `beramono' from `.83' to `.81' -- seems
+ a better fit in relation to Linux Libertine
+2013/09/24 v0.6 - workaround for footnotes in minipages => libertine does not
+ have superior letters
+ - new options `abstract-format' and `abstract-width'
+2013/09/30 v0.7 - added better microtype settings to the predefined preamble
+ - replaced \def's with \newcommand or \newrobustcmd
+2013/10/04 v0.7a - renamed \cnltx@package@name@format into
+ \cnltxpackagenameformat
+ - added \cnltxpackagenameformat to the disabled pdfstring
+ commands
+ - added possibility to define a opitonal argument with
+ \newnote
+2013/10/21 v0.8 - disable ligatures for teletype font
+ - extended preamble loading
+ * choice if fonts are loaded
+ * choice if microtype is loaded
+ - \visualizespaces and \visiblespace
+2014/01/23 v0.10 - adapt to KOMA-Script v3.12
+2014/03/11 v0.11 - change biblatex locale from en_EN to en_US
+ - fix bug: wrong boolean used for option `add-bib'
+ - some translations are now provided by the `tools' module
+ and by the `cnltx' bibliography style
+ - use \cnltx@load@modules
+ - new commands \email, \website, \securewebsite
+ - \expandablesymbol, \unexpandablesymbol
+
% --------------------------------------------------------------------------
TODO:
diff --git a/Master/texmf-dist/tex/latex/cnltx/cnltx-example.sty b/Master/texmf-dist/tex/latex/cnltx/cnltx-example.sty
index ce75c9b1cd0..256e154fb15 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-2014 Clemens Niederberger
+% Copyright 2013-2015 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -27,7 +27,7 @@
% --------------------------------------------------------------------------
\RequirePackage{cnltx-base}
\ProvidesPackage{cnltx-example}[\cnltx@@date\space \cnltx@@version\space \cnltx@@info]
-\RequirePackage{cnltx-listings}
+\cnltx@load@modules{listings,translations}
\cnltx@create@bundle@message{example}{Error}
\cnltx@create@bundle@message{example}{Warning}
@@ -35,10 +35,10 @@
\cnltx@create@bundle@message{example}{Info}
% --------------------------------------------------------------------------
-\RequirePackage{translations}
\PassOptionsToPackage{framemethod=tikz}{mdframed}
\RequirePackage{mdframed}
\RequirePackage{idxcmds}
+\RequirePackage{textcomp}
\RequirePackage{adjustbox}
\RequirePackage{ifxetex}
@@ -58,7 +58,7 @@
\newidxcmd\cs{\code{\textbackslash\textcolor{cs}{#1}}}
% \env
-\newidxcmd\env{\code{#1}}[\ (\GetTranslation{cnltx-environment})]
+\newidxcmd\env{\code{\textcolor{env}{#1}}}[\ (\GetTranslation{cnltx-environment})]
% \begin, \end
\newidxcmd\beginend{\code{\textbackslash\textcolor{beginend}{#1}}}
@@ -207,7 +207,7 @@
}
\lst@RequireAspects{writefile}
-\providecommand*\MakePercentComment{\catcode`\%14\relax}
+\providecommand*\MakePercentComment{\cnltx@set@catcode{\%}{14}}
\def\cnltx@gobble{2}
@@ -229,7 +229,9 @@
{Ä}{{\"A}}1
{Ö}{{\"O}}1
{Ü}{{\"U}}1
- {ß}{{\ss}}1 ,
+ {ß}{{\ss}}1
+ {`}{\`{}}1
+ {'}{\textquotesingle}1 ,
breaklines = true,
keepspaces = true,
breakindent = 1em,
@@ -242,6 +244,7 @@
center,
description,document,
end,enumerate,
+ equation,eqnarray,
figure,flushleft,flushright,
itemize,list,
otherlanguage,
@@ -254,6 +257,7 @@
center,
description,document,
end,enumerate,
+ equation,eqnarray,
figure,flushleft,flushright,
itemize,list,
otherlanguage,
@@ -264,20 +268,20 @@
index = [2][texcs2],
indexstyle = [2]\@gobble,
moretexcs = [2]{begin,end},
- % added environments that'll be indexed:
- texcsstyle = [3]\color{env},
+ % control sequences that'll be indexed:
+ texcsstyle = [3]\color{cs},
index = [3][texcs3],
- indexstyle = [3]\indexenv,
- % environments that won't be indexed:
- texcsstyle = [4]\color{env},
+ indexstyle = [3]\indexcs,
+ % control sequences that won't be indexed:
+ texcsstyle = [4]\color{cs},
index = [4][texcs4],
indexstyle = [4]\@gobble,
- % control sequences that'll be indexed:
- texcsstyle = [5]\color{cs},
+ % added environments that'll be indexed:
+ texcsstyle = [5]\color{env},
index = [5][texcs5],
- indexstyle = [5]\indexcs,
- % control sequences that won't be indexed:
- texcsstyle = [6]\color{cs},
+ indexstyle = [5]\indexenv,
+ % environments that won't be indexed:
+ texcsstyle = [6]\color{env},
index = [6][texcs6],
indexstyle = [6]\@gobble,
moredelim = *[s][\color{math}]{$}{$}
@@ -357,18 +361,18 @@
\def\cnltx@addcmds#1{%
\cnltx@expandargs(nx)\lstdefinestyle
{cnltx}
- {\expandonce\cnltx@listings@style,\unexpanded{moretexcs={[5]#1}}}%
+ {\expandonce\cnltx@listings@style,\unexpanded{moretexcs={[3]#1}}}%
\edef\cnltx@listings@style{%
- \expandonce\cnltx@listings@style,\unexpanded{moretexcs={[5]#1}}%
+ \expandonce\cnltx@listings@style,\unexpanded{moretexcs={[3]#1}}%
}%
}
\def\cnltx@addsilentcmds#1{%
\cnltx@expandargs(nx)\lstdefinestyle
{cnltx}
- {\expandonce\cnltx@listings@style,\unexpanded{moretexcs={[6]#1}}}%
+ {\expandonce\cnltx@listings@style,\unexpanded{moretexcs={[4]#1}}}%
\edef\cnltx@listings@style{%
- \expandonce\cnltx@listings@style,\unexpanded{moretexcs={[6]#1}}%
+ \expandonce\cnltx@listings@style,\unexpanded{moretexcs={[4]#1}}%
}%
}
@@ -377,18 +381,18 @@
\def\cnltx@addenvs#1{%
\cnltx@expandargs(nx)\lstdefinestyle
{cnltx}
- {\expandonce\cnltx@listings@style,\unexpanded{moretexcs={[3]#1}}}%
+ {\expandonce\cnltx@listings@style,\unexpanded{moretexcs={[5]#1}}}%
\edef\cnltx@listings@style{%
- \expandonce\cnltx@listings@style,\unexpanded{moretexcs={[3]#1}}%
+ \expandonce\cnltx@listings@style,\unexpanded{moretexcs={[5]#1}}%
}%
}
\def\cnltx@addsilentenvs#1{%
\cnltx@expandargs(nx)\lstdefinestyle
{cnltx}
- {\expandonce\cnltx@listings@style,\unexpanded{moretexcs={[4]#1}}}%
+ {\expandonce\cnltx@listings@style,\unexpanded{moretexcs={[6]#1}}}%
\edef\cnltx@listings@style{%
- \expandonce\cnltx@listings@style,\unexpanded{moretexcs={[4]#1}}%
+ \expandonce\cnltx@listings@style,\unexpanded{moretexcs={[6]#1}}%
}%
}
@@ -415,17 +419,20 @@
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} ,
+ add-sourcecode-options/.code =
+ \edef\cnltx@local@listings@options{\trim@spaces@noexp{#1}} ,
sourcecode-options/.code =
\booltrue{cnltx@local@sourcecode@overwrite}
- \def\cnltx@local@listings@options{#1}
+ \edef\cnltx@local@listings@options{\trim@spaces@noexp{#1}}
}
\def\cnltx@mdframed@options
{
backgroundcolor = cnltxbg ,
linecolor = cnltx ,
- roundcorner = 5pt
+ roundcorner = 5pt ,
+ skipabove = .5\baselineskip ,
+ skipbelow = .5\baselineskip
}
\cnltx@expandargs(nx)\mdfdefinestyle
{cnltx}
@@ -451,6 +458,10 @@
\newsavebox\cnltx@example@box
+\newlength\cnltx@sidebysidewidth
+\newlength\cnltx@before@skip
+\newlength\cnltx@after@skip
+
\newcommand*\cnltx@examplesep{\hrulefill}
\newcommand*\cnltx@pre@source@hook{}
\newcommand*\cnltx@after@source@hook{}
@@ -529,9 +540,14 @@
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
+ add-frame/.default = true ,
+ before-skip/.code = \setlength\cnltx@before@skip{#1} ,
+ after-skip/.code = \setlength\cnltx@after@skip{#1}
}
+\setlength\cnltx@before@skip{\baselineskip}
+\setlength\cnltx@after@skip{\baselineskip}
+
\newcommand*\cnltx@get@page@list[1]{%
\forcsvlist{\cnltx@read@page@list@item}{#1}%
}
@@ -614,29 +630,43 @@
\endgroup
}
-\newcommand*\cnltx@source@input@start[1]{%
+\newrobustcmd*\cnltx@source@input@start[1]{%
\ifboolexpr{ bool {cnltx@sidebyside} and not bool {cnltx@codeonly} }
- {\setbox\cnltx@example@box=\hbox\bgroup}{\cnltx@pre@source@hook}%
- \lst@BeginAlsoWriteFile{#1}%
+ {%
+ \adjustbox{
+ % discard,
+ trim= 0pt 0pt \linewidth{} 0pt,
+ valign=c,
+ gstore=\cnltx@example@box,
+ discard
+ }\bgroup
+ }
+ {\cnltx@pre@source@hook}%
+ \lst@BeginAlsoWriteFile{#1}%
}
-\newcommand*\cnltx@source@input@end{%
+\newrobustcmd*\cnltx@source@input@end{%
\lst@EndWriteFile
\ifboolexpr{ bool {cnltx@sidebyside} and not bool {cnltx@codeonly} }
{\egroup}{\cnltx@after@source@hook}%
}
-\newcommand*\cnltx@example@start[1]{%
+\newrobustcmd*\cnltx@example@start[1]{%
\pgfqkeys{/cnltx}{#1}%
\ifbool{cnltx@local@sourcecode@overwrite}
{%
\cnltx@expandargs(x)\lstset{
+ \ifboolexpe{ bool {cnltx@sidebyside} and not bool {cnltx@codeonly} }
+ {linewidth=\cnltx@sidebysidewidth,}{}%
+ moretexcs=[3], moretexcs=[5],
\expandonce\cnltx@local@listings@options
}%
}
{%
\cnltx@expandargs(x)\lstset{
style=cnltx,
+ \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]}%
@@ -645,7 +675,7 @@
\ifbool{cnltx@local@frame@overwrite}
{%
\cnltx@expandargs(nxx)%
- \ifbool{cnltx@sidebyside}
+ \ifboolexpe{ bool {cnltx@sidebyside} and not bool {cnltx@codeonly} }
{%
\noexpand\mdframed[
\expandonce\cnltx@local@frame@options,
@@ -659,7 +689,7 @@
}
{%
\cnltx@expandargs(nxx)%
- \ifbool{cnltx@sidebyside}
+ \ifboolexpe{ bool {cnltx@sidebyside} and not bool {cnltx@codeonly} }
{%
\noexpand\mdframed[
style=cnltx,
@@ -680,7 +710,7 @@
% #1: filename
% #2: number of pages
% #3: current page
-\newcommand*\cnltx@print@documentpage[3]{%
+\newrobustcmd*\cnltx@print@documentpage[3]{%
\cnltx@expandargs(x)\setlength\cnltx@tmpa@length{%
\strip@pt\dimexpr1pt/%
\ifnumgreater{#2}{\value{cnltx@maxpages}}
@@ -728,11 +758,11 @@
}%
}
-\newcommand*\cnltx@stepcounter@ifnotempty[2]{%
+\newrobustcmd*\cnltx@stepcounter@ifnotempty[2]{%
\ifblank{#2}{}{\stepcounter{#1}}%
}
-\newcommand*\cnltx@example@end[1]{%
+\newrobustcmd*\cnltx@example@end[1]{%
\ifblank{#1}{\booltrue{cnltx@codeonly}}{}
\ifboolexpr
{
@@ -742,48 +772,32 @@
}
{}
{% direct input of code example
+ % \showthe\wd\cnltx@example@box
+ % \showthe\linewidth
\ifbool{cnltx@sidebyside}
{% side-by-side
\ifbool{cnltx@codeleft}
{% code on the left
- \minipage[c]{%
- \dimexpr
- .49\linewidth
- -.75\lst@xleftmargin
- \relax
- }%
+ \noindent
+ \minipage[c]{\cnltx@sidebysidewidth}%
\cnltx@pre@source@hook
\unhbox\cnltx@example@box
\cnltx@after@source@hook
\endminipage\hfill
- \minipage[c]{%
- \dimexpr
- .49\linewidth
- -.75\lst@xleftmargin
- \relax
- }%
+ \minipage[c]{\cnltx@sidebysidewidth}%
\cnltx@pre@example@hook
\cnltx@example@input{#1.code}%
\cnltx@after@example@hook
\endminipage
}
{% code on the right
- \minipage[c]{%
- \dimexpr
- .49\linewidth
- -.75\lst@xleftmargin
- \relax
- }%
+ \noindent
+ \minipage[c]{\cnltx@sidebysidewidth}%
\cnltx@pre@example@hook
\cnltx@example@input{#1.code}%
\cnltx@after@example@hook
\endminipage\hfill
- \minipage[c]{%
- \dimexpr
- .49\linewidth
- -.75\lst@xleftmargin
- \relax
- }%
+ \minipage[c]{\cnltx@sidebysidewidth}%
\cnltx@pre@source@hook
\unhbox\cnltx@example@box
\cnltx@after@source@hook
@@ -865,12 +879,13 @@
{%
\cnltx@after@example@hook
\endmdframed
+ \par
}%
}
- {\endmdframed}%
+ {\endmdframed\par}%
}%
{%
- \endmdframed
+ \endmdframed\par
\ifbool{cnltx@outside}
{%
\cnltx@pre@example@hook
@@ -885,6 +900,12 @@
\def\cnltx@new@sourcecode@env#1#2{%
\lstnewenvironment{#2}[1][]
{%
+ \vskip\cnltx@before@skip
+ \setlength\cnltx@sidebysidewidth
+ {\dimexpr .45\columnwidth -\lst@xleftmargin -\lst@xrightmargin\relax}%
+ \ifboolexpr{ bool {cnltx@sidebyside} and not bool {cnltx@codeonly} }
+ {\cnltx@addlistingsoptions{linewidth=\cnltx@sidebysidewidth}}
+ {}%
\cnltx@example@start{##1,#1}%
\ifbool{cnltx@compile}{%
\stepcounter{cnltx@filenumber}%
@@ -901,6 +922,8 @@
\if@nobreak
\@nobreakfalse
\fi
+ \csname par\endcsname
+ \vskip\cnltx@after@skip
}%
}
\newrobustcmd\newsourcecodeenv[2][]{%
@@ -967,22 +990,6 @@
}%
}
-\DeclareTranslationFallback{cnltx-package}{package}
-\DeclareTranslation{English}{cnltx-package}{package}
-\DeclareTranslation{German}{cnltx-package}{Paket}
-
-\DeclareTranslationFallback{cnltx-environment}{environment}
-\DeclareTranslation{English}{cnltx-environment}{environment}
-\DeclareTranslation{German}{cnltx-environment}{Umgebung}
-
-\DeclareTranslationFallback{cnltx-class}{class}
-\DeclareTranslation{English}{cnltx-class}{class}
-\DeclareTranslation{German}{cnltx-class}{Klasse}
-
-\DeclareTranslationFallback{cnltx-bundle}{bundle}
-\DeclareTranslation{English}{cnltx-bundle}{bundle}
-\DeclareTranslation{German}{cnltx-bundle}{Bundle}
-
\endinput
% --------------------------------------------------------------------------
@@ -1030,7 +1037,8 @@ HISTORY:
- 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
TODO:
diff --git a/Master/texmf-dist/tex/latex/cnltx/cnltx-listings.sty b/Master/texmf-dist/tex/latex/cnltx/cnltx-listings.sty
index abc8f2e9890..7db538a102d 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-2014 Clemens Niederberger
+% Copyright 2013-2015 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -204,7 +204,7 @@
% custom fields:
namea,nameb,namec,
nameatype,namebtype,namectype,
- lista,listb,listc,listd,liste.listf,
+ lista,listb,listc,listd,liste,listf,
usera,userb,userc,userd,usere,userf,
verba,verbb,verbc,
% field aliases:
@@ -874,7 +874,7 @@
intop,
iota,
it,
- item.
+ item,
itemindent,
itemitem,
itemize,
@@ -1319,7 +1319,7 @@
protect,
protected,
protected@eappto,protected@xappto,
- protected@edef.protected@xdef,
+ protected@edef,protected@xdef,
protected@epreto,protected@xpreto,
protected@cseappto,protected@csxappto,
protected@csedef,protected@csxdef,
@@ -1958,4 +1958,5 @@ HISTORY:
2013/10/21 v0.8 - added missing comma in list of commands
2013/10/21 v0.9 - added internal LaTeX commands and a number of `etoolbox'
macros
+2014/03/11 v0.11 - small bug fixes in \cnltx@predefined@control@sequences
diff --git a/Master/texmf-dist/tex/latex/cnltx/cnltx-names.sty b/Master/texmf-dist/tex/latex/cnltx/cnltx-names.sty
new file mode 100644
index 00000000000..d97c975c79c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cnltx/cnltx-names.sty
@@ -0,0 +1,177 @@
+% a /very/ preliminary draft – don't use it
+\RequirePackage{cnltx-base}
+\ProvidesPackage{cnltx-names}[\cnltx@@date\space \cnltx@@version\space \cnltx@@info]
+
+% --------------------------------------------------------------------------
+\cnltx@create@bundle@message{names}{Error}
+\cnltx@create@bundle@message{names}{Warning}
+\cnltx@create@bundle@message{names}{WarningNoLine}
+\cnltx@create@bundle@message{names}{Info}
+
+% \newfirstformat\foo
+%
+% definiert
+% => \foo{bar} % als `benutzt' markieren, verwendet zuerst
+% % \foofirstformat , dann \fooformat
+% => \foo*{bar} % nicht als `benutzt' markieren, verwendet \fooformat
+% => \fooformat % kann später umdefiniert werden nach eigenem Geschmack
+% => \foofirstformat % kann später umdefiniert werden nach eigenem Geschmack
+% => \resetfoo % setzt alle \foo wieder (lokal) auf unbenutzt zurück
+\newrobustcmd*\newfirstformat[1]{%
+ \newrobustcmd*#1{%
+ \@ifstar
+ {\csuse{\cnltx@stripbs#1@star}}
+ {\csuse{\cnltx@stripbs#1@nostar}}%
+ }%
+ \cnltx@robust@cs{\cnltx@stripbs#1@nostar}[1]{%
+ \ifcsdef{\cnltx@stripbs#1@\detokenize{##1}}
+ {\csuse{\cnltx@stripbs#1format}{##1}}
+ {\csuse{\cnltx@stripbs#1firstformat}{##1}\csuse{define@\cnltx@stripbs#1}{##1}}%
+ }%
+ \cnltx@robust@cs{\cnltx@stripbs#1@star}[1]{\csuse{\cnltx@stripbs#1starformat}{##1}}%
+ \cnltx@new@cs{\cnltx@stripbs#1@used}{}%
+ \cnltx@robust@cs{define@\cnltx@stripbs#1}[1]{%
+ \csgdef{\cnltx@stripbs#1@\detokenize{##1}}{}%
+ \listcsgadd{\cnltx@stripbs#1@used}{##1}%
+ }%
+ \cnltx@robust@cs{undefine@\cnltx@stripbs#1}[1]{%
+ \csundef{\cnltx@stripbs#1@\detokenize{##1}}%
+ }%
+ \cnltx@robust@cs{reset\cnltx@stripbs#1}{%
+ \forlistcsloop{\csuse{undefine@\cnltx@stripbs#1}}{\cnltx@stripbs#1@used}%
+ \csdef{\cnltx@stripbs#1@used}{}%
+ }%
+ \cnltx@new@cs{\cnltx@stripbs#1firstformat}[1]{##1}%
+ \cnltx@new@cs{\cnltx@stripbs#1format}[1]{##1}%
+ \cnltx@new@cs{\cnltx@stripbs#1starformat}[1]{##1}%
+}
+
+% --------------------------------------------------------------------------
+
+\newcommand*\writename[1]{\cnltx@write@name#1 \q@stop}
+
+\newcommand*\cnltx@write@firstname[1]{#1}
+\newcommand*\cnltx@write@middlename[1]{\cnltx@initial{#1}}
+\newcommand*\cnltx@write@lastname[1]{\textsc{#1}}
+\newcommand*\cnltx@between@names{\,}
+
+\newcommand*\cnltx@initial[1]{\cnltx@initial@aux#1\q@stop}
+\def\cnltx@initial@aux#1#2\q@stop{#1.}
+
+\newcommand*\cnltx@name@idx[3]{%
+ \ifblank{#1}
+ {\index{#3@\cnltx@write@lastname{#3}}}
+ {\index{#3, #1@\cnltx@write@lastname{#3}, \cnltx@write@firstname{#1}}}%
+}
+
+% TODO: Index hinzufügen \newcommand*\cnltx@name@idx[2]{\index{#1@#2}}
+\newcommand*\cnltx@write@fullname[2]{%
+ \cnltx@write@firstname{#1}\cnltx@between@names
+ \cnltx@write@lastname{#2}%
+}
+
+\newcommand*\cnltx@write@fullmiddlename[3]{%
+ \cnltx@write@firstname{#1}\cnltx@between@names
+ \cnltx@write@middlename{#2}\cnltx@between@names
+ \cnltx@write@lastname{#3}%
+}
+\def\cnltx@write@fullmiddlename@aux#1#2#3 \q@stop{%
+ \cnltx@write@fullmiddlename{#1}{#2}{#3}%
+ \ifbool{cnltx@name@noidx}{}{%
+ \cnltx@name@idx{#1}{#2}{#3}%
+ }%
+}
+
+\def\cnltx@write@name#1 #2\q@stop{%
+ \ifblank{#2}
+ {%
+ \cnltx@write@lastname{#1}%
+ \ifbool{cnltx@name@noidx}{}
+ {\cnltx@name@idx{}{}{#1}}%
+ }
+ {\cnltx@write@completename{#1}#2\q@stop}%
+}
+% TODO: erweitern auf mehrere mittlere Namen:
+\def\cnltx@write@completename#1#2 #3\q@stop{%
+ \ifblank{#3}
+ {%
+ \cnltx@write@fullname{#1}{#2}%
+ \ifbool{cnltx@name@noidx}{}
+ {\cnltx@name@idx{#1}{}{#2}}%
+ }
+ {\cnltx@write@fullmiddlename@aux{#1}{#2}#3\q@stop}%
+}
+
+% name formats:
+\newrobustcmd*\defnameformat[4]{%
+ \cnltx@def@nameformat{#1}{#2}{#3}{#4}%
+}
+\newrobustcmd*\cnltx@def@nameformat[4]{%
+ \protected\csdef{cnltx@nameformat@#1}{%
+ \def\cnltx@write@firstname####1{#2}%
+ \def\cnltx@write@middlename####1{#3}%
+ \def\cnltx@write@lastname####1{#4}%
+ }%
+}
+
+\defnameformat{fullname}
+ {##1}
+ {##1}
+ {\textsc{##1}}
+\defnameformat{middledot}
+ {##1}
+ {\cnltx@initial{##1}}
+ {\textsc{##1}}
+\defnameformat{firstmiddledot}
+ {\cnltx@initial{##1}}
+ {\cnltx@initial{##1}}
+ {\textsc{##1}}
+\defnameformat{alldot}
+ {\cnltx@initial{##1}}
+ {\cnltx@initial{##1}}
+ {\cnltx@initial{##1}}
+\defnameformat{nomiddle}
+ {##1}
+ {\@gobble}
+ {\textsc{##1}}
+\defnameformat{nomiddledot}
+ {\cnltx@initial{##1}}
+ {\@gobble}
+ {\textsc{##1}}
+% \show\cnltx@nameformat@nomiddledot
+\defnameformat{onlylast}
+ {\@gobble}
+ {\@gobble}
+ {\textsc{##1}}
+
+% choose name format:
+\newrobustcmd*\writenameformat[1]{%
+ \csuse{cnltx@nameformat@#1}%
+}
+
+% --------------------------------------------------------------------------
+
+\newbool{cnltx@name@noidx}
+
+\newfirstformat\name
+\renewcommand*\namefirstformat[1]{\writename{#1}}
+\renewcommand*\nameformat[1]{{\writenameformat{nomiddle}\writename{#1}}}
+\renewcommand*\namestarformat[1]{%
+ \begingroup
+ \booltrue{cnltx@name@noidx}%
+ \namefirstformat{#1}%
+ \endgroup
+}
+
+\newrobustcmd*\cnltx@newname[2]{%
+ \newrobustcmd*#1{%
+ \@ifstar
+ {\name*{#2}}
+ {\name{#2}}%
+ }%
+}
+
+\newrobustcmd*\newname{\cnltx@newname}
+
+\endinput
+% --------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/cnltx/cnltx-tools.sty b/Master/texmf-dist/tex/latex/cnltx/cnltx-tools.sty
index 5b3ee29a4c9..3b53ee0ec44 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-2014 Clemens Niederberger
+% Copyright 2013-2015 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -34,45 +34,72 @@
\cnltx@create@bundle@message{tools}{WarningNoLine}
\cnltx@create@bundle@message{tools}{Info}
-% --------------------------------------------------------------------------
-\newcommand*\cnltx@name@first[1]{#1}
-\newcommand*\cnltx@name@last[1]{\textsc{#1}}
-\newcommand*\cnltx@name@base[1]{#1}
-
-\pgfkeys{
- cnltx/.cd,
- last-name-format/.code = \def\cnltx@name@last##1{#1} ,
- first-name-format/.code = \def\cnltx@name@first##1{#1} ,
- name-format/.code = \def\cnltx@name@base##1{#1}
-}
+\cnltx@load@module{translations}
-\newcommand*\cnltx@name@idx[1]{\index{#1@#1}}
-\newrobustcmd*\cnltx@name@star[2][]{%
- \ifblank{#1}
- {\cnltx@name@base{\cnltx@name@last{#2}}}
- {\cnltx@name@base{\cnltx@name@first{#1} \cnltx@name@last{#2}}}%
-}
-\newrobustcmd*\cnltx@name@nostar[2][]{%
- \ifblank{#1}
- {\cnltx@name@base{\cnltx@name@last{#2}}\cnltx@name@idx{#2}}
- {%
- \cnltx@name@base{\cnltx@name@first{#1} \cnltx@name@last{#2}}%
- \cnltx@name@idx{#2, #1}%
- }%
-}
-\def\cnltx@name{\@ifstar{\cnltx@name@star}{\cnltx@name@nostar}}
-
-\newrobustcmd*\cnltx@newname[3]{%
- \csdef{\cnltx@stripbs#1@short}{\cnltx@name@base{#3}\cnltx@name@idx{#3, #2}}%
- \csdef{\cnltx@stripbs#1@long}{\cnltx@name@base{#2 #3}\cnltx@name@idx{#3, #2}}%
- \newrobustcmd*#1{%
- \@ifstar
- {\csuse{\cnltx@stripbs#1@short}}
- {\csuse{\cnltx@stripbs#1@long}}%
- }%
-}
+% --------------------------------------------------------------------------
+% \newcommand*\cnltx@name@first[1]{#1}
+% \newcommand*\cnltx@name@last[1]{\textsc{#1}}
+% \newcommand*\cnltx@name@base[1]{#1}
+
+% \pgfkeys{
+% cnltx/.cd,
+% last-name-format/.code = \def\cnltx@name@last##1{#1} ,
+% first-name-format/.code = \def\cnltx@name@first##1{#1} ,
+% name-format/.code = \def\cnltx@name@base##1{#1}
+% }
+
+% \newcommand*\cnltx@name@idx[2]{\index{#1@#2}}
+% \newrobustcmd*\cnltx@name@star[2]{%
+% \ifblank{#1}
+% {\cnltx@name@base{\cnltx@name@last{#2}}}
+% {\cnltx@name@base{\cnltx@name@first{#1} \cnltx@name@last{#2}}}%
+% }
+% \newrobustcmd*\cnltx@name@nostar[2]{%
+% \ifblank{#1}
+% {%
+% \cnltx@name@base{\cnltx@name@last{#2}}%
+% \cnltx@name@idx{#2}{\cnltx@name@base{\cnltx@name@last{#2}}}%
+% }
+% {%
+% \cnltx@name@base{\cnltx@name@first{#1} \cnltx@name@last{#2}}%
+% \cnltx@name@idx{#2, #1}{%
+% \cnltx@name@base{\cnltx@name@last{#2}},
+% \cnltx@name@base{\cnltx@name@first{#1}}%
+% }%
+% }%
+% }
+% \newrobustcmd*\cnltx@name{\@ifstar{\cnltx@name@star}{\cnltx@name@nostar}}
+
+% \newrobustcmd*\cnltx@newname[3]{%
+% \csdef{\cnltx@stripbs#1@short}{%
+% \cnltx@name@base{\cnltx@name@last{#3}}%
+% \cnltx@name@idx{#3, #2}{%
+% \cnltx@name@base{\cnltx@name@last{#3}, \cnltx@name@first{#2}}%
+% }%
+% }%
+% \csdef{\cnltx@stripbs#1@long}{%
+% \cnltx@name@base{\cnltx@name@first{#2} \cnltx@name@last{#3}}%
+% \cnltx@name@idx{#3, #2}{%
+% \cnltx@name@base{\cnltx@name@last{#3}},
+% \cnltx@name@base{\cnltx@name@first{#2}}%
+% }%
+% }%
+% \newrobustcmd*#1{%
+% \@ifstar
+% {\csuse{\cnltx@stripbs#1@short}}
+% {\csuse{\cnltx@stripbs#1@long}}%
+% }%
+% }
+
+% \newrobustcmd*\newname{\cnltx@newname}
+
+% \newrobustcmd*\name{%
+% \@ifstar
+% {\@testopt{\cnltx@name@user*}{}}
+% {\@testopt{\cnltx@name@user{}}{}}%
+% }
+% \def\cnltx@name@user#1[#2]#3{\cnltx@name#1{#2}{#3}}
-\newrobustcmd*\newname{\cnltx@newname}
% --------------------------------------------------------------------------
\PassOptionsToPackage{space=true}{accsupp}
@@ -91,7 +118,10 @@
\AtBeginDocument{%
\@ifpackageloaded{hyperref}
{}
- {\providecommand\texorpdfstring[2]{#1}}%
+ {%
+ \providecommand\nohyperpage[1]{#1}%
+ \providecommand\texorpdfstring[2]{#1}%
+ }%
}
\def\cnltx@acronym@format{\scshape}
@@ -173,26 +203,11 @@
\newcommand*\cnltxlatin[1]{\textit{#1}}
-\DeclareTranslationFallback{cnltx-i.e.}{\cnltxlatin{i.\,e}}
-\DeclareTranslation{English}{cnltx-i.e.}{\cnltxlatin{i.\,e}}
-\DeclareTranslation{German}{cnltx-i.e.}{d.\,h}
-
-\DeclareTranslationFallback{cnltx-e.g.}{\cnltxlatin{e.\,g}}
-\DeclareTranslation{English}{cnltx-e.g.}{\cnltxlatin{e.\,g}}
-\DeclareTranslation{German}{cnltx-e.g.}{z.\,B}
-
-\DeclareTranslationFallback{cnltx-cf.}{\cnltxlatin{cf}}
-\DeclareTranslation{English}{cnltx-cf.}{\cnltxlatin{cf}}
-\DeclareTranslation{German}{cnltx-cf.}{vgl}
-
-\DeclareTranslationFallback{cnltx-etc.}{\cnltxlatin{etc}}
-\DeclareTranslation{English}{cnltx-etc.}{\cnltxlatin{etc}}
-\DeclareTranslation{German}{cnltx-etc.}{etc}
-
\newabbr\ie{\GetTranslation{cnltx-i.e.}}
\newabbr\eg{\GetTranslation{cnltx-e.g.}}
\newabbr\cf{\GetTranslation{cnltx-cf.}}
\newabbr\etc{\GetTranslation{cnltx-etc.}}
+\newabbr\vs{\GetTranslation{cnltx-vs.}}
\newabbr\zB{z.\,B}
\newabbr\ZB{Z.\,B}
@@ -219,4 +234,8 @@ HISTORY:
2013/09/10 v0.2 - first published version
2013/09/30 v0.7 - added abbreviations
2013/11/22 v0.9 - \bzw
+2014/03/11 v0.11 - bug fixes in the \newname definitions
+ - new command \name
+ - use \cnltx@load@module
+2014/??/?? v0.?? - \vs
diff --git a/Master/texmf-dist/tex/latex/cnltx/cnltx-translations.sty b/Master/texmf-dist/tex/latex/cnltx/cnltx-translations.sty
new file mode 100644
index 00000000000..53dc2d4ed4a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/cnltx/cnltx-translations.sty
@@ -0,0 +1,128 @@
+% --------------------------------------------------------------------------
+% the CNLTX bundle
+%
+% LaTeX source code and output
+%
+% --------------------------------------------------------------------------
+% Clemens Niederberger
+% Web: https://github.com/cgnieder/cnltx/
+% E-Mail: contact@mychemistry.eu
+% --------------------------------------------------------------------------
+% Copyright 2013-2015 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-base}
+\ProvidesPackage{cnltx-translations}[\cnltx@@date\space \cnltx@@version\space \cnltx@@info]
+
+% --------------------------------------------------------------------------
+\cnltx@create@bundle@message{translations}{Error}
+\cnltx@create@bundle@message{translations}{Warning}
+\cnltx@create@bundle@message{translations}{WarningNoLine}
+\cnltx@create@bundle@message{translations}{Info}
+
+% --------------------------------------------------------------------------
+\RequirePackage{translations}
+
+\DeclareTranslationFallback{cnltx-f.}{f.}
+\DeclareTranslation{English}{cnltx-f.}{f.}
+\DeclareTranslation{German}{cnltx-f.}{f.}
+
+\DeclareTranslationFallback{cnltx-ff.}{ff.}
+\DeclareTranslation{English}{cnltx-ff.}{ff.}
+\DeclareTranslation{German}{cnltx-ff.}{ff.}
+
+\DeclareTranslationFallback{cnltx-package}{package}
+\DeclareTranslation{English}{cnltx-package}{package}
+\DeclareTranslation{German}{cnltx-package}{Paket}
+
+\DeclareTranslationFallback{cnltx-environment}{environment}
+\DeclareTranslation{English}{cnltx-environment}{environment}
+\DeclareTranslation{German}{cnltx-environment}{Umgebung}
+
+\DeclareTranslationFallback{cnltx-class}{class}
+\DeclareTranslation{English}{cnltx-class}{class}
+\DeclareTranslation{German}{cnltx-class}{Klasse}
+
+\DeclareTranslationFallback{cnltx-bundle}{bundle}
+\DeclareTranslation{English}{cnltx-bundle}{bundle}
+\DeclareTranslation{German}{cnltx-bundle}{Bundle}
+
+\DeclareTranslationFallback{cnltx-default}{Default}
+\DeclareTranslation{English}{cnltx-default}{Default}
+\DeclareTranslation{German}{cnltx-default}{Voreinstellung}
+
+\DeclareTranslationFallback{cnltx-required}{required}
+\DeclareTranslation{English}{cnltx-required}{required}
+\DeclareTranslation{German}{cnltx-required}{erforderlich}
+
+\DeclareTranslationFallback{cnltx-empty}{initially empty}
+\DeclareTranslation{English}{cnltx-empty}{initially empty}
+\DeclareTranslation{German}{cnltx-empty}{zun\"achst leer}
+
+\DeclareTranslationFallback{cnltx-toc}{Table of Contents}
+\DeclareTranslation{English}{cnltx-toc}{Table of Contents}
+\DeclareTranslation{German}{cnltx-toc}{Inhaltsverzeichnis}
+
+\DeclareTranslationFallback{cnltx-license}{%
+ Permission is granted to copy, distribute and/or modify this software under
+ the terms of the \LPPL\ (\lppl), version 1.3 or later
+ (\url{http://www.latex-project.org/lppl.txt}). The software has the status%
+}
+\DeclareTranslation{English}{cnltx-license}{%
+ Permission is granted to copy, distribute and/or modify this software under
+ the terms of the \LPPL\ (\lppl), version 1.3 or later
+ (\url{http://www.latex-project.org/lppl.txt}). The software has the status%
+}
+\DeclareTranslation{German}{cnltx-license}{%
+ Es ist erlaubt, diese Software unter den Bedingungen der \LPPL\ (\lppl),
+ Version 1.3 oder sp\"ater, zu kopieren und zu verteilen
+ (\url{http://www.latex-project.org/lppl.txt}). Sie hat den Status%
+}
+
+\DeclareTranslationFallback{cnltx-introduced}{Introduced in version}
+\DeclareTranslation{English}{cnltx-introduced}{Introduced in version}
+\DeclareTranslation{German}{cnltx-introduced}{Eingef\"uhrt in Version}
+
+\DeclareTranslationFallback{cnltx-changed}{Changed in version}
+\DeclareTranslation{English}{cnltx-changed}{Changed in version}
+\DeclareTranslation{German}{cnltx-changed}{Ge\"andert in Version}
+
+\DeclareTranslationFallback{cnltx-i.e.}{\cnltxlatin{i.\,e}}
+\DeclareTranslation{English}{cnltx-i.e.}{\cnltxlatin{i.\,e}}
+\DeclareTranslation{German}{cnltx-i.e.}{d.\,h}
+
+\DeclareTranslationFallback{cnltx-e.g.}{\cnltxlatin{e.\,g}}
+\DeclareTranslation{English}{cnltx-e.g.}{\cnltxlatin{e.\,g}}
+\DeclareTranslation{German}{cnltx-e.g.}{z.\,B}
+
+\DeclareTranslationFallback{cnltx-cf.}{\cnltxlatin{cf}}
+\DeclareTranslation{English}{cnltx-cf.}{\cnltxlatin{cf}}
+\DeclareTranslation{German}{cnltx-cf.}{vgl}
+
+\DeclareTranslationFallback{cnltx-etc.}{\cnltxlatin{etc}}
+\DeclareTranslation{English}{cnltx-etc.}{\cnltxlatin{etc}}
+\DeclareTranslation{German}{cnltx-etc.}{etc}
+
+\DeclareTranslationFallback{cnltx-vs.}{\cnltxlatin{vs}}
+\DeclareTranslation{English}{cnltx-vs.}{\cnltxlatin{vs}}
+\DeclareTranslation{German}{cnltx-vs.}{vs}
+
+% --------------------------------------------------------------------------
+\endinput
+
+2014/03/11 v0.11 - first published version
+2014/??/?? v0.?? - {cnltx-vs.}
diff --git a/Master/texmf-dist/tex/latex/cnltx/cnltx.bbx b/Master/texmf-dist/tex/latex/cnltx/cnltx.bbx
index 0c8099fb0af..1fd4dc2b1bc 100644
--- a/Master/texmf-dist/tex/latex/cnltx/cnltx.bbx
+++ b/Master/texmf-dist/tex/latex/cnltx/cnltx.bbx
@@ -25,11 +25,13 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-\RequirePackage{cnltx-example}
+\RequirePackage{cnltx-base}
\ProvidesFile{cnltx.bbx}[\cnltx@@date\space \cnltx@@version\space \cnltx@@info]
+\cnltx@load@modules{example,tools,translations}
+
\RequireBibliographyStyle{alphabetic}
-\ExecuteBibliographyOptions{block=ragged}
+\ExecuteBibliographyOptions{block=ragged,useprefix=true}
\DeclareBibliographyDriver{latex}{%
\usebibmacro{bibindex}%
@@ -77,13 +79,22 @@
}%
}
+\renewcommand*{\mkbibnamelast}[1]{\cnltx@write@lastname{#1}}
+\renewcommand*{\mkbibnamefirst}[1]{\cnltx@write@firstname{#1}}
+\renewcommand*{\mkbibnameprefix}[1]{\cnltx@write@lastname{#1}}
+
\DeclareNameAlias[package]{maintainer}{default}
\DeclareNameAlias[class]{maintainer}{default}
\DeclareNameAlias[bundle]{maintainer}{default}
-\DeclareIndexNameAlias[package]{maintainer}{default}
-\DeclareIndexNameAlias[class]{maintainer}{default}
-\DeclareIndexNameAlias[bundle]{maintainer}{default}
+\RequirePackage{translations}
+\DeclareTranslationFallback{cnltx-maintainer}{current maintainer}
+\DeclareTranslation{English}{cnltx-maintainer}{current maintainer}
+\DeclareTranslation{German}{cnltx-maintainer}{aktueller Maintainer}
+
+\DeclareTranslationFallback{cnltx-maintainers}{current maintainers}
+\DeclareTranslation{English}{cnltx-maintainers}{current maintainers}
+\DeclareTranslation{German}{cnltx-maintainers}{aktuelle Maintainer}
\DeclareFieldFormat[package]{title}{\pkg*{#1}}
\DeclareFieldFormat[class]{title}{\cls*{#1}}
@@ -121,6 +132,46 @@
{\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}}%
+ }%
+ }%
+}
+
+\DeclareIndexNameAlias{labelname}{cnltx}
+\DeclareIndexNameAlias{author}{cnltx}
+\DeclareIndexNameAlias{maintainer}{cnltx}
+\DeclareIndexNameAlias{labelname}{cnltx}
+\DeclareIndexNameAlias{author}{cnltx}
+\DeclareIndexNameAlias{maintainer}{cnltx}
+\DeclareIndexNameAlias{labelname}{cnltx}
+\DeclareIndexNameAlias{author}{cnltx}
+\DeclareIndexNameAlias{maintainer}{cnltx}
+
\DeclareFieldFormat[package]{subtitle}{\mkbibemph{#1}}
\DeclareFieldFormat[class]{subtitle}{\mkbibemph{#1}}
\DeclareFieldFormat[bundle]{subtitle}{\mkbibemph{#1}}
@@ -143,8 +194,12 @@
\endinput
HISTORY:
-2013/09/14 v0.4 - first version added to the bundle
-2013/10/04 v0.7a - added drivers `@class' and `@bundle'
-2013/11/22 v0.9 - made independent from the `cnltx-doc' class
-
+2013/09/14 v0.4 - first version added to the bundle
+2013/10/04 v0.7a - added drivers `@class' and `@bundle'
+2013/11/22 v0.9 - made independent from the `cnltx-doc' class
+2014/03/11 v0.11 - change name format so that names are printed according to
+ the format of the \newname commands from the `tools'
+ module;
+ this is going to need tests if it really is consistent
+ for different types of name formats (prefixes, affixes...)
diff --git a/Master/texmf-dist/tex/latex/cnltx/cnltx.sty b/Master/texmf-dist/tex/latex/cnltx/cnltx.sty
index 08ed2e80541..298ba37b749 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-2014 Clemens Niederberger
+% Copyright 2013-2015 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -28,19 +28,19 @@
\RequirePackage{cnltx-base}
\ProvidesPackage{cnltx}[\cnltx@@date\space \cnltx@@version\space \cnltx@@info]
-\newcommand*\cnltx@register@module[1]{%
- \DeclareOption{#1}{\AtEndOfPackage{\RequirePackage{cnltx-#1}}}%
-}
-
\cnltx@register@module{listings}
\cnltx@register@module{example}
+\cnltx@register@module{names}
\cnltx@register@module{tools}
+\cnltx@register@module{translations}
\ProcessOptions*
\endinput
HISTORY:
-2013/11/22 v0.9 - first added to the bundle
-
+2013/11/22 v0.9 - first added to the bundle
+2014/03/11 v0.11 - use \cnltx@load@module
+2015/01/11 v0.12 - move definition of \cnltx@register@module in base module
+ - add `names' module
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-06 16:45:54 +0000