summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-04-21 23:51:42 +0000
committerKarl Berry <karl@freefriends.org>2015-04-21 23:51:42 +0000
commit204b4d155bec6f3abfcf0e0a163029aee5e402e9 (patch)
tree4945ab01eb5def833a1fe6fbd86301918216eb75
parentb5c4101d03d97b6b343cbe28e71b6f0c03cd672c (diff)
spanglish -> babel-spanglish
git-svn-id: svn://tug.org/texlive/trunk@36995 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/babel-spanglish/README37
-rw-r--r--Master/texmf-dist/tex/generic/babel-spanglish/spanglish.ldf268
-rw-r--r--Master/texmf-dist/tex/generic/babel-spanglish/spanglish.sty66
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check4
-rw-r--r--Master/tlpkg/tlpsrc/babel-spanglish.tlpsrc0
-rw-r--r--Master/tlpkg/tlpsrc/collection-langspanish.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc1
7 files changed, 374 insertions, 3 deletions
diff --git a/Master/texmf-dist/doc/generic/babel-spanglish/README b/Master/texmf-dist/doc/generic/babel-spanglish/README
new file mode 100644
index 00000000000..a227977ff25
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/babel-spanglish/README
@@ -0,0 +1,37 @@
+
+The \textsf{Spanglish} ``language'' is a compromise between the use of the
+Spanish language in writing and English mathematical support for LaTeX.
+You may see it as a form of Spanish text with English mathematics
+---or viceversa.
+
+Therefore, there are no Spanish mathematical features supported (no accented
+operators, no decimal comma), and there is (probably less than) minimal
+Spanish language support for text,
+activating Spanish hyphenation, captions, date, frenchspacing, indentfirst,
+symbolic footnotes, lowercase roman numerals,
+and a few shorthands to improve hyphenation.
+All other typographic decisions are left to other macro packages
+according to user's taste (or lack thereof).
+
+There is a conscious effort to make this ``language'' upwards compatible with
+the ``standard'' Spanish language definition, so the shorthands implemented here
+are but a very narrow subset of the standard Spanish language:
+those strictly necessary to handle Spanish hyphenation properly,
+and a few extras to straighten the text a little in a Spanish layout and support
+plain ASCII input in LaTeX.
+So, in a sense, this ``language'' is a very stripped down or ultra-sloppy
+version of the ``standard'' spanish.ldf, conceived mostly as a fallback
+or a ``poor man's'' Spanish.
+
+There are two attributes/modifiers enabled for this ``language'': asc (ASCII shorthands)
+and nt (NTilde), designed to improve support of ASCII input.
+ASC activates all shorthands convenient to input Spanish with plain ASCII
+characters: this modifier supersedes the need to call the activeacute option
+from Babel;
+NT supports the input of Spanish \~n with the tilde ~n.
+Both modifiers are provided for backwards compatibility, assuming that most
+Spanish users actually choose a suitable 8bit input and font encoding.
+
+Questions, comments? Drop me an email at jlrn77 at gmail dot com
+
+April 1, 2015.
diff --git a/Master/texmf-dist/tex/generic/babel-spanglish/spanglish.ldf b/Master/texmf-dist/tex/generic/babel-spanglish/spanglish.ldf
new file mode 100644
index 00000000000..983550f5b37
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/babel-spanglish/spanglish.ldf
@@ -0,0 +1,268 @@
+%%
+%% This is file `spanglish.ldf',
+%% Copyright 2008-2015 Luis Rivera and any individual authors
+%% listed elsewhere in this file. All rights reserved.
+%%
+% The 'spanglish' dialect was originally adapted from the 'galician'
+% language (v1.2l 2005/03/30), by Manuel Carriba (mcarriba at eunetcom.net),
+% based on the original spanish.sty, written by Julio S\'anchez,
+% (jsanchez at gmv.es)
+% Additional code from spanish.ldf v4.2, by Javier Bezos L\'opez (JBL).
+%%
+%% This file may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% The Current Maintainer of this work is J. Luis Rivera N.
+%% jlrn77 at gmail dot com
+%%
+%% \changes{2010/12/28}{Release version, from 2007/01/26 code.}
+%5 \changes{2013/03/01}{Bug fixes.}
+%% \changes{2015/04/01}{Removed accented math operators and \bbl@activate patch.}
+%% \changes{2015/04/10}{Removed activeacute support and added ascii input modifiers.}
+%% \changes{2015/04/10}{Removed dependency on esindex: now you have to load it yourself.}
+%%
+\ProvidesLanguage{spanglish}
+ [2015/04/01 v0.3 Spanglish: Simpler Spanish support]
+\LdfInit{spanglish}\captionsspanglish
+% spanglish is a dialect of either Spanish or English
+\ifx\l@spanglish\@undefined
+ \ifx\l@spanish\@undefined
+ \@nopatterns{span[gl]ish}
+ \adddialect\l@spanglish0
+ \else
+ \adddialect\l@spanglish\l@spanish
+ \fi\fi
+%
+\addto\captionsspanglish{%
+ \def\prefacename{Prefacio}%
+ \def\refname{Referencias}%
+ \def\abstractname{Resumen}%
+ \def\bibname{Bibliograf\'{\i}a}%
+ \def\chaptername{Cap\'{\i}tulo}%
+ \def\appendixname{Ap\'endice}%
+ \def\contentsname{\'Indice}%
+ \def\listfigurename{\'Indice de Figuras}%
+ \def\listtablename{\'Indice de Cuadros}%
+ \def\indexname{\'Indice Alfab\'etico}%
+ \def\figurename{Figura}%
+ \def\tablename{Cuadro}%
+ \def\partname{Parte}%
+ \def\enclname{Anexo}%
+ \def\ccname{Copia a}%
+ \def\headtoname{A}%
+ \def\pagename{P\'agina}%
+ \def\seename{v\'ease}%
+ \def\alsoname{v\'ease tambi\'en}%
+ \def\proofname{Demostraci\'on}%
+ \def\glossaryname{Glosario}%
+}
+%
+\def\datespanglish{%
+ \def\today{\number\day\space de \ifcase\month\or
+ enero\or febrero\or marzo\or abril\or mayo\or junio\or
+ julio\or agosto\or septiembre\or octubre\or noviembre\or diciembre\fi
+ \space de \number\year}}
+\addto\extrasspanglish{\bbl@frenchspacing}
+\addto\noextrasspanglish{\bbl@nonfrenchspacing}
+%
+\newif\ifesmx@latex
+\@ifundefined{documentclass}
+ {\esmx@latexfalse}
+ {\esmx@latextrue}
+%
+\addto\extrasspanglish{\languageshorthands{spanglish}}
+\initiate@active@char{"}% Only doublequote is active by default
+\addto\extrasspanglish{%
+ \bbl@activate{"}}
+\addto\noextrasspanglish{%
+ \bbl@deactivate{"}}
+\addto\extrasspanglish{%
+ \babel@save\"%
+ \def\"{\protect\@umlaut}}
+\let\dieresis\"
+\def\@umlaut#1{\allowhyphens\dieresis{#1}\allowhyphens}
+% shorthands for hyphenation
+\declare@shorthand{spanglish}{"-}{\nobreak-\bbl@allowhyphens}
+\declare@shorthand{spanglish}{"|}{\discretionary{-}{}{\kern.03em}}
+\declare@shorthand{spanglish}{"r}% to hyphenate para"rrayos properly
+ {\bbl@allowhyphens\discretionary{\char\hyphenchar\font}%
+ {}{r}\bbl@allowhyphens}
+\declare@shorthand{spanglish}{"R}
+ {\bbl@allowhyphens\discretionary{\char\hyphenchar\font}%
+ {}{R}\bbl@allowhyphens}
+\ifesmx@latex% this guillemets hack, by jbl
+ \DeclareTextCommand{\guillemotleft}{OT1}{%
+ \ifmmode\ll
+ \else
+ \save@sf@q{\penalty\@M
+ \leavevmode\hbox{\usefont{U}{lasy}{m}{n}%
+ \char40 \kern-0.19em\char40 }}%
+ \fi}%
+ \DeclareTextCommand{\guillemotright}{OT1}{%
+ \ifmmode\gg
+ \else
+ \save@sf@q{\penalty\@M
+ \leavevmode\hbox{\usefont{U}{lasy}{m}{n}%
+ \char41 \kern-0.19em\char41 }}%
+ \fi}%
+% end jbl; jlrn's American double quotes
+\declare@shorthand{spanglish}{"`}{\textquotedblleft{}}
+\declare@shorthand{spanglish}{"'}{\textquotedblright{}}
+\fi % end quotedbldefs
+% three hacks by JBL to adjust height of ?`!`/ with all uppercase letters
+\declare@shorthand{spanglish}{"/}% first
+ {\setbox\z@\hbox{/}%
+ \dimen@\ht\z@
+ \advance\dimen@-1ex
+ \advance\dimen@\dp\z@
+ \dimen@.31\dimen@
+ \advance\dimen@-\dp\z@
+ \ifdim\dimen@>0pt
+ \kern.01em\lower\dimen@\box\z@\kern.03em
+ \else
+ \box\z@
+ \fi}
+\declare@shorthand{spanglish}{"?}% second
+ {\setbox\z@\hbox{?`}%
+ \leavevmode\raise\dp\z@\box\z@}
+\declare@shorthand{spanglish}{"!}% third
+ {\setbox\z@\hbox{!`}%
+ \leavevmode\raise\dp\z@\box\z@}
+\addto\extrasspanglish{% JS's discretionary hyphens
+ \babel@save{\-}%
+ \def\-{\bbl@allowhyphens\discretionary{-}{}{}\bbl@allowhyphens}}
+%%%
+%%% some code to support accented and spaced math operators was here. RIP.
+%%%
+% support for abbreviations
+\def\esmx@plain@esabrv#1{.$^{{\rm #1}}$}
+\def\esmx@ltx@esabrv#1{.\textsuperscript{#1}}
+\def\esmx@esabrv@r#1#2{\esabrv{#1#2}}% nice trick by JBL
+\ifesmx@latex
+ \let\esabrv\esmx@ltx@esabrv
+ \else
+ \let\esabrv\esmx@plain@esabrv
+\fi
+%% ascii shorthands, rearranged, without activeacute...
+ \bbl@declare@ttribute{spanglish}{asc}{
+ \initiate@active@char{'}
+ \addto\extrasspanglish{\bbl@activate{'}}
+ \addto\noextrasspanglish{\bbl@deactivate{'}}
+ \babel@save\'%
+ \addto\extrasspanglish{\def\'{\protect\@acute}}
+ \let\textacute\'
+ \def\@acute##1{\allowhyphens\textacute{##1}\allowhyphens}
+ \declare@shorthand{spanglish}{'a}{\textormath{\@acute a}{^{\prime} a}}
+ \declare@shorthand{spanglish}{'e}{\textormath{\@acute e}{^{\prime} e}}
+ \declare@shorthand{spanglish}{'i}{\textormath{\@acute\i{}}{^{\prime}i}}
+ \declare@shorthand{spanglish}{'o}{\textormath{\@acute o}{^{\prime} o}}
+ \declare@shorthand{spanglish}{'u}{\textormath{\@acute u}{^{\prime} u}}
+ \declare@shorthand{spanglish}{'A}{\textormath{\@acute A}{^{\prime} A}}
+ \declare@shorthand{spanglish}{'E}{\textormath{\@acute E}{^{\prime} E}}
+ \declare@shorthand{spanglish}{'I}{\textormath{\@acute I}{^{\prime} I}}
+ \declare@shorthand{spanglish}{'O}{\textormath{\@acute O}{^{\prime} O}}
+ \declare@shorthand{spanglish}{'U}{\textormath{\@acute U}{^{\prime} U}}
+ \declare@shorthand{spanglish}{'n}{\textormath{\~n}{^{\prime} n}}
+ \declare@shorthand{spanglish}{'N}{\textormath{\~N}{^{\prime} N}}
+ \declare@shorthand{spanglish}{''}{\textormath{\textquotedblright}{\sp\bgroup\prim@s'}}
+ \declare@shorthand{spanglish}{"u}{\@umlaut{u}}
+ \declare@shorthand{spanglish}{"U}{\@umlaut{U}}
+ \declare@shorthand{spanglish}{"i}{\@umlaut{\i}}
+ \declare@shorthand{spanglish}{"I}{\@umlaut{I}}
+ \declare@shorthand{spanglish}{"a}{\esabrv{a}}
+ \declare@shorthand{spanglish}{"o}{\esabrv{o}}
+ \declare@shorthand{spanglish}{"e}{\protect\esmx@esabrv@r{e}}
+ \declare@shorthand{spanglish}{"A}{\esabrv{A}}
+ \declare@shorthand{spanglish}{"O}{\esabrv{O}}
+ \declare@shorthand{spanglish}{"E}{\protect\esmx@esabrv@r{E}}
+ \declare@shorthand{spanglish}{"<}{\guillemotleft{}}
+ \declare@shorthand{spanglish}{">}{\guillemotright{}}
+}
+%% tilden tildeN
+\bbl@declare@ttribute{spanglish}{nt}{
+ \initiate@active@char{~}
+ \addto\extrasspanglish{\bbl@activate{~}\def\~{\protect\@tilde}}
+ \addto\noextrasspanglish{\bbl@deactivate{~}}
+ \addto\extrasspanglish{\babel@save\~}
+ \let\texttilde\~
+ \let\@tilde\texttilde
+ \declare@shorthand{spanglish}{~n}{\textormath{\~n}{\@tilde n}}
+ \declare@shorthand{spanglish}{~N}{\textormath{\~N}{\@tilde N}}
+}
+% A crude hack to turn ES into US abbreviations.
+\bbl@declare@ttribute{spanglish}{usord}{
+\addto\extrasspanglish{% this code should state ordinal 1"o as 1o.
+ \def\esmx@usabrv##1{##1.}
+ \let\esabrv\esmx@usabrv
+ \def\esmx@esabrv@r##1##2{\esabrv{##1##2}}
+ }
+}
+% spanish layout
+\addto\extrasspanglish{%
+ \def\@alph#1%
+ {\ifcase#1\or a\or b\or c\or d\or e\or f\or g\or h\or i\or j\or
+ k\or l\or m\or n\or \~n\or o\or p\or q\or r\or s\or t\or u\or v\or
+ w\or x\or y\or z\else\@ctrerr\fi}%
+ \def\@Alph#1%
+ {\ifcase#1\or A\or B\or C\or D\or E\or F\or G\or H\or I\or J\or
+ K\or L\or M\or N\or \~N\or O\or P\or Q\or R\or S\or T\or U\or V\or
+ W\or X\or Y\or Z\else\@ctrerr\fi}
+ }
+% JBL's fix (lowercase small caps) for lowercase roman numbers and acronyms.
+\ifesmx@latex
+ \addto\textspanish{%
+ \babel@save\lsc
+ \def\lsc{\protect\esmx@lsc}}
+%
+ \def\esmx@lsc#1{%
+ \leavevmode
+ \hbox{\scshape\selectfont
+ \expandafter\ifx\csname\f@encoding/\f@family/\f@series
+ /n/\f@size\expandafter\endcsname
+ \csname\curr@fontshape/\f@size\endcsname
+ \csname S@\f@size\endcsname
+ \fontsize\sf@size\z@\selectfont
+ \PackageInfo{spanglish}{Replacing undefined sc font\MessageBreak
+ shape by faked small caps}%
+ \MakeUppercase{#1}%
+ \else
+ \MakeLowercase{#1}%
+ \fi}}
+%
+\DeclareTextCompositeCommand{\'}{OT1}{i}{\@tabacckludge'{\i}}
+%
+ \def\spanglishlayout{
+ \def\theenumii{\alph{enumii}}% fix the second level enumeration label
+ \def\labelenumii{\textit{\theenumii})}
+ \def\p@enumii{\textit{\theenumii}}
+ \def\theenumiii{\Roman{enumiii}}% fix the third level enumeration label
+ \def\labelenumiii{\theenumiii.}
+ \def\p@enumiii{\theenumiii}
+ \let\@afterindentfalse\@afterindenttrue% afterindent true
+ \@afterindenttrue%
+ \def\@fnsymbol##1%
+ {\ifcase##1\or*\or**\or***\or****\or
+ *****\or******\else\@ctrerr\fi}%
+ \def\@roman##1{\protect\esmx@roman{\number##1}}%
+ \def\esmx@roman##1{\protect\esmx@lsc{\romannumeral##1}}%
+ %\def\esromanindex##1##2{##1{\protect\esmx@lsc{##2}}}
+ }
+\AtEndOfPackage{%
+ %\RequirePackage{esindex}% now load it on your own!
+ \def\bbl@tempa{spanglish}%
+ \ifx\bbl@main@language\bbl@tempa%
+ \AtBeginDocument{\spanglishlayout}\fi%
+ }
+\fi
+%% A patch to fix a bug in \bbl@activate was here. RIP.
+\ldf@finish{spanglish}
+\endinput
+%%
+%% End of file `spanglish.ldf'.
diff --git a/Master/texmf-dist/tex/generic/babel-spanglish/spanglish.sty b/Master/texmf-dist/tex/generic/babel-spanglish/spanglish.sty
new file mode 100644
index 00000000000..9712b6581fc
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/babel-spanglish/spanglish.sty
@@ -0,0 +1,66 @@
+%%
+%% This is file `spanglish.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% spanglish.dtx (with options: `sty')
+%%
+%% This is a generated file.
+%%
+%% Copyright 2008 Luis Rivera and any individual authors
+%% listed elsewhere in this file. All rights reserved.
+%%
+%% This file may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% The Current Maintainer of this work is Luis Rivera.
+%% jlrn7 at gmail dot com
+%%
+%% The list of derived (unpacked) files belonging to the distribution
+%% and covered by LPPL is defined by the unpacking scripts (with
+%% extension .ins) which are part of the distribution.
+%%
+\ifx\LdfInit\undefined
+ \def\LdfInit{%
+ \chardef\atcatcode=\catcode`\@
+ \catcode`\@=11\relax
+ \input babel.def\relax
+ \catcode`\@=\atcatcode \let\atcatcode\relax
+ \LdfInit}
+\fi
+\ifx\PackageError\undefined
+ \def\ProvidesLanguage#1[#2 #3 #4]{%
+ \wlog{Language: #1 #4 #3 <#2>}}%
+\else
+ \def\bblstyerror{%
+ \PackageError{babel}%
+ {You have used an old interface to call babel\MessageBreak
+ You may expect compatibility problems with other packages}%
+ {You could proceed but don't complain if you run into errors}%
+ \let\bblstyerror\@undefined
+ }
+ \ifx\ProvidesLanguage\undefined
+ \bblstyerror
+ \def\ProvidesLanguage{%
+ \chardef\atcatcode=\catcode`\@
+ \catcode`\@=11\relax
+ \input babel.def\relax
+ \catcode`\@=\atcatcode \let\atcatcode\relax
+ \ProvidesLanguage}
+ \else
+ \bblstyerror
+ \fi
+\fi
+\def\CurrentOption{spanglish}
+\input spanglish.ldf\relax
+\endinput
+%%
+%% End of file `spanglish.sty'.
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index f1908b64ace..6316c5eaf80 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -60,7 +60,7 @@ my @TLP_working = qw(
babel-kurmanji babel-latin babel-latvian babel-norsk babel-piedmontese
babel-polish babel-portuges babel-romanian babel-romansh
babel-russian babel-samin babel-scottish babel-serbian
- babel-serbianc babel-slovak babel-slovenian babel-sorbian
+ babel-serbianc babel-slovak babel-slovenian babel-sorbian babel-spanglish
babel-spanish babel-swedish babel-thai babel-turkish babel-ukraineb
babel-vietnamese babel-welsh
babelbib background backnaur bagpipe bangorcsthesis bangtex bankstatement
@@ -489,7 +489,7 @@ my @TLP_working = qw(
slantsc slideshow smalltableof smartdiagram smartref
snapshot snotez
songbook songs sort-by-letters soton soul sourcecodepro sourcesanspro
- spanglish spanish-mx sparklines spath3 spelling spie
+ spanish-mx sparklines spath3 spelling spie
sphack sphdthesis splines splitbib splitindex
spot spotcolor spreadtab spverbatim
sr-vorl srbook-mem srcltx sseq sslides
diff --git a/Master/tlpkg/tlpsrc/babel-spanglish.tlpsrc b/Master/tlpkg/tlpsrc/babel-spanglish.tlpsrc
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/babel-spanglish.tlpsrc
diff --git a/Master/tlpkg/tlpsrc/collection-langspanish.tlpsrc b/Master/tlpkg/tlpsrc/collection-langspanish.tlpsrc
index 77b2aedf76e..a18024a2f1c 100644
--- a/Master/tlpkg/tlpsrc/collection-langspanish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langspanish.tlpsrc
@@ -6,6 +6,7 @@ depend collection-basic
#
depend babel-catalan
depend babel-galician
+depend babel-spanglish
depend babel-spanish
depend es-tex-faq
depend hyphen-catalan
diff --git a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
index bdc3143ad50..8925d9d5cda 100644
--- a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
@@ -847,7 +847,6 @@ depend smartref
depend snapshot
depend snotez
depend soul
-depend spanglish
depend sparklines
depend sphack
depend splitindex