babel-icelandic (29dec15)

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

5 files changed, 339 insertions, 183 deletions

diff --git a/Master/texmf-dist/doc/generic/babel-icelandic/README.md b/Master/texmf-dist/doc/generic/babel-icelandic/README.md
new file mode 100644
index 00000000000..38cb2ed0809
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/babel-icelandic/README.md
@@ -0,0 +1,14 @@
+Icelandic 1.2a
+--------------
+
+This is the babel style for Icelandic.
+
+Changes 1.2
+-----------
+
+* It now works with LuaTeX
+* UTF-8 encoded strings for XeTeX and LuaTeX
+* Old icelandic with inputenc utf8
+
+----------
+2015-12-29
\ 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 09a3968f860..f53b1697f0d 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 7b4be56c383..42b6421313a 100644
--- a/Master/texmf-dist/source/generic/babel-icelandic/icelandic.dtx
+++ b/Master/texmf-dist/source/generic/babel-icelandic/icelandic.dtx
@@ -1,7 +1,8 @@
 % \iffalse meta-comment
 %
-% Copyright 1989-2005 Johannes L. Braams and any individual authors
-% listed elsewhere in this file.  All rights reserved.
+% Copyright 1989-2015 Einar \'Arnason, Johannes L. Braams, Javier
+% Bezos and any individual authors listed elsewhere in this file.  All
+% rights reserved.
 % 
 % This file is part of the Babel system.
 % --------------------------------------
@@ -16,7 +17,7 @@
 % 
 % This work has the LPPL maintenance status "maintained".
 % 
-% The Current Maintainer of this work is Johannes Braams.
+% The Current Maintainer of this work is Javier Bezos.
 % 
 % The list of all files belonging to the Babel system is
 % given in the file `manifest.bbl. See also `legal.bbl' for additional
@@ -26,7 +27,7 @@
 % and covered by LPPL is defined by the unpacking scripts (with
 % extension .ins) which are part of the distribution.
 % \fi
-% \CheckSum{546}
+% \CheckSum{636}
 %
 % \iffalse
 %    Tell the \LaTeX\ system who we are and write an entry on the
@@ -37,28 +38,25 @@
 %<code>\ProvidesLanguage{icelandic}
 %\fi
 %\ProvidesFile{icelandic.dtx}
-        [2005/03/30 v1.1g Icelandic support from the babel system]
+        [2015/12/29 v1.2a Icelandic support from the babel system]
 %\iffalse
 %% File iceland.dtx
-%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989--2005
-%%           by Johannes Braams, TeXniek
 %
 %% Icelandic Language Definition File
-%% Copyright (C)  1996--2005
+%% Copyright (C)  1996--2015
 %%           by Einar \'Arnason <einar@lif.hi.is>
 %%              Johannes Braams, TeXniek
+%%              Javier Bezos (1.2a)
 %
-%% Please report errors to: Einar \'Arnason
-%%                          einar at lif.hi.is
-%% or to:                   J.L. Braams
-%%                          babel at braams.cistron.nl
 %%
 %
 %<*filedriver>
 \documentclass{ltxdoc}
-\usepackage{t1enc}
-\usepackage[icelandic,english]{babel}
+\usepackage[T1]{fontenc}
+\expandafter\def\csname u8:ǫ\endcsname{\k{o}}
+\expandafter\def\csname u8:Ǫ\endcsname{\k{O}}
+\usepackage[utf8]{inputenc}
+\usepackage[icelandic.utf8old,english]{babel}
 \font\manual=logo10 % font used for the METAFONT logo, etc.
 \newcommand*\MF{{\manual META}\-{\manual FONT}}
 \newcommand*\TeXhax{\TeX hax}
@@ -88,10 +86,10 @@
 %
 %  \subsection{Overview}
 %
-%    The file \file{\filename}\footnote{The file described in this
-%    section has version number \fileversion\ and was last revised on
-%    \filedate. }  defines all the language definition macros for 
-%    the Icelandic language
+%  The file \file{\filename}\footnote{The file described in this
+%  section has version number 1.2a and was last revised on 2015-12-29
+%  by Javier Bezos to fix some issues.}  defines all the language
+%  definition macros for the Icelandic language
 %
 %    Customization for the Icelandic language was made following
 %    several official and semiofficial publications~\cite{74:_augl,
@@ -121,12 +119,12 @@
 %             (similar to $<<$).\\
 %      |"o| & for old Icelandic "o \\
 %      |"O| & for old Icelandic "O \\
-%      |"�| & for old Icelandic "� \\
-%      |"�| & for old Icelandic "� \\
+%      |"ó| & for old Icelandic "ó \\
+%      |"Ó| & for old Icelandic "Ó \\
 %      |"e| & for old Icelandic "e \\
 %      |"E| & for old Icelandic "E \\
-%      |"�| & for old Icelandic "� \\
-%      |"�| & for old Icelandic "� \\
+%      |"é| & for old Icelandic "é \\
+%      |"É| & for old Icelandic "É \\
 %      |\tala| & for typesetting numbers\\
 %      |\grada| & for the `degree' symbol\\
 %      |\gradur| & for `degrees', e.g. 5~\gradur C\\
@@ -163,12 +161,12 @@
 %      |\dq|    & the original quotes character (|"|).        \\
 %      |\oob|   & for old Icelandic "o \\
 %      |\Oob|   & for old Icelandic "O \\
-%      |\ooob|  & for old Icelandic "� \\
-%      |\OOob|  & for old Icelandic "� \\
+%      |\ooob|  & for old Icelandic "ó \\
+%      |\OOob|  & for old Icelandic "Ó \\
 %      |\eob|   & for old Icelandic "e \\
 %      |\Eob|   & for old Icelandic "E \\
-%      |\eeob|  & for old Icelandic "� \\
-%      |\EEob|  & for old Icelandic "� \\
+%      |\eeob|  & for old Icelandic "é \\
+%      |\EEob|  & for old Icelandic "É \\
 %     \end{tabular}
 %     \end{otherlanguage*}
 %     \caption{Commands which produce quotes and old Icelandic
@@ -177,21 +175,39 @@
 %     \end{center}
 %    \end{table}
 %
+%    Version 1.2 does not raise an error with \textsf{luatex}, and in
+%    addition Unicode strings are defined. Shorthands for ó, Ó, é and
+%    É with ogonek now works with \verb|utf8| and \textsf{inputenc} in
+%    8-bit engines, but for compatibility and due to some limitations
+%    they must be activated explicitly with the modifier
+%    \verb|utf8old|, ie:
+% \begin{verbatim}
+%    \usepackage[icelandic.utf8old]{babel}
+% \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).
+%
+%    The original definitions for the ogonek are preserved, even if
+%    the results are not always satisfactory. To be fixed.
+%
+%    See also below for some extra features.
+%
 %    \begin{thebibliography}{1}
 %    
 %    \bibitem{88:_reglur}
-%    Al�ingi.
-%    \newblock {\em Reglur um fr�gang �ingskjala og prentun umr��na},
+%    Alþingi.
+%    \newblock {\em Reglur um frágang þingskjala og prentun umræðna},
 %    1988. 
 %    
 %    \bibitem{74:_augl}
-%    Augl�sing um greinarmerkjasetningu.
-%    \newblock Stj.t�� B, nr. 133/1974, 1974.
+%    Auglýsing um greinarmerkjasetningu.
+%    \newblock Stj.tíð B, nr. 133/1974, 1974.
 %    
 %    \bibitem{77:_augl}
-%    Augl�sing um breyting augl�singu nr. 132/1974 um �slenska
+%    Auglýsing um breyting auglýsingu nr. 132/1974 um íslenska
 %    stafsetningu. 
-%    \newblock Stj.t�� B, nr. 261/1977, 1977.
+%    \newblock Stj.tíð B, nr. 261/1977, 1977.
 %    
 %    \bibitem{unknown72:_first_gramm_treat}
 %    Einar Haugen, editor.
@@ -199,12 +215,12 @@
 %    \newblock Longman, London, 2 edition, 1972.
 %    
 %    \bibitem{97:_forst_fs}
-%    Sta�lar�� �slands og Fagr�� � uppl�singat�kni, Reykjav�k.
-%    \newblock {\em Forsta�all FS 130:1997}, 1997.
+%    Staðlaráð Íslands og Fagráð í upplýsingatækni, Reykjavík.
+%    \newblock {\em Forstaðall FS 130:1997}, 1997.
 %    
 %    \bibitem{94:_si}
-%    STR� Sta�lar�� �slands.
-%    \newblock {\em SI - kerfi�}, 2 edition, 1994.
+%    STRÍ Staðlaráð Íslands.
+%    \newblock {\em SI - kerfið}, 2 edition, 1994.
 %    
 %    \end{thebibliography}
 %     
@@ -261,31 +277,6 @@
 %    \end{macrocode}
 %  \end{macro}
 %
-%
-%  \begin{macro}{\extrasicelandic}
-%  \begin{macro}{\noextrasicelandic}
-%
-%    The macro |\extrasicelandic| 
-%    will perform all the extra definitions needed for the Icelandic
-%    language. The macro |\noextrasicelandic| is used to cancel the
-%    actions of |\extrasicelandic|. 
-%
-%    For Icelandic  the \texttt{"} character is
-%    made active. This is done once, later on its definition may vary.
-%    \begin{macrocode}
-\initiate@active@char{"}
-\@namedef{extras\CurrentOption}{%
-  \languageshorthands{icelandic}}
-\expandafter\addto\csname extras\CurrentOption\endcsname{%
-  \bbl@activate{"}}
-%    \end{macrocode}
-%    Don't forget to turn the shorthands off again.
-% \changes{icelandic-1.1e}{1999/12/17}{Deactivate shorthands ouside of
-%    Icelandic}
-%    \begin{macrocode}
-\addto\noextrasicelandic{\bbl@deactivate{"}}
-%    \end{macrocode}
-%
 %    The icelandic hyphenation patterns can be used with
 %    |\lefthyphenmin| and |\righthyphenmin| set to~2.
 % \changes{icelandic-1.1f}{2000/09/22}{Now use \cs{providehyphenmins}
@@ -293,15 +284,6 @@
 %    \begin{macrocode}
 \providehyphenmins{\CurrentOption}{\tw@\tw@}
 %    \end{macrocode}
-%  \end{macro}
-%  \end{macro}
-%
-%    The code above is necessary because we need an extra active
-%    character. This character is then used as indicated in
-%    table~\ref{tab:icelandic-commands}.
-%
-%    To be able to define the function of |"|, we first define a
-%    couple of `support' macros.
 %
 %  \subsection{Captionnames and date}
 %
@@ -316,48 +298,75 @@
 % \changes{icelandic-1.1g}{2002/01/00}{Only use 7-bit ASCII characters
 %    in order to keep the texts input encoding independant}
 % \changes{icelandic-1.1g}{2002/01/09}{Added translation for Glossary}
-%    \begin{macrocode}
-\@namedef{captions\CurrentOption}{%
-  \def\prefacename{Form\'{a}li}%
-  \def\refname{Heimildir}%
-  \def\abstractname{\'{U}tdr\'{a}ttur}%
-  \def\bibname{Heimildir}%
-  \def\chaptername{Kafli}%
-  \def\appendixname{Vi{\dh}auki}%
-  \def\contentsname{Efnisyfirlit}%
-  \def\listfigurename{Myndaskr\'{a}}%
-  \def\listtablename{T\"{o}fluskr\'{a}}%
-  \def\indexname{Atri{\dh}isor{\dh}askr\'{a}}%
-  \def\figurename{Mynd}%
-  \def\tablename{Tafla}%
-  \def\partname{Hluti}%
-  \def\enclname{Hj\'{a}lagt}%
-  \def\ccname{Samrit}% 
-  \def\headtoname{Til:}% in letter
-  \def\pagename{Bla{\dh}s\'{\i}{\dh}a}%
-  \def\seename{Sj\'{a}}%
-  \def\alsoname{Sj\'{a} einnig}%
-  \def\proofname{S\"{o}nnun}%
-  \def\glossaryname{Or{\dh}alisti}%
- }
-%    \end{macrocode}
-%  \end{macro}
 %
 % \begin{macro}{\dateicelandic}
 %    The macro |\dateicelandic| redefines the command |\today|
 %    to produce Icelandic dates.
 % \changes{icelandic-1.1c}{1997/10/01}{Use \cs{edef} to define
 %    \cs{today} to save memory}
-% \changes{icelandic-1.1c}{1998/03/28}{use \cs{def} instead of \cs{edef}}
+% \changes{icelandic-1.1c}{1998/03/28}{use \cs{def} instead of
+%    \cs{edef}}
+% \changes{icelandic-1.2a}{2105/03/28}{Define strings using
+%    \cs{StartBabelCommands}}
+%
+%    \begin{macrocode}
+\StartBabelCommands*{icelandic}{captions}
+  [unicode, charset=utf8, fontenc=EU1 EU2]
+  \SetString{\prefacename}{Formáli}
+  \SetString{\abstractname}{Útdráttur}
+  \SetString{\appendixname}{Viðauki}
+  \SetString{\listfigurename}{Myndaskrá}
+  \SetString{\listtablename}{Töfluskrá}
+  \SetString{\indexname}{Atriðisorðaskrá}
+  \SetString{\enclname}{Hjálagt}
+  \SetString{\pagename}{Blaðsíða}
+  \SetString{\seename}{Sjá}
+  \SetString{\alsoname}{Sjá einnig}
+  \SetString{\proofname}{Sönnun}
+  \SetString{\glossaryname}{Orðalisti}
+\StartBabelCommands*{icelandic}{date}
+  [unicode, charset=utf8, fontenc=EU1 EU2]
+  \SetStringLoop{month#1name}{%
+    janúar,febrúar,mars,apríl,maí,júní,
+    júlí,ágúst,september,október,nóvember,desember}
+%    \end{macrocode}
+%
+%    And now, the generic branch, using the LICR and assuming T1.
+%
 %    \begin{macrocode}
-\def\dateicelandic{%
-  \def\today{\number\day.~\ifcase\month\or
-    jan\'{u}ar\or febr\'{u}ar\or mars\or apr\'{\i}l\or ma\'{\i}\or 
-    j\'{u}n\'{\i}\or j\'{u}l\'{\i}\or \'{a}g\'{u}st\or september\or
-    okt\'{o}ber\or n\'{o}vember\or desember\fi
-    \space\number\year}}
+\StartBabelCommands*{icelandic}{captions}
+  \SetString{\prefacename}{Form\'{a}li}
+  \SetString{\refname}{Heimildir}
+  \SetString{\abstractname}{\'{U}tdr\'{a}ttur}
+  \SetString{\bibname}{Heimildir}
+  \SetString{\chaptername}{Kafli}
+  \SetString{\appendixname}{Vi{\dh}auki}
+  \SetString{\contentsname}{Efnisyfirlit}
+  \SetString{\listfigurename}{Myndaskr\'{a}}
+  \SetString{\listtablename}{T\"{o}fluskr\'{a}}
+  \SetString{\indexname}{Atri{\dh}isor{\dh}askr\'{a}}
+  \SetString{\figurename}{Mynd}
+  \SetString{\tablename}{Tafla}
+  \SetString{\partname}{Hluti}
+  \SetString{\enclname}{Hj\'{a}lagt}
+  \SetString{\ccname}{Samrit} 
+  \SetString{\headtoname}{Til:} % in letter
+  \SetString{\pagename}{Bla{\dh}s\'{\i}{\dh}a}
+  \SetString{\seename}{Sj\'{a}}
+  \SetString{\alsoname}{Sj\'{a} einnig}
+  \SetString{\proofname}{S\"{o}nnun}
+  \SetString{\glossaryname}{Or{\dh}alisti}
+\StartBabelCommands*{icelandic}{date}
+  \SetStringLoop{month#1name}{%
+    jan\'{u}ar,febr\'{u}ar,mars,apr\'{\i}l,ma\'{\i},j\'{u}n\'{\i},%
+    j\'{u}l\'{\i},\'{a}g\'{u}st,september,okt\'{o}ber,n\'{o}vember,desember}
+  \SetString\today{%
+    {\number\day}.~\@nameuse{month\romannumeral\month name}
+    {\number\year}}
+\EndBabelCommands
 %    \end{macrocode}
-% \end{macro}
+%  \end{macro}
+%  \end{macro}
 %
 %
 %  \subsection{Icelandic quotation marks}
@@ -393,7 +402,17 @@
 \let\ifrqq\flqq
 %    \end{macrocode}
 %
+%    \section{Shorthands}
+%
+%    The code below is necessary because we need an extra active
+%    character. This character is then used as indicated in
+%    table~\ref{tab:icelandic-commands}.
+%
+%    To be able to define the function of |"|, we also define a
+%    couple of `support' macros.
+%
 %    \begin{macrocode}
+\initiate@active@char{"}
 \declare@shorthand{icelandic}{"`}{\glqq}
 \declare@shorthand{icelandic}{"'}{\grqq}
 \declare@shorthand{icelandic}{">}{\frqq}
@@ -416,18 +435,21 @@
 %
 % \changes{icelandic-1.1}{1997/04/24}{Added definitions for old
 %    icelandic.}
+% \changes{icelandic-1.2a}{2105/03/28}{Reorganized for luatex,
+%    Unicode and utf8.}
 %
-%    In old Icelandic some letters have special diacritical marks, 
+%    In old Icelandic some letters have special diacritical marks,
 %    described for example in \emph{First Grammatical
 %    Treatise}~\cite{unknown72:_first_gramm_treat,97:_forst_fs}. We
-%    provide these in the \texttt{T1} encoding with the `ogonek'. The
-%    ogonek is placed with the letters `o', and `O', `�' and `�', `e'
-%    and `E', and `�' and `�'. Shorthands are provided for these as
-%    well. 
-%
-%    The following code by Leszek Holenderski lifted from 
-%    \texttt{polish.dtx} is  designed to position the diacritics 
-%    correctly for every font in every size. These macros need a 
+%    provide these in the \texttt{T1} encoding with the `ogonek', as
+%    well in \verb|EU|$x$ encondings. The ogonek is placed with the
+%    letters `o', and `O', `ó' and `Ó', `e' and `E', and `é' and
+%    `É'. Shorthands are provided for these as well.
+%
+%    The following code by Leszek Holenderski lifted from
+%    \texttt{polish.dtx} is designed to position the diacritics
+%    correctly for every font in every size in Computer Modern. In
+%    other fonts they might be slightly misplaced. These macros need a
 %    few extra dimension variables.
 %
 %    \begin{macrocode}
@@ -461,15 +483,18 @@
 %  \begin{macro}{\Eob}
 %  \begin{macro}{\eeob}
 %  \begin{macro}{\EEob}
+%
+%  Now, just define the composite characters.
+%
 %    \begin{macrocode}
-\DeclareTextCommand{\oob}{T1}{\sob {o}{.85}{0}{.04}{0}}
-\DeclareTextCommand{\Oob}{T1}{\sob {O}{.7}{0}{0}{0}}
-\DeclareTextCommand{\ooob}{T1}{\sob {�}{.85}{0}{.04}{0}}
-\DeclareTextCommand{\OOob}{T1}{\sob {�}{.7}{0}{0}{0}}
-\DeclareTextCommand{\eob}{T1}{\sob {e}{1}{0}{.04}{0}}
-\DeclareTextCommand{\Eob}{T1}{\sob {E}{1}{0}{.04}{0}}
-\DeclareTextCommand{\eeob}{T1}{\sob {�}{1}{0}{.04}{0}}
-\DeclareTextCommand{\EEob}{T1}{\sob {�}{1}{0}{.04}{0}}
+\DeclareTextCommandDefault{\oob}{\sob{o}{.85}{0}{.04}{0}}
+\DeclareTextCommandDefault{\Oob}{\sob{O}{.7}{0}{0}{0}}
+\DeclareTextCommandDefault{\ooob}{\sob{\'{o}}{.85}{0}{.04}{0}}
+\DeclareTextCommandDefault{\OOob}{\sob{\'{O}}{.7}{0}{0}{0}}
+\DeclareTextCommandDefault{\eob}{\sob{e}{1}{0}{.04}{0}}
+\DeclareTextCommandDefault{\Eob}{\sob{E}{1}{0}{.04}{0}}
+\DeclareTextCommandDefault{\eeob}{\sob{\'{e}}{1}{0}{.04}{0}}
+\DeclareTextCommandDefault{\EEob}{\sob{\'{E}}{1}{0}{.04}{0}}
 %    \end{macrocode}
 %  \end{macro}
 %  \end{macro}
@@ -480,16 +505,81 @@
 %  \end{macro}
 %  \end{macro}
 %
+%  And their shorthands.
+%
 %    \begin{macrocode}
 \declare@shorthand{icelandic}{"o}{\oob}
 \declare@shorthand{icelandic}{"O}{\Oob}
-\declare@shorthand{icelandic}{"�}{\ooob}
-\declare@shorthand{icelandic}{"�}{\OOob}
 \declare@shorthand{icelandic}{"e}{\eob}
 \declare@shorthand{icelandic}{"E}{\Eob}
-\declare@shorthand{icelandic}{"�}{\eeob}
-\declare@shorthand{icelandic}{"�}{\EEob}
+\StartBabelCommands*{icelandic}{captions}
+  [unicode, charset=utf8, fontenc=EU1 EU2]
+  \AfterBabelCommands{%
+    \newcommand\icelandic@og{%
+      \edef\icelandic@tempa##1{%
+        \noexpand\DeclareTextCommand
+        {##1}{\ifcase\bbl@engine\or EU2\or EU1\fi}}%
+      \icelandic@tempa{\oob}{ǫ}%
+      \icelandic@tempa{\Oob}{Ǫ}%
+      \icelandic@tempa{\ooob}{\'{ǫ}}%
+      \icelandic@tempa{\OOob}{\'{Ǫ}}%
+      \icelandic@tempa{\eob}{ę}%
+      \icelandic@tempa{\Eob}{Ę}%
+      \icelandic@tempa{\eeob}{\'{ę}}%
+      \icelandic@tempa{\EEob}{\'{Ę}}%
+      \declare@shorthand{icelandic}{"ó}{\ooob}%
+      \declare@shorthand{icelandic}{"Ó}{\OOob}%
+      \declare@shorthand{icelandic}{"é}{\eeob}%
+      \declare@shorthand{icelandic}{"É}{\EEob}}}
+\StartBabelCommands*{icelandic}{captions} 
+  \AfterBabelCommands{%
+    \providecommand\icelandic@og{%
+      \declare@shorthand{icelandic}{"^^db}{\OOob}%
+      \declare@shorthand{icelandic}{"^^e9}{\eeob}%
+      \declare@shorthand{icelandic}{"^^c9}{\EEob}%
+      \declare@shorthand{icelandic}{"^^fb}{\ooob}%
+      \@expandtwoargs\in@{,utf8old,}{,\BabelModifiers,}%
+      \ifin@
+        \declare@shorthand{icelandic}{"^^c3}{\icelandic@preq}%
+        \@namedef{icelandic@preq@^^b3}{\ooob}%
+        \@namedef{icelandic@preq@^^93}{\OOob}%
+        \@namedef{icelandic@preq@^^a9}{\eeob}%
+        \@namedef{icelandic@preq@^^89}{\EEob}%
+        \def\icelandic@preq##1{%
+          \@ifundefined{icelandic@preq@\string##1}%
+            {"{}\UTFviii@two@octets ^^c3##1}%
+            {\@nameuse{icelandic@preq@\string##1}}}%
+      \fi}%
+    \icelandic@og
+    \let\icelandic@og\relax}
+\EndBabelCommands
+
+%    \end{macrocode}
+%
+%  \begin{macro}{\extrasicelandic}
+%  \begin{macro}{\noextrasicelandic}
+%
+%    The macro |\extrasicelandic| 
+%    will perform all the extra definitions needed for the Icelandic
+%    language. The macro |\noextrasicelandic| is used to cancel the
+%    actions of |\extrasicelandic|. 
+%
+%    For Icelandic  the \texttt{"} character is
+%    made active. This is done once, later on its definition may vary.
+%    \begin{macrocode}
+\@namedef{extras\CurrentOption}{%
+  \languageshorthands{icelandic}}
+\expandafter\addto\csname extras\CurrentOption\endcsname{%
+  \bbl@activate{"}}
+%    \end{macrocode}
+%    Don't forget to turn the shorthands off again.
+% \changes{icelandic-1.1e}{1999/12/17}{Deactivate shorthands ouside of
+%    Icelandic}
+%    \begin{macrocode}
+\addto\noextrasicelandic{\bbl@deactivate{"}}
 %    \end{macrocode}
+%  \end{macro}
+%  \end{macro}
 %
 %  \subsection{Formatting numbers}
 %  \label{numbers}
diff --git a/Master/texmf-dist/source/generic/babel-icelandic/icelandic.ins b/Master/texmf-dist/source/generic/babel-icelandic/icelandic.ins
index 21ba5daade9..c77f9b3c983 100644
--- a/Master/texmf-dist/source/generic/babel-icelandic/icelandic.ins
+++ b/Master/texmf-dist/source/generic/babel-icelandic/icelandic.ins
@@ -31,7 +31,7 @@
 %%
 %% --------------- start of docstrip commands ------------------
 %%
-\def\filedate{2000/09/26}
+\def\filedate{2015/12/29}
 \def\batchfile{icelandic.ins}
 \input docstrip.tex
 
diff --git a/Master/texmf-dist/tex/generic/babel-icelandic/icelandic.ldf b/Master/texmf-dist/tex/generic/babel-icelandic/icelandic.ldf
index 037c786a84a..5653be7c5f7 100644
--- a/Master/texmf-dist/tex/generic/babel-icelandic/icelandic.ldf
+++ b/Master/texmf-dist/tex/generic/babel-icelandic/icelandic.ldf
@@ -37,19 +37,13 @@
 %% and covered by LPPL is defined by the unpacking scripts (with
 %% extension .ins) which are part of the distribution.
 \ProvidesLanguage{icelandic}
-        [2005/03/30 v1.1g Icelandic support from the babel system]
+        [2015/12/29 v1.2a Icelandic support from the babel system]
 %% File iceland.dtx
-%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989--2005
-%%           by Johannes Braams, TeXniek
 %% Icelandic Language Definition File
-%% Copyright (C)  1996--2005
+%% Copyright (C)  1996--2015
 %%           by Einar \'Arnason <einar@lif.hi.is>
 %%              Johannes Braams, TeXniek
-%% Please report errors to: Einar \'Arnason
-%%                          einar at lif.hi.is
-%% or to:                   J.L. Braams
-%%                          babel at braams.cistron.nl
+%%              Javier Bezos (1.2a)
 %%
 \def\bbl@tempa{icelandic}
 \ifx\CurrentOption\bbl@tempa
@@ -67,42 +61,56 @@
 \else
   \if@compatibility \@Two@Efalse \fi
 \@FI@
-\initiate@active@char{"}
-\@namedef{extras\CurrentOption}{%
-  \languageshorthands{icelandic}}
-\expandafter\addto\csname extras\CurrentOption\endcsname{%
-  \bbl@activate{"}}
-\addto\noextrasicelandic{\bbl@deactivate{"}}
 \providehyphenmins{\CurrentOption}{\tw@\tw@}
-\@namedef{captions\CurrentOption}{%
-  \def\prefacename{Form\'{a}li}%
-  \def\refname{Heimildir}%
-  \def\abstractname{\'{U}tdr\'{a}ttur}%
-  \def\bibname{Heimildir}%
-  \def\chaptername{Kafli}%
-  \def\appendixname{Vi{\dh}auki}%
-  \def\contentsname{Efnisyfirlit}%
-  \def\listfigurename{Myndaskr\'{a}}%
-  \def\listtablename{T\"{o}fluskr\'{a}}%
-  \def\indexname{Atri{\dh}isor{\dh}askr\'{a}}%
-  \def\figurename{Mynd}%
-  \def\tablename{Tafla}%
-  \def\partname{Hluti}%
-  \def\enclname{Hj\'{a}lagt}%
-  \def\ccname{Samrit}%
-  \def\headtoname{Til:}% in letter
-  \def\pagename{Bla{\dh}s\'{\i}{\dh}a}%
-  \def\seename{Sj\'{a}}%
-  \def\alsoname{Sj\'{a} einnig}%
-  \def\proofname{S\"{o}nnun}%
-  \def\glossaryname{Or{\dh}alisti}%
- }
-\def\dateicelandic{%
-  \def\today{\number\day.~\ifcase\month\or
-    jan\'{u}ar\or febr\'{u}ar\or mars\or apr\'{\i}l\or ma\'{\i}\or
-    j\'{u}n\'{\i}\or j\'{u}l\'{\i}\or \'{a}g\'{u}st\or september\or
-    okt\'{o}ber\or n\'{o}vember\or desember\fi
-    \space\number\year}}
+\StartBabelCommands*{icelandic}{captions}
+  [unicode, charset=utf8, fontenc=EU1 EU2]
+  \SetString{\prefacename}{Formáli}
+  \SetString{\abstractname}{Útdráttur}
+  \SetString{\appendixname}{Viðauki}
+  \SetString{\listfigurename}{Myndaskrá}
+  \SetString{\listtablename}{Töfluskrá}
+  \SetString{\indexname}{Atriðisorðaskrá}
+  \SetString{\enclname}{Hjálagt}
+  \SetString{\pagename}{Blaðsíða}
+  \SetString{\seename}{Sjá}
+  \SetString{\alsoname}{Sjá einnig}
+  \SetString{\proofname}{Sönnun}
+  \SetString{\glossaryname}{Orðalisti}
+\StartBabelCommands*{icelandic}{date}
+  [unicode, charset=utf8, fontenc=EU1 EU2]
+  \SetStringLoop{month#1name}{%
+    janúar,febrúar,mars,apríl,maí,júní,
+    júlí,ágúst,september,október,nóvember,desember}
+\StartBabelCommands*{icelandic}{captions}
+  \SetString{\prefacename}{Form\'{a}li}
+  \SetString{\refname}{Heimildir}
+  \SetString{\abstractname}{\'{U}tdr\'{a}ttur}
+  \SetString{\bibname}{Heimildir}
+  \SetString{\chaptername}{Kafli}
+  \SetString{\appendixname}{Vi{\dh}auki}
+  \SetString{\contentsname}{Efnisyfirlit}
+  \SetString{\listfigurename}{Myndaskr\'{a}}
+  \SetString{\listtablename}{T\"{o}fluskr\'{a}}
+  \SetString{\indexname}{Atri{\dh}isor{\dh}askr\'{a}}
+  \SetString{\figurename}{Mynd}
+  \SetString{\tablename}{Tafla}
+  \SetString{\partname}{Hluti}
+  \SetString{\enclname}{Hj\'{a}lagt}
+  \SetString{\ccname}{Samrit}
+  \SetString{\headtoname}{Til:} % in letter
+  \SetString{\pagename}{Bla{\dh}s\'{\i}{\dh}a}
+  \SetString{\seename}{Sj\'{a}}
+  \SetString{\alsoname}{Sj\'{a} einnig}
+  \SetString{\proofname}{S\"{o}nnun}
+  \SetString{\glossaryname}{Or{\dh}alisti}
+\StartBabelCommands*{icelandic}{date}
+  \SetStringLoop{month#1name}{%
+    jan\'{u}ar,febr\'{u}ar,mars,apr\'{\i}l,ma\'{\i},j\'{u}n\'{\i},%
+    j\'{u}l\'{\i},\'{a}g\'{u}st,september,okt\'{o}ber,n\'{o}vember,desember}
+  \SetString\today{%
+    {\number\day}.~\@nameuse{month\romannumeral\month name}
+    {\number\year}}
+\EndBabelCommands
 \begingroup \catcode`\"12
 \def\x{\endgroup
   \def\@SS{\mathchar"7019 }
@@ -116,6 +124,7 @@
 \let\irqq\grqq
 \let\iflqq\frqq
 \let\ifrqq\flqq
+\initiate@active@char{"}
 \declare@shorthand{icelandic}{"`}{\glqq}
 \declare@shorthand{icelandic}{"'}{\grqq}
 \declare@shorthand{icelandic}{">}{\frqq}
@@ -139,22 +148,65 @@
   \pl@temp=-\pl@down \advance\pl@temp by\dp2 \dp1=\pl@temp
   \leavevmode
   \kern\pl@right\lower\pl@down\box1\kern-\pl@left #1}
-\DeclareTextCommand{\oob}{T1}{\sob {o}{.85}{0}{.04}{0}}
-\DeclareTextCommand{\Oob}{T1}{\sob {O}{.7}{0}{0}{0}}
-\DeclareTextCommand{\ooob}{T1}{\sob {�}{.85}{0}{.04}{0}}
-\DeclareTextCommand{\OOob}{T1}{\sob {�}{.7}{0}{0}{0}}
-\DeclareTextCommand{\eob}{T1}{\sob {e}{1}{0}{.04}{0}}
-\DeclareTextCommand{\Eob}{T1}{\sob {E}{1}{0}{.04}{0}}
-\DeclareTextCommand{\eeob}{T1}{\sob {�}{1}{0}{.04}{0}}
-\DeclareTextCommand{\EEob}{T1}{\sob {�}{1}{0}{.04}{0}}
+\DeclareTextCommandDefault{\oob}{\sob{o}{.85}{0}{.04}{0}}
+\DeclareTextCommandDefault{\Oob}{\sob{O}{.7}{0}{0}{0}}
+\DeclareTextCommandDefault{\ooob}{\sob{\'{o}}{.85}{0}{.04}{0}}
+\DeclareTextCommandDefault{\OOob}{\sob{\'{O}}{.7}{0}{0}{0}}
+\DeclareTextCommandDefault{\eob}{\sob{e}{1}{0}{.04}{0}}
+\DeclareTextCommandDefault{\Eob}{\sob{E}{1}{0}{.04}{0}}
+\DeclareTextCommandDefault{\eeob}{\sob{\'{e}}{1}{0}{.04}{0}}
+\DeclareTextCommandDefault{\EEob}{\sob{\'{E}}{1}{0}{.04}{0}}
 \declare@shorthand{icelandic}{"o}{\oob}
 \declare@shorthand{icelandic}{"O}{\Oob}
-\declare@shorthand{icelandic}{"�}{\ooob}
-\declare@shorthand{icelandic}{"�}{\OOob}
 \declare@shorthand{icelandic}{"e}{\eob}
 \declare@shorthand{icelandic}{"E}{\Eob}
-\declare@shorthand{icelandic}{"�}{\eeob}
-\declare@shorthand{icelandic}{"�}{\EEob}
+\StartBabelCommands*{icelandic}{captions}
+  [unicode, charset=utf8, fontenc=EU1 EU2]
+  \AfterBabelCommands{%
+    \newcommand\icelandic@og{%
+      \edef\icelandic@tempa##1{%
+        \noexpand\DeclareTextCommand
+        {##1}{\ifcase\bbl@engine\or EU2\or EU1\fi}}%
+      \icelandic@tempa{\oob}{ǫ}%
+      \icelandic@tempa{\Oob}{Ǫ}%
+      \icelandic@tempa{\ooob}{\'{ǫ}}%
+      \icelandic@tempa{\OOob}{\'{Ǫ}}%
+      \icelandic@tempa{\eob}{ę}%
+      \icelandic@tempa{\Eob}{Ę}%
+      \icelandic@tempa{\eeob}{\'{ę}}%
+      \icelandic@tempa{\EEob}{\'{Ę}}%
+      \declare@shorthand{icelandic}{"ó}{\ooob}%
+      \declare@shorthand{icelandic}{"Ó}{\OOob}%
+      \declare@shorthand{icelandic}{"é}{\eeob}%
+      \declare@shorthand{icelandic}{"É}{\EEob}}}
+\StartBabelCommands*{icelandic}{captions}
+  \AfterBabelCommands{%
+    \providecommand\icelandic@og{%
+      \declare@shorthand{icelandic}{"^^db}{\OOob}%
+      \declare@shorthand{icelandic}{"^^e9}{\eeob}%
+      \declare@shorthand{icelandic}{"^^c9}{\EEob}%
+      \declare@shorthand{icelandic}{"^^fb}{\ooob}%
+      \@expandtwoargs\in@{,utf8old,}{,\BabelModifiers,}%
+      \ifin@
+        \declare@shorthand{icelandic}{"^^c3}{\icelandic@preq}%
+        \@namedef{icelandic@preq@^^b3}{\ooob}%
+        \@namedef{icelandic@preq@^^93}{\OOob}%
+        \@namedef{icelandic@preq@^^a9}{\eeob}%
+        \@namedef{icelandic@preq@^^89}{\EEob}%
+        \def\icelandic@preq##1{%
+          \@ifundefined{icelandic@preq@\string##1}%
+            {"{}\UTFviii@two@octets ^^c3##1}%
+            {\@nameuse{icelandic@preq@\string##1}}}%
+      \fi}%
+    \icelandic@og
+    \let\icelandic@og\relax}
+\EndBabelCommands
+
+\@namedef{extras\CurrentOption}{%
+  \languageshorthands{icelandic}}
+\expandafter\addto\csname extras\CurrentOption\endcsname{%
+  \bbl@activate{"}}
+\addto\noextrasicelandic{\bbl@deactivate{"}}
 \mathchardef\m@comma="013B \def\@comma@{\ifmmode\m@comma\else,\fi}
 \def\f@thousandsep{\ifmmode\mskip5.5mu\else\penalty\@M\kern.3em\fi}
 \newcommand{\decimalsep}{.}  \newcommand{\thousandsep}{\@comma@}