summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-07-01 23:39:43 +0000
committerKarl Berry <karl@freefriends.org>2008-07-01 23:39:43 +0000
commit8b768593a30fd71b68322152d35013a79e5828ea (patch)
tree7fa09a27e5c82aeec6f2fc3cc8b1339f68920664
parentfa193328354a6579c7e8d38f84be55adb1977ff0 (diff)
magyar.ldf update from upstream
git-svn-id: svn://tug.org/texlive/trunk@9146 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/magyar/magyar.ldf129
1 files changed, 121 insertions, 8 deletions
diff --git a/Master/texmf-dist/doc/latex/magyar/magyar.ldf b/Master/texmf-dist/doc/latex/magyar/magyar.ldf
index a49852eed89..70e0ccb5a1d 100644
--- a/Master/texmf-dist/doc/latex/magyar/magyar.ldf
+++ b/Master/texmf-dist/doc/latex/magyar/magyar.ldf
@@ -2136,7 +2136,7 @@
% language.
% \ps@headings isn't run \AtBeginDocument, but book.cls runs
% \pagestyle{headings} when it is loaded. We should change this to
-% (4)
+% \AtBeginDocument or similar (4).
\ifnum\magyar@opt@@toclang=0 \@@magyar@skiplong\fi
\ifnum\magyar@opt@@toclang>1
@@ -2149,10 +2149,10 @@
% \usepackage[...]{babel}). If that is run after \AtBeginDocument hooks,
% then most packages will use 12 as \catcode\string``, which is intended.
% \@@magyar@psheadings might just be run \AtBeginDocument, it doesn't
- % need \@preamblecmds.
+ % need \@preamblecmds -- but it must be after \select@language.
\expandafter\gdef\expandafter\@preamblecmds\expandafter{\@preamblecmds
\select@language{\languagename}% force initial language
- \@@magyar@psheadings% !! don't put inside toclang=
+ \@@magyar@psheadings
}%
% Solve problem (1) and assist solving problem (2) by not emitting
% \select@language twice.
@@ -4374,6 +4374,117 @@
\ifx\magyar@opt@@classmod\relax\@@magyar@skiplong\fi
+%** Branches based on whether the \pagestyle has changed since loading the
+%** class file.
+%** @param #1 class file name, e.g. `book.cls'. Tested with book.cls and
+%** report.cls.
+%** @param implicit-#2 then-branch
+%** @param implicit-#3 else-branch
+\def\magyar@if@originalpagestyle#1{%
+ \begingroup
+ % Dat: no \paragraphmark or \subparagraphmark
+ \providecommand\partmark[1]{\relax}%
+ \providecommand\chaptermark[1]{\relax}%
+ % vvv Dat: already defined in latex.ltx
+ %\providecommand\sectionmark[1]{\relax}
+ %\providecommand\subsectionmark[1]{\relax}
+ %** Appends the first-level expansion of argless macro ##2 to ##1.
+ \def\magyar@letappendto##1##2{%
+ \expandafter\expandafter\expandafter\def
+ \expandafter\expandafter\expandafter##1%
+ \expandafter\expandafter\expandafter{%
+ \expandafter##1##2}}%
+ %** Defines ##1 to the concatenation of \partmark ... \subparagraphmark,
+ %** \oddfoot, \evenfoot, \oddhead, \evenhead.
+ \def\magyar@mark@fingerprint@def##1{%
+ \expandafter\def\expandafter##1\expandafter{%
+ \expandafter{\partmark!}}%
+ \expandafter\def\expandafter\reserved@b\expandafter{%
+ \expandafter{\chaptermark!}}%
+ \magyar@letappendto##1\reserved@b
+ \expandafter\def\expandafter\reserved@b\expandafter{%
+ \expandafter{\sectionmark!}}%
+ \magyar@letappendto##1\reserved@b
+ \expandafter\def\expandafter\reserved@b\expandafter{%
+ \expandafter{\subsectionmark!}}%
+ \magyar@letappendto##1\reserved@b
+ \expandafter\def\expandafter\reserved@b\expandafter{%
+ \expandafter{\subsectionmark!}}%
+ \magyar@letappendto##1\reserved@b
+ \expandafter\def\expandafter\reserved@b\expandafter{%
+ \expandafter{\paragraphmark!}}%
+ \magyar@letappendto##1\reserved@b
+ \expandafter\def\expandafter\reserved@b\expandafter{%
+ \expandafter{\subparagraphmark!}}%
+ \magyar@letappendto##1\reserved@b
+ \expandafter\def\expandafter\reserved@b\expandafter{%
+ \expandafter{\@oddfoot}}%
+ \magyar@letappendto##1\reserved@b
+ \expandafter\def\expandafter\reserved@b\expandafter{%
+ \expandafter{\@evenfoot}}%
+ \magyar@letappendto##1\reserved@b
+ \expandafter\def\expandafter\reserved@b\expandafter{%
+ \expandafter{\@evenhead}}%
+ \magyar@letappendto##1\reserved@b
+ \expandafter\def\expandafter\reserved@b\expandafter{%
+ \expandafter{\@oddhead}}%
+ \magyar@letappendto##1\reserved@b
+ % Dat: don't use \@mkboth (\let\@mkboth\markboth)
+ }%
+ \magyar@mark@fingerprint@def\@@magyar@now@marks
+ \def\ProvidesClass##1[##2]{}%
+ \def\NeedsTeXFormat##1[##2]{}% avoid ``can be used only in preamble''
+ \long\def\DeclareOption##1##2{}%
+ \def\ExecuteOptions##1{}%
+ \def\ProcessOptions{}%
+ \def\DeclareOldFontCommand##1##2##3{}%
+ %
+ \def\magyar@gobbleopt[##1]{}%
+ % Dat: \newcommand etc. are not \global. Good.
+ \let\newdimen\@gobble
+ \let\newif\@gobble
+ \let\newskip\@gobble
+ \let\newmuskip\@gobble
+ \let\newcount\@gobble
+ \let\newbox\@gobble
+ \let\newtoks\@gobble
+ \let\newread\@gobble
+ \let\newwrite\@gobble
+ \let\newlaunguage\@gobble
+ \let\newlength\@gobble
+ \def\newcounter##1{\@ifnextchar[\magyar@gobbleopt{}}%
+ %** Like \newcommand, but always overrides old values.
+ \def\magyar@defcommand{\@star@or@long\magyar@defcommand@low}
+ \def\magyar@defcommand@low##1{%
+ \begingroup
+ \escapechar\m@ne\xdef\@gtempa{\string##1}%
+ \endgroup
+ \expandafter\let\csname\@gtempa\endcsname\@undefined
+ \@star@or@long\new@command##1%
+ }%
+ \def\newcommand{\magyar@defcommand}%
+ \def\renewcommand{\magyar@defcommand}%
+ \def\magyar@defenvironment##1{%
+ \@ifundefined{##1}{}{%
+ \expandafter\let\csname ##1\endcsname\@undefined
+ \expandafter\let\csname end##1\endcsname\@undefined
+ }%
+ \@star@or@long\new@environment{##1}%
+ }%
+ \def\newenvironment{\magyar@defenvironment}%
+ \def\renewenvironment{\magyar@defenvironment}%
+ \def\input##1 {} % size10.clo etc.
+ \makeatletter \@@input #1 %
+ \magyar@mark@fingerprint@def\@@magyar@class@marks
+ \ifx\@@magyar@now@marks\@@magyar@class@marks
+ \endgroup\expandafter\@firstoftwo
+ \else
+ \endgroup\expandafter\@secondoftwo
+ \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]
@@ -4432,9 +4543,10 @@
\let\ps@headings\@@magyar@book@psheadings
% ^^^ Dat: the user has to run \pagestyle{headings} after \selectlanguage{magyar} -- for performance reasons
}
- % vvv !! Imp: make this conditional, based on the changes made by \ps@empty etc.
% !! only if Hungarian is active
- \def\@@magyar@psheadings{\ps@headings}% not \let
+ \def\@@magyar@psheadings{%
+ \magyar@if@originalpagestyle{book.cls}{\ps@headings}{}%
+ }%
\def\magyar@ulladik{ulladik0}% [Nn]ulladik, `0' at end is intentional
% Part: inserting dot, changing order, toc
\expandafter\addto\csname extras\CurrentOption\endcsname{%
@@ -4537,10 +4649,9 @@
\fi
##1}}}%
\else
-%\zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz
\let\@oddfoot\@empty
\def\@oddhead{%
-\@@magyar@headrule3{\@@magyar@slshape\rightmark}\hfil\thepage}%
+ \@@magyar@headrule3{\@@magyar@slshape\rightmark}\hfil\thepage}%
\let\@mkboth\markboth
\def\chaptermark##1{%
\markright{\MakeUppercase{%
@@ -4556,7 +4667,9 @@
\let\ps@headings\@@magyar@report@psheadings
% ^^^ Dat: the user has to run \pagestyle{headings} after \selectlanguage{magyar} -- for performance reasons
}
- \def\@@magyar@psheadings{\ps@headings}% not \let
+ \def\@@magyar@psheadings{%
+ \magyar@if@originalpagestyle{report.cls}{\ps@headings}{}%
+ }%
\def\magyar@ulladik{ulladik0}% [Nn]ulladik, `0' at end is intentional
% Chapter: dot, changing typeout, toc
% Part...