magyar (22nov10)

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

1 files changed, 81 insertions, 12 deletions

diff --git a/Master/texmf-dist/doc/latex/magyar/magyar.ldf b/Master/texmf-dist/doc/latex/magyar/magyar.ldf
index 047d44d7e74..8f1ba846aad 100644
--- a/Master/texmf-dist/doc/latex/magyar/magyar.ldf
+++ b/Master/texmf-dist/doc/latex/magyar/magyar.ldf
@@ -476,20 +476,88 @@
   \magyar@opt@cjhebrewfix@@yes
 }
 
+%** Expands to the \magyarOptions changes defaults=hu-min makes over
+%** defaults=safest.
+\def\magyar@@humin@options{%
+  active=safe,
+  activeprefix=babelopt2,
+  activespace=safe,
+  amslevelfix=fix-ams,
+  amspostsectiondot=no,
+  amstocnumlang=all,
+  amstocnumskip=\enskip,
+  appendixdot=no,
+  az=weak,
+  captions=hu,
+  chapterhead=yes,
+  cjhebrewfix=yes,
+  classmod=yes,
+  classmod=yes,
+  dottedtocline=fix,
+  emitdate=weak,
+  extras=yes,
+  fancyhdr=hu,
+  figurecaptions=hu,
+  footnote=huplain,
+  frenchspacing=yes,
+  hang=weak,
+  hunnewlabel=yes,
+  hunumbers=yes,
+  hutoday=yes,
+  hynumberline=hu,
+  hyphenmins=22,
+  labelenums=hu-d,
+  labelitems=hu,
+  longcaption=centered,
+  mathbrk=define,
+  mathbrk=fix,
+  mathfactorial=define,
+  mathhucomma=fix,
+  mathreal=weak,
+  mond=weak,
+  openqq=maybedown,
+  postdescription=dot,
+  postpara=diamond,
+  postsubpara=star,
+  refstruc=weak,
+  sectiondot=safe,
+  shorthandcs=\shu,
+  shortrefcmds=yes,
+  showfix=yes,
+  tablecaptions=hu,
+  textqq=weak,
+  theoremtitle=hu,
+  titles=\enskip,
+  toclang=good,
+  told=weak,
+  varioref=hu,
+}
+
 %** Matches Hungarian typographic orders most closely -- and most
 %** simplistically.
 \dMf magyar@opt@defaults@@hu-min {%
-  \csname magyar@opt@defaults@@over-1.4\endcsname
+  %\csname magyar@opt@defaults@@over-1.4\endcsname
+  \csname magyar@opt@defaults@@safest\endcsname
   % Dat: no openqq=unchanged (!)
-  \magyar@doopt  activespace=safe,amstocnumskip=\enskip,frenchspacing=yes,
-    captions=hu,classmod=yes,figurecaptions=hu,
-    footnote=huplain,frenchspacing=yes,hyphenmins=22,
-    labelenums=hu-d,labelitems=hu,fancyhdr=hu,
-    longcaption=centered,mathbrk=fix,mathhucomma=fix,
-    postpara=diamond,postsubpara=star,postdescription=dot,
-    sectiondot=safe,tablecaptions=hu,theoremtitle=hu,
-    appendixdot=no,hynumberline=hu,
-    titles=\enskip,\hfuzz,%
+  \expandafter\magyar@doopt\magyar@@humin@options\hfuzz,%
+}
+
+\def\magyarDumpHuMin{%
+  \begingroup
+  \typeout{}
+  \typeout{\expandafter\@gobble\string\% for defaults=hu-min}%
+  \typeout{\string\def\string\magyarOptions\expandafter\@gobble\string\{}%
+  \typeout{ \space defaults=safest,}%
+  \typeout{ \space\expandafter\@gobble\string\%}%
+  \def\magyar@applyopt##1##2{%
+    \def\reserved@a{##1=##2,}%
+    \typeout{ \space\expandafter\strip@prefix\meaning\reserved@a}%
+  }%
+  \expandafter\magyar@doopt\magyar@@humin@options\hfuzz,%
+  \typeout{\expandafter\@gobble\string\}}%
+  \typeout{\string\usepackage[magyar]{babel}}%
+  \typeout{}%
+  \endgroup
 }
 
 \let\magyar@opt@defaults\magyar@enumarg
@@ -774,6 +842,7 @@
   \fi
 }
 \@gobble\iftrue% \def\magyar@doopt@low contains `\fi'. Make it skippable.
+\def\magyar@applyopt#1#2{\csname magyar@opt@#1\endcsname{#1}{#2}}%
 %** @param #1 is here for gobbling space tokens
 \def\magyar@doopt@low#1#2=#3,#4\fi{%
   % Dat: Normal case: #1#2 is key, #3 is value, #4 is `=,'
@@ -793,7 +862,7 @@
     \expandafter\ifx\csname magyar@opt@#1#2\endcsname\relax
       \@@magyar@error{Unknown option: #1#2 (= #3)}%
     \else
-      \csname magyar@opt@#1#2\endcsname{#1#2}{#3}%
+      \magyar@applyopt{#1#2}{#3}%
     \fi
     \expandafter\magyar@doopt
   \fi
@@ -830,7 +899,7 @@
 }
 
 
-\magyar@opt@defaults{defaults}{over-1.4}
+\magyar@opt@defaults{defaults}{over-1.4}  % defaults=over-1.4 by default
 \def\magyar@opt@@hdrtitleskip{\enskip}% !! option for that
 \magyar@dooptions% in \magyarOptions
 \ifnum\magyar@opt@@openqq=3 % =maybedown