babel-italian (13oct13)

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

1 files changed, 48 insertions, 19 deletions

diff --git a/Master/texmf-dist/tex/generic/babel-italian/italian.ldf b/Master/texmf-dist/tex/generic/babel-italian/italian.ldf
index 75e4c9d8816..c12f692915f 100644
--- a/Master/texmf-dist/tex/generic/babel-italian/italian.ldf
+++ b/Master/texmf-dist/tex/generic/babel-italian/italian.ldf
@@ -17,7 +17,7 @@
 %% License, as described in lppl.txt in the base LaTeX distribution.
 %% Either version 1.3 or, at your option, any later version.
 \ProvidesLanguage{italian}
-        [2013/10/02 v1.3a Italian support from the babel system]
+        [2013/10/13 v1.3c Italian support from the babel system]
 %% Italian support for the babel package
 %% Copyright (C) 2013 by Claudio Beccari
 %%
@@ -160,29 +160,58 @@
  \DeclareMathSymbol{\virgola}{\mathpunct}{letters}{"3B}
  \DeclareMathSymbol{\virgoladecimale}{\mathord}{letters}{"3B}
 \AtEndOfPackage{%
-\AtEndPreamble{%
-  \@ifpackageloaded{polyglossia}{%
-    \ifcsstring{xpg@main@language}{english}{\relax}{%
-      \mathcode`\,=\string"8000}
-  }{%
-    \ifcsstring{languagename}{english}{\relax}{%
-      \mathcode`\,=\string"8000}
-  }
+\AtEndPreamble{\@ifpackageloaded{icomma}{\relax}{%
+    \@ifpackageloaded{polyglossia}{%
+      \ifcsstring{xpg@main@language}{english}{\relax}{%
+        \mathcode`\,=\string"8000}
+    }{%
+      \ifcsstring{languagename}{english}{\relax}{%
+        \mathcode`\,=\string"8000}
+    }%
+  }%
 }}
-\DeclareRobustCommand*\it@comma@def{\futurelet\let@token\m@thcomma}%
+\DeclareRobustCommand*\it@comma@def{\futurelet\let@token\@@math@comma}%
 {\catcode `,=\active \gdef,{\it@comma@def}}%
-
 \DeclareRobustCommand*\@math@comma{%
-  \ifnumequal{\Virgola}{\z@}{\virgola}{%
-  \unless\ifcat\noexpand\let@token*%
-    \expandafter\virgola\else
-    \expandafter\@math@@comma\fi}}
-\DeclareRobustCommand*\@math@@comma[1]{%
-    \ifcsundef{\expandafter\@gobble\string #1}{%
+   \ifnumequal{\Virgola}{\z@}{\virgola}{%
+     \ifcat\noexpand\let@token*%
+        \expandafter\@firstoftwo
+     \else
+        \expandafter\@secondoftwo
+     \fi{%  \let@token is of  category 12
+          \@math@@comma
+        }{% test if \let@token is a macro
+           \ifcat\noexpand\let@token\noexpand\relax
+              \expandafter\@firstoftwo
+           \else
+              \expandafter\@secondoftwo
+           \fi{% it is a macro macro
+                 \@@math@@comma
+              }{% it is something else.
+                 \virgola
+              }
+        }
+   }
+}
+\DeclareRobustCommand*\@math@@comma[1]{% argument is certainly of category 12
+    \ifcsundef{\expandafter\@gobble\string #1}{% test if it is a real digit
         \ifnumless{`#1}{`0}{\virgola}%
           {\ifnumgreater{`#1}{`9}{\virgola}%
-             {\virgoladecimale}}}{\virgola}#1}
-\AtEndOfPackage{\AtEndPreamble{\let\m@thcomma\@math@comma}}
+             {\virgoladecimale}}%
+    }{% it's an implicit character of category 12
+      \let\@tempVirgola\virgola
+      \@tfor\@tempCifra:=0123456789\do{%
+        \expandafter\if\@tempCifra#1\let\@tempVirgola\virgoladecimale
+        \@break@tfor\fi}\@tempVirgola
+    }#1}
+
+\DeclareRobustCommand*\@@math@@comma[1]{% argument is a macro
+   \let\@tempVirgola\virgola
+   \@tfor\@tempCifra:=0123456789\do{%
+   \if\@tempCifra#1\let\@tempVirgola\virgoladecimale
+   \@break@tfor\fi}\@tempVirgola#1
+}
+\AtEndOfPackage{\AtEndPreamble{\let\@@math@comma\@math@comma}}
 \def\LtxSymbCaporali{%
      \DeclareRobustCommand*{\it@ocap}{\mbox{%
         \fontencoding{U}\fontfamily{lasy}\selectfont(\kern-0.20em(}%