update of magyar.ldf from petr

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

1 files changed, 39 insertions, 17 deletions

diff --git a/Master/texmf-dist/doc/latex/magyar/magyar.ldf b/Master/texmf-dist/doc/latex/magyar/magyar.ldf
index 559d64a8c75..2596c01086b 100644
--- a/Master/texmf-dist/doc/latex/magyar/magyar.ldf
+++ b/Master/texmf-dist/doc/latex/magyar/magyar.ldf
@@ -2097,28 +2097,48 @@
 {^}%
 
 % --- amstocnumskip=, amstocnumlang=
+%
+% Change \tocsection, \tocsubsection etc. in amsart.cls etc. These commands
+% have effect in \tableofcontents, e.g. in the .toc file:
+% `\contentsline {section}{\tocsubsection {}{1.1}{Foo}}{1}'
+%
+% We should be careful not to define \tocchapter and \tocsection if
+% tocbibind.sty is (or will be) loaded, because it provides its own definition
+% as \newcommand.
 
 \ifx\@empty\magyar@opt@@amstocnumskip \@@magyar@skiplong\fi
   % Similar to titleskip=, but AMS classes don't look at \@seccntformat
-  \def\tocsubsection{\tocsection}%
-  \let\tocsubsubsection\tocsubsection
-  \let\tocparagraph\tocsubsection
-  \let\tocsubparagraph\tocsubsection
-  \let\tocpart\tocsubsection
-  \let\tocchapter\tocsubsection
+  \def\@@magyar@amstocnumskip@lets{%
+    \ifx\tocsubsection\@undefined\else
+      \ifx\tocsubsection\tocparagraph
+	\def\tocsubsection{\tocsection}%
+	% These lines are similar to those in amsart.cls.
+	\let\tocsubsubsection\tocsubsection
+	\let\tocparagraph\tocsubsection
+	\let\tocsubparagraph\tocsubsection
+	\let\tocpart\tocsubsection
+	\let\tocchapter\tocsubsection
+      \fi
+    \fi
+  }%
   \def\@@magyar@amstocnumskip@defs{%
-    %** Overrides amsart.cls etc. Only for Hungarian \section{}s. Changes \quad to
-    %** \magyar@opt@@amstocnumskip in the definition.
-    \def\tocsection##1##2##3{%
-      %%\typeout{--##3--}%
-      \indentlabel{\@ifnotempty{##2}{\ignorespaces##1 ##2.\magyar@opt@@amstocnumskip}}##3%
-    }%
-    %** Overrides amsart.cls etc. Only for Hungarian \section{}s. Changes \quad to
-    %** \magyar@opt@@amstocnumskip in the definition.
-    \def\tocappendix##1##2##3{\indentlabel{##1\@ifnotempty{##2}{ ##2}.\magyar@opt@@amstocnumskip}##3}%
-  }
+    \ifx\tocsubsection\@undefined\else
+      \ifx\tocsubsection\tocparagraph
+	%** Overrides amsart.cls etc. Only for Hungarian \section{}s. Changes \quad to
+	%** \magyar@opt@@amstocnumskip in the definition.
+	\def\tocsection##1##2##3{%
+	  %%\typeout{--##3--}%
+	  \indentlabel{\@ifnotempty{##2}{\ignorespaces##1 ##2.\magyar@opt@@amstocnumskip}}##3%
+	}%
+	%** Overrides amsart.cls etc. Only for Hungarian \section{}s. Changes \quad to
+	%** \magyar@opt@@amstocnumskip in the definition.
+	\def\tocappendix##1##2##3{\indentlabel{##1\@ifnotempty{##2}{ ##2}.\magyar@opt@@amstocnumskip}##3}%
+      \fi
+    \fi
+  }%
+  \AtBeginDocument\@@magyar@amstocnumskip@lets  % must be before @defs
   \if2\magyar@opt@@amstocnumlang
-    \@@magyar@amstocnumskip@defs
+    \AtBeginDocument\@@magyar@amstocnumskip@defs
     %\let\@@magyar@amstocnumskip@defs\@undefined% for use by the user
   \else
     \expandafter\addto\csname extras\CurrentOption\endcsname{%
@@ -4352,6 +4372,8 @@
 \if0\magyar@opt@@hynumberline \@@magyar@skiplong\fi
   %** Overrides original definition (\def\Hy@numberline#1{#1 }) in
   %** pdfmark.def.
+  %** Also possible with:
+  %** \pdfstringdefDisableCommands{\renewcommand*{\numberline}[1]{#1. }}
   \def\@@magyar@@hynumberline@old#1{#1 }% as defined in pdfmark.def
   \def\@@magyar@@hynumberline@hu #1{#1. }%
   \expandafter\addto\csname extras\CurrentOption\endcsname{%