summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-03-02 21:46:45 +0000
committerKarl Berry <karl@freefriends.org>2016-03-02 21:46:45 +0000
commitb0a208d1bb2dde60316eb934e15757372426132e (patch)
treef8c59f0c1ef7c6d2fca20ed1d2328596c5094bdd
parentde8746a819c0e2ad3fe4c7d6f5deb5ecc3d39838 (diff)
babel-spanish (2mar16)
git-svn-id: svn://tug.org/texlive/trunk@39920 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/babel-spanish/README.md9
-rw-r--r--Master/texmf-dist/doc/generic/babel-spanish/spanish.pdfbin183267 -> 183261 bytes
-rw-r--r--Master/texmf-dist/source/generic/babel-spanish/spanish.dtx76
-rw-r--r--Master/texmf-dist/tex/generic/babel-spanish/spanish.ldf66
4 files changed, 106 insertions, 45 deletions
diff --git a/Master/texmf-dist/doc/generic/babel-spanish/README.md b/Master/texmf-dist/doc/generic/babel-spanish/README.md
index 13a0711375d..6ced2b5f673 100644
--- a/Master/texmf-dist/doc/generic/babel-spanish/README.md
+++ b/Master/texmf-dist/doc/generic/babel-spanish/README.md
@@ -1,7 +1,7 @@
-Spanish for babel 5.0n
+Spanish for babel 5.0p
======================
-This is the babel style for the Spanish language (5.0n).
+This is the babel style for the Spanish language (5.0p).
History
-------
@@ -55,5 +55,8 @@ New macro \spanishdatefirst
Fixed a bug when \alph reached tilde-n
Fixed \dotlessi with lua (but not \acute, yet)
+5.0p. 2016-03-03
+Fixed \acute with lua (it now uses the composite char)
+
----------
-2016-01-15
+2016-03-03
diff --git a/Master/texmf-dist/doc/generic/babel-spanish/spanish.pdf b/Master/texmf-dist/doc/generic/babel-spanish/spanish.pdf
index f057af362b4..1c92661aaed 100644
--- a/Master/texmf-dist/doc/generic/babel-spanish/spanish.pdf
+++ b/Master/texmf-dist/doc/generic/babel-spanish/spanish.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/generic/babel-spanish/spanish.dtx b/Master/texmf-dist/source/generic/babel-spanish/spanish.dtx
index dec261a5700..6311cf329c4 100644
--- a/Master/texmf-dist/source/generic/babel-spanish/spanish.dtx
+++ b/Master/texmf-dist/source/generic/babel-spanish/spanish.dtx
@@ -23,7 +23,7 @@
% \fi
%
% \ProvidesFile{spanish.dtx}
-% [2016/01/15 v5.0o Spanish support from the babel system]
+% [2016/03/03 v5.0p Spanish support from the babel system]
%\iffalse
%% File `spanish.dtx'
%
@@ -118,7 +118,7 @@
\title{Estilo \textsf{spanish}\\
para el sistema \babel.\footnote{Este archivo está actualmente
-en la versión 5.0no con fecha 15 de enero del 2016. ^^A@#
+en la versión 5.0p con fecha 3 de marzo del 2016.
Esta copia del manual se compuso el~\today.}}
\author{Javier Bezos\footnote{Por favor, envíen comentarios y
@@ -128,7 +128,7 @@ sus comentarios y sugerencias; en particular, han sido muy activos
Juan Luis Varona y José Luis Rivera. Para información sobre
actualizaciones: http://www.cervantex.es/}}
-\date{15 de enero del 2016} ^^A@#
+\date{3 de marzo del 2016}
\maketitle
@@ -1266,7 +1266,7 @@ Trigg, Madrid, Alianza, 1987, t.~2, págs.~1423~-1451.
\section{The Spanish language}
The file \file{spanish.dtx}\footnote{The file described in this
-section has version number 5.0o and was last revised on 2016-01-15.
+section has version number 5.0p and was last revised on 2016-03-03.
The maintainer from v4.0 on is Javier Bezos
(http://www.tex-tipografia.com). Previous versions were made by Julio
S\'anchez. The English documentation has been improved by José Luis
@@ -1567,7 +1567,7 @@ previous behavior and macros for backwards compatibility.
% \begin{macrocode}
%<*code>
\ProvidesLanguage{spanish.ldf}
- [2016/01/15 v5.0o Spanish support from the babel system]
+ [2016/03/03 v5.0p Spanish support from the babel system]
\LdfInit{spanish}\captionsspanish
\edef\es@savedcatcodes{%
@@ -1944,6 +1944,8 @@ previous behavior and macros for backwards compatibility.
% versions, depending on the format.
% \changes{spanish~5.0o}{2016/01/10}{Fixed EUx: deal with them
% separately, to be improved}
+% \changes{spanish~5.0p}{2016/03/02}{Added TU. Now with uni encs use the
+% actual composite char}
%
% \begin{macrocode}
\addto\mathspanish{\es@sDRC\dotlessi{\es@dotlessi}}
@@ -1954,29 +1956,34 @@ previous behavior and macros for backwards compatibility.
\addto\@uclclist{\dotlessi\es@texti}
\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}
+
\ifes@latex
- \@ifundefined{Umathchardef}{}%
- {\expandafter\Umathchardef\csname es@EU1@dotlessi\endcsname"7"1"0131\relax
- \expandafter\Umathchardef\csname es@EU2@dotlessi\endcsname"7"1"0131\relax}%
+ \ifx\Umathchardef\@undefined\else
+ \expandafter\Umathchardef\csname es@EU1@dotlessi\endcsname"7"1"0131\relax
+ \expandafter\Umathchardef\csname es@EU2@dotlessi\endcsname"7"1"0131\relax
+ \expandafter\Umathchardef\csname es@TU@dotlessi\endcsname"7"1"0131\relax
+ \fi
\def\es@dotlessi{%
\ifmmode
{\ifnum\mathgroup=\m@ne
\imath
\else
- \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
+ \es@fetchenc
\@ifundefined{es@\f@encoding @dotlessi}%
{\@ifundefined{\f@encoding\string\i}%
{\edef\f@encoding{\string?}}{}%
@@ -1992,8 +1999,31 @@ previous behavior and macros for backwards compatibility.
\def\es@dotlessi{\textormath{\i}{\mathchar"7010}}
\fi
+\def\es@op@ac@base#1{\acute{\if i#1\dotlessi\else#1\fi}}
+\ifx\Umathchar\@undefined\else
+ \def\es@ac@TU@a{"00E1}\def\es@ac@TU@A{"00C1}%
+ \def\es@ac@TU@e{"00E9}\def\es@ac@TU@E{"00C9}%
+ \def\es@ac@TU@i{"00ED}\def\es@ac@TU@I{"00CD}%
+ \def\es@ac@TU@o{"00F3}\def\es@ac@TU@O{"00D3}%
+ \def\es@ac@TU@u{"00FA}\def\es@ac@TU@U{"00DA}%
+ \def\es@op@ac@TU#1{%
+ \ifnum\mathgroup=\m@ne
+ \es@op@ac@base{#1}%
+ \else
+ \es@fetchenc
+ \@ifundefined{es@op@ac@\f@encoding}%
+ {\es@op@ac@base{#1}}%
+ {\@ifundefined{es@ac@TU@#1}%
+ {\es@op@ac@base{#1}}%
+ {\Umathchar"7"1\csname es@ac@TU@#1\endcsname}}%
+ \fi}%
+ \expandafter\let\csname es@op@ac@EU1\endcsname\es@op@ac@TU
+ \expandafter\let\csname es@op@ac@EU2\endcsname\es@op@ac@TU
+\fi
\def\accentedoperators{%
- \def\es@op@ac##1{\acute{\if i##1\dotlessi\else##1\fi}}}
+ \@ifundefined{es@op@ac@TU}%
+ {\let\es@op@ac\es@op@ac@base}%
+ {\let\es@op@ac\es@op@ac@TU}}
\def\unaccentedoperators{%
\def\es@op@ac##1{##1}}
\accentedoperators
diff --git a/Master/texmf-dist/tex/generic/babel-spanish/spanish.ldf b/Master/texmf-dist/tex/generic/babel-spanish/spanish.ldf
index 51b105d47a9..73e4ba313cf 100644
--- a/Master/texmf-dist/tex/generic/babel-spanish/spanish.ldf
+++ b/Master/texmf-dist/tex/generic/babel-spanish/spanish.ldf
@@ -36,7 +36,7 @@
%% Please report errors to: Javier Bezos (preferably)
%% www.tex-tipografia.com
\ProvidesLanguage{spanish.ldf}
- [2016/01/15 v5.0o Spanish support from the babel system]
+ [2016/03/03 v5.0p Spanish support from the babel system]
\LdfInit{spanish}\captionsspanish
\edef\es@savedcatcodes{%
@@ -343,29 +343,34 @@
\addto\@uclclist{\dotlessi\es@texti}
\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}
+
\ifes@latex
- \@ifundefined{Umathchardef}{}%
- {\expandafter\Umathchardef\csname es@EU1@dotlessi\endcsname"7"1"0131\relax
- \expandafter\Umathchardef\csname es@EU2@dotlessi\endcsname"7"1"0131\relax}%
+ \ifx\Umathchardef\@undefined\else
+ \expandafter\Umathchardef\csname es@EU1@dotlessi\endcsname"7"1"0131\relax
+ \expandafter\Umathchardef\csname es@EU2@dotlessi\endcsname"7"1"0131\relax
+ \expandafter\Umathchardef\csname es@TU@dotlessi\endcsname"7"1"0131\relax
+ \fi
\def\es@dotlessi{%
\ifmmode
{\ifnum\mathgroup=\m@ne
\imath
\else
- \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
+ \es@fetchenc
\@ifundefined{es@\f@encoding @dotlessi}%
{\@ifundefined{\f@encoding\string\i}%
{\edef\f@encoding{\string?}}{}%
@@ -381,8 +386,31 @@
\def\es@dotlessi{\textormath{\i}{\mathchar"7010}}
\fi
+\def\es@op@ac@base#1{\acute{\if i#1\dotlessi\else#1\fi}}
+\ifx\Umathchar\@undefined\else
+ \def\es@ac@TU@a{"00E1}\def\es@ac@TU@A{"00C1}%
+ \def\es@ac@TU@e{"00E9}\def\es@ac@TU@E{"00C9}%
+ \def\es@ac@TU@i{"00ED}\def\es@ac@TU@I{"00CD}%
+ \def\es@ac@TU@o{"00F3}\def\es@ac@TU@O{"00D3}%
+ \def\es@ac@TU@u{"00FA}\def\es@ac@TU@U{"00DA}%
+ \def\es@op@ac@TU#1{%
+ \ifnum\mathgroup=\m@ne
+ \es@op@ac@base{#1}%
+ \else
+ \es@fetchenc
+ \@ifundefined{es@op@ac@\f@encoding}%
+ {\es@op@ac@base{#1}}%
+ {\@ifundefined{es@ac@TU@#1}%
+ {\es@op@ac@base{#1}}%
+ {\Umathchar"7"1\csname es@ac@TU@#1\endcsname}}%
+ \fi}%
+ \expandafter\let\csname es@op@ac@EU1\endcsname\es@op@ac@TU
+ \expandafter\let\csname es@op@ac@EU2\endcsname\es@op@ac@TU
+\fi
\def\accentedoperators{%
- \def\es@op@ac##1{\acute{\if i##1\dotlessi\else##1\fi}}}
+ \@ifundefined{es@op@ac@TU}%
+ {\let\es@op@ac\es@op@ac@base}%
+ {\let\es@op@ac\es@op@ac@TU}}
\def\unaccentedoperators{%
\def\es@op@ac##1{##1}}
\accentedoperators