summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/cnltx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/cnltx')
-rw-r--r--Master/texmf-dist/tex/latex/cnltx/cnltx-base.sty12
-rw-r--r--Master/texmf-dist/tex/latex/cnltx/cnltx-doc.cls67
-rw-r--r--Master/texmf-dist/tex/latex/cnltx/cnltx-example.sty18
3 files changed, 57 insertions, 40 deletions
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,
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-22 16:29:48 +0000