babel-icelandic (14jan16)

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

4 files changed, 51 insertions, 16 deletions

diff --git a/Master/texmf-dist/doc/generic/babel-icelandic/README.md b/Master/texmf-dist/doc/generic/babel-icelandic/README.md
index 38cb2ed0809..621b9df0c74 100644
--- a/Master/texmf-dist/doc/generic/babel-icelandic/README.md
+++ b/Master/texmf-dist/doc/generic/babel-icelandic/README.md
@@ -1,14 +1,19 @@
-Icelandic 1.2a
+Icelandic 1.2b
 --------------
 
 This is the babel style for Icelandic.
 
-Changes 1.2
------------
+Changes 1.2a
+------------
 
 * It now works with LuaTeX
 * UTF-8 encoded strings for XeTeX and LuaTeX
 * Old icelandic with inputenc utf8
 
+Changes 1.2b
+------------
+
+* Warning with xe/lua without EUx (and documented)
+
 ----------
-2015-12-29
\ No newline at end of file
+2016-01-14
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/generic/babel-icelandic/icelandic.pdf b/Master/texmf-dist/doc/generic/babel-icelandic/icelandic.pdf
index f53b1697f0d..2874e8fb82a 100644
--- a/Master/texmf-dist/doc/generic/babel-icelandic/icelandic.pdf
+++ b/Master/texmf-dist/doc/generic/babel-icelandic/icelandic.pdf
diff --git a/Master/texmf-dist/source/generic/babel-icelandic/icelandic.dtx b/Master/texmf-dist/source/generic/babel-icelandic/icelandic.dtx
index 42b6421313a..d4987b06a56 100644
--- a/Master/texmf-dist/source/generic/babel-icelandic/icelandic.dtx
+++ b/Master/texmf-dist/source/generic/babel-icelandic/icelandic.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright 1989-2015 Einar \'Arnason, Johannes L. Braams, Javier
+% Copyright 1989-2016 Einar \'Arnason, Johannes L. Braams, Javier
 % Bezos and any individual authors listed elsewhere in this file.  All
 % rights reserved.
 % 
@@ -27,7 +27,7 @@
 % and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
 % \fi
-% \CheckSum{636}
+% \CheckSum{646}
 %
 % \iffalse
 %    Tell the \LaTeX\ system who we are and write an entry on the
@@ -38,15 +38,15 @@
 %<code>\ProvidesLanguage{icelandic}
 %\fi
 %\ProvidesFile{icelandic.dtx}
-        [2015/12/29 v1.2a Icelandic support from the babel system]
+        [2016/01/14 v1.2b Icelandic support from the babel system]
 %\iffalse
 %% File iceland.dtx
 %
 %% Icelandic Language Definition File
-%% Copyright (C)  1996--2015
+%% Copyright (C)  1996--2016
 %%           by Einar \'Arnason <einar@lif.hi.is>
 %%              Johannes Braams, TeXniek
-%%              Javier Bezos (1.2a)
+%%              Javier Bezos (1.2a,b)
 %
 %%
 %
@@ -87,7 +87,7 @@
 %  \subsection{Overview}
 %
 %  The file \file{\filename}\footnote{The file described in this
-%  section has version number 1.2a and was last revised on 2015-12-29
+%  section has version number 1.2b and was last revised on 2016-01-14
 %  by Javier Bezos to fix some issues.}  defines all the language
 %  definition macros for the Icelandic language
 %
@@ -186,8 +186,24 @@
 % \end{verbatim}
 %    This modifier is not necessary with \textsf{xe/luatex}. Note with
 %    the latter you need a font containing those glyphs (or at least
-%    with the possibility to compose them).
-%
+%    with the possibility to compose them), as well as defining the
+%    \verb|EU1| or \verb|EU2| encoding (with \textsf{fontspec} and/or
+%    \textsf{fontenc}).\footnote{If you definitely don't want to load
+%    it, there is still an alternative -- the \texttt{strings=generic}
+%    option described in the \textsf{babel} manual, which relies
+%    entirely on the LICR, but this is discouraged.} For example:
+% \begin{verbatim}
+%    \documentclass{article}
+%    \usepackage[icelandic]{babel}
+%    \usepackage{fontspec}
+%    \setmainfont{Arial}
+%    \begin{document}
+%    Íslenska er indóevrópskt, germanskt og vesturnorrænt tungumál sem
+%    er einkum talað og ritað á Íslandi og er móðurmál langflestra
+%    Íslendinga. (From Wikipedia.) 
+%    \end{document}
+% \end{verbatim}
+% 
 %    The original definitions for the ogonek are preserved, even if
 %    the results are not always satisfactory. To be fixed.
 %
@@ -306,8 +322,10 @@
 %    \cs{today} to save memory}
 % \changes{icelandic-1.1c}{1998/03/28}{use \cs{def} instead of
 %    \cs{edef}}
-% \changes{icelandic-1.2a}{2105/03/28}{Define strings using
+% \changes{icelandic-1.2a}{2015/12/28}{Define strings using
 %    \cs{StartBabelCommands}}
+% \changes{icelandic-1.2b}{2016/01/14}{Warning if used with xe/lua
+%    without EUx encondings}
 %
 %    \begin{macrocode}
 \StartBabelCommands*{icelandic}{captions}
@@ -516,6 +534,12 @@
   [unicode, charset=utf8, fontenc=EU1 EU2]
   \AfterBabelCommands{%
     \newcommand\icelandic@og{%
+      \AtBeginDocument{%
+        \@ifundefined{T@\ifcase\bbl@engine\or EU2\or EU1\fi}%
+         {\PackageWarning{icelandic}%
+          {With xetex/luatex EU1 or EU2 should be defined. Use\MessageBreak
+           `fontspec' o `fontenc'. I'll proceed, but expect\MessageBreak
+           some errors. Reported}}{}}%
       \edef\icelandic@tempa##1{%
         \noexpand\DeclareTextCommand
         {##1}{\ifcase\bbl@engine\or EU2\or EU1\fi}}%
diff --git a/Master/texmf-dist/tex/generic/babel-icelandic/icelandic.ldf b/Master/texmf-dist/tex/generic/babel-icelandic/icelandic.ldf
index 5653be7c5f7..fce95f03901 100644
--- a/Master/texmf-dist/tex/generic/babel-icelandic/icelandic.ldf
+++ b/Master/texmf-dist/tex/generic/babel-icelandic/icelandic.ldf
@@ -37,13 +37,13 @@
 %% and covered by LPPL is defined by the unpacking scripts (with
 %% extension .ins) which are part of the distribution.
 \ProvidesLanguage{icelandic}
-        [2015/12/29 v1.2a Icelandic support from the babel system]
+        [2016/01/14 v1.2b Icelandic support from the babel system]
 %% File iceland.dtx
 %% Icelandic Language Definition File
-%% Copyright (C)  1996--2015
+%% Copyright (C)  1996--2016
 %%           by Einar \'Arnason <einar@lif.hi.is>
 %%              Johannes Braams, TeXniek
-%%              Javier Bezos (1.2a)
+%%              Javier Bezos (1.2a,b)
 %%
 \def\bbl@tempa{icelandic}
 \ifx\CurrentOption\bbl@tempa
@@ -164,6 +164,12 @@
   [unicode, charset=utf8, fontenc=EU1 EU2]
   \AfterBabelCommands{%
     \newcommand\icelandic@og{%
+      \AtBeginDocument{%
+        \@ifundefined{T@\ifcase\bbl@engine\or EU2\or EU1\fi}%
+         {\PackageWarning{icelandic}%
+          {With xetex/luatex EU1 or EU2 should be defined. Use\MessageBreak
+           `fontspec' o `fontenc'. I'll proceed, but expect\MessageBreak
+           some errors. Reported}}{}}%
       \edef\icelandic@tempa##1{%
         \noexpand\DeclareTextCommand
         {##1}{\ifcase\bbl@engine\or EU2\or EU1\fi}}%