cnltx (17aug15)

git-svn-id: svn://tug.org/texlive/trunk@38138 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 253 insertions, 111 deletions

diff --git a/Master/texmf-dist/bibtex/bib/cnltx/cnltx.bib b/Master/texmf-dist/bibtex/bib/cnltx/cnltx.bib
index 2ed9643e79d..d38858ab3d1 100644
--- a/Master/texmf-dist/bibtex/bib/cnltx/cnltx.bib
+++ b/Master/texmf-dist/bibtex/bib/cnltx/cnltx.bib
@@ -79,10 +79,18 @@
   title    = {amsmath} ,
   author   = {{American Mathematical Society}} ,
   sortname = {American Mathematical Society} ,
+  shorthand = {AMS} ,
   date     = {2002-02-25} ,
   version  = {2.0} ,
   url      = {http://mirror.ctan.org/macros/latex/required/amsmath/}
 }
+@package{pkg:amstext,
+  title    = {amstext} ,
+  author   = {Frank Mittelbach and Rainer Sch\"opf} ,
+  date     = {2000-06-29} ,
+  version  = {2.01} ,
+  url      = {http://mirror.ctan.org/macros/latex/required/amstext/}
+}
 @package{pkg:answers,
   title      = {answers},
   author     = {Mike Piff},
@@ -135,6 +143,13 @@
   version = {1.25},
   url     = {http://mirror.ctan.org/macros/latex/contrib/bigfoot/}
 }
+@package{pkg:bohr,
+  title      = {bohr} ,
+  author     = {Clemens Niederberger} ,
+  date       = {2015-06-16} ,
+  version    = {1.0} ,
+  url        = {http://mirror.ctan.org/macros/latex/contrib/bohr/}
+}
 @package{pkg:booktabs,
   title      = {booktabs} ,
   author     = {Simon Fear} ,
@@ -180,31 +195,38 @@
 @package{pkg:chemformula,
   title   = {chemformula} ,
   author  = {Clemens Niederberger} ,
-  date    = {2014-08-08} ,
-  version = {4.8} ,
+  date    = {2015-06-30} ,
+  version = {4.11} ,
   url     = {http://mirror.ctan.org/macros/latex/contrib/chemformula/}
 }
 @package{pkg:chemgreek,
   title   = {chemgreek} ,
   author  = {Clemens Niederberger} ,
-  date    = {2014-08-08} ,
-  version = {0.5} ,
+  date    = {2015-07-01} ,
+  version = {1.0a} ,
   url     = {http://mirror.ctan.org/macros/latex/contrib/chemgreek/}
 }
 @package{pkg:chemmacros,
   title   = {chemmacros} ,
   author  = {Clemens Niederberger} ,
-  date    = {2014-08-08} ,
-  version = {4.6} ,
+  date    = {2015-02-08} ,
+  version = {4.7} ,
   url     = {http://mirror.ctan.org/macros/latex/contrib/chemmacros/}
 }
 @package{pkg:chemnum,
   title   = {chemnum} ,
   author  = {Clemens Niederberger} ,
-  date    = {2014-08-08} ,
-  version = {1.1} ,
+  date    = {2015-05-13} ,
+  version = {1.1a} ,
   url     = {http://mirror.ctan.org/macros/latex/contrib/chemnum/}
 }
+@package{pkg:chemstyle,
+  title   = {chemstyle} ,
+  author  = {Joseph Wright} ,
+  date    = {2013-07-03} ,
+  version = {2.0m} ,
+  url     = {http://mirror.ctan.org/macros/latex/contrib/chemstyle/}
+}
 @package{pkg:chngcntr,
   title      = {chngcntr} ,
   author     = {Peter Wilson} ,
@@ -241,6 +263,13 @@
   version    = {1.0e},
   url        = {http://mirror.ctan.org/macros/latex/contrib/cprotect/}
 }
+@package{pkg:elements,
+  title      = {elements},
+  author     = {Clemens Niederberger},
+  version    = {0.1},
+  date       = {2015-06-14},
+  url        = {http://mirror.ctan.org/macros/latex/contrib/elements/}
+}
 @package{pkg:endnotes,
   title      = {endnotes} ,
   author     = {John Lavagnino} ,
@@ -292,17 +321,18 @@
   url        = {http://mirror.ctan.org/macros/latex/contrib/esami/}
 }
 @package{pkg:etoolbox,
-  title   = {etoolbox} ,
-  author  = {Philipp Lehman} ,
-  date    = {2011-01-03} ,
-  version = {2.1} ,
-  url     = {http://mirror.ctan.org/macros/latex/contrib/etoolbox/}
+  title      = {etoolbox} ,
+  author     = {Philipp Lehman} ,
+  maintainer = {Joseph Wright} ,
+  date       = {2015-04-04} ,
+  version    = {2.2} ,
+  url        = {http://mirror.ctan.org/macros/latex/contrib/etoolbox/}
 }
 @class{cls:exam,
   title      = {exam},
   author     = {Philip Hirschhorn},
-  date       = {2011-05-22},
-  version    = {2.4},
+  date       = {2015-05-07},
+  version    = {2.5},
   url        = {http://mirror.ctan.org/macros/latex/contrib/exam/}
 }
 @package{pkg:examdesign,
@@ -486,9 +516,9 @@
   sorttitle      = {KOMA-Script} ,
   indextitle     = {\KOMAScript} ,
   indexsorttitle = {KOMA-Script} ,
-  author         = {Markus Kohm and Frank Neukahm},
-  date           = {2012-07-29} ,
-  version        = {3.11b} ,
+  author         = {Markus Kohm},
+  date           = {2015-07-02} ,
+  version        = {3.18} ,
   url            = {http://mirror.ctan.org/macros/latex/contrib/koma-script/}
 }
 @package{pkg:kpfonts,
@@ -502,25 +532,28 @@
 @bundle{bnd:l3experimental,
   title      = {l3experimental} ,
   author     = {{The \LaTeX3 Project Team}} ,
+  shorthand  = {L3P} ,
   sortname   = {LaTeX3 Project Team} ,
-  version    = {SVN 4582} ,
-  date       = {2013-07-28} ,
+  version    = {SVN 5630} ,
+  date       = {2015-07-15} ,
   url        = {http://mirror.ctan.org/macros/latex/contrib/l3experimental/}
 }
 @bundle{bnd:l3kernel,
   title      = {l3kernel} ,
   author     = {{The \LaTeX3 Project Team}} ,
+  shorthand  = {L3P} ,
   sortname   = {LaTeX3 Project Team} ,
-  version    = {SVN 4582} ,
-  date       = {2013-07-28} ,
+  version    = {SVN 5630} ,
+  date       = {2015-07-15} ,
   url        = {http://mirror.ctan.org/macros/latex/contrib/l3kernel/}
 }
 @bundle{bnd:l3packages,
   title      = {l3packages} ,
   author     = {{The \LaTeX3 Project Team}} ,
+  shorthand  = {L3P} ,
   sortname   = {LaTeX3 Project Team} ,
-  version    = {SVN 4582} ,
-  date       = {2013-07-28} ,
+  version    = {SVN 5530} ,
+  date       = {2015-07-15} ,
   url        = {http://mirror.ctan.org/macros/latex/contrib/l3packages/}
 }
 @package{pkg:libertine,
@@ -544,6 +577,13 @@
   version  = {4.11} ,
   url      = {http://mirror.ctan.org/macros/latex/required/tools/}
 }
+@package{pkg:lscape,
+  title    = {lscape} ,
+  author   = {David Carlisle} ,
+  date     = {2000-10-22} ,
+  version  = {3.01} ,
+  url      = {http://mirror.ctan.org/macros/latex/required/graphics/}
+}
 @package{pkg:ltxcmds,
   title   = {ltxcmds},
   author  = {Heiko Oberdiek},
@@ -739,13 +779,20 @@
   version  = {2.1} ,
   url      = {http://mirror.ctan.org/macros/latex/contrib/ms/ragged2e/}
 }
- @package{pkg:realbookchords,
+@package{pkg:realbookchords,
   title   = {realbookchords},
   author  = {Clemens Niederberger},
   date    = {2013-04-29},
   version = {0.1},
   url     = {https://bitbucket.org/cgnieder/guitarchordschemes/}
 }
+@package{pkg:relsize,
+  title   = {relsize} ,
+  author  = {Donald Arseneau} ,
+  date    = {2013-03-29} ,
+  version = {4.1} ,
+  url     = {http://mirror.ctan.org/macros/latex/contrib/relsize}
+}
 @package{pkg:scrlfile,
   title   = {scrlfile} ,
   author  = {Markus Kohm} ,
@@ -770,8 +817,8 @@
 @package{pkg:siunitx,
   title   = {siunitx} ,
   author  = {Joseph Wright} ,
-  version = {2.5s} ,
-  date    = {2013-07-31} ,
+  version = {2.6h} ,
+  date    = {2015-07-17} ,
   url     = {http://mirror.ctan.org/macros/latex/contrib/siunitx/}
 }
 @package{pkg:snotez,
@@ -906,6 +953,15 @@
   version = {2.11} ,
   url     = {http://mirror.ctan.org/macros/latex/contrib/xcolor/}
 }
+@package{pkg:xfrac,
+  title     = {xfrac} ,
+  author    = {{The \LaTeX3 Project Team}} ,
+  shorthand = {L3P} ,
+  sortname  = {LaTeX3 Project Team} ,
+  date      = {2014-05-04} ,
+  version   = {4728} ,
+  url       = {http://mirror.ctan.org/macros/latex/contrib/l3packages/}
+}
 @package{pkg:xpatch,
   title   = {xpatch} ,
   author  = {Enrico Gregorio} ,
diff --git a/Master/texmf-dist/doc/latex/cnltx/README b/Master/texmf-dist/doc/latex/cnltx/README
index e70bf85deaf..aa4361964af 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.12 2015/01/11
+the CNLTX bundle v0.13 2015/08/17
 
   LaTeX tools and documenting facilities
 
diff --git a/Master/texmf-dist/doc/latex/cnltx/cnltx_en.pdf b/Master/texmf-dist/doc/latex/cnltx/cnltx_en.pdf
index ba4fab65a6f..d25b68094ad 100644
--- a/Master/texmf-dist/doc/latex/cnltx/cnltx_en.pdf
+++ b/Master/texmf-dist/doc/latex/cnltx/cnltx_en.pdf
diff --git a/Master/texmf-dist/doc/latex/cnltx/cnltx_en.tex b/Master/texmf-dist/doc/latex/cnltx/cnltx_en.tex
index 6e62c578f0e..867a808b613 100644
--- a/Master/texmf-dist/doc/latex/cnltx/cnltx_en.tex
+++ b/Master/texmf-dist/doc/latex/cnltx/cnltx_en.tex
@@ -30,7 +30,8 @@
 % If you have any ideas, questions, suggestions or bugs to report, please
 % feel free to contact me.
 % --------------------------------------------------------------------------
-\documentclass[load-preamble+,babel-options={ngerman,english}]{cnltx-doc}
+\PassOptionsToPackage{ngerman,english}{babel}
+\documentclass[load-preamble+]{cnltx-doc}
 \usepackage[utf8]{inputenc}
 
 \usepackage{varioref}
@@ -1716,12 +1717,18 @@ The \cnltxdoc\ class only knows a few options:
     See section~\vref{sec:predefined-indexing} for details.
   \keybool{add-index}\Default{false}
     See section~\vref{sec:predefined-indexing} for details.
+  \keybool{adapt-layout}\Default{true}
+    \sinceversion{0.13}If set to true \cnltxdoc\ will make some changes to the
+    section and part formats, it will redefine the footnote format, set the
+    header and footer and adapt the caption format.
   \keyval{babel-options}{options}\Default{english}
     Options given to the \needpackage[macros/latex/required]{babel} package.
     This option only has an effect if \keyis-{load-preamble}{true}.
   \keyval{scrartcl}{options}\Default
-    Options that are passed to the underlying class \cls{scrartcl}.  \emph{All
-    global options you want to use should be given here.}
+    \changedversion{0.13}Options that are passed to the underlying class
+    \cls{scrartcl}.  Can be used to pass options to \cls{scrartcl} when
+    \option{load-preamble} is used.  Not really necessary since unknown
+    options are passed to \cls{scrartcl}, anyway.
 \end{options}
 
 
@@ -1851,59 +1858,124 @@ passing an option as class option.
     Class option that preloads part of my custom preamble.
 \end{options}
 
-Using the option will include the following code:\changedversion{0.10}
+Using the option will include the following code:\changedversion{0.13}
 
 \begin{sourcecode}
   \RequirePackage{ifxetex,ifluatex}
-  \ifboolexpr{not bool{xetex} and not bool{luatex}}
-    {\RequirePackage[T1]{fontenc}}
-    {\RequirePackage{fontspec}}
-  \RequirePackage[oldstyle]{libertine}
-  % `libertinehologopatch' is not on CTAN, yet!
-  % you can get it at https://bitbucket.org/cgnieder/libertinehologopatch/
-  \RequirePackage{libertinehologopatch}
-  \RequirePackage[supstfm=libertinesups]{superiors}
-  % libertine does not have superior letters:
-  \def\@makefnmark{%
-    \hbox{%
-      \cnltx@ifisnum{\@thefnmark}
-        {\textsu{\hspace*{\superiors@spaced}\@thefnmark}}
-        {\@textsuperscript{\normalfont\@thefnmark}}%
-    }%
-  }
-  \RequirePackage{microtype}
-  \ifboolexpr
+  \ifbool{cnltx@load@fonts}
     {
-      test {\ifcsdef{MT@pr@set@@romansans}} and
-      test {\ifcsdef{MT@ex@set@@romansans}}
+      \ifboolexpr{not bool{xetex} and not bool{luatex}}
+        {\RequirePackage[T1]{fontenc}}
+        {\RequirePackage{fontspec}}
+      \RequirePackage[oldstyle]{libertine}
+      \RequirePackage{libertinehologopatch}
+      \RequirePackage[supstfm=libertinesups]{superiors}
+      % libertine does not have superior letters:
+      \def\@makefnmark{%
+        \hbox{%
+          \cnltx@ifisnum{\@thefnmark}
+            {\textsu{\hspace*{\superiors@spaced}\@thefnmark}}
+            {\@textsuperscript{\normalfont\@thefnmark}}%
+        }%
+      }
     }
     {}
+  \ifbool{cnltx@microtype}
+    {\RequirePackage{microtype}}
+    {}
+  \ifboolexpr
+    {
+      bool {cnltx@microtype} and
+      not test {\ifcsdef{MT@pr@set@@romansans}} and
+      not test {\ifcsdef{MT@ex@set@@romansans}} and
+      bool {cnltx@load@fonts}
+    }
     {
       \DeclareMicrotypeSet{romansans}{
         encoding = {*},
         family   = {rm*,sf*}
       }
     }
-  \ifcsdef{MT@tr@set@@scshape}
     {}
+  \ifboolexpr
+    {
+      bool {cnltx@microtype} and
+      not test {\ifcsdef{MT@tr@set@@scshape}} and
+      bool {cnltx@load@fonts}
+    }
     {
       \DeclareMicrotypeSet[tracking]{scshape}{
         encoding = {*} ,
         shape    = {sc,scit,si}
       }
     }
-  \microtypesetup{
-    tracking   = scshape ,
-    protrusion = romansans ,
-    expansion  = romansans
-  }
-  \ifboolexpr{not bool{xetex} and not bool{luatex}}
-    {\RequirePackage[scaled=.79]{beramono}}
-    {\setmonofont[Scale=MatchLowercase]{Bitstream Vera Sans Mono}}
+    {}
+  \ifboolexpr
+    {
+      not bool {xetex} and
+      bool {cnltx@load@fonts} and
+      bool {cnltx@microtype}
+    }
+    {
+      \microtypesetup{
+        tracking   = scshape ,
+        protrusion = romansans ,
+        expansion  = romansans
+      }
+      \DisableLigatures{ family = tt* }
+    }
+    {}
+  \ifbool{cnltx@load@fonts}
+    {
+      \ifboolexpr{not bool{xetex} and not bool{luatex}}
+        {\RequirePackage[scaled=.81]{beramono}}
+        {
+          \setmonofont[
+            Scale = MatchLowercase ,
+            Ligatures = {NoCommon,NoRequired,NoContextual}
+          ]{DejaVu Sans Mono}
+        }
+      \KOMAoptions{DIV=last}
+      \recalctypearea
+    }
+    {}
   \RequirePackage{fnpct}
   \expandafter\RequirePackage\expandafter[\cnltx@babel@options]{babel}
-  \renewcommand*\othersectionlevelsformat[3]{%
-    \textcolor{cnltx}{#3\autodot}\enskip}
+\end{sourcecode}
+
+The effect of this preamble is demonstrated by the document you're reading at
+this moment.
+
+\begin{options}
+  \keybool{load-preamble-}\Default{false}
+    This option has the same effect as adding using \option{load-preamble} but
+    without making any font decisions.
+\end{options}
+
+Another option affects the layout of the document:
+\begin{options}
+  \keybool{adapt-layout}\Default{true}
+    \sinceversion{0.13}If set to true \cnltxdoc\ will make some changes to the
+    section and part formats, it will redefine the footnote format, set the
+    header and footer and adapt the caption format.
+\end{options}
+
+Using the option will include the following code:
+
+\begin{sourcecode}
+  \renewcommand*\sectionformat{%
+    \textcolor{cnltx}{\thesection\autodot}\enskip
+  }
+  \renewcommand*\subsectionformat{%
+    \textcolor{cnltx}{\thesubsection\autodot}\enskip
+  }
+  \renewcommand*\subsubsectionformat{%
+    \textcolor{cnltx}{\thesubsubsection\autodot}\enskip
+  }
+  \setkomafont{subsubsection}{\normalfont\normalsize\itshape}
+  \renewcommand*\partformat{%
+    \textcolor{cnltx}{\partname~\thepart\autodot}%
+  }
   \renewcommand*\partformat{%
     \textcolor{cnltx}{\partname~\thepart\autodot}}
   \deffootnote{2em}{1em}{\llap{\thefootnotemark. }}%
@@ -1916,9 +1988,6 @@ Using the option will include the following code:\changedversion{0.10}
   \setkomafont{captionlabel}{\cnltx@captionlabel@font}
 \end{sourcecode}
 
-The effect of this preamble is demonstrated by the document you're reading at
-this moment.
-
 \subsection{Predefined Indexing}\label{sec:predefined-indexing}
 \cnltxdoc\ allows the automated creation of an index.  This is done with the
 help of the \pkg{imakeidx} package by \egreg~\cite{pkg:imakeidx}.  To use this
@@ -1986,8 +2055,8 @@ packages in \file{bib} files:
   @class{cls:exam,
     title      = {exam},
     author     = {Philip Hirschhorn},
-    date       = {2011-05-22},
-    version    = {2.4},
+    date       = {2015-05-07},
+    version    = {2.5},
     url        = {http://mirror.ctan.org/macros/latex/contrib/exam/}
   }
   @bundle{bnd:koma-script,
@@ -1995,9 +2064,9 @@ packages in \file{bib} files:
     sorttitle      = {KOMA-Script} ,
     indextitle     = {\KOMAScript} ,
     indexsorttitle = {KOMA-Script} ,
-    author         = {Markus Kohm and Frank Neukahm},
-    date           = {2012-07-29} ,
-    version        = {3.11b} ,
+    author         = {Markus Kohm},
+    date           = {2015-07-02} ,
+    version        = {3.18} ,
     url            = {http://mirror.ctan.org/macros/latex/contrib/koma-script/}
   }
 \end{sourcecode}
diff --git a/Master/texmf-dist/tex/latex/cnltx/cnltx-base.sty b/Master/texmf-dist/tex/latex/cnltx/cnltx-base.sty
index a4be7114fd9..d8c63223fdd 100644
--- a/Master/texmf-dist/tex/latex/cnltx/cnltx-base.sty
+++ b/Master/texmf-dist/tex/latex/cnltx/cnltx-base.sty
@@ -25,8 +25,8 @@
 % If you have any ideas, questions, suggestions or bugs to report, please
 % feel free to contact me.
 % --------------------------------------------------------------------------
-\def\cnltx@@date{2015/01/11}
-\def\cnltx@@version{v0.12}
+\def\cnltx@@date{2015/08/17}
+\def\cnltx@@version{v0.13}
 \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}
@@ -546,13 +546,6 @@
 \newcommand*\cnltx@punctuation@ifpar{%
   \iftest{\expandafter\ifx\cnltx@trailpunct\par}%
 }
-% \def\cnltx@punctuation@ifpar{%
-%   \expandafter\ifx\cnltx@trailpunct\par
-%     \expandafter\@firstoftwo
-%   \else
-%     \expandafter\@secondoftwo
-%   \fi
-% }
 
 % --------------------------------------------------------------------------
 % per case list:
@@ -897,4 +890,5 @@ HISTORY:
                   - \cnltx@load@module, \cnltx@load@modules
 2015/01/11 v0.12  - updating the bundle to CTAN
                   - more security for \cnltx@ifisnum
+2015/08/17 v0.13  - resolve long overdue issues with cnltx-doc
 
diff --git a/Master/texmf-dist/tex/latex/cnltx/cnltx-doc.cls b/Master/texmf-dist/tex/latex/cnltx/cnltx-doc.cls
index 0044576bab8..4d7339db32a 100644
--- a/Master/texmf-dist/tex/latex/cnltx/cnltx-doc.cls
+++ b/Master/texmf-dist/tex/latex/cnltx/cnltx-doc.cls
@@ -39,6 +39,9 @@
 \newbool{cnltx@add@bib}
 \newbool{cnltx@load@fonts}
 \newbool{cnltx@microtype}
+\newbool{cnltx@layout}
+
+\booltrue{cnltx@layout}
 
 \newcommand*\cnltx@scrartcl@options{}
 \newcommand*\cnltx@babel@options{english}
@@ -65,13 +68,15 @@
       \booltrue{cnltx@microtype}
       \booltrue{cnltx@add@index}
       \booltrue{cnltx@add@bib} ,
-    babel-options/.code  = \def\cnltx@babel@options{#1}
+    babel-options/.code    = \def\cnltx@babel@options{#1} ,
+    adapt-layout/.is if    = cnltx@layout ,
+    unknown/.code          =
+      \edef\cnltx@scrartcl@options{\cnltx@scrartcl@options,\pgfkeyscurrentname}
 }
 
 \ProcessPgfOptions{/cnltx-doc}
 
-\let\@classoptionslist\relax
-\LoadClass{scrartcl}
+\LoadClass[\cnltx@scrartcl@options]{scrartcl}
 
 
 \newcommand*\cnltx@index@prologue{}
@@ -113,9 +118,6 @@
         {\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:
@@ -183,13 +185,29 @@
             Ligatures = {NoCommon,NoRequired,NoContextual}
           ]{DejaVu Sans Mono}
         }
+      \KOMAoptions{DIV=last}
       \recalctypearea
     }
     {}
   \RequirePackage{fnpct}
   \expandafter\RequirePackage\expandafter[\cnltx@babel@options]{babel}
-  \renewcommand*\othersectionlevelsformat[3]{%
-    \textcolor{cnltx}{#3\autodot}\enskip}
+  % \RequirePackage{babel}
+}{}
+
+\ifbool{cnltx@layout}{
+  \renewcommand*\sectionformat{%
+    \textcolor{cnltx}{\thesection\autodot}\enskip
+  }
+  \renewcommand*\subsectionformat{%
+    \textcolor{cnltx}{\thesubsection\autodot}\enskip
+  }
+  \renewcommand*\subsubsectionformat{%
+    \textcolor{cnltx}{\thesubsubsection\autodot}\enskip
+  }
+  \setkomafont{subsubsection}{\normalfont\normalsize\itshape}
+  \renewcommand*\partformat{%
+    \textcolor{cnltx}{\partname~\thepart\autodot}%
+  }
   \renewcommand*\partformat{%
     \textcolor{cnltx}{\partname~\thepart\autodot}}
   \deffootnote{2em}{1em}{\llap{\thefootnotemark. }}%
@@ -280,6 +298,7 @@
 \newcommand*\cnltx@package@title{??}
 \newcommand*\cnltx@title@format{\bfseries\scshape}
 \newbool{cnltx@package@title}
+\newbool{cnltx@build@title}
 \newcommand*\cnltx@package@subtitle{??}
 \newbool{cnltx@package@subtitle}
 \newcommand*\cnltx@package@url{??}
@@ -288,8 +307,7 @@
 \newbool{cnltx@package@email}
 \newcommand*\cnltx@package@abstract{??}
 \newbool{cnltx@package@abstract}
-\newlength\cnltx@package@abstract@width
-\setlength\cnltx@package@abstract@width{.75\linewidth}
+\newcommand*\cnltx@package@abstract@width{.75\linewidth}
 \newcommand*\cnltx@package@abstract@format{\setlength\parskip{.333\baselineskip}}
 
 \newrobustcmd*\cnltxpackagenameformat[1]{\textcolor{cnltx}{\textsc{#1}}}
@@ -360,24 +378,27 @@
       \@ifpackageloaded{#1}
         {\cnltx@getfileinfo{#1}{sty}}
         {\cnltx@doc@warning{Package `#1' is not loaded, yet!}}
-      \booltrue{cnltx@package@name} ,
+      \booltrue{cnltx@package@name}
+      \booltrue{cnltx@build@title} ,
     class/.code =
       \ifcsdef{#1}{}{\expandafter\newpackagename\csname#1\endcsname{#1}}
       \gdef\cnltx@package@name{#1}
       \@ifclassloaded{#1}
         {\cnltx@getfileinfo{#1}{cls}}
         {\cnltx@doc@warning{Class `#1' is not loaded, yet!}}
-      \booltrue{cnltx@package@name} ,
+      \booltrue{cnltx@package@name}
+      \booltrue{cnltx@build@title} ,
     name/.code =
       \ifcsdef{#1}{}{\expandafter\newpackagename\csname#1\endcsname{#1}}
       \gdef\cnltx@package@name{#1}
-      \booltrue{cnltx@package@name} ,
+      \booltrue{cnltx@package@name}
+      \booltrue{cnltx@build@title} ,
     title/.code =
       \gdef\cnltx@package@title{#1}
       \booltrue{cnltx@package@title} ,
     title-format/.code =
       \def\cnltx@title@format{#1} ,
-    build-title/.is if = cnltx@package@title ,
+    build-title/.is if = cnltx@build@title ,
     subtitle/.code =
       \gdef\cnltx@package@subtitle{#1}
       \booltrue{cnltx@package@subtitle} ,
@@ -659,7 +680,7 @@
 \newcommand*\cnltx@module@text[2]{%
   \begingroup
     \reversemarginpar
-    \marginnote{\hfill\module#1{#2}\cnltx@module@sep}%
+    \marginnote{\hfill\llap{\module#1{#2}}\cnltx@module@sep}%
   \endgroup
 }
   
@@ -710,14 +731,16 @@
   }%
   \RequirePackage{multicol}
   \AtBeginDocument{%
-    \ifbool{cnltx@package@name}
-      {\cnltx@title@information}
-      {%
-        \cnltx@doc@warning{%
-          No package/class name given. Hence I won't create an
-          automatic title%
+    \ifbool{cnltx@build@title}{%
+      \ifbool{cnltx@package@name}
+        {\cnltx@title@information}
+        {%
+          \cnltx@doc@warning{%
+            No package/class name given. Hence I won't create an
+            automatic title%
+          }%
         }%
-      }%
+    }{}%
   }%
 }
 
diff --git a/Master/texmf-dist/tex/latex/cnltx/cnltx-example.sty b/Master/texmf-dist/tex/latex/cnltx/cnltx-example.sty
index 256e154fb15..39d066602fd 100644
--- a/Master/texmf-dist/tex/latex/cnltx/cnltx-example.sty
+++ b/Master/texmf-dist/tex/latex/cnltx/cnltx-example.sty
@@ -223,15 +223,15 @@
   gobble           = \cnltx@gobble ,
   columns          = fullflexible,
   literate         =
-    {ä}{{\"a}}1
-    {ö}{{\"o}}1
-    {ü}{{\"u}}1
-    {Ä}{{\"A}}1
-    {Ö}{{\"O}}1
-    {Ü}{{\"U}}1
-    {ß}{{\ss}}1
-    {`}{\`{}}1
-    {'}{\textquotesingle}1 ,
+    {ä}{{\"a}}{1}
+    {ö}{{\"o}}{1}
+    {ü}{{\"u}}{1}
+    {Ä}{{\"A}}{1}
+    {Ö}{{\"O}}{1}
+    {Ü}{{\"U}}{1}
+    {ß}{{\ss}}{1}
+    {`}{\`{}}{1}
+    {'}{\textquotesingle}{1} ,
   breaklines       = true,
   keepspaces       = true,
   breakindent      = 1em,