etoc (18may14)

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

5 files changed, 40 insertions, 15 deletions

diff --git a/Master/texmf-dist/doc/latex/etoc/etoc-DE.pdf b/Master/texmf-dist/doc/latex/etoc/etoc-DE.pdf
index 7b1dbe9b42b..f3304a201c9 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
index 143d01a539e..048273da799 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 f6f180e378e..c2246a640a1 100644
--- a/Master/texmf-dist/source/latex/etoc/etoc.dtx
+++ b/Master/texmf-dist/source/latex/etoc/etoc.dtx
@@ -7,26 +7,25 @@
 %% Copyright (C) 2014 Christine Roemer <Christine_Roemer at t-online dot de>
 %%    and collaborators for the translation into German of the documentation
 %%
-% (repeated below in \etocLicense macro and must be manually updated there)
+% (repeated below in \etocLicense macro)
 %<*insfile>
 \def\etocpkgdate        {2014/04/22} 
+\def\etocdocdate        {2014/04/29}% not extracted from Time-stamp anymore
 \def\etocpkgversion     {v1.07l}
 \def\etocpkgdescription {Completely customisable TOCs (jfB)}
 %</insfile>
 %<*none>
-{\def\doctimestamp {Time-stamp: <29-04-2014 12:05:48 CEST>}% 
- % needs a colon : after Time-stamp for emacs automatic updating of
- % time-stamp and must be among first eight lines
+{\def\doctimestamp {Time-stamp: <18-05-2014 11:51:45 CEST>}% 
+ % This differs from 2014/04/29 only in fixing the misplaced \NeedsTeXFormat,
+ % defining manually \etocdocdate and translating the pdf info into German 
  \def\getdtxtimestamp #1 <#2 #3 #4>{#2 at #3 #4}%
- \def\getdocdate      #1 <#2-#3-#4 #5>{#4/#3/#2}%
- \xdef\etocdtxtimestamp {\expandafter\getdtxtimestamp\doctimestamp }%
- \xdef\etocdocdate      {\expandafter\getdocdate\doctimestamp }}%
+ \xdef\etocdtxtimestamp {\expandafter\getdtxtimestamp\doctimestamp }}%
 % Now the date and version which are specific to the German translation.
 % Replace \let by suitable \def's in case this lags behing English version.
-\let\etocDEdocdate   \etocdocdate    % currently 2014/04/29
 \let\etocDEpkgdate   \etocpkgdate    % currently 2014/04/22
+\let\etocDEdocdate   \etocdocdate    % currently 2014/04/29
 \let\etocDEpkgversion\etocpkgversion % currently 1.07l
-% Definiton of \etocLicense, in order to have it here and not have to maintain 
+% Definition of \etocLicense, in order to have it here and not have to maintain 
 % a copy elsewhere. Must be compatible with all manners of compiling etoc.dtx.
 %   (copyright lines from top of file must be repeated here)
 \begingroup
@@ -182,6 +181,7 @@
 \input docstrip.tex
 \askforoverwritefalse
 \def\etocpkgpreamble{\defaultpreamble^^J\MetaPrefix^^J%
+\string\NeedsTeXFormat{LaTeX2e}^^J%
 \string\ProvidesPackage{etoc}^^J%
 \space[\etocpkgdate\space\etocpkgversion\space\etocpkgdescription]}%
 \generate{\nopreamble
@@ -257,6 +257,7 @@
     \input docstrip.tex
     \askforoverwritefalse
     \def\etocpkgpreamble{\defaultpreamble^^J\MetaPrefix^^J%
+    \string\NeedsTeXFormat{LaTeX2e}^^J%
     \string\ProvidesPackage{etoc}^^J%
     \space[\etocpkgdate\space\etocpkgversion\space\etocpkgdescription]}%
     \generate{\nopreamble
@@ -489,6 +490,8 @@
 % 9 octobre 2013, je me décide à ne plus utiliser hidelinks, mais il est tout de
 % même ajouté au .toc
 
+% 18 mai 2014: pdfinfo différent suivant anglais ou allemand
+\ifnum\ForEnglish=1
 \usepackage[pdfencoding=pdfdoc]{hyperref}
 \hypersetup{%
 linktoc=all,%      why is the important stuff
@@ -500,10 +503,27 @@ linkcolor=RoyalBlue,% Orchid
 urlcolor=OliveGreen,%
 pdfauthor={Jean-Fran\c cois Burnol},%
 pdftitle={The etoc package},%
-pdfsubject={LaTeX, table of contents},%
+pdfsubject={Tables of contents with LaTeX},%
 pdfkeywords={LaTeX, table of contents},%
 pdfstartview=FitH,%
 pdfpagemode=UseOutlines}
+\fi
+
+\ifnum\ForDeutsch=1
+\usepackage[pdfencoding=pdfdoc]{hyperref}
+\hypersetup{%
+linktoc=all,%
+breaklinks=true,%
+colorlinks,%   
+linkcolor=RoyalBlue,% Orchid
+urlcolor=OliveGreen,%
+pdfauthor={Jean-Fran\c cois Burnol, Christine Römer},%
+pdftitle={Das etoc Paket},%
+pdfsubject={Inhaltsverzeichnisse mit LaTeX},%
+pdfkeywords={LaTeX, Inhaltsverzeichnis},%
+pdfstartview=FitH,%
+pdfpagemode=UseOutlines}
+\fi
 
 % added usage of package bookmark 2013/10/10
 \usepackage{bookmark} 
@@ -823,7 +843,7 @@ etoc-framed-mp-hook}
   \footnotesize \ttfamily jfbu (at) free (dot) fr\\
   Package version: \etocpkgversion\ (\etocpkgdate)
   \let\thefootnote\empty
-  \footnote{Documentation generated from the source file
+  \footnote{Documentation (\etocdocdate) generated from the source file
   with timestamp ``\etocdtxtimestamp''.}\par
 \end{center}
 \setcounter{footnote}{0}
@@ -4981,7 +5001,7 @@ version is \texttt{\etocpkgversion}, of \texttt{\etocpkgdate}.
   \textsc{Jean-François Burnol}\par
   \footnotesize \ttfamily jfbu (at) free (dot) fr\\
   Paketversion: \etocDEpkgversion\ (\etocDEpkgdate) \let\thefootnote\empty
-  \footnote{Original Dokumentationzeitstempel: ``\etocdtxtimestamp''.\par
+  \footnote{Original Dokumentationzeitstempel: ``\etocDEdocdate''.\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.}\par
@@ -9300,6 +9320,9 @@ v1.02 [2012/11/18]>
 % Also, I prefer not to add macros to the |.sty| file giving the package
 % date, name, or version. So I extracted this from the real macrocode
 % environment (leaving out the \init@crossref.)
+
+% 2014/05/18: I fix only now this very strange bug that this (presumably
+% from 2012) left  \NeedsTeXFormat{LaTeX2e} to after \ProvidesPackage...
 \makeatletter
 \begingroup
 \topsep\MacrocodeTopsep
@@ -9312,6 +9335,7 @@ v1.02 [2012/11/18]>
   \everypar{\global\advance\c@CodelineNo\@ne
   \llap{\theCodelineNo\ \hskip\@totalleftmargin}}%
 \fi
+\string\NeedsTeXFormat\string{LaTeX2e\string}\par
 \string\ProvidesPackage\string{etoc\string}\par
 \noindent\space [\etocpkgdate\space\etocpkgversion\space\etocpkgdescription]\par
 \nointerlineskip
@@ -9334,7 +9358,6 @@ v1.02 [2012/11/18]>
 %</none>
 %<*package>
 %    \begin{macrocode}
-\NeedsTeXFormat{LaTeX2e}
 \RequirePackage{multicol}
 \DeclareOption*{\PackageWarning{etoc}{Option `\CurrentOption' is unknown.}}
 \ProcessOptions\relax
@@ -10870,7 +10893,7 @@ v1.02 [2012/11/18]>
   Grave accent  \`     Left brace    \{     Vertical bar  \|
   Right brace   \}     Tilde         \~}
 
-\CheckSum{2968}
+\CheckSum{2967}
 
 \csname check@checksum\endcsname
 \Finale
diff --git a/Master/texmf-dist/source/latex/etoc/etoc.ins b/Master/texmf-dist/source/latex/etoc/etoc.ins
index ffd370fd96c..3d28a98f5cd 100644
--- a/Master/texmf-dist/source/latex/etoc/etoc.ins
+++ b/Master/texmf-dist/source/latex/etoc/etoc.ins
@@ -7,6 +7,7 @@
 %%    and collaborators for the translation into German of the documentation
 %%
 \def\etocpkgdate        {2014/04/22}
+\def\etocdocdate        {2014/04/29}% not extracted from Time-stamp anymore
 \def\etocpkgversion     {v1.07l}
 \def\etocpkgdescription {Completely customisable TOCs (jfB)}
 %% Run tex on this file to extract from etoc.dtx:
@@ -43,6 +44,7 @@
 \input docstrip.tex
 \askforoverwritefalse
 \def\etocpkgpreamble{\defaultpreamble^^J\MetaPrefix^^J%
+\string\NeedsTeXFormat{LaTeX2e}^^J%
 \string\ProvidesPackage{etoc}^^J%
 \space[\etocpkgdate\space\etocpkgversion\space\etocpkgdescription]}%
 \generate{\nopreamble
diff --git a/Master/texmf-dist/tex/latex/etoc/etoc.sty b/Master/texmf-dist/tex/latex/etoc/etoc.sty
index d56f41378cc..8a5e4446d34 100644
--- a/Master/texmf-dist/tex/latex/etoc/etoc.sty
+++ b/Master/texmf-dist/tex/latex/etoc/etoc.sty
@@ -21,6 +21,7 @@
 %% same distribution. (The sources need not necessarily be
 %% in the same archive or directory.)
 %%
+\NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{etoc}
  [2014/04/22 v1.07l Completely customisable TOCs (jfB)]
 %%
@@ -31,7 +32,6 @@
 %% Copyright (C) 2014 Christine Roemer <Christine_Roemer at t-online dot de>
 %%    and collaborators for the translation into German of the documentation
 %%
-\NeedsTeXFormat{LaTeX2e}
 \RequirePackage{multicol}
 \DeclareOption*{\PackageWarning{etoc}{Option `\CurrentOption' is unknown.}}
 \ProcessOptions\relax