magyar update (22apr09)

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

1 files changed, 17 insertions, 12 deletions

diff --git a/Master/texmf-dist/doc/latex/magyar/magyar.ldf b/Master/texmf-dist/doc/latex/magyar/magyar.ldf
index 3ad144de03e..f84f624a9f8 100644
--- a/Master/texmf-dist/doc/latex/magyar/magyar.ldf
+++ b/Master/texmf-dist/doc/latex/magyar/magyar.ldf
@@ -3619,7 +3619,7 @@
   \endgroup
 }
 
-\def\@@magyar@chapapp{\appendixname}%
+\def\@@magyar@appendix@chapapp{\appendixname}%
 
 %** Input is \reserved@a, output is \reserved@c
 %** @param #1 the control sequence \r@foo:bar
@@ -3650,8 +3650,8 @@
   \def\reserved@c{chapter}\edef         \reserved@b{\csname the\reserved@c\endcsname}\ifx\reserved@a\reserved@b\else
   \def\reserved@c{appendix}\edef        \reserved@b{\expandafter\ifx\csname c@chapter\endcsname\relax\else\@Alph\c@chapter\fi}\ifx\reserved@a\reserved@b\else% Imp: do this without changing counters in \appendix
   \def\reserved@c{part}\edef            \reserved@b{\csname the\reserved@c\endcsname}\ifx\reserved@a\reserved@b\else
-  %%\show\@chapapp \show\@@magyar@chapapp
-  \ifx\@chapapp\@@magyar@chapapp% we're in an appendix referring to a normal chapter
+  %%\show\@chapapp \show\@@magyar@appendix@chapapp
+  \ifx\@chapapp\@@magyar@appendix@chapapp% we're in an appendix referring to a normal chapter
     \def\thechapter{\@arabic\c@chapter}\fi
   \def\reserved@c{subsubparagraph}\edef \reserved@b{\csname the\reserved@c\endcsname}\ifx\reserved@a\reserved@b\else
   \def\reserved@c{subparagraph}\edef    \reserved@b{\csname the\reserved@c\endcsname}\ifx\reserved@a\reserved@b\else
@@ -4821,11 +4821,13 @@
          \if@mainmatter
            \refstepcounter{chapter}%
            \typeout{\thechapter\ifx\@chapapp\@@magyar@appendixname\else.\fi\space\@chapapp.}%
-           \ifnum\magyar@opt@@chapternumber>0 \protected@edef\@currentlabel{\@huordinal\c@chapter}\fi
-           \ifx\@chapapp\@@magyar@appendixname
-                % \@gobble gobbles the dot emitted by \numberline.
-                \addcontentsline{toc}{chapter}{\protect\numberline{\thechapter\protect\@gobble}#1}%
-           \else\addcontentsline{toc}{chapter}{\protect\numberline{\thechapter}#1}\fi
+           \ifx\@chapapp\@@magyar@appendix@chapapp
+             % \@gobble gobbles the dot emitted by \numberline.
+             \addcontentsline{toc}{chapter}{\protect\numberline{\thechapter\protect\@gobble}#1}%
+           \else
+             \addcontentsline{toc}{chapter}{\protect\numberline{\thechapter}#1}
+             \ifnum\magyar@opt@@chapternumber>0 \protected@edef\@currentlabel{\@huordinal\c@chapter}\fi
+           \fi
          \else
            \addcontentsline{toc}{chapter}{#1}%
          \fi
@@ -4911,10 +4913,13 @@
       \ifnum \c@secnumdepth >\m@ne
            \refstepcounter{chapter}%
            \typeout{\thechapter\ifx\@chapapp\@@magyar@appendixname\else.\fi\space\@chapapp.}%
-           \ifnum\magyar@opt@@chapternumber>0 \protected@edef\@currentlabel{\@huordinal\c@chapter}\fi
-           \ifx\@chapapp\@@magyar@appendixname
-                \addcontentsline{toc}{chapter}{\protect\numberline{\thechapter\protect\@gobble}#1}%
-           \else\addcontentsline{toc}{chapter}{\protect\numberline{\thechapter}#1}\fi
+           \ifx\@chapapp\@@magyar@appendix@chapapp
+             % \@gobble gobbles the dot emitted by \numberline.
+             \addcontentsline{toc}{chapter}{\protect\numberline{\thechapter\protect\@gobble}#1}%
+           \else
+             \addcontentsline{toc}{chapter}{\protect\numberline{\thechapter}#1}\fi
+             \ifnum\magyar@opt@@chapternumber>0 \protected@edef\@currentlabel{\@huordinal\c@chapter}\fi
+           \fi
       \else
         \addcontentsline{toc}{chapter}{#1}%
       \fi