babel-spanish (27may21)

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

2 files changed, 46 insertions, 30 deletions

diff --git a/Master/texmf-dist/tex/generic/babel-spanish/romanidx.sty b/Master/texmf-dist/tex/generic/babel-spanish/romanidx.sty
index 32d25215497..1b8a99b7825 100644
--- a/Master/texmf-dist/tex/generic/babel-spanish/romanidx.sty
+++ b/Master/texmf-dist/tex/generic/babel-spanish/romanidx.sty
@@ -7,8 +7,8 @@
 %% spanish.dtx  (with options: `indexes')
 %% This is a generated file.
 %% 
-%% Copyright (C) 1997 - 2014
-%%        Javier Bezos (www.tex-tipografia.com)
+%% Copyright (C) 1997 - 2021
+%%        Javier Bezos (www.texnia.com)
 %%     and
 %%        CervanTeX (www.cervantex.es)
 %% 
diff --git a/Master/texmf-dist/tex/generic/babel-spanish/spanish.ldf b/Master/texmf-dist/tex/generic/babel-spanish/spanish.ldf
index 73e4ba313cf..2f107756278 100644
--- a/Master/texmf-dist/tex/generic/babel-spanish/spanish.ldf
+++ b/Master/texmf-dist/tex/generic/babel-spanish/spanish.ldf
@@ -7,8 +7,8 @@
 %% spanish.dtx  (with options: `code')
 %% This is a generated file.
 %% 
-%% Copyright (C) 1997 - 2014
-%%        Javier Bezos (www.tex-tipografia.com)
+%% Copyright (C) 1997 - 2021
+%%        Javier Bezos (www.texnia.com)
 %%     and
 %%        CervanTeX (www.cervantex.es)
 %% 
@@ -36,7 +36,7 @@
 %% Please report errors to: Javier Bezos (preferably)
 %%                          www.tex-tipografia.com
 \ProvidesLanguage{spanish.ldf}
-    [2016/03/03 v5.0p Spanish support from the babel system]
+    [2021/05/27 v5.0q Spanish support from the babel system]
 \LdfInit{spanish}\captionsspanish
 
 \edef\es@savedcatcodes{%
@@ -330,7 +330,14 @@
   \let\es@save@dot\.%
   \es@sDRC\.{\@ifnextchar.{\es@dots}{\es@save@dot}}}
 \def\es@dots..{\leavevmode\hbox{...}\spacefactor\@M}
-\def\es@sppercent{\unskip\textormath{$\m@th\,$}{\,}}
+\AtBeginDocument{% TODO. Not quite correct.
+  \ifx\pdfstringdefDisableCommands\@undefined\else
+    \pdfstringdefDisableCommands{\let\.\es@save@dot}%
+  \fi}
+\def\es@sppercent{% See tex.stack 435216 @egreg
+  \leavevmode
+  \ifnum\gluestretchorder\lastskip=\z@\unskip\fi
+  \textormath{$\m@th\,$}{\,}}
 \def\spanishplainpercent{\let\es@sppercent\@empty}
 \addto\textspanish{%
   \let\percentsign\%%
@@ -344,20 +351,22 @@
 \fi
 
 \def\es@fetchenc{%
-  \count@\escapechar \escapechar=\m@ne
-    \edef\es@a{\expandafter\string\the\textfont\mathgroup}%
-    \expandafter\split@name\es@a////\@nil
-  \escapechar=\count@
-  \@expandtwoargs\in@{////}{\f@size}%
-  \ifin@\else
-    \PackageError{spanish}{%
-      Non-NFSS font name. The current math font (\es@a)\MessageBreak
-      doesn't follow the NFSS conventions. I'll use the\MessageBreak
-      default \string\i\space for \string\dotlessi,
-      but expect a wrong output.}%
-    {Find where this font has been (re)defined, and fix it.}%
-    \def\f@encoding{OT1}%
-  \fi}
+  \begingroup
+    \count@\escapechar \escapechar=\m@ne
+      \edef\es@a{\expandafter\string\the\textfont\mathgroup}%
+      \expandafter\split@name\es@a////\@nil
+    \escapechar=\count@
+    \@expandtwoargs\in@{////}{\f@size}%
+    \ifin@\else
+      \PackageError{spanish}{%
+        Non-NFSS font name. The current math font (\es@a)\MessageBreak
+        doesn't follow the NFSS conventions. I'll use the\MessageBreak
+        default \string\i\space for \string\dotlessi,
+        but expect a wrong output.}%
+      {Find where this font has been (re)defined, and fix it.}%
+      \def\f@encoding{OT1}%
+    \fi
+  \bbl@exp{\endgroup\def\\\f@encoding{\f@encoding}}}
 
 \ifes@latex
   \ifx\Umathchardef\@undefined\else
@@ -576,6 +585,8 @@
   \es@sdef\'#1{\if#1i\es@accent\'{19}\i\else\es@accent\'{19}{#1}\fi}}
 \fi
 
+\def\es@babeltexpdf#1#2{\babel@texpdf{#1}{#2}{#2}{}}
+
 \def\es@sptext@r#1#2{\es@sptext{#1#2}}
 \es@declare{"a}{\sptext{a}}
 \es@declare{"A}{\sptext{A}}
@@ -593,11 +604,11 @@
 \es@declare{">}{\guillemotright{}}
 \def\es@chf{\char\hyphenchar\font}
 \es@declare{"-}{\bbl@allowhyphens\-\bbl@allowhyphens}
-\es@declare{"=}{\bbl@allowhyphens\es@chf\hskip\z@skip}
+\es@declare{"=}{\es@babeltexpdf{\bbl@allowhyphens\es@chf\hskip\z@skip}{-}}
 \es@declare{"~}
-  {\bbl@allowhyphens
+  {\es@babeltexpdf{\bbl@allowhyphens
    \discretionary{\es@chf}{\es@chf}{\es@chf}%
-   \bbl@allowhyphens}
+   \bbl@allowhyphens}{-}}
 \es@declare{"r}
   {\bbl@allowhyphens
    \discretionary{\es@chf}{}{r}%
@@ -624,16 +635,18 @@
      \box\z@
    \fi}
 \es@declare{"?}
-  {\setbox\z@\hbox{?`}%
-   \leavevmode\raise\dp\z@\box\z@}
+  {\es@babeltexpdf{\setbox\z@\hbox{?`}%
+   \leavevmode\raise\dp\z@\box\z@}{\textquestiondown}}
 \es@declare{"!}
-  {\setbox\z@\hbox{!`}%
-   \leavevmode\raise\dp\z@\box\z@}
+  {\es@babeltexpdf{\setbox\z@\hbox{!`}%
+   \leavevmode\raise\dp\z@\box\z@}{\textexclamdown}}
 
 \def\spanishdecimal#1{\def\es@decimal{{#1}}}
 \def\decimalcomma{\spanishdecimal{,}}
 \def\decimalpoint{\spanishdecimal{.}}
 \decimalcomma
+\bbl@ifshorthand{.}{}%
+  {\PassOptionsToPackage{es-nodecimaldot}{babel}}
 \es@ifoption{nodecimaldot}{}
   {\AtBeginDocument{\bgroup\@fileswfalse}%
    \begingroup\lccode`\~=`\.\lowercase{\endgroup
@@ -661,6 +674,8 @@
    \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}
 
+\bbl@ifshorthand{~}{}%
+  {\PassOptionsToPackage{es-notilde}{babel}}
 \es@ifoption{notilde}{}{\es@set@shorthand{~}}
 \def\deactivatetilden{%
   \expandafter\let\csname spanish@sh@\string~@n@\endcsname\relax
@@ -706,8 +721,8 @@
        \shorthandoff{<>}%
        \let\es@quoting\deactivatequoting}}{}}
 
-\es@declarealt{<<}{"`}{\begin{quoting}}
-\es@declarealt{>>}{"'}{\end{quoting}}
+\es@declarealt{<<}{"`}{\es@babeltexpdf{\begin{quoting}}{\guillemotleft}}
+\es@declarealt{>>}{"'}{\es@babeltexpdf{\end{quoting}}{\guillemotright}}
 \begingroup
 \catcode`\'=12
 \gdef\es@activeacute{%
@@ -811,7 +826,8 @@
   {\def\es@romandef{%
      \def\esromanindex##1##2{##1{\es@scroman{##2}}}%
      \def\@roman##1{\es@roman{\number##1}}%
-     \def\es@roman##1{\es@scroman{\romannumeral##1}}%
+     \def\es@roman##1{%
+       \es@babeltexpdf{\es@scroman{\romannumeral##1}}{\@Roman{##1}}}%
      \DeclareRobustCommand\es@scroman{\es@xlsc\uppercase\@firstofone}}}
 \es@optlayout{lcroman}{\es@romandef}
 \newcommand\spanishlcroman{\def\@roman##1{\romannumeral##1}}