diff options
author | Karl Berry <karl@freefriends.org> | 2009-03-15 22:23:49 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-03-15 22:23:49 +0000 |
commit | 01cef80aa00bf03172175a0ab2fed0bdeb007619 (patch) | |
tree | 5e6bd9ee61ecc5534bc373a99487e9c14c7cbc66 /Master/texmf-dist/doc/latex | |
parent | b2687a5d1a39f73fb4966832156b34dedfd37022 (diff) |
magyar update (15mar09)
git-svn-id: svn://tug.org/texlive/trunk@12393 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/latex')
-rw-r--r-- | Master/texmf-dist/doc/latex/magyar/magyar.ldf | 72 |
1 files changed, 47 insertions, 25 deletions
diff --git a/Master/texmf-dist/doc/latex/magyar/magyar.ldf b/Master/texmf-dist/doc/latex/magyar/magyar.ldf index 37cab6f1bdd..9606337892e 100644 --- a/Master/texmf-dist/doc/latex/magyar/magyar.ldf +++ b/Master/texmf-dist/doc/latex/magyar/magyar.ldf @@ -1814,11 +1814,14 @@ % --- labelenums= \if0\magyar@opt@@labelenums \@@magyar@skiplong\fi - \providecommand\@greekalph[1]{\relax\ifcase#1\or\(\alpha\)\or\(\beta\)\or\(\gamma\)\or\(\delta\)% - \or\(\varepsilon\)\or\(\zeta\)\or\(\eta\)\or\(\vartheta\)\or\(\iota\)\or\(\kappa\)% - \or\(\lambda\)\or\(\mu\)\or\(\nu\)\or\(\xi\)\or\(\varphi\)\or\(\varpi\)\or\(\varrho\)% - \or\(\varsigma\)\or\(\tau\)\or\(\upsilon\)\or\(\chi\)\or\(\psi\)\or\(\omega\)% - \else\@ctrerr\fi} + \providecommand\@greekalph[1]{% + % We use the robust \ensuremath here, similarly to \def\@fnsymbol in + % latex.ltx. + \ensuremath{\ifcase#1\or\alpha\or\beta\or\gamma\or\delta% + \or\varepsilon\or\zeta\or\eta\or\vartheta\or\iota\or\kappa% + \or\lambda\or\mu\or\nu\or\xi\or\varphi\or\varpi\or\varrho% + \or\varsigma\or\tau\or\upsilon\or\chi\or\psi\or\omega% + \else\@ctrerr\fi}} \expandafter\ifx\csname c@enumv\endcsname\relax \@definecounter{enumv}% call this before \def\theenumv \fi @@ -4353,11 +4356,14 @@ %** @param #3 ignored %** @param #4 a \cs \def\@@magyar@fixmathcmd@low#1"#2"#3\hfuzz#4{% + % Imp: check \cong and \notin with txfonts and pxfonts. Do they look OK? \def\reserved@a{#1}% \edef\reserved@b{\string\mathchar}% \ifx\reserved@a\reserved@b \ifnum"#2<"8000 % redundant sanity check, trueness implied by #1==\mathchar - \edef#4{\noexpand\protect\csname \expandafter\@gobble\string#4 \endcsname}% + % Make #4 robust. + \edef#4{\noexpand\protect\expandafter\noexpand\csname + \expandafter\@gobble\string#4 \endcsname}% % vvv Imp: \def would be better than \edef? \expandafter\edef\csname\expandafter\@gobble\string#4 \endcsname{% % Dat: \mathchar already produces: `! Missing $ inserted.' @@ -4739,15 +4745,16 @@ \expandafter\endgroup#1% } -%** Define \magyar@@toc@thechapter to \thechapter expanded but huordinal in -%** arabic. -\def\@@magyar@def@toc@thechapter{% +%** Define \magyar@@toc@thechapter (#1) to \thechapter (#2) expanded but +%** huordinal in arabic. +%** @param #1 control sequence to define +%** @param #2 counter to expand, e.g. \thechapter or \thepart +\def\@@magyar@def@arabic#1#2{% \begingroup \let\@Huordinal\@arabic \let\@huordinal\@arabic - \edef\magyar@@toc@thechapter{\thechapter}% - \expandafter\endgroup\expandafter\def\expandafter\magyar@@toc@thechapter - \expandafter{\magyar@@toc@thechapter}% + \edef#1{#2}% + \expandafter\endgroup\expandafter\def\expandafter#1\expandafter{#1}% } %** Convert \@currentlabel to lowercase \@huordinal if \thechapter is a @@ -4759,6 +4766,15 @@ \fi } +%** Convert \@currentlabel to lowercase \@huordinal if \thepart is a +%** huordinal or a Huordinal. +\def\@@magyar@lowercase@currentlabel@toc@thepart{% + \ifx\vfuzz\magyar@@toc@thepart\vfuzz\else + % Convert to lower case. + \protected@edef\@currentlabel{\@huordinal\c@part}% + \fi +} + %** Emits the rule to the running head. Must put something of zero width %** to the horizontal list. %** @param #1 0: even page, 1: odd page, 3: page w/o [twoside] @@ -4783,7 +4799,7 @@ \def\@oddhead {\@@magyar@headrule1{\@@magyar@slshape\rightmark}\hfil\thepage}% \let\@mkboth\markboth \def\chaptermark##1{% - \@@magyar@huordinal@dotdef\reserved@a{chapter}\reserved@a + \@@magyar@huordinal@dotdef\reserved@a{chapter}% \markboth {\MakeUppercase{% \ifnum \c@secnumdepth >\m@ne \if@mainmatter% Dat: mainmatter only in book.cls, not in report.cls @@ -4805,7 +4821,7 @@ \def\@oddhead{\@@magyar@headrule3{\@@magyar@slshape\rightmark}\hfil\thepage}% \let\@mkboth\markboth \def\chaptermark##1{% - \@@magyar@huordinal@dotdef\reserved@a{chapter}\reserved@a + \@@magyar@huordinal@dotdef\reserved@a{chapter}% \markright {\MakeUppercase{% \ifnum \c@secnumdepth >\m@ne \if@mainmatter @@ -4822,10 +4838,12 @@ % Part: inserting dot, changing order, toc \expandafter\addto\csname extras\CurrentOption\endcsname{% \babel@save\@part - \def\@part[#1]#2{% + \def\@part[#1]#2{% book \ifnum \c@secnumdepth >-2\relax \refstepcounter{part}% - \addcontentsline{toc}{part}{\thepart.\hspace{1em}#1}% + \@@magyar@def@arabic\magyar@@toc@thepart\thepart + \@@magyar@lowercase@currentlabel@toc@thepart + \addcontentsline{toc}{part}{\magyar@@toc@thepart.\hspace{1em}#1}% \else \addcontentsline{toc}{part}{#1}% \fi @@ -4849,7 +4867,7 @@ \if@mainmatter \refstepcounter{chapter}% \typeout{\thechapter\ifx\@chapapp\@@magyar@appendixname\else.\fi\space\@chapapp.}% - \@@magyar@def@toc@thechapter + \@@magyar@def@arabic\magyar@@toc@thechapter\thechapter \@@magyar@lowercase@currentlabel@toc@thechapter \ifx\@chapapp\@@magyar@appendixname % \@gobble gobbles the dot emitted by \numberline. @@ -4908,7 +4926,7 @@ \def\@oddhead {\@@magyar@headrule1{\@@magyar@slshape\rightmark}\hfil\thepage}% \let\@mkboth\markboth \def\chaptermark##1{% - \@@magyar@huordinal@dotdef\reserved@a{chapter}\reserved@a + \@@magyar@huordinal@dotdef\reserved@a{chapter}% \markboth {\MakeUppercase{% \ifnum \c@secnumdepth >\m@ne \thechapter @@ -4929,7 +4947,7 @@ \@@magyar@headrule3{\@@magyar@slshape\rightmark}\hfil\thepage}% \let\@mkboth\markboth \def\chaptermark##1{% - \@@magyar@huordinal@dotdef\reserved@a{chapter}\reserved@a + \@@magyar@huordinal@dotdef\reserved@a{chapter}% \markright{\MakeUppercase{% \ifnum \c@secnumdepth >\m@ne \thechapter @@ -4949,7 +4967,7 @@ \ifnum \c@secnumdepth >\m@ne \refstepcounter{chapter}% \typeout{\thechapter\ifx\@chapapp\@@magyar@appendixname\else.\fi\space\@chapapp.}% - \@@magyar@def@toc@thechapter + \@@magyar@def@arabic\magyar@@toc@thechapter\thechapter \@@magyar@lowercase@currentlabel@toc@thechapter \ifx\@chapapp\@@magyar@appendixname \addcontentsline{toc}{chapter}{\protect\numberline{\magyar@@toc@thechapter\protect\@gobble}#1}% @@ -4967,10 +4985,12 @@ \@afterheading \fi}% \babel@save\@part - \def\@part[#1]#2{% added at Fri Jul 23 11:45:57 CEST 2004 + \def\@part[#1]#2{% report; added at Fri Jul 23 11:45:57 CEST 2004 \ifnum \c@secnumdepth >-2\relax \refstepcounter{part}% - \addcontentsline{toc}{part}{\thepart.\hspace{1em}#1}% hu dot + \@@magyar@def@arabic\magyar@@toc@thepart\thepart + \@@magyar@lowercase@currentlabel@toc@thepart + \addcontentsline{toc}{part}{\magyar@@toc@thepart.\hspace{1em}#1}% \else \addcontentsline{toc}{part}{#1}% \fi @@ -5048,10 +5068,12 @@ \expandafter\magyar@def@psheadings\expandafter{\CurrentOption}{article}% \expandafter\addto\csname extras\CurrentOption\endcsname{% \babel@save\@part - \def\@part[#1]#2{% added at Fri Jul 23 11:45:57 CEST 2004 + \def\@part[#1]#2{% article % added at Fri Jul 23 11:45:57 CEST 2004 \ifnum \c@secnumdepth >\m@ne \refstepcounter{part}% - \addcontentsline{toc}{part}{\thepart.\hspace{1em}#1}% hu dot + \@@magyar@def@arabic\magyar@@toc@thepart\thepart + \@@magyar@lowercase@currentlabel@toc@thepart + \addcontentsline{toc}{part}{\magyar@@toc@thepart.\hspace{1em}#1}% \else \addcontentsline{toc}{part}{#1}% \fi @@ -5259,7 +5281,7 @@ \def\subsectionmark#1{\markright {\ifnum \c@secnumdepth >\@ne \thesubsection.\magyar@opt@@hdrtitleskip \fi #1}}% }{\def\chaptermark#1{ - \@@magyar@huordinal@dotdef\reserved@a{chapter}\reserved@a + \@@magyar@huordinal@dotdef\reserved@a{chapter}% \markboth{\MakeUppercase{\ifnum \c@secnumdepth>\m@ne \csname if@mainmatter\endcsname% report.cls doesn't have it \thechapter |