spanish (outside of babel) update (6oct11)

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

9 files changed, 57 insertions, 30 deletions

diff --git a/Master/texmf-dist/doc/latex/spanish/README b/Master/texmf-dist/doc/latex/spanish/README
index 9b092ddc1da..7538df5a856 100644
--- a/Master/texmf-dist/doc/latex/spanish/README
+++ b/Master/texmf-dist/doc/latex/spanish/README
@@ -46,10 +46,13 @@ As of 2010-05-22 this obsolete version is still the one bundled with babel.
 5.0i. 2009-05-11 (in babel: never)
 Fixed bug with romanidx.
 
-5.0j. 2010-05-23 (in babel: pending)
+5.0j. 2010-05-23 (in babel: never)
 Fixed a babel bug for spanish to work with french.
 Fixed a bug with ifthen.
 Fixed a bug with \... and \.
 
+5.0k. 2011-10-06
+Fixed an error when . had mathcode "8000 before loading spanish
+
 ----------
-2010-05-23
+2011-10-06
diff --git a/Master/texmf-dist/doc/latex/spanish/tex/romanidx.sty b/Master/texmf-dist/doc/latex/spanish/romanidx.sty
index fa3422f5d5d..947346329cb 100644
--- a/Master/texmf-dist/doc/latex/spanish/tex/romanidx.sty
+++ b/Master/texmf-dist/doc/latex/spanish/romanidx.sty
@@ -38,10 +38,10 @@
 %% extension .ins) which are part of the distribution.
 %% File `spanish.dtx'
 %% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2008
+%% Copyright (C) 1989 - 2011
 %%           by Johannes Braams, TeXniek
 %% Spanish Language Definition File
-%% Copyright (C) 1997 - 2010
+%% Copyright (C) 1997 - 2011
 %%        Javier Bezos (www.tex-tipografia.com)
 %%     and
 %%        CervanTeX (www.cervantex.es)
diff --git a/Master/texmf-dist/doc/latex/spanish/tex/spanish.ldf b/Master/texmf-dist/doc/latex/spanish/spanish.ldf
index e4eb4cb654c..eaddf70a882 100644
--- a/Master/texmf-dist/doc/latex/spanish/tex/spanish.ldf
+++ b/Master/texmf-dist/doc/latex/spanish/spanish.ldf
@@ -38,10 +38,10 @@
 %% extension .ins) which are part of the distribution.
 %% File `spanish.dtx'
 %% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2008
+%% Copyright (C) 1989 - 2011
 %%           by Johannes Braams, TeXniek
 %% Spanish Language Definition File
-%% Copyright (C) 1997 - 2010
+%% Copyright (C) 1997 - 2011
 %%        Javier Bezos (www.tex-tipografia.com)
 %%     and
 %%        CervanTeX (www.cervantex.es)
@@ -52,7 +52,7 @@
 
 
 \ProvidesLanguage{spanish.ldf}
-    [2010/05/23 v5.0j Spanish support from the babel system]
+    [2011/10/06 v5.0k Spanish support from the babel system]
 \LdfInit{spanish}\captionsspanish
 
 \edef\es@savedcatcodes{%
@@ -447,7 +447,8 @@
 
 \def\es@spdeactivate#1{%
  \if.#1%
-  \mathcode`\.=\es@period@code
+  \mathcode`\.=\es@period@math\relax
+  \begingroup\lccode`\~=`\.\lowercase{\endgroup\let~\es@period@code}%
  \else
   \begingroup
    \lccode`\~=`#1
@@ -572,17 +573,27 @@
 \decimalcomma
 \es@ifoption{nodecimaldot}{}
  {\AtBeginDocument{\bgroup\@fileswfalse}%
-  \es@set@shorthand{.}%
+  \begingroup\lccode`\~=`\.\lowercase{\endgroup
+    \let\es@period@code~%
+    \es@set@shorthand{.}%
+    \let~\es@period@code}%
   \AtBeginDocument{\egroup}%
   \@namedef{normal@char\string.}{%
    \@ifnextchar\egroup
-    {\mathchar\es@period@code\relax}%
+    {\es@period@code}%
     {\csname active@char\string.\endcsname}}%
-  \declare@shorthand{system}{.}{\mathchar\es@period@code\relax}%
+  \declare@shorthand{system}{.}{\es@period@code}%
   \addto\shorthandsspanish{%
-   \mathchardef\es@period@code\the\mathcode`\.%
    \babel@savevariable{\mathcode`\.}%
-   \mathcode`\.="8000 %
+   \edef\es@period@math{\the\mathcode`\.}%
+   \babel@save\es@period@code
+   \ifnum\es@period@math="8000
+    \begingroup\lccode`\~=`\.\lowercase{\endgroup\let\es@period@code~}%
+   \else
+    \mathchardef\es@period@code\es@period@math\relax
+    \mathcode`\.="8000 %
+   \fi
+   \begingroup\lccode`\~=`\.\lowercase{\endgroup\babel@save~}%
    \es@activate{.}}%
   \def\es@a#1{\es@declare{.#1}{\es@decimal#1}}%
   \es@a1\es@a2\es@a3\es@a4\es@a5\es@a6\es@a7\es@a8\es@a9\es@a0}
diff --git a/Master/texmf-dist/doc/latex/spanish/doc/spanish.pdf b/Master/texmf-dist/doc/latex/spanish/spanish.pdf
index 76d31217d7c..16ef12129c1 100644
--- a/Master/texmf-dist/doc/latex/spanish/doc/spanish.pdf
+++ b/Master/texmf-dist/doc/latex/spanish/spanish.pdf
diff --git a/Master/texmf-dist/doc/latex/spanish/doc/spanish2.html b/Master/texmf-dist/doc/latex/spanish/spanish2.html
index 7a2c1ad765e..7a2c1ad765e 100644
--- a/Master/texmf-dist/doc/latex/spanish/doc/spanish2.html
+++ b/Master/texmf-dist/doc/latex/spanish/spanish2.html
diff --git a/Master/texmf-dist/doc/latex/spanish/source/spanish.dtx b/Master/texmf-dist/source/latex/spanish/spanish.dtx
index 6ccda904044..fba4c78f4b9 100644
--- a/Master/texmf-dist/doc/latex/spanish/source/spanish.dtx
+++ b/Master/texmf-dist/source/latex/spanish/spanish.dtx
@@ -28,15 +28,15 @@
 % \fi
 %
 % \ProvidesFile{spanish.dtx}
-%       [2010/05/23 v5.0j Spanish support from the babel system] 
+%       [2011/10/06 v5.0k Spanish support from the babel system] 
 %\iffalse
 %% File `spanish.dtx'
 %% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2008
+%% Copyright (C) 1989 - 2011
 %%           by Johannes Braams, TeXniek
 %
 %% Spanish Language Definition File
-%% Copyright (C) 1997 - 2010
+%% Copyright (C) 1997 - 2011
 %%        Javier Bezos (www.tex-tipografia.com)
 %%     and
 %%        CervanTeX (www.cervantex.es)
@@ -139,7 +139,7 @@
 % \title{Estilo \textsf{spanish}\\
 %  para el sistema \babel.\footnote{Este
 %  archivo está actualmente en la versión
-%  5.0j con fecha 23 de mayo del 2010. ^^A@#
+%  5.0k con fecha 6 de octubre del 2011. ^^A@#
 %  Esta copia del manual se compuso el~\today.}}
 %
 % \author{Javier Bezos\footnote{Por favor, envíen comentarios y
@@ -151,7 +151,7 @@
 % \textit{Tipografía española con \TeX.} Para información sobre
 % actualizaciones: http://www.cervantex.es/}}
 %
-% \date{23 de mayo del 2010} ^^A@#
+% \date{6 de octubre del 2011} ^^A@#
 %
 % \maketitle
 % 
@@ -1646,15 +1646,15 @@
 % \changes{spanish~5.0j}{2010/01/06}{Overdot \cs{.} was not robust.}
 % \changes{spanish~5.0j}{2010/04/04}{Colon in saved catcodes, because 
 %   babel doesn't restore it after french}
-% \changes{spanish~5.0j}{2010/05/08}{Changed order of tests in 
-%   shorthands, to fix a bug with ifthen}
+% \changes{spanish~5.0k}{2011/08/08}{When saving ., check if 
+%   \cs{mathcode} is 8000}
 %
 %    This file is for both \LaTeXe{} and Plain formats.
 %
 %    \begin{macrocode}
 %<*code>
 \ProvidesLanguage{spanish.ldf}
-    [2010/05/23 v5.0j Spanish support from the babel system]
+    [2011/10/06 v5.0k Spanish support from the babel system]
 \LdfInit{spanish}\captionsspanish
 
 \edef\es@savedcatcodes{%
@@ -1822,7 +1822,7 @@
 %    \end{macrocode}
 %
 %    Instead of joining all the extras directly in |\extrasspanish|,
-%    we subdivide them in three further groups.
+%    we subdivide them in three further groups. 
 %
 %    \begin{macrocode}
 \def\extrasspanish{%
@@ -2145,7 +2145,8 @@
 
 \def\es@spdeactivate#1{%
  \if.#1%
-  \mathcode`\.=\es@period@code
+  \mathcode`\.=\es@period@math\relax
+  \begingroup\lccode`\~=`\.\lowercase{\endgroup\let~\es@period@code}%
  \else
   \begingroup
    \lccode`\~=`#1
@@ -2297,21 +2298,32 @@
 \decimalcomma
 \es@ifoption{nodecimaldot}{}
  {\AtBeginDocument{\bgroup\@fileswfalse}%
-  \es@set@shorthand{.}%
+  \begingroup\lccode`\~=`\.\lowercase{\endgroup
+    \let\es@period@code~%
+    \es@set@shorthand{.}%
+    \let~\es@period@code}%
   \AtBeginDocument{\egroup}%
   \@namedef{normal@char\string.}{%
    \@ifnextchar\egroup
-    {\mathchar\es@period@code\relax}%
+    {\es@period@code}%
     {\csname active@char\string.\endcsname}}%
-  \declare@shorthand{system}{.}{\mathchar\es@period@code\relax}%
+  \declare@shorthand{system}{.}{\es@period@code}%
   \addto\shorthandsspanish{%
-   \mathchardef\es@period@code\the\mathcode`\.%
    \babel@savevariable{\mathcode`\.}%
-   \mathcode`\.="8000 %
+   \edef\es@period@math{\the\mathcode`\.}%
+   \babel@save\es@period@code
+   \ifnum\es@period@math="8000
+    \begingroup\lccode`\~=`\.\lowercase{\endgroup\let\es@period@code~}%
+   \else
+    \mathchardef\es@period@code\es@period@math\relax
+    \mathcode`\.="8000 %
+   \fi
+   \begingroup\lccode`\~=`\.\lowercase{\endgroup\babel@save~}%
    \es@activate{.}}%
   \def\es@a#1{\es@declare{.#1}{\es@decimal#1}}%
   \es@a1\es@a2\es@a3\es@a4\es@a5\es@a6\es@a7\es@a8\es@a9\es@a0}
 
+
 \es@ifoption{notilde}{}{\es@set@shorthand{~}}
 \def\deactivatetilden{%
  \expandafter\let\csname spanish@sh@\string~@n@\endcsname\relax
diff --git a/Master/texmf-dist/doc/latex/spanish/source/spanish.ins b/Master/texmf-dist/source/latex/spanish/spanish.ins
index bd7876dde6d..bd7876dde6d 100644
--- a/Master/texmf-dist/doc/latex/spanish/source/spanish.ins
+++ b/Master/texmf-dist/source/latex/spanish/spanish.ins
diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo
index b7507bbce9a..0848ff94558 100755
--- a/Master/tlpkg/bin/tlpkginfo
+++ b/Master/tlpkg/bin/tlpkginfo
@@ -18,9 +18,9 @@ sub main {
   # erroneous or problematic tds files (warn Robin about them)
   # list format: pkg1|pkg2|etc
   $erroneous_tds = join ("|",
-    qw(engpron fmtcount imtekda purifyeps svn-multi
+    qw(engpron fmtcount imtekda purifyeps spanish svn-multi
        thailatex tugboat tufte-latex xetexref xtab),
-    qw(lastpage papermas papertex undolabl)); #muench
+    qw(lastpage papermas papertex undolabl));
   
   # Heiko's tds files (don't propagate through CTAN fast enough).
   $oberdiek_tds = "hyperref|oberdiek";
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 2c3e80802b5..85b816c7c47 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1249,6 +1249,7 @@ $standardtex='\.(.bx|cfg|sty|clo|ldf|cls|def|fd|cmap|4ht)$';
  'shade',	'shade\.tex',  # not description.tex
  'shadethm',	'\.sth|' . $standardtex,
  'shapepar',	'\.sty',  # not def
+ 'spanish',	'NULL',  # babel conflict
  'showexpl',	'\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$',  # not cfg
  'splitindex',	'splitindex\.tex|' . $standardtex,
  'spotcolor',	'spotcolor.*\.tex|' . $standardtex,