summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-03-28 00:29:18 +0000
committerKarl Berry <karl@freefriends.org>2009-03-28 00:29:18 +0000
commitedce26078de436a63848e74ea297688f82226b5e (patch)
treecb901c57d263a37b1eeca7326e03f2d952fb83c6 /Master/texmf-dist
parent7f2abf2484994dd940cb6f108a2998f9f7e12807 (diff)
magyar update (25mar09)
git-svn-id: svn://tug.org/texlive/trunk@12542 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/magyar/magyar.ldf46
1 files changed, 38 insertions, 8 deletions
diff --git a/Master/texmf-dist/doc/latex/magyar/magyar.ldf b/Master/texmf-dist/doc/latex/magyar/magyar.ldf
index 9606337892e..6970bdadf58 100644
--- a/Master/texmf-dist/doc/latex/magyar/magyar.ldf
+++ b/Master/texmf-dist/doc/latex/magyar/magyar.ldf
@@ -845,6 +845,7 @@
\@@magyar@error{(chapter|part)number=... needs hunumbers=yes}%
\magyar@opt@@hunumbers1
\fi
+ \def\magyar@@alph@thechapter{\@Alph\c@chapter}
%** Replace \thechapter at the beginning of the definition of \thesection
%** with \@arabic\c@chapter if appropriate.
%** @param #1#2 the first-level expansion of \thesection
@@ -859,7 +860,12 @@
\edef\reserved@a{\expandafter\@gobble\reserved@a0}%
\ifx\reserved@a\magyar@ulladik% \thechapter is a huordinal
\endgroup
- \def\thesection{\@arabic\c@chapter#2}%
+ \def\thesection{%
+ \ifx\thechapter\magyar@@alph@thechapter
+ \magyar@@alph@thechapter % in the \appendix
+ \else
+ \@arabic\c@chapter
+ \fi#2}%
\else
\endgroup\fi
\fi
@@ -4757,6 +4763,18 @@
\expandafter\endgroup\expandafter\def\expandafter#1\expandafter{#1}%
}
+%** Define \magyar@@toc@thechapter (#1) to \thechapter (#2) expanded but
+%** huordinal in roman.
+%** @param #1 control sequence to define
+%** @param #2 counter to expand, e.g. \thechapter or \thepart
+\def\@@magyar@def@roman#1#2{%
+ \begingroup
+ \let\@Huordinal\@Roman
+ \let\@huordinal\@roman
+ \edef#1{#2}%
+ \expandafter\endgroup\expandafter\def\expandafter#1\expandafter{#1}%
+}
+
%** Convert \@currentlabel to lowercase \@huordinal if \thechapter is a
%** huordinal or a Huordinal.
\def\@@magyar@lowercase@currentlabel@toc@thechapter{%
@@ -4841,7 +4859,7 @@
\def\@part[#1]#2{% book
\ifnum \c@secnumdepth >-2\relax
\refstepcounter{part}%
- \@@magyar@def@arabic\magyar@@toc@thepart\thepart
+ \@@magyar@def@roman\magyar@@toc@thepart\thepart
\@@magyar@lowercase@currentlabel@toc@thepart
\addcontentsline{toc}{part}{\magyar@@toc@thepart.\hspace{1em}#1}%
\else
@@ -4988,7 +5006,7 @@
\def\@part[#1]#2{% report; added at Fri Jul 23 11:45:57 CEST 2004
\ifnum \c@secnumdepth >-2\relax
\refstepcounter{part}%
- \@@magyar@def@arabic\magyar@@toc@thepart\thepart
+ \@@magyar@def@roman\magyar@@toc@thepart\thepart
\@@magyar@lowercase@currentlabel@toc@thepart
\addcontentsline{toc}{part}{\magyar@@toc@thepart.\hspace{1em}#1}%
\else
@@ -5071,7 +5089,7 @@
\def\@part[#1]#2{% article % added at Fri Jul 23 11:45:57 CEST 2004
\ifnum \c@secnumdepth >\m@ne
\refstepcounter{part}%
- \@@magyar@def@arabic\magyar@@toc@thepart\thepart
+ \@@magyar@def@roman\magyar@@toc@thepart\thepart
\@@magyar@lowercase@currentlabel@toc@thepart
\addcontentsline{toc}{part}{\magyar@@toc@thepart.\hspace{1em}#1}%
\else
@@ -5271,30 +5289,42 @@
\if0\magyar@opt@@fancyhdr \@@magyar@skiplong\fi
\expandafter\ifx\csname ps@fancy\endcsname\relax
% Emit a warning if \pagestyle{fancy} is used after this.
+ % The original definition: \def\ps@fancy{\@fancyplainfalse\ps@@fancy}
\def\@@magyar@@ps@fancy{\@fancyplainfalse\ps@@fancy}%
\else
\addto\ps@fancy{% works for article.cls, report.cls and book.cls
\@ifundefined{chapter}{%
+ % article:
+ % > \sectionmark=macro:
+ %#1->\markboth {\MakeUppercase {\ifnum \c@secnumdepth >\z@
+ %\thesection \hskip 1em\relax \fi #1}}{}.
\def\sectionmark#1{\markboth{\MakeUppercase{\ifnum \c@secnumdepth>\z@
\thesection.\magyar@opt@@hdrtitleskip \fi #1}}{}}%
% vvv Imp: do we need \if@twoside to set \subsectionmark here?
+ % #1->\markright {\ifnum \c@secnumdepth >\@ne \thesubsection
+ % \hskip 1em\relax \fi #1}.
\def\subsectionmark#1{\markright {\ifnum \c@secnumdepth >\@ne
\thesubsection.\magyar@opt@@hdrtitleskip \fi #1}}%
}{\def\chaptermark#1{
\@@magyar@huordinal@dotdef\reserved@a{chapter}%
\markboth{\MakeUppercase{\ifnum \c@secnumdepth>\m@ne
- \csname if@mainmatter\endcsname% report.cls doesn't have it
+ % report.cls doesn't have \if@mainmatter, so we replace it with \iftrue
+ \@gobble\iftrue % balance for quick skipping
+ \@@magyar@ifmainmatter % must be macro if quick skipping
\thechapter
% \reserved@a is empty or a dot, by \@magyar@huordinal@dotdef
\ifx\@chapapp\@@magyar@appendixname\enspace\else\reserved@a~\fi
\@chapapp.\magyar@opt@@hdrtitleskip
- \expandafter\ifx\csname if@mainmatter\endcsname\relax
- \csname iftrue\endcsname\fi
- \csname fi\endcsname\fi#1}}{}}%
+ \fi % for \if@mainmatter
+ \fi#1}}{}}%
\def\sectionmark#1{\markright{\MakeUppercase{\ifnum \c@secnumdepth>\z@
\thesection.\magyar@opt@@hdrtitleskip \fi#1}}}}}%
\def\@@magyar@@ps@fancy{\relax}% must be done after suggestions=
\fi
+% This definition must be outside \iffalse.
+\def\@@magyar@ifmainmatter{%
+ \csname \ifx\if@mainmatter\@undefined iftrue\else if@mainmatter\fi
+ \endcsname}
\@gobble
{^}%