magyar update

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

1 files changed, 12 insertions, 3 deletions

diff --git a/Master/texmf-dist/doc/latex/magyar/magyar.ldf b/Master/texmf-dist/doc/latex/magyar/magyar.ldf
index 404a3857287..852610e6b91 100644
--- a/Master/texmf-dist/doc/latex/magyar/magyar.ldf
+++ b/Master/texmf-dist/doc/latex/magyar/magyar.ldf
@@ -397,7 +397,7 @@
   \magyar@opt@sectiondot@@none
   \magyar@opt@shorthandcs{shorthandcs}{none}%
   \magyar@opt@shortrefcmds@@no
-  \magyar@opt@showfix@@no
+  \magyar@opt@showfix@@unchanged
   \magyar@opt@suggestions@@yes
   \magyar@opt@tablecaptions@@unchanged
   \magyar@opt@textqq{textqq}{no}%
@@ -4310,7 +4310,9 @@
     \fi
   }
 
-  %** Only works if \cs of #1 doesn't have macro arguments
+  %** Only works if \cs of #1 doesn't have macro arguments. It works for
+  %** \figure and \table, because their optional argument `[b]' etc. is not
+  %** a macro argument.
   %** @example \makeFootnotable{figure}
   %** @example \makeFootnotable{} -- current instance of current environment
   \def\makeFootnotable#1{%
@@ -4322,8 +4324,9 @@
       \csname end#1\endcsname
     \fi
   }
+  %** @example \magyar@fo@makef@low\table\endtable
   \def\magyar@fo@makef@low#1#2{\expandafter\def\expandafter#1\expandafter{%
-    #1\magyar@fo@mp@setup#2}}%
+    \expandafter\magyar@fo@mp@setup\expandafter#2#1}}%
 
   \if2\magyar@opt@@footnote \fos@huplain\fi
   \if3\magyar@opt@@footnote \fos@starplain\fi
@@ -4671,6 +4674,10 @@
 %** @param implicit-#4 else-branch
 \def\magyar@if@originalpagestyle#1#2{%
   \begingroup
+  % article.cls calls \pagenumbering, which does a \gdef\thepage and
+  % \global\c@page=1. We'll cancel that below.
+  \let\magyar@@pagestyle@save@thepage\thepage
+  \edef\magyar@@pagestyle@save@c@page{\the\c@page\space}
   % Dat: no \paragraphmark or \subparagraphmark
   % vvv Dat: already defined in latex.ltx
   %\providecommand\sectionmark[1]{\relax}
@@ -4731,6 +4738,8 @@
   #2\magyar@mark@fingerprint@def\@@magyar@class@marks
   %\message{AAA \meaning\@@magyar@now@marks}%
   %\message{BBB \meaning\@@magyar@class@marks}%
+  \global\let\thepage\magyar@@pagestyle@save@thepage
+  \global\c@page\magyar@@pagestyle@save@c@page
   \ifx\@@magyar@now@marks\@@magyar@class@marks
     \endgroup\expandafter\@firstoftwo
   \else