diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/etoc/README | 16 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/etoc/README.md | 41 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/etoc/etoc-DE.pdf | bin | 406076 -> 409313 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/etoc/etoc.pdf | bin | 433010 -> 435626 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/etoc/etoc.dtx | 126 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/etoc/etoc.ins | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/etoc/etoc.sty | 2 |
7 files changed, 117 insertions, 72 deletions
diff --git a/Master/texmf-dist/doc/latex/etoc/README b/Master/texmf-dist/doc/latex/etoc/README index 225a6480b56..80172a3e9fe 100644 --- a/Master/texmf-dist/doc/latex/etoc/README +++ b/Master/texmf-dist/doc/latex/etoc/README @@ -1,14 +1,12 @@ - Source: etoc.dtx (v1.08b 2015/03/18) + Source: etoc.dtx (v1.08b 2015/03/18; doc of 2015/03/28) Author: Jean-Francois Burnol - Author for German tranlation: Christine Roemer + Author: Christine Roemer et al. (German tranlation) Info: Completely customisable TOCs License: LPPL 1.3c or later - -Copyright (C) 2012-2015 Jean-Francois Burnol <jfbu at free dot fr> - -Copyright (C) 2014-2015 Christine Roemer -<Christine_Roemer at t-online dot de> and collaborators for the -translation into German of the documentation. + Copyright (C) 2012-2015 Jean-Francois Burnol. + Copyright (C) 2014-2015 Christine Roemer and collaborators for + the translation into German of the documentation. + <jfbu at free dot fr> <Christine_Roemer at t-online dot de> @@ -143,6 +141,8 @@ Bug fixes: was defined to be \partname, but this is not compatible at least with babel+french context. Now simply expands to Part. - some problems fixed in the German documentation. +- [2015/03/28] some more problems fixed in the documentation. Added + mention of \etocarticlestyle and \etocbookstyle. v1.08a [2015/03/13] diff --git a/Master/texmf-dist/doc/latex/etoc/README.md b/Master/texmf-dist/doc/latex/etoc/README.md index 860974a32f3..dc9d36c0090 100644 --- a/Master/texmf-dist/doc/latex/etoc/README.md +++ b/Master/texmf-dist/doc/latex/etoc/README.md @@ -1,15 +1,14 @@ <!-- --> - Source: etoc.dtx (v1.08b 2015/03/18) + Source: etoc.dtx (v1.08b 2015/03/18; doc of 2015/03/28) Author: Jean-Francois Burnol - Author for German tranlation: Christine Roemer + Author: Christine Roemer et al. (German tranlation) Info: Completely customisable TOCs License: LPPL 1.3c or later - -Copyright (C) 2012-2015 Jean-Francois Burnol `<jfbu at free dot fr>` - -Copyright (C) 2014-2015 Christine Roemer `<Christine_Roemer at t-online dot de>` -and collaborators for the translation into German of the documentation. + Copyright (C) 2012-2015 Jean-Francois Burnol. + Copyright (C) 2014-2015 Christine Roemer and collaborators for + the translation into German of the documentation. + <jfbu at free dot fr> <Christine_Roemer at t-online dot de> ABSTRACT ======== @@ -127,8 +126,8 @@ etoc.pdf, etoc-DE.pdf, etoc.dvi, etoc-DE.dvi. RECENT CHANGES ============== -v1.08b [2015/03/18] -------------------- +v1.08b \[2015/03/18\] +--------------------- Bug fixes: @@ -138,14 +137,16 @@ Bug fixes: styles) was defined to be `\partname`, but this is not compatible at least with `babel+french` context. Now simply expands to Part. - some problems fixed in the German documentation. +- \[2015/03/28\] some more problems fixed in the documentation. Added + mention of `\etocarticlestyle` and `\etocbookstyle`. -v1.08a [2015/03/13] -------------------- +v1.08a \[2015/03/13\] +--------------------- `\etocname`, `\etocnumber` and `\etocpage` are now the robust variants of `\etocthelinkedname`, `\etocthelinkednumber` and `\etocthelinkedpage`. This should arguably have been done since -the addition of the latter to etoc with v1.07f [2013/03/07]. The +the addition of the latter to etoc with v1.07f \[2013/03/07\]. The earlier `\etocname` etc... contained the hyperlink destination only in an unexpanded form. @@ -154,8 +155,8 @@ The documentation has a brand new title page and a new section etoc to display tables of contents as trees in an automatic manner. -v1.08 [2015/03/10] ------------------- +v1.08 \[2015/03/10\] +-------------------- `\etocskipfirstprefix` may now appear anywhere in the `<start>` part of a level style. @@ -174,8 +175,8 @@ enumitem. On this occasion, various old parts of the code have been improved. -v1.07n [2015/03/05] -------------------- +v1.07n \[2015/03/05\] +--------------------- No more use of `\toks@` when etoc constructs `\etocthelinkedname` etc... Thus `\toks@` can be put in the line styles in order to @@ -184,8 +185,8 @@ will change `\toks@` either. In the documentation: list of main commands now in alphabetic order. -v1.07m [2015/01/23] -------------------- +v1.07m \[2015/01/23\] +--------------------- Reading of .toc file is delayed to `\begin{document}` to account for possible Babel active characters used therein. Thanks to Denis @@ -195,8 +196,8 @@ Improved global toc display emulation under KOMA-script classes. New command `\etocbeforetitlehook`. New command `\etocdisplay`. -v1.07l [doc of 2014/04/29] --------------------------- +v1.07l \[doc of 2014/04/29\] +---------------------------- Added to the documentation an example of use of `\etocthelinkedname` together with an enumitem inline itemize\* environment; moved main diff --git a/Master/texmf-dist/doc/latex/etoc/etoc-DE.pdf b/Master/texmf-dist/doc/latex/etoc/etoc-DE.pdf Binary files differindex 7d8103156c6..7d49fe60e22 100644 --- a/Master/texmf-dist/doc/latex/etoc/etoc-DE.pdf +++ b/Master/texmf-dist/doc/latex/etoc/etoc-DE.pdf diff --git a/Master/texmf-dist/doc/latex/etoc/etoc.pdf b/Master/texmf-dist/doc/latex/etoc/etoc.pdf Binary files differindex 50a02e7dabb..eb91978240a 100644 --- a/Master/texmf-dist/doc/latex/etoc/etoc.pdf +++ b/Master/texmf-dist/doc/latex/etoc/etoc.pdf diff --git a/Master/texmf-dist/source/latex/etoc/etoc.dtx b/Master/texmf-dist/source/latex/etoc/etoc.dtx index 137286d7c52..0833e571269 100644 --- a/Master/texmf-dist/source/latex/etoc/etoc.dtx +++ b/Master/texmf-dist/source/latex/etoc/etoc.dtx @@ -1,13 +1,13 @@ % -*- coding: utf-8; -*- %<*none> -{\def\doctimestamp {Time-stamp: <18-03-2015 22:41:13 CET>}% +{\def\doctimestamp {Time-stamp: <28-03-2015 10:10:25 CET>}% \def\getdtxtimestamp #1 <#2 #3 #4>{#2 at #3 #4}% \xdef\etocdtxtimestamp {\expandafter\getdtxtimestamp\doctimestamp }}% %</none> %<*!readme> %% %% Package: etoc -%% Version: 1.08b (2015/03/18) +%% Version: 1.08b (2015/03/18; doc of 2015/03/28) %% License: LPPL 1.3c or later (see etoc.dtx) %% Copyright (C) 2012-2015 Jean-Francois Burnol %% <jfbu at free dot fr> @@ -18,7 +18,7 @@ %</!readme> %<*insfile> \def\etocpkgdate {2015/03/18} -\def\etocdocdate {2015/03/18} +\def\etocdocdate {2015/03/28} \def\etocpkgversion {v1.08b} \def\etocpkgdescription {Completely customisable TOCs (jfB)} %</insfile> @@ -36,7 +36,7 @@ \catcode32=13\catcode`\\=12^^Brelax^^A ^^Bfirstofone{^^Bendgroup^^Bdef^^BetocLicense^^A {% Package: etoc -% Version: 1.08b (2015/03/18) +% Version: 1.08b (2015/03/18; doc of 2015/03/28) % License: LPPL 1.3c or later % Copyright (C) 2012-2015 Jean-Francois Burnol <jfbu at free dot fr> % Copyright (C) 2014-2015 Christine Roemer <Christine_Roemer at t-online dot de> @@ -71,16 +71,15 @@ %<*readme> <!-- --> - Source: etoc.dtx (v1.08b 2015/03/18) + Source: etoc.dtx (v1.08b 2015/03/18; doc of 2015/03/28) Author: Jean-Francois Burnol - Author for German tranlation: Christine Roemer + Author: Christine Roemer et al. (German tranlation) Info: Completely customisable TOCs License: LPPL 1.3c or later - -Copyright (C) 2012-2015 Jean-Francois Burnol `<jfbu at free dot fr>` - -Copyright (C) 2014-2015 Christine Roemer `<Christine_Roemer at t-online dot de>` -and collaborators for the translation into German of the documentation. + Copyright (C) 2012-2015 Jean-Francois Burnol. + Copyright (C) 2014-2015 Christine Roemer and collaborators for + the translation into German of the documentation. + <jfbu at free dot fr> <Christine_Roemer at t-online dot de> ABSTRACT ======== @@ -198,8 +197,9 @@ etoc.pdf, etoc-DE.pdf, etoc.dvi, etoc-DE.dvi. RECENT CHANGES ============== -v1.08b [2015/03/18] -------------------- + +v1.08b \[2015/03/18\] +--------------------- Bug fixes: @@ -209,14 +209,16 @@ Bug fixes: styles) was defined to be `\partname`, but this is not compatible at least with `babel+french` context. Now simply expands to Part. - some problems fixed in the German documentation. +- \[2015/03/28\] some more problems fixed in the documentation. Added + mention of `\etocarticlestyle` and `\etocbookstyle`. -v1.08a [2015/03/13] -------------------- +v1.08a \[2015/03/13\] +--------------------- `\etocname`, `\etocnumber` and `\etocpage` are now the robust variants of `\etocthelinkedname`, `\etocthelinkednumber` and `\etocthelinkedpage`. This should arguably have been done since -the addition of the latter to etoc with v1.07f [2013/03/07]. The +the addition of the latter to etoc with v1.07f \[2013/03/07\]. The earlier `\etocname` etc... contained the hyperlink destination only in an unexpanded form. @@ -225,8 +227,8 @@ The documentation has a brand new title page and a new section etoc to display tables of contents as trees in an automatic manner. -v1.08 [2015/03/10] ------------------- +v1.08 \[2015/03/10\] +-------------------- `\etocskipfirstprefix` may now appear anywhere in the `<start>` part of a level style. @@ -245,8 +247,8 @@ enumitem. On this occasion, various old parts of the code have been improved. -v1.07n [2015/03/05] -------------------- +v1.07n \[2015/03/05\] +--------------------- No more use of `\toks@` when etoc constructs `\etocthelinkedname` etc... Thus `\toks@` can be put in the line styles in order to @@ -255,8 +257,8 @@ will change `\toks@` either. In the documentation: list of main commands now in alphabetic order. -v1.07m [2015/01/23] -------------------- +v1.07m \[2015/01/23\] +--------------------- Reading of .toc file is delayed to `\begin{document}` to account for possible Babel active characters used therein. Thanks to Denis @@ -266,8 +268,8 @@ Improved global toc display emulation under KOMA-script classes. New command `\etocbeforetitlehook`. New command `\etocdisplay`. -v1.07l [doc of 2014/04/29] --------------------------- +v1.07l \[doc of 2014/04/29\] +---------------------------- Added to the documentation an example of use of `\etocthelinkedname` together with an enumitem inline itemize\* environment; moved main @@ -687,12 +689,15 @@ Jena). My grateful thanks to all! \usepackage {babel} % ngerman and english options have been passed to babel \AtBeginDocument { +%% ATTENTION à ce que fait la classe scrdoc: File/Datei pour \partname !!! +%% Je l'avais oublié pour 1.08 lorsque je suis passé à ngerman. +%% Attention aussi au fait qu'il faut faire le \renewcommand\partname +%% ET le mettre dans les \captions... +%% \ifnum\ForEnglish=1 \renewcommand\partname{Part}\fi + \ifnum\ForDeutsch=1 \renewcommand\partname{Teil}\fi \addto\captionsenglish {\renewcommand\partname{Part}} \addto\captionsgerman {\renewcommand\partname{Teil}} -%% ATTENTION À CE QUE FAIT LA CLASSE scrdoc !!! -%% je l'avais oublié et pour 1.08 je suis passé à ngerman -%% mais il fallait alors ceci sinon scrdoc utilise Datei !!! \addto\captionsngerman {\renewcommand\partname{Teil}} } @@ -799,6 +804,7 @@ pdfpagemode=UseOutlines} % (et pour 1.07i.. à nouveau 3 faudra vraiment que je change cela) % et maintenant =4 pour version de la doc du 28 avril 2014... faudra vraiment qu % je mette un mécanisme plus robuste pour cette TOC. +% ATTENTION AUSSI AUX CODES VERBATIM \makeatletter \newcommand*{\MyQuasiStandardTOC}[1]{% \begingroup @@ -994,7 +1000,7 @@ pdfpagemode=UseOutlines} \newcommand\staritb[1]{\csb{#1}\lowast} \hyphenation{toc-depth sec-num-depth con-tents-line} -\hyphenation{etoc-tan-dard-lines +\hyphenation{etoc-stan-dard-lines etoc-de-fault-lines etoc-toc-lines etoc-set-style @@ -1023,6 +1029,8 @@ etoc-set-tag-depth etoc-obey-depth-tags etoc-ig-nore-depth-tags etoc-stan-dard-dis-playstyle +etoc-ar-ti-cle-style +etoc-book-style etoc-set-toc-style etoc-mul-ti-col-style etoc-mul-ti-col @@ -2889,7 +2897,7 @@ section, for which the layout is completely modified: This example only has sections and subsections, and the code used in \csa{MyStandardTOC} was: \begin{verbatim} \etocsetstyle{section}{} - {\ifnum\etocthenumber=3 + {\ifnum\etocthenumber=4 \etocsetstyle{subsection} {\par\nopagebreak\begingroup \leftskip1.5em \rightskip\@tocrmarg \parfillskip\@flushglue @@ -4342,7 +4350,7 @@ no impact on the styles of later TOCs is:\\ And there is also \csa{etoclocalmulticol}\oarg{number\_of\_columns}\marg{heading}. -\subsubsection{The command \csbhyp{etoctocstyle}} +\subsection{The command \csbhyp{etoctocstyle}} \label{etoctocstyle} \centeredline{\csb{etoctocstyle}\oarg{kind}% @@ -4353,11 +4361,12 @@ And there is also where |kind| is one of |chapter|, |section|, . . . and defaults to |chapter| or |section| depending on the document class. -\paragraph{\texorpdfstring{\csbhyp{etoc\-toc\-style\-with\-marks}}{etoctocstylewithmarks}}% -\leavevmode\unskip{\color{blue}\oarg{kind}\marg{number\_of\_columns}\marg{title}\marg{mark}} +\subsubsection{The command \csbhyp{etoctocstylewithmarks}} \label{etoctocstylewithmarks} \label{etoctocstylewithmarksnouc} +\centeredline{\csb{etoctocstylewithmarks}\oarg{kind}% +\marg{number\_of\_columns}\marg{title}\marg{mark}} \centeredline {=\csb{etocmulticolstyle}|[|{\itshape number\_of\_columns}|]|% |{\kind*{|\itshape title \ttfamily\upshape\string\markboth% @@ -4367,7 +4376,6 @@ actual display of the marks depends on the settings of the page style. There is variant \csb{etoctocstylewithmarksnouc} which does not uppercase. - \paragraph{Do we really want paragraph entries in the TOC?} \paragraph{really?} @@ -4487,7 +4495,18 @@ done regarding the global display style of the table of contents, in its absence. All customizing from inside the class should be obeyed, too. -\subsection{The command \csbhyp{etoc\-inline}} +\subsubsection{The commands \csbhyp{etocarticlestyle}, \csbhyp{etocbookstyle}, + \dots} + +These are the commands used internally by \etoc in compatibility mode +depending on the document class. For example \csa{etocarticlestyle} uses +|\section*{\contentsname}| (and puts marks in the page) whereas +\csa{etocbookstyle} uses |\chapter*{\contentsname}|. It can prove useful to +issue \csa{etocarticlestyle} for a \csa{localtableofcontents} inside a +chapter, in |book| class and compatibility mode for the global TOC display +style. + +\subsection{The command \csbhyp{etocinline}} \label{etocinline} \label{etocnopar} \label{etocdisplay} @@ -5815,6 +5834,12 @@ version is \texttt{\etocpkgversion}, of \texttt{\etocpkgdate}. % START GERMAN (DEUTSCH) VERSION + +% Note for translation (March 2015) +% One should use "= and not - : for example +% not \etocsetstyle-Befehl but rather \etocsetstyle"=Befehl. +% This is important for hyphenation. + \bookmark[named=FirstPage,level=1]{Titelseite}% 10 octobre 2013. \begingroup @@ -5888,7 +5913,7 @@ version is \texttt{\etocpkgversion}, of \texttt{\etocpkgdate}. \indent\null \begingroup \let\thefootnote\empty -\footnote{Original Dokumentationzeitstempel: ``\etocDEdocdate''.\par +\footnote{Erzeugt von der Quelldatei mit Zeitstempel ``\etocdtxtimestamp''.\par Übersetzt ins Deutsche von Felix Baral-Weber, Jenny Rothkrämer-Vogt, Daniel Büttner, Claudia Dahl, Christian Otto und Christine Römer (FSU Jena). Hinweise zur Übersetzung an Christine\_Roemer at t-online dot de.} @@ -5901,7 +5926,6 @@ version is \texttt{\etocpkgversion}, of \texttt{\etocpkgdate}. \clearpage - \etocdepthtag.toc {preamble} %---- % MAIN TOC @@ -5997,7 +6021,8 @@ gleichzeitig mit |tocloft| zu benutzen. \etocLicense\endgroup -\clearpage +%\clearpage % ATTENTION retiré 28 mars 2015 + \etocsettocdepth {subsection} \etocdepthtag.toc{overview} @@ -6397,6 +6422,8 @@ Der Code: \endgroup \end{verbatim} +\clearpage % ATTENTION 28 mars 2015 + \section{Verlinkte Liste der Hauptbefehle} % 16 octobre @@ -9031,7 +9058,7 @@ kürzere Variante für nur ein Inhaltsverzeichnis ohne Einfluss auf spätere ist \centeredline{\csa{etocmulticol}\oarg{number\_of\_columns}\marg{heading}} oder \centeredline{\csa{etoclocalmulticol}\oarg{number\_of\_columns}\marg{heading}.} -\subsubsection{Der Befehl \csbhyp{etoctocstyle}} +\subsection{Der Befehl \csbhyp{etoctocstyle}} \label{etoctocstyle} \centeredline{\csb{etoctocstyle}\oarg{kind}% @@ -9041,11 +9068,12 @@ kürzere Variante für nur ein Inhaltsverzeichnis ohne Einfluss auf spätere ist Wobei |Typ| gewählt wird aus |chapter|, |section| usw. Standardwert ist |chapter| oder |section|, abhängig von der Dokumentklasse. -\paragraph{\texorpdfstring{\csbhyp{etoc\-toc\-style\-with\-marks}}{etoctocstylewithmarks}}% -\leavevmode\unskip{\color{blue}\oarg{kind}\marg{number\_of\_columns}\marg{title}\marg{mark}} +\subsubsection{Der Befehl \csbhyp{etoctocstylewithmarks}} \label{etoctocstylewithmarks} \label{etoctocstylewithmarksnouc} +\centeredline{\csb{etoctocstylewithmarks}\oarg{kind}% +\marg{number\_of\_columns}\marg{title}\marg{mark}} \centeredline {=\csb{etocmulticolstyle}|[|{\itshape number\_of\_columns}|]|% |{\kind*{|\itshape title \ttfamily\upshape\string\markboth% @@ -9160,7 +9188,21 @@ verantwortlich ist, in Bezug auf den globalen Display"=Stil des Inhaltsverzeichnisses. Allen Änderung von innerhalb der Klasse sollten berücksichtigt werden. -\subsection{Der Befehl \csbhyp{etoc\-inline}} +\subsubsection{Die Befehle \csbhyp{etocarticlestyle}, \csbhyp{etocbookstyle}, + \dots} + +\textbf{UEBERSETZUNG NOETIG} +\begin{otherlanguage}{english} + These are the commands used internally by \etoc in compatibility mode + depending on the document class. For example \csa{etocarticlestyle} uses + |\section*{\contentsname}| (and puts marks in the page) whereas + \csa{etocbookstyle} uses |\chapter*{\contentsname}|. It can prove useful to + issue \csa{etocarticlestyle} for a \csa{localtableofcontents} inside a + chapter, in |book| class and compatibility mode for the global TOC display + style. +\end{otherlanguage} + +\subsection{Der Befehl \csbhyp{etocinline}} \label{etocinline} \label{etocnopar} \label{etocdisplay} @@ -10609,6 +10651,8 @@ v1.08b [2015/03/18]^ styles) was defined to be \partname, but this is not compatible at least with babel+french context. Now simply expands to Part. - some problems fixed in the German documentation. + - [2015/03/28] some more problems fixed in the documentation. Added + mention of \etocarticlestyle and \etocbookstyle. v1.08a [2015/03/13]^ diff --git a/Master/texmf-dist/source/latex/etoc/etoc.ins b/Master/texmf-dist/source/latex/etoc/etoc.ins index 63b71e7ac09..a5057462100 100644 --- a/Master/texmf-dist/source/latex/etoc/etoc.ins +++ b/Master/texmf-dist/source/latex/etoc/etoc.ins @@ -1,6 +1,6 @@ %% %% Package: etoc -%% Version: 1.08b (2015/03/18) +%% Version: 1.08b (2015/03/18; doc of 2015/03/28) %% License: LPPL 1.3c or later (see etoc.dtx) %% Copyright (C) 2012-2015 Jean-Francois Burnol %% <jfbu at free dot fr> @@ -9,7 +9,7 @@ %% and collaborators for the translation into German of the documentation %% \def\etocpkgdate {2015/03/18} -\def\etocdocdate {2015/03/18} +\def\etocdocdate {2015/03/28} \def\etocpkgversion {v1.08b} \def\etocpkgdescription {Completely customisable TOCs (jfB)} %% Run etex on this file to extract from etoc.dtx: diff --git a/Master/texmf-dist/tex/latex/etoc/etoc.sty b/Master/texmf-dist/tex/latex/etoc/etoc.sty index b9251b3a4e3..73aaa8e8762 100644 --- a/Master/texmf-dist/tex/latex/etoc/etoc.sty +++ b/Master/texmf-dist/tex/latex/etoc/etoc.sty @@ -26,7 +26,7 @@ [2015/03/18 v1.08b Completely customisable TOCs (jfB)] %% %% Package: etoc -%% Version: 1.08b (2015/03/18) +%% Version: 1.08b (2015/03/18; doc of 2015/03/28) %% License: LPPL 1.3c or later (see etoc.dtx) %% Copyright (C) 2012-2015 Jean-Francois Burnol %% <jfbu at free dot fr> |