magyar update (11oct10)

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

1 files changed, 8 insertions, 3 deletions

diff --git a/Master/texmf-dist/doc/latex/magyar/magyar.ldf b/Master/texmf-dist/doc/latex/magyar/magyar.ldf
index cb98bb93b86..047d44d7e74 100644
--- a/Master/texmf-dist/doc/latex/magyar/magyar.ldf
+++ b/Master/texmf-dist/doc/latex/magyar/magyar.ldf
@@ -2565,7 +2565,9 @@
   %** @param #1 a single character (will be prefixed by ``' etc.)
   %*  @param #2 TeX code
   %\def\@@magyar@declare@shorthand#1#2{\magyar@opt@@activeprefix#1{#2}}% defined below
-  \ifx\magyar@opt@@activeprefix\relax \magyar@opt@@active0
+  \ifx\magyar@opt@@activeprefix\relax
+    \def\magyar@opt@@active{0}% =none
+    \def\magyar@opt@@openqq{0}% =unchanged  (this must be defined before processing openqq below)
   \else\edef\@@magyar@declare@shorthand#1#2{\noexpand\@@magyar@declare@shorthand@low\expandafter\string\magyar@opt@@activeprefix#1{#2}}\fi
   %\magyar@activate@shorthands% not yet
   \def\@@magyar@declare@shorthandx#1#2{%
@@ -4441,10 +4443,13 @@
   %** matchar. We fix that by prepending \mathcode`-45 to \newmcodes@ .
   %** This is OK, because \newmcodes@ is protected by a block set up by
   %** \qopname.
+  \def\@@magyar@newmcodes@fixed{\mathcode`-"45 \magyar@@newmcodes}%
   \def\@@magyar@fix@newmcodes@dash{%
     \ifx\newmcodes@\@undefined\else
-      \let\magyar@@newmcodes\newmcodes@
-      \def\newmcodes@{\mathcode`-"45 \magyar@@newmcodes}%
+      \ifx\newmcodes@\@@magyar@newmcodes@fixed\else  % Protect against double redefinition such as in \begin{align*}\tg\end{align*}
+        \let\magyar@@newmcodes\newmcodes@
+        \let\newmcodes@\@@magyar@newmcodes@fixed
+      \fi
     \fi
   }%