biblatex (24nov13)

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

8 files changed, 350 insertions, 221 deletions

diff --git a/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst b/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
index 7c9e7405f50..fbeef0ec9dd 100644
--- a/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
+++ b/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
@@ -25,6 +25,7 @@ ENTRY {
     keywords
     label
     langid
+    langidopts
     options
     presort
     shorthand
@@ -1404,6 +1405,7 @@ FUNCTION {output:fields.2} {
   "issuetitle"      issuetitle      output:write:field
   "iswc"            iswc            output:write:field
   "journalsubtitle" journalsubtitle output:write:field
+  "langidopts"      langidopts      output:write:field
   "library"         library         output:write:field
   "mainsubtitle"    mainsubtitle    output:write:field
   "maintitleaddon"  maintitleaddon  output:write:field
diff --git a/Master/texmf-dist/doc/latex/biblatex/RELEASE b/Master/texmf-dist/doc/latex/biblatex/RELEASE
index 230918b03b6..f2500e2c364 100644
--- a/Master/texmf-dist/doc/latex/biblatex/RELEASE
+++ b/Master/texmf-dist/doc/latex/biblatex/RELEASE
@@ -1,3 +1,13 @@
+RELEASE NOTES FOR VERSION 2.8a
+
+* INCOMPATIBLE CHANGE - The "language" option has new values. "language=autobib" changes
+  language for bibliography entries based on the LANGID field and the "autolang" option setting.
+  As a new feature, "language=autocite" does the same for citations. "language=auto" sets
+  both "autocite" and "autobib" and the default is "lanauge=autobib". This is a change from
+  the previous default. If your style sets "language=auto" explicitly, you will get the new
+  citation language switching behaviour and might want to use "language=autobib" to get the old
+  behaviour back.
+
 RELEASE NOTES FOR VERSION 2.8
 
 * Biber version 1.8 is required for biblatex 2.8
diff --git a/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf b/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf
index e2bf5956337..1b2516fc226 100644
--- a/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf
+++ b/Master/texmf-dist/doc/latex/biblatex/biblatex.pdf
diff --git a/Master/texmf-dist/doc/latex/biblatex/biblatex.tex b/Master/texmf-dist/doc/latex/biblatex/biblatex.tex
index 114b7d8003d..44d87da5120 100644
--- a/Master/texmf-dist/doc/latex/biblatex/biblatex.tex
+++ b/Master/texmf-dist/doc/latex/biblatex/biblatex.tex
@@ -52,8 +52,8 @@
   url={\biblatexhome},
   author={Philipp Lehman \\(with Philip Kime, Audrey Boruvka and Joseph Wright)},
   email={},
-  revision={2.8},
-  date={21/10/2013}}
+  revision={2.8a},
+  date={25/11/2013}}
 
 \hypersetup{%
   pdftitle={The \biblatex Package},
@@ -2107,9 +2107,9 @@ This option controls the behavior of the \cmd{autocite} command discussed in \se
 
 This option controls whether the citation commands scan ahead for punctuation marks. See \secref{use:cit} and \cmd{DeclareAutoPunctuation} in \secref{aut:pct:cfg} for details.
 
-\optitem[auto]{language}{\opt{auto}, \prm{language}}
+\optitem[autobib]{language}{\opt{autobib}, \opt{autocite}, \opt{auto}, \prm{language}}
 
-This option controls multilingual support. When set to \opt{auto}, \sty{biblatex} will try to get the main document language from the \sty{babel}/\sty{polyglossia} package (and fall back to English if \sty{babel}/\sty{polyglossia} is not available). This is the default behavior. It is also possible to select the document language manually. In this case, the \opt{autolang} option below will have no effect. Please refer to \tabref{bib:fld:tab1} for a list of supported languages and the corresponding identifiers.
+This option controls multilingual support. When set to \opt{autobib}, \opt{autocite} or \opt{auto}, \sty{biblatex} will try to get the main document language from the \sty{babel}/\sty{polyglossia} package (and fall back to English if \sty{babel}/\sty{polyglossia} is not available). It is also possible to select the document language manually. In this case, the \opt{autolang} option below will have no effect. Please refer to \tabref{bib:fld:tab1} for a list of supported languages and the corresponding identifiers. \opt{autobib} switches the language for each entry in the bibliography using the \bibfield{langid} field and the language environment specified by the \opt{autolang} option. \opt{autocite} switches the language for each citation using the \bibfield{langid} field and the language environment specified by the \opt{autolang} option. \opt{auto} is a shorthand to set both \opt{autobib} and \opt{autocite}. The default is to switch languages automatically only for bibliography entries (\opt{autobib}).
 
 \boolitem[true]{clearlang}
 
@@ -3186,7 +3186,7 @@ The \env{refsegment} environment is used in the document body to mark a referenc
 
 \envitem{refsegment}
 
-The difference between a \env{refsection} and a \env{refsegment} environment is that the former creates labels which are local to the environment whereas the latter provides a target for the \opt{segment} filter of \cmd{printbibliography} without affecting the labels. They will be unique across the entire document. \env{refsegment} environments may not be nested, but you may use them in conjunction with \env{refsection} to subdivide a reference section into segments. In this case, the segments are local to the enclosing \env{refsection} environment. Use the \env{refsegment} option of \cmd{printbibliography} to select a segment when printing the bibliography. Within a section, the reference segments are numbered starting at~\texttt{1} and the number of the current segment will be written to the transcript file. All citations given outside a \env{refsegment} environment are assigned to segment~0. In contrast to the \env{refsection} environment, the current segment is not selected automatically if \cmd{printbibliography} is used within a \env{refsegment} environment.
+The difference between a \env{refsection} and a \env{refsegment} environment is that the former creates labels which are local to the environment whereas the latter provides a target for the \opt{segment} filter of \cmd{printbibliography} without affecting the labels. They will be unique across the entire document. \env{refsegment} environments may not be nested, but you may use them in conjunction with \env{refsection} to subdivide a reference section into segments. In this case, the segments are local to the enclosing \env{refsection} environment. Use the \env{segment} option of \cmd{printbibliography} to select a segment when printing the bibliography. Within a section, the reference segments are numbered starting at~\texttt{1} and the number of the current segment will be written to the transcript file. All citations given outside a \env{refsegment} environment are assigned to segment~0. In contrast to the \env{refsection} environment, the current segment is not selected automatically if \cmd{printbibliography} is used within a \env{refsegment} environment.
 
 \csitem{newrefsegment}
 
@@ -10993,6 +10993,10 @@ This revision history is a list of changes relevant to users of this package. Ch
 
 \begin{changelog}
 
+\begin{release}{2.8a}{2013-11-25}
+\item Split option \opt{language=auto} into \opt{language=autocite} and \opt{language=autobib}\see{use:opt:pre:gen}
+\end{release}
+
 \begin{release}{2.8}{2013-10-21}
 \item New \bibfield{langidopts}\see{bib:fld:spc}
 \item \bibfield{hyphenation} field renamed to \bibfield{langid}\see{bib:fld:spc}
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
index f0299e8fd27..69d0d083f79 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex.sty
@@ -3,8 +3,8 @@
 %%
 
 % Set up the version strings here, so they are the same for both branches
-\def\abx@date{2013/10/26}
-\def\abx@version{2.8}
+\def\abx@date{2013/11/24}
+\def\abx@version{2.8a}
 \def\abx@bbxid{\abx@date\space v\abx@version\space biblatex bibliography style (PK/JW/AB)}
 \def\abx@cbxid{\abx@date\space v\abx@version\space biblatex citation style (PK/JW/AB)}
 \def\abx@lbxid{\abx@date\space v\abx@version\space biblatex localization (PK/JW/AB)}
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty
index 5777027e0ab..3e529ac3280 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex1.sty
@@ -70,14 +70,32 @@
     cite,citeref,drftcite,footbib,inlinebib,jurabib,mcite,mciteplus,
     mlbib,multibbl,multibib,natbib,opcit,overcite,splitbib,ucs}%
   \@ifpackageloaded{polyglossia}
-    {\iftoggle{blx@autolang}
-       {\blx@mkautolangpoly}
-       {\blx@mknoautolang}}
+    {\ifboolexpr{
+      not test {\iftoggle{blx@autolangbib}}
+      and
+      not test {\iftoggle{blx@autolangcite}}}
+       {\blx@mknoautolang}
+       {\blx@mkautolangpoly}}
     {\@ifpackageloaded{babel}
-      {\iftoggle{blx@autolang}
-         {\blx@mkautolangbabel}
-         {\blx@mknoautolang}}
-      {{\blx@mknoautolang}}}%
+      {\ifboolexpr{
+        not test {\iftoggle{blx@autolangbib}}
+        and
+        not test {\iftoggle{blx@autolangcite}}}
+         {\blx@mknoautolang}
+         {\blx@mkautolangbabel}}
+      {\blx@mknoautolang}}%
+  % These already have defaults set to basically do nothing
+  % so if the toggles are true, we need to define again since
+  % mkautolang* redefines \blx@beglang
+  % In turn, \blx@beglang defines \blx@endlang and so \blx@beglangcite and
+  % \blx@endlangcite need redefining inside \blx@beglang after \blx@endlang
+  % has been defined.
+  \iftoggle{blx@autolangbib}
+    {\let\blx@beglangbib\blx@beglang}
+    {}%
+  \iftoggle{blx@autolangcite}
+    {\let\blx@beglangcite\blx@beglang}
+    {}%
   \csuse{abx@extras@\blx@languagename}%
   \csuse{abx@strings@\blx@languagename}%
   \undef\blx@mkautolangbabel
@@ -421,7 +439,8 @@
 \newtoggle{blx@debug}
 \newtoggle{blx@sortcase}
 \newtoggle{blx@sortupper}
-\newtoggle{blx@autolang}
+\newtoggle{blx@autolangbib}
+\newtoggle{blx@autolangcite}
 \newtoggle{blx@clearlang}
 \newtoggle{blx@defernumbers}
 \newtoggle{blx@omitnumbers}
@@ -3173,9 +3192,9 @@
   \let\abx@macro@bibindex\@empty
   \let\abx@macro@pageref\@empty
   \csuse{blx@hook@bbxinit}#1%
-  \blx@beglang
+  \blx@beglangbib
   \blx@driver{#2}%
-  \blx@endlang
+  \blx@endlangbib
   \endgroup}
 
 % Punctuation
@@ -4024,7 +4043,7 @@
      \blx@setoptions@entry
      \addtocounter{instcount}\@ne
      \blx@execute
-     \blx@beglang#3\blx@endlang
+     \blx@beglangbib#3\blx@endlangbib
      \endgroup}
     {}}
 
@@ -4063,13 +4082,13 @@
      \blx@setoptions@entry
      \addtocounter{instcount}\@ne
      \blx@execute
-     \blx@beglang
+     \blx@beglangbib
      \blx@begunit
      \blx@entryset@precode
      \blx@driver{\blx@imc@thefield{entrytype}}
      \blx@entryset@postcode
      \blx@endunit
-     \blx@endlang
+     \blx@endlangbib
      \endgroup}
     {\blx@nounit}}
 
@@ -5015,6 +5034,10 @@
 %% babel/polyglossia interface
 \def\blx@beglang{\blx@clearlang\begingroup}
 \def\blx@endlang{\endgroup}
+\let\blx@beglangbib\blx@beglang
+\let\blx@endlangbib\blx@endlang
+\let\blx@beglangcite\blx@beglang
+\let\blx@endlangcite\blx@endlang
 \let\blx@hook@endlang\@empty
 \let\blx@hook@initlang\@empty
 \let\blx@imc@mainlang\@empty
@@ -5047,6 +5070,12 @@
                   \blx@hook@endlang
                   \csname end\blx@thelangenv\endcsname
                   \endgroup}%
+                \iftoggle{blx@autolangbib}
+                  {\let\blx@endlangbib\blx@endlang}
+                  {}%
+                \iftoggle{blx@autolangcite}
+                  {\let\blx@endlangcite\blx@endlang}
+                  {}%
                 \csname\blx@thelangenv\expandafter\endcsname
                 \expandafter{\abx@field@langid}}}}}
        {}%
@@ -5071,8 +5100,18 @@
                   \blx@hook@endlang
                   \csname end\blx@thelangenv\endcsname
                   \endgroup}%
-                \csname\blx@thelangenv\expandafter\endcsname
-                \expandafter{\abx@field@langid}%
+                \iftoggle{blx@autolangbib}
+                  {\let\blx@endlangbib\blx@endlang}
+                  {}%
+                \iftoggle{blx@autolangcite}
+                  {\let\blx@endlangcite\blx@endlang}
+                  {}%
+                \ifcsstring{blx@thelangenv}{langname}
+                  {\ifdef\abx@field@langidopts
+                     {\csname\abx@field@langid\expandafter\endcsname\expandafter[\abx@field@langidopts]}
+                     {\csname\abx@field@langid\endcsname}}
+                  {\csname\blx@thelangenv\expandafter\endcsname
+                   \expandafter{\abx@field@langid}}%                
                 % These lines are equal to \blx@maplang
                 \blx@resetpunct
                 \csuse{abx@extras@\abx@field@langid}%
@@ -6836,12 +6875,12 @@
        \blx@execute
        \blx@initunit
        \blx@anchor
-       \blx@beglang
+       \blx@beglangbib
        \bibsentence
        \blx@pagetracker
        \blx@driver\abx@field@entrytype
        \blx@postpunct
-       \blx@endlang}%
+       \blx@endlangbib}%
      \endgroup}
     {}}
 
@@ -7024,12 +7063,12 @@
        \csuse{blx@hook@lositem}%
        \blx@execute
        \blx@initunit
-       \blx@beglang
+       \blx@beglangbib
        \bibsentence
        \blx@pagetracker
        \blx@driver{shorthands}%
        \blx@postpunct
-       \blx@endlang}%
+       \blx@endlangbib}%
      \endgroup}
     {}}
 
@@ -7675,6 +7714,7 @@
   \blx@pagetracker
   \csuse{blx@hook@citekey}%
   \csuse{blx@hook@citekey@next}%
+  \blx@beglangcite
   \blx@execute
   \blx@loopcode
   \blx@citecounter
@@ -7687,6 +7727,7 @@
     \def\blx@thecheckpunct{\blx@err@nestcite\@gobble}%
     \blx@postcode
   \fi
+  \blx@endlangcite
   \endgroup}
 
 % cite counter
@@ -9913,15 +9954,33 @@
     {\let\abx@bibmonth\blx@imc@biblstring}}
 
 \DeclareBibliographyOption{language}{%
-  \ifstrequal{#1}{auto}
-    {\toggletrue{blx@autolang}%
-     \def\blx@languagename{english}}
-    {\IfFileExists{#1.lbx}
-       {\togglefalse{blx@autolang}%
-	\edef\blx@languagename{#1}}
-       {\blx@error
-	  {Language '#1' not supported}
-	  {Failed to find a matching '#1.lbx' file}}}}
+  \togglefalse{blx@autolangbib}%
+  \togglefalse{blx@autolangcite}%
+  \ifboolexpr{
+    test {\ifstrequal{#1}{auto}}
+    or
+    test {\ifstrequal{#1}{autobib}}
+    or
+    test {\ifstrequal{#1}{autocite}}
+  }
+  {\def\blx@languagename{english}%
+   \ifstrequal{#1}{auto}
+    {\toggletrue{blx@autolangbib}%
+     \toggletrue{blx@autolangcite}}
+    {}%
+   \ifstrequal{#1}{autobib}
+    {\toggletrue{blx@autolangbib}}
+    {}%
+   \ifstrequal{#1}{autocite}
+    {\toggletrue{blx@autolangcite}}
+    {}}
+  {\IfFileExists{#1.lbx}
+    {\togglefalse{blx@autolangbib}%
+     \togglefalse{blx@autolangcite}%
+     \edef\blx@languagename{#1}}
+    {\blx@error
+      {Language '#1' not supported}
+      {Failed to find a matching '#1.lbx' file}}}}
 
 \DeclareBibliographyOption{clearlang}[true]{%
   \settoggle{blx@clearlang}{#1}}
@@ -10578,7 +10637,7 @@
   usetranslator=false,indexing=false,abbreviate=true,dateabbrev=true,
   backref=false,backrefsetstyle=setonly,pagetracker=false,ibidtracker=false,
   idemtracker=false,opcittracker=false,loccittracker=false,citetracker=false,
-  citecounter=false,block=none,language=auto,clearlang=true,autolang=none,
+  citecounter=false,block=none,language=autobib,clearlang=true,autolang=none,
   date=comp,datelabel=year,origdate=comp,eventdate=comp,urldate=short,
   autopunct=true,punctfont=false,defernumbers=false,
   refsection=none,refsegment=none,citereset=none,hyperref=auto,
diff --git a/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty b/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty
index 9a7bef604b1..e9b49c817f2 100644
--- a/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty
+++ b/Master/texmf-dist/tex/latex/biblatex/biblatex2.sty
@@ -66,14 +66,32 @@
     cite,citeref,drftcite,footbib,inlinebib,jurabib,mcite,mciteplus,
     mlbib,multibbl,multibib,natbib,opcit,overcite,splitbib,ucs}%
   \@ifpackageloaded{polyglossia}
-    {\iftoggle{blx@autolang}
-       {\blx@mkautolangpoly}
-       {\blx@mknoautolang}}
+    {\ifboolexpr{
+      not test {\iftoggle{blx@autolangbib}}
+      and
+      not test {\iftoggle{blx@autolangcite}}}
+       {\blx@mknoautolang}
+       {\blx@mkautolangpoly}}
     {\@ifpackageloaded{babel}
-      {\iftoggle{blx@autolang}
-         {\blx@mkautolangbabel}
-         {\blx@mknoautolang}}
+      {\ifboolexpr{
+        not test {\iftoggle{blx@autolangbib}}
+        and
+        not test {\iftoggle{blx@autolangcite}}}
+         {\blx@mknoautolang}
+         {\blx@mkautolangbabel}}
       {\blx@mknoautolang}}%
+  % These already have defaults set to basically do nothing
+  % so if the toggles are true, we need to define again since
+  % mkautolang* redefines \blx@beglang
+  % In turn, \blx@beglang defines \blx@endlang and so \blx@beglangcite and
+  % \blx@endlangcite need redefining inside \blx@beglang after \blx@endlang
+  % has been defined.
+  \iftoggle{blx@autolangbib}
+    {\let\blx@beglangbib\blx@beglang}
+    {}%
+  \iftoggle{blx@autolangcite}
+    {\let\blx@beglangcite\blx@beglang}
+    {}%
   \csuse{abx@extras@\blx@languagename}%
   \csuse{abx@strings@\blx@languagename}%
   \undef\blx@mkautolangbabel
@@ -422,7 +440,8 @@
 \newtoggle{blx@debug}
 \newtoggle{blx@sortcase}
 \newtoggle{blx@sortupper}
-\newtoggle{blx@autolang}
+\newtoggle{blx@autolangbib}
+\newtoggle{blx@autolangcite}
 \newtoggle{blx@clearlang}
 \newtoggle{blx@defernumbers}
 \newtoggle{blx@omitnumbers}
@@ -3002,9 +3021,9 @@
   \let\abx@macro@bibindex\@empty
   \let\abx@macro@pageref\@empty
   \csuse{blx@hook@bbxinit}#1%
-  \blx@beglang
+  \blx@beglangbib
   \blx@driver{#2}%
-  \blx@endlang
+  \blx@endlangbib
   \endgroup}
 
 % Punctuation
@@ -3850,7 +3869,7 @@
      \blx@setoptions@entry
      \addtocounter{instcount}\@ne
      \blx@execute
-     \blx@beglang#3\blx@endlang
+     \blx@beglangbib#3\blx@endlangbib
      \endgroup}
     {}}
 
@@ -3889,13 +3908,13 @@
      \blx@setoptions@entry
      \addtocounter{instcount}\@ne
      \blx@execute
-     \blx@beglang
+     \blx@beglangbib
      \blx@begunit
      \blx@entryset@precode
      \blx@driver{\blx@imc@thefield{entrytype}}
      \blx@entryset@postcode
      \blx@endunit
-     \blx@endlang
+     \blx@endlangbib
      \endgroup}
     {\blx@nounit}}
 
@@ -4842,6 +4861,10 @@
 %% babel/polyglossia interface
 \def\blx@beglang{\blx@clearlang\begingroup}
 \def\blx@endlang{\endgroup}
+\let\blx@beglangbib\blx@beglang
+\let\blx@endlangbib\blx@endlang
+\let\blx@beglangcite\blx@beglang
+\let\blx@endlangcite\blx@endlang
 \let\blx@hook@endlang\@empty
 \let\blx@hook@initlang\@empty
 \let\blx@imc@mainlang\@empty
@@ -4873,6 +4896,12 @@
                   \blx@hook@endlang
                   \csname end\blx@thelangenv\endcsname
                   \endgroup}%
+                \iftoggle{blx@autolangbib}
+                  {\let\blx@endlangbib\blx@endlang}
+                  {}%
+                \iftoggle{blx@autolangcite}
+                  {\let\blx@endlangcite\blx@endlang}
+                  {}%
                 \csname\blx@thelangenv\expandafter\endcsname
                 \expandafter{\abx@field@langid}}}
             {}}}
@@ -4896,16 +4925,21 @@
                 \def\blx@endlang{%
                   \blx@hook@endlang
                   % Polyglossia language envs are \<lang>[]
-                  \expandafter\ifstrequal\expandafter{\blx@thelangenv}{langname}
+                  \ifcsstring{blx@thelangenv}{langname}
                     {\csname end\abx@field@langid\endcsname}
                     {\csname end\blx@thelangenv\endcsname}%
                   \endgroup}%
-                \expandafter\ifstrequal\expandafter{\blx@thelangenv}{langname}
+                \iftoggle{blx@autolangbib}
+                  {\let\blx@endlangbib\blx@endlang}
+                  {}%
+                \iftoggle{blx@autolangcite}
+                  {\let\blx@endlangcite\blx@endlang}
+                  {}%
+                \ifcsstring{blx@thelangenv}{langname}
                   {\ifdef\abx@field@langidopts
                      {\csname\abx@field@langid\expandafter\endcsname\expandafter[\abx@field@langidopts]}
                      {\csname\abx@field@langid\endcsname}}
-                  {\csname\blx@thelangenv\expandafter\endcsname
-                   \expandafter{\abx@field@langid}}%                
+                  {\csname\blx@thelangenv\expandafter\endcsname\expandafter{\abx@field@langid}}%
                 % These lines are equal to \blx@maplang
                 \blx@resetpunct
                 \csuse{abx@extras@\abx@field@langid}%
@@ -6648,12 +6682,12 @@
        \blx@execute
        \blx@initunit
        \blx@anchor
-       \blx@beglang
+       \blx@beglangbib
        \bibsentence
        \blx@pagetracker
        \blx@driver\abx@field@entrytype
        \blx@postpunct
-       \blx@endlang}%
+       \blx@endlangbib}%
      \endgroup}
     {}}
 
@@ -6850,12 +6884,12 @@
        \csuse{blx@hook@lositem}%
        \blx@execute
        \blx@initunit
-       \blx@beglang
+       \blx@beglangbib
        \bibsentence
        \blx@pagetracker
        \blx@driver{shorthands}%
        \blx@postpunct
-       \blx@endlang}%
+       \blx@endlangbib}%
      \endgroup}
     {}}
 
@@ -7456,6 +7490,7 @@
   \blx@pagetracker
   \csuse{blx@hook@citekey}%
   \csuse{blx@hook@citekey@next}%
+  \blx@beglangcite
   \blx@execute
   \blx@loopcode
   \blx@citecounter
@@ -7468,6 +7503,7 @@
     \def\blx@thecheckpunct{\blx@err@nestcite\@gobble}%
     \blx@postcode
   \fi
+  \blx@endlangcite
   \endgroup}
 
 % cite counter
@@ -10127,15 +10163,33 @@
     {\let\abx@bibmonth\blx@imc@biblstring}}
 
 \DeclareBibliographyOption{language}{%
-  \ifstrequal{#1}{auto}
-    {\toggletrue{blx@autolang}%
-     \def\blx@languagename{english}}
-    {\IfFileExists{#1.lbx}
-       {\togglefalse{blx@autolang}%
-        \edef\blx@languagename{#1}}
-       {\blx@error
-          {Language '#1' not supported}
-          {Failed to find a matching '#1.lbx' file}}}}
+  \togglefalse{blx@autolangbib}%
+  \togglefalse{blx@autolangcite}%
+  \ifboolexpr{
+    test {\ifstrequal{#1}{auto}}
+    or
+    test {\ifstrequal{#1}{autobib}}
+    or
+    test {\ifstrequal{#1}{autocite}}
+  }
+  {\def\blx@languagename{english}%
+   \ifstrequal{#1}{auto}
+    {\toggletrue{blx@autolangbib}%
+     \toggletrue{blx@autolangcite}}
+    {}%
+   \ifstrequal{#1}{autobib}
+    {\toggletrue{blx@autolangbib}}
+    {}%
+   \ifstrequal{#1}{autocite}
+    {\toggletrue{blx@autolangcite}}
+    {}}
+  {\IfFileExists{#1.lbx}
+    {\togglefalse{blx@autolangbib}%
+     \togglefalse{blx@autolangcite}%
+     \edef\blx@languagename{#1}}
+    {\blx@error
+      {Language '#1' not supported}
+      {Failed to find a matching '#1.lbx' file}}}}
 
 \DeclareBibliographyOption{clearlang}[true]{%
   \settoggle{blx@clearlang}{#1}}
@@ -10809,7 +10863,7 @@
   usetranslator=false,indexing=false,abbreviate=true,dateabbrev=true,
   backref=false,backrefsetstyle=setonly,pagetracker=false,ibidtracker=false,
   idemtracker=false,opcittracker=false,loccittracker=false,citetracker=false,
-  citecounter=false,block=none,language=auto,clearlang=true,autolang=none,
+  citecounter=false,block=none,language=autobib,clearlang=true,autolang=none,
   date=comp,datelabel=year,origdate=comp,eventdate=comp,urldate=short,
   autopunct=true,punctfont=false,defernumbers=false,
   refsection=none,refsegment=none,citereset=none,hyperref=auto,
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx
index 958bea1bd86..affd2a7dea7 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/icelandic.lbx
@@ -62,16 +62,16 @@
   bibliography     = {{Heimildaskr\'a}{Heimildaskr\'a}},
   references       = {{Heimildir}{Heimildir}},
   shorthands       = {{Listi yfir skammstafanir}{Skammstafanir}},
-  editor           = {{ristj\adddot}{ritstj\adddot}},
-  editors          = {{ritstj\adddot}{ritstj\adddot}},
+  editor           = {{ristj\'ori}{ritstj\adddot}},
+  editors          = {{ritstj\'orar}{ritstj\adddot}},
   compiler         = {{samantekt}{samantekt}},
   compilers        = {{samantekt}{samantekt}},
 % FIXME: redactor and editor are the same string;
 % is that acceptable?
-  redactor         = {{ritstj\adddot}{ritstj\adddot}},
-  redactors        = {{ritstj\adddot}{ritstj\adddot}},
-  reviser          = {{endursk\adddot}{endursk\adddot}},
-  revisers         = {{endursk\adddot}{endursk\adddot}},
+  redactor         = {{ritstj\'ori}{ritstj\adddot}},
+  redactors        = {{ritstj\'orar}{ritstj\adddot}},
+  reviser          = {{\'utg\'afuendursko\dh{}andi}{endursk\adddot}},
+  revisers         = {{\'utg\'afuendursko\dh{}endur}{endursk\adddot}},
 % founder          = {{}{}},% FIXME: missing
 % founders         = {{}{}},% FIXME: missing
 % continuator      = {{}{}},% FIXME: missing
@@ -80,17 +80,17 @@
 % collaborators    = {{}{}},% FIXME: missing
 % FIXME: A great deal of conflation here, as well as simplifications in order
 % to avoid problems associated with declension:
-  translator       = {{\'y\adddot}{\'y\adddot}},
-  translators      = {{\'y\adddot}{\'y\adddot}},
-  commentator      = {{sk\'yringar:}{sk\'yr\adddot}},
-  commentators     = {{sk\'yringar:}{sk\'yr\adddot}},
-  annotator        = {{t\'ulkun:}{t\'ulk\adddot}},
-  annotators       = {{t\'ulkun:}{t\'ulk\adddot}},
-  commentary       = {{sk\'yringar:}{sk\'yr\adddot}},
-  annotations      = {{sk\'yringar:}{sk\'yr\adddot}},
+  translator       = {{\th\'y\dh{}andi}{\th\'y\dh\adddot}},
+  translators      = {{\th\'y\dh{}endur}{\th\'y\dh\adddot}},
+  commentator      = {{sk\'yrandi}{sk\'yr\adddot}},
+  commentators     = {{sk\'yrendur}{sk\'yr\adddot}},
+  annotator        = {{\'utsk\'yrandi}{\'utsk\'yr\adddot}},
+  annotators       = {{\'utsk\'yrendur}{\'utsk\'yr\adddot}},
+  commentary       = {{sk\'yringar}{sk\'yr\adddot}},
+  annotations      = {{\'utsk\'yringar}{\'utsk\'yr\adddot}},
   introduction     = {{inngangur}{inng\adddot}},
-  foreword         = {{form\'ali:}{form\'ali:}},
-  afterword        = {{eftirm\'ali:}{eftirm\'ali:}},
+  foreword         = {{form\'ali}{form\'ali}},
+  afterword        = {{eftirm\'ali}{eftirm\'ali}},
 % editortr         = {{}{}},% FIXME: missing
 % editorstr        = {{}{}},% FIXME: missing
 % editorco         = {{}{}},% FIXME: missing
@@ -159,126 +159,126 @@
 % translatorsanfo  = {{}{}},% FIXME: missing
 % translatoranaf   = {{}{}},% FIXME: missing
 % translatorsanaf  = {{}{}},% FIXME: missing
-  byauthor         = {{h\"of.:}{h\"of.:}},
-  byeditor         = {{gefi \'ut af}{gefi \'ut af}},
-  bycompiler       = {{teki saman af}{teki saman af}},
-  byredactor       = {{endurskoa af}{endurskoa af}},
+  byauthor         = {{h\"ofundur}{h\"of\adddot}},
+  byeditor         = {{gefi\dh{} \'ut af}{gefi\dh{} \'ut af}},
+  bycompiler       = {{teki\dh{} saman af}{teki\dh{} saman af}},
+  byredactor       = {{endursko\dh{}a\dh{} af}{endursk\adddot}},
 % byreviser        = {{}{}},% FIXME: missing
 % byreviewer       = {{}{}},% FIXME: missing
 % byfounder        = {{}{}},% FIXME: missing
 % bycontinuator    = {{}{}},% FIXME: missing
 % bycollaborator   = {{}{}},% FIXME: missing
-% FIXME: For most of the keys below, the better way would be to postpend
+% FIXME: For some of the keys below, the better way would be to postpend
 % rather than prepend the localized bibstrings. That would however require a
 % redefinition of many macros. Later, perhaps...
-  bytranslator     = {{\'y\adddot \lbx@lfromlang}{\'y\adddot \lbx@sfromlang}},
-  bycommentator    = {{sk\'yringar:}{sk\'yringar:}},
-  byannotator      = {{sk\'yringar:}{sk\'yringar:}}, 
-  withcommentator  = {{sk\'yringar:}{sk\'yringar:}},
-  withannotator    = {{sk\'yringar:}{sk\'yringar:}},
-  withintroduction = {{inng\adddot}{inng\adddot}},
-  withforeword     = {{form\'ali:}{form\'ali:}},
-  withafterword    = {{eftirm\'ali:}{eftirm\'ali:}},
-  byeditortr       = {{\'utg.~og \'y\adddot \lbx@lfromlang}%
-                     {\'utg.~og \'y\adddot}},
-  byeditorco       = {{\'utg.~og sk\'yringar:}%
-                     {\'utg.~og sk\'yringar:}},
-  byeditoran       = {{\'utg.~og sk\'yringar:}%
-                     {\'utg. og sk\'yringar:}},
-  byeditorin       = {{\'utg. og inng\adddot:}%
-                     {\'utg. og inng\adddot:}},
-  byeditorfo       = {{\'utg. og form\'ali:}%
-                     {\'utg. og form\'ali:}},
-  byeditoraf       = {{\'utg. og eftirm\'ali:}%
-                     {\'utg. og eftirm\'ali:}},
-  byeditortrco     = {{\'utg., \'y\adddot \lbx@sfromlang\ og sk\'yringar:}%
-                     {\'utg., \'y\adddot \lbx@sfromlang\ og sk\'yringar:}},
-  byeditortran     = {{\'utg., \'y\adddot \lbx@sfromlang\ og sk\'yringar:}%
-                     {\'utg., \'y\adddot \lbx@sfromlang\ og sk\'yringar:}},
-  byeditortrin     = {{\'utg., \'y\adddot \lbx@sfromlang\ og inng\adddot:}%
-                     {\'utg., \'y\adddot \lbx@sfromlang\ og inng\adddot:}},
-  byeditortrfo     = {{\'utg., \'y\adddot \lbx@sfromlang\ og form\'ali:}%
-                     {\'utg., \'y\adddot \lbx@sfromlang\ og form\'ali:}},
-  byeditortraf     = {{\'utg., \'y\adddot \lbx@sfromlang\ og eftirm\'ali:}%
-                     {\'utg., \'y\adddot \lbx@sfromlang\ og eftirm\'ali:}},
-  byeditorcoin     = {{\'utg., sk\'yringar og inng\adddot:}%
-                     {\'utg., sk\'yringar og inng\adddot:}},
-  byeditorcofo     = {{\'utg., sk\'yringar og form\'ali:}%
-                     {\'utg., sk\'yringar og form\'ali:}},
-  byeditorcoaf     = {{\'utg., sk\'yringar og eftirm\'ali:}%
-                     {\'utg., sk\'yringar og eftirm\'ali:}},
-  byeditoranin     = {{\'utg., sk\'yringar og inng\adddot:}%
-                     {\'utg., sk\'yringar og inng\adddot:}},
-  byeditoranfo     = {{\'utg., sk\'yringar og form\'ali:}%
-                     {\'utg., sk\'yringar og form\'ali:}},
-  byeditoranaf     = {{\'utg., sk\'yringar og eftirm\'ali:}%
-                     {\'utg., sk\'yringar og eftirm\'ali:}},
-  byeditortrcoin   = {{\'utg., \'y\adddot \lbx@sfromlang\ og sk\'yringar og inng\adddot:}%
-                     {\'utg., \'y\adddot \lbx@sfromlang\ og sk\'yringar og inng\adddot:}},
-  byeditortrcofo   = {{\'utg., \'y\adddot \lbx@sfromlang\ og sk\'yringar og form\'ali:}%
-                     {\'utg., \'y\adddot \lbx@sfromlang\ og sk\'yringar og form\'ali:}},
-  byeditortrcoaf   = {{\'utg., \'y\adddot \lbx@sfromlang\ og sk\'yringar og eftirm\'ali:}%
-                     {\'utg., \'y\adddot \lbx@sfromlang\ og sk\'yringar og eftirm\'ali:}},
-  byeditortranin   = {{\'utg., \'y\adddot \lbx@sfromlang\ og sk\'yringar og inng\adddot:}%
-                     {\'utg., \'y\adddot \lbx@sfromlang\ og sk\'yringar og inng\adddot:}}, 
-  byeditortranfo   = {{\'utg., \'y\adddot \lbx@sfromlang\ og sk\'yringar og form\'ali:}%
-                     {\'utg., \'y\adddot \lbx@sfromlang\ og sk\'yringar og form\'ali:}},
-  byeditortranaf   = {{\'utg., \'y\adddot \lbx@sfromlang\ og sk\'yringar og eftirm\'ali:}%
-                     {\'utg., \'y\adddot \lbx@sfromlang\ og sk\'yringar og eftirm\'ali:}}, 
-  bytranslatorco   = {{\'y\adddot \lbx@lfromlang\ og sk\'yringar:}%
-                     {\'y\adddot \lbx@lfromlang\ og sk\'yringar:}},
-  bytranslatoran   = {{\'y\adddot \lbx@lfromlang\ og sk\'yringar:}%
-                     {\'y\adddot \lbx@lfromlang\ og sk\'yringar:}}, 
-  bytranslatorin   = {{\'y\adddot \lbx@lfromlang\ og inng\adddot:}%
-                     {\'y\adddot \lbx@lfromlang\ og inng\adddot:}},
-  bytranslatorfo   = {{\'y\adddot \lbx@lfromlang\ og form\'ali:}%
-                     {\'y\adddot \lbx@lfromlang\ og form\'ali:}},
-  bytranslatoraf   = {{\'y\adddot \lbx@lfromlang\ og eftirm\'ali:}%
-                     {\'y\adddot \lbx@lfromlang\ og eftirm\'ali:}},
-  bytranslatorcoin = {{\'y\adddot \lbx@lfromlang, sk\'yringar og inng\adddot:}%
-                     {\'y\adddot \lbx@lfromlang, sk\'yringar og inng\adddot:}},
-  bytranslatorcofo = {{\'y\adddot \lbx@lfromlang, sk\'yringar og form\'ali:}%
-                     {\'y\adddot \lbx@lfromlang, sk\'yringar og form\'ali:}},
-  bytranslatorcoaf = {{\'y\adddot \lbx@lfromlang, sk\'yringar og eftirm\'ali:}%
-                     {\'y\adddot \lbx@lfromlang, sk\'yringar og eftirm\'ali:}},
-  bytranslatoranin = {{\'y\adddot \lbx@lfromlang, sk\'yringar og inng\adddot:}%
-                     {\'y\adddot \lbx@lfromlang, sk\'yringar og inng\adddot:}},
-  bytranslatoranfo = {{\'y\adddot \lbx@lfromlang, sk\'yringar og form\'ali:}%
-                     {\'y\adddot \lbx@lfromlang, sk\'yringar og form\'ali:}},
-  bytranslatoranaf = {{\'y\adddot \lbx@lfromlang, sk\'yringar og eftirm\'ali:}%
-                     {\'y\adddot \lbx@lfromlang, sk\'yringar og eftirm\'ali:}},
+  bytranslator     = {{\th\'y\dh{}ing \lbx@lfromlang}{\th\'y\dh\adddot{} \lbx@sfromlang}},
+  bycommentator    = {{sk\'yringar eftir}{sk\'yr\adddot}},
+  byannotator      = {{\'utsk\'yringar eftir}{\'utsk\'yr\adddot}},
+  withcommentator  = {{me\dh{} sk\'yringum eftir}{m\adddot sk\'yr\adddot e\adddot}},
+  withannotator    = {{me\dh{} \'utsk\'yringum eftir}{m\adddot \'utsk\'yr\adddot e\adddot}},
+  withintroduction = {{me\dh{} inngangi eftir}{inng\adddot}},
+  withforeword     = {{me\dh{} form\'ala eftir}{m\adddot form\adddot e\adddot}},
+  withafterword    = {{me\dh{} eftirm\'ala eftir}{m\adddot eftirm\adddot e\adddot}},
+  byeditortr       = {{\'utg\'afa og \th\'y\dh{}ing \lbx@lfromlang}%
+                     {\'utg\adddot{} og \th\'y\dh\adddot}},
+  byeditorco       = {{\'utg\'a fa og sk\'yringar eftir}%
+                     {\'utg\adddot{} og sk\'yr\adddot}},
+  byeditoran       = {{\'utg\'a fa og \'utsk\'yringar eftir}%
+                     {\'utg\adddot{} og \'utsk\'yr\adddot}},
+  byeditorin       = {{\'utg\'afa og inngangur eftir}%
+                     {\'utg\adddot{} og inng\adddot}},
+  byeditorfo       = {{\'utg\'afa og form\'ali eftir}%
+                     {\'utg\adddot{} og form\adddot e\adddot}},
+  byeditoraf       = {{\'utg\'afa og eftirm\'ali eftir}%
+                     {\'utg\adddot{} og eftirm\adddot e\adddot}},
+  byeditortrco     = {{\'utg\'afa \th\'y\dh{}ing \lbx@sfromlang\ og sk\'yringar eftir}%
+                     {\'utg\adddot, \th\'y\dh\adddot{} \lbx@sfromlang\ og sk\'yr\adddot}},
+  byeditortran     = {{\'utg\'afa \th\'y\dh{}ing \lbx@sfromlang\ og \'utsk\'yringar eftir}%
+                     {\'utg\adddot, \th\'y\dh\adddot{} \lbx@sfromlang\ og \'utsk\'yr\adddot}},
+  byeditortrin     = {{\'utg\'afa \th\'y\dh{}ing \lbx@sfromlang\ og inngangur eftir}%
+                     {\'utg\adddot, \th\'y\dh\adddot{} \lbx@sfromlang\ og inng\adddot}},
+  byeditortrfo     = {{\'utg\'afa \th\'y\dh{}ing \lbx@sfromlang\ og form\'ali eftir}%
+                     {\'utg\adddot, \th\'y\dh\adddot{} \lbx@sfromlang\ og form\adddot}},
+  byeditortraf     = {{\'utg\'afa \th\'y\dh{}ing \lbx@sfromlang\ og eftirm\'ali eftir}%
+                     {\'utg\adddot, \th\'y\dh\adddot{} \lbx@sfromlang\ og eftirm\adddot}},
+  byeditorcoin     = {{\'utg\'afa, sk\'yringar og inngangur eftir}%
+                     {\'utg\adddot, sk\'yr\adddot{} og inng\adddot}},
+  byeditorcofo     = {{\'utg\'afa, sk\'yringar og form\'ali eftir}%
+                     {\'utg\adddot, sk\'yr\adddot{} og form\adddot}},
+  byeditorcoaf     = {{\'utg\'afa, sk\'yringar og eftirm\'ali eftir}%
+                     {\'utg\adddot, sk\'yr\adddot{} og eftirm\adddot}},
+  byeditoranin     = {{\'utg\'afa, \'utsk\'yringar og inngangur eftir}%
+                     {\'utg\adddot, \'utsk\'yr\adddot{} og inng\adddot}},
+  byeditoranfo     = {{\'utg\'afa, \'utsk\'yringar og form\'ali eftir}%
+                     {\'utg\adddot, \'utsk\'yr\adddot{} og form\adddot}},
+  byeditoranaf     = {{\'utg\'afa, sk\'yringar og eftirm\'ali eftir}%
+                     {\'utg\adddot, sk\'yr\adddot{} og eftirm\adddot}},
+  byeditortrcoin   = {{\'utg\'afa, \th\'y\dh{}ing \lbx@sfromlang, sk\'yringar og inngangur eftir}%
+                     {\'utg\adddot, \th\'y\dh\adddot{} \lbx@sfromlang, sk\'yr\adddot{} og inng\adddot}},
+  byeditortrcofo   = {{\'utg\'afa, \th\'y\dh{}ing \lbx@sfromlang, sk\'yringar og form\'ali eftir}%
+                     {\'utg\adddot, \th\'y\dh\adddot{} \lbx@sfromlang, sk\'yr\adddot{} og form\adddot}},
+  byeditortrcoaf   = {{\'utg\'afa, \th\'y\dh{}ing \lbx@sfromlang, sk\'yringar og eftirm\'ali eftir}%
+                     {\'utg\adddot, \th\'y\dh\adddot{} \lbx@sfromlang, sk\'yr\adddot{} og eftirm\adddot}},
+  byeditortranin   = {{\'utg\'afa, \th\'y\dh{}ing \lbx@sfromlang, \'utsk\'yringar og inngangur eftir}%
+                     {\'utg\adddot, \th\'y\dh\adddot{} \lbx@sfromlang, \'utsk\'yr\adddot{} og inng\adddot}},
+  byeditortranfo   = {{\'utg\'afa, \th\'y\dh{}ing \lbx@sfromlang, \'utsk\'yringar og form\'ali eftir}%
+                     {\'utg\adddot, \th\'y\dh\adddot{} \lbx@sfromlang, \'utsk\'yr\adddot{} og form\adddot}},
+  byeditortranaf   = {{\'utg\'afa, \th\'y\dh{}ing \lbx@sfromlang, \'utsk\'yringar og eftirm\'ali eftir}%
+                     {\'utg\adddot, \th\'y\dh\adddot{} \lbx@sfromlang, \'utsk\'yr\adddot{} og eftirm\adddot}},
+  bytranslatorco   = {{\th\'y\dh{}ing \lbx@lfromlang\ og sk\'yringar eftir}%
+                     {\th\'y\dh\adddot{} \lbx@lfromlang\ og sk\'yr\adddot}},
+  bytranslatoran   = {{\th\'y\dh{}ing \lbx@lfromlang\ og \'utsk\'yringar eftir}%
+                     {\th\'y\dh\adddot{} \lbx@lfromlang\ og \'utsk\'yr\adddot}},
+  bytranslatorin   = {{\th\'y\dh{}ing \lbx@lfromlang\ og inngangur eftir}%
+                     {\th\'y\dh\adddot{} \lbx@lfromlang\ og inng\adddot}},
+  bytranslatorfo   = {{\th\'y\dh{}ing \lbx@lfromlang\ og form\'ali eftir}%
+                     {\th\'y\dh\adddot{} \lbx@lfromlang\ og form\adddot}},
+  bytranslatoraf   = {{\th\'y\dh{}ing \lbx@lfromlang\ og eftirm\'ali eftir}%
+                     {\th\'y\dh\adddot{} \lbx@lfromlang\ og eftirm\adddot}},
+  bytranslatorcoin = {{\th\'y\dh{}ing \lbx@lfromlang, sk\'yringar og inngangur eftir}%
+                     {\th\'y\dh\adddot{} \lbx@lfromlang, sk\'yr\adddot{} og inng\adddot}},
+  bytranslatorcofo = {{\th\'y\dh{}ing \lbx@lfromlang, sk\'yringar og form\'ali eftir}%
+                     {\th\'y\dh\adddot{} \lbx@lfromlang, sk\'yr\adddot{} og form\adddot}},
+  bytranslatorcoaf = {{\th\'y\dh{}ing \lbx@lfromlang, sk\'yringar og eftirm\'ali eftir}%
+                     {\th\'y\dh\adddot{} \lbx@lfromlang, sk\'yr\adddot{} og eftirm\adddot}},
+  bytranslatoranin = {{\th\'y\dh{}ing \lbx@lfromlang, \'utsk\'yringar og inngangur eftir}%
+                     {\th\'y\dh\adddot{} \lbx@lfromlang, \'utsk\'yr\adddot{} og inng\adddot}},
+  bytranslatoranfo = {{\th\'y\dh{}ing \lbx@lfromlang, \'utsk\'yringar og form\'ali eftir}%
+                     {\th\'y\dh\adddot{} \lbx@lfromlang, \'utsk\'yringar og form\adddot}},
+  bytranslatoranaf = {{\th\'y\dh{}ing \lbx@lfromlang, \'utsk\'yringar og eftirm\'ali eftir}%
+                     {\th\'y\dh\adddot{} \lbx@lfromlang, \'utsk\'yr\adddot{} og eftirm\adddot}},
   and              = {{og}{og}},
-  andothers        = {{o\adddot fl\adddot}{o\adddot fl\adddot}},
-  andmore          = {{o\adddot fl\adddot}{o\adddot fl\adddot}},
-  volume           = {{bindi}{bindi}},
-  volumes          = {{bindi}{bindi}}, 
-% involumes        = {{}{}},% FIXME: missing
+  andothers        = {{\'asamt fleirum}{o\adddot fl\adddot}},
+  andmore          = {{og fleiri}{o\adddot fl\adddot}},
+  volume           = {{bindi}{bd\adddot}},
+  volumes          = {{bindi}{bd\adddot}},
+  involumes        = {{\'{\i}}{\'{\i}}},
   jourvol          = {{\'argangur}{\'arg\adddot}},
-  jourser          = {{r\"o}{r\"o}},
+  jourser          = {{r\"o\dh}{r\"o\dh}},
   book             = {{b\'ok}{b\'ok}},
   part             = {{hluti}{hluti}},
   issue            = {{hefti}{hefti}},
-  newseries        = {{n\'y ritr\"o}{n\'y ritr\"o}},
-  oldseries        = {{g\"omul ritr\"o}{g\"omul ritr\"o}},
+  newseries        = {{n\'y ritr\"o\dh}{n\'y ritr\"o\dh}},
+  oldseries        = {{g\"omul ritr\"o\dh}{g\"omul ritr\"o\dh}},
   edition          = {{\'utg\'afa}{\'utg\adddot}},
-  reprint          = {{endurprentun}{endurprentun}},
-  reprintof        = {{endurprentun \'a}{endurprentun \'a}},
-  reprintas        = {{endurprenta sem}{endurprenta sem}},
-% reprintfrom      = {{}{}},% FIXME: missing
-% translationof    = {{}{}},% FIXME: missing
-% translationas    = {{}{}},% FIXME: missing
-% translationfrom  = {{}{}},% FIXME: missing
-% reviewof         = {{}{}},% FIXME: missing
+  reprint          = {{endurprentun}{endurpr\adddot}},
+  reprintof        = {{endurprentun \'a}{endurpr\adddot{} \'a}},
+  reprintas        = {{endurprenta\dh{} sem}{endurpr\adddot{} sem}},
+  reprintfrom      = {{endurprentun \'ur}{endurpr\adddot{} \'ur}},
+  translationof    = {{\th'yth ing \'a}{\th\'y\dh\adddot{} \'a}},
+  translationas    = {{\th'ytt sem}{\th\'ytt sem}},
+  translationfrom  = {{\th'yth ing \'ur}{\th\'y\dh\adddot{} \'ur}},
+  reviewof         = {{ums\"ogn um}{ums\"ogn um}},
 % origpubas        = {{}{}},% FIXME: missing
 % origpubin        = {{}{}},% FIXME: missing
 % astitle          = {{}{}},% FIXME: missing
-  page             = {{bls\adddot}{bls\adddot}},
-  pages            = {{bls\adddot}{bls\adddot}},
+  page             = {{bla\dh{}s\'{\i}\dh{}a}{bls\adddot}},
+  pages            = {{bla\dh{}s\'{\i}\dh{}ur}{bls\adddot}},
   column           = {{d\'alkur}{dlk\adddot}},
   columns          = {{d\'alkar}{dlk\adddot}},
   line             = {{l\'{\i}na}{l\adddot}},
   lines            = {{l\'{\i}nur}{l\adddot}},
-  nodate           = {{n\adddot d\adddot}{n\adddot d\adddot}},%FIXME
+  nodate           = {{\'an \'ars}{\'an \'ars}},
   verse            = {{erindi}{er\adddot}},
   verses           = {{erindi}{er\adddot}},
   section          = {{grein}{\S}},
@@ -286,28 +286,28 @@
   paragraph        = {{m\'alsgrein}{mgr\adddot}},
   paragraphs       = {{m\'alsgreinar}{mgr\adddot}},
   in               = {{\'{\i}}{\'{\i}}},
-  inseries         = {{ritr\"oin}{ritr\"oin}},
-  ofseries         = {{\'ur ritr\"oinni}{\'ur ritr\"oinni}},
+  inseries         = {{ritr\"o\dh{}in}{ritr\"o\dh{}in}},
+  ofseries         = {{\'ur ritr\"o\dh{}inni}{\'ur ritr\adddot}},
   number           = {{n\'umer}{nr\adddot}},
   chapter          = {{kafli}{k\adddot}},
-  mathesis         = {{meistarapr\'ofsritger}{meistararitg\adddot}},
-  phdthesis        = {{doktorsritger}{doktorsritg\adddot}},
-% candthesis       = {{}{}},% FIXME: missing
+  mathesis         = {{meistarapr\'ofsritger\dh}{meistararitg\adddot}},
+  phdthesis        = {{doktorsritger\dh}{doktorsritg\adddot}},
+  candthesis       = {{kand\'{\i}datsritger\dh}{kand\'{\i}datsritg\adddot}},
   resreport        = {{ranns\'oknarsk\'yrsla}{ranns\'oknarsk\'yrsla}},
   techreport       = {{t\ae{}knileg sk\'yrsla}{t\ae{}knileg sk\'yrsla}},
-  software         = {{hugb\'unaur}{hugb\'unaur}}, 
-  datacd           = {{gagnadiskur}{gagnadiskur}}, 
-  audiocd          = {{hlj\'odiskur}{hlj\'odiskur}},
+  software         = {{hugb\'una\dh{}ur}{hugb\'una\dh{}ur}},
+  datacd           = {{gagnadiskur}{gagnadiskur}},
+  audiocd          = {{hlj\'o\dh{}diskur}{hlj\'o\dh{}diskur}},
   version          = {{\'utg\'afa}{\'utg\adddot}},
-  url              = {{vefsl\'o}{vefsl\'o}},
+  url              = {{vefsl\'o\dh{}}{vefsl\'o\dh{}}},
 % urlfrom          = {{}{}},% FIXME: missing
-  urlseen          = {{skoa}{skoa}},
+  urlseen          = {{sko\dh{}a\dh}{sko\dh{}a\dh}},
   inpreparation    = {{\'{\i} vinnslu}{\'{\i} vinnslu}},
   submitted        = {{afhent til birtingar}{afhent til birtingar}},
   forthcoming      = {{mun birtast}{mun birtast}},
   inpress          = {{\'{\i} prentun}{\'{\i} prentun}},
-% prepublished     = {{}{}},% FIXME: missing
-  citedas          = {{h\'er eftir skammstafa}{h\'er eftir skst\adddot}},
+  prepublished     = {{forbirt}{forbirt}},
+  citedas          = {{h\'er eftir skammstafa\dh}{h\'er eftir skst\adddot}},
   seenote          = {{sj\'a athugasemd}{sj\'a aths\adddot}},
   quotedin         = {{tilvitnun samkv\ae{}mt}{tilvitnun skv\adddot}},
   idem             = {{sama heimild}{s\adddot h\adddot}},
@@ -320,15 +320,15 @@
   idempp           = {{sama heimild}{s\adddot h\adddot}},
   ibidem           = {{sama heimild}{s\adddot h\adddot}},
   opcit            = {{sama rit}{sama rit}},
-  loccit           = {{sami staur}{s\adddot st\adddot}},
+  loccit           = {{sami sta\dh{}ur}{s\adddot st\adddot}},
   confer           = {{sbr\adddot}{sbr\adddot}},
   sequens          = {{o\adddot \'afr\adddot}{o\adddot \'afr\adddot}},
   sequentes        = {{o\adddot \'afr\adddot}{o\adddot \'afr\adddot}},
-  passim           = {{v\'{\i}a}{v\'{\i}a}},
+  passim           = {{v\'{\i}\dh{}a}{v\'{\i}\dh{}a}},
   see              = {{sj\'a}{sj\'a}},
   seealso          = {{sj\'a einnig}{sj\'a einnig}},
-  backrefpage      = {{sj\'a blas\'{\i}u}{sj\'a bls\adddot}},
-  backrefpages     = {{sj\'a blas\'{\i}ur}{sj\'a bls\adddot}},
+  backrefpage      = {{sj\'a bla\dh{}s\'{\i}u}{sj\'a bls\adddot}},
+  backrefpages     = {{sj\'a bla\dh{}s\'{\i}ur}{sj\'a bls\adddot}},
   january          = {{jan\'uar}{jan\adddot}},
   february         = {{febr\'uar}{feb\adddot}},
   march            = {{mars}{mar\adddot}},
@@ -346,55 +346,55 @@
 % langcatalan      = {{}{}},% FIXME: missing
 % langcroatian     = {{}{}},% FIXME: missing
 % langczech        = {{}{}},% FIXME: missing
-% langdanish       = {{}{}},% FIXME: missing
-% langdutch        = {{}{}},% FIXME: missing
+  langdanish       = {{danska}{danska}},
+  langdutch        = {{hollenska}{hollenska}},
   langenglish      = {{enska}{enska}},
-% langfinnish      = {{}{}},% FIXME: missing
+  langfinnish      = {{finnska}{finnska}},
   langfrench       = {{franska}{franska}},
-  langgerman       = {{\'yska}{\'yska}},
+  langgerman       = {{\th\'yska}{\th\'yska}},
   langgreek        = {{gr\'{\i}ska}{gr\'{\i}ska}},
   langitalian      = {{\'{\i}talska}{\'{\i}talska}},
   langlatin        = {{lat\'{\i}na}{lat\'{\i}na}},
   langnorwegian    = {{norska}{norska}},
-% langpolish       = {{}{}},% FIXME: missing
-% langportuguese   = {{}{}},% FIXME: missing
-% langrussian      = {{}{}},% FIXME: missing
+  langpolish       = {{p\'olska}{p\'olska}},
+  langportuguese   = {{port\'ugalska}{port\'ugalska}},
+  langrussian      = {{r\'ussneska}{r\'ussneska}},
   langspanish      = {{sp\ae{}nska}{sp\ae{}nska}},
-% langswedish      = {{}{}},% FIXME: missing
+  langswedish      = {{s\ae{}nska}{s\ae{}nska}},
   fromamerican     = {{\'ur bandar\'{\i}sku}{\'ur bandar\'{\i}sku}},
 % frombrazilian    = {{}{}},% FIXME: missing
 % fromcatalan      = {{}{}},% FIXME: missing
 % fromcroatian     = {{}{}},% FIXME: missing
 % fromczech        = {{}{}},% FIXME: missing
-% fromdanish       = {{}{}},% FIXME: missing
-% fromdutch        = {{}{}},% FIXME: missing
+  fromdanish       = {{\'ur d\"onsku}{\'ur d\"onsku}},
+  fromdutch        = {{\'ur hollensku}{\'ur hollensku}},
   fromenglish      = {{\'ur ensku}{\'ur ensku}},
-% fromfinnish      = {{}{}},% FIXME: missing
+  fromfinnish      = {{\'ur finnsku}{\'ur finnsku}},
   fromfrench       = {{\'ur fr\"onsku}{\'ur fr\"onsku}},
-  fromgerman       = {{\'ur \'ysku}{\'ur \'ysku}},
+  fromgerman       = {{\'ur \th\'ysku}{\'ur \th\'ysku}},
   fromgreek        = {{\'ur gr\'{\i}sku}{\'ur gr\'{\i}sku}},
   fromitalian      = {{\'ur \'{\i}t\"olsku}{\'ur \'{\i}t\"olsku}},
   fromlatin        = {{\'ur lat\'{\i}nu}{\'ur lat\'{\i}nu}},
   fromnorwegian    = {{\'ur norsku}{\'ur norsku}},
-% frompolish       = {{}{}},% FIXME: missing
-% fromportuguese   = {{}{}},% FIXME: missing
-% fromrussian      = {{}{}},% FIXME: missing
+  frompolish       = {{\'ur p\'olsku}{\'ur p\'olsku}},
+  fromportuguese   = {{\'ur port\'ug\"olsku}{\'ur port\'ug\"olsku}},
+  fromrussian      = {{\'ur r\'ussnesku}{\'ur r\'ussnesku}},
   fromspanish      = {{\'ur sp\ae{}nsku}{\'ur sp\ae{}nsku}},
-% fromswedish      = {{}{}},% FIXME: missing
-  countryde        = {{\'yskaland}{DE}},
-  countryeu        = {{Evr\'opusambandi}{EU}},
-  countryep        = {{Evr\'opusambandi}{EP}},
+  fromswedish      = {{\'ur s\ae{}nsku}{\'ur s\ae{}nsku}},
+  countryde        = {{\TH\'yskaland}{DE}},
+  countryeu        = {{Evr\'opusambandi\dh}{EU}},
+  countryep        = {{Evr\'opusambandi\dh}{EP}},
   countryfr        = {{Frakkland}{FR}},
   countryuk        = {{Bretland}{GB}},
   countryus        = {{Bandar\'{\i}kin}{US}},
   patent           = {{einkaleyfi}{einkaleyfi}},
-  patentde         = {{\'yskt einkaleyfi}{\'yskt einkaleyfi}},
-  patenteu         = {{evr\'opskt einkaleyfi}{evr\'opskt einkaleyfi}}, 
+  patentde         = {{\th\'yskt einkaleyfi}{\th\'yskt einkaleyfi}},
+  patenteu         = {{evr\'opskt einkaleyfi}{evr\'opskt einkaleyfi}},
   patentfr         = {{franskt einkaleyfi}{franskt einkaleyfi}},
   patentuk         = {{breskt einkaleyfi}{breskt einkaleyfi}},
   patentus         = {{bandar\'{\i}skt einkaleyfi}{bandar\'{\i}skt einkaleyfi}},
-  patreq           = {{ums\'okn um einkaleyfi}{ums\'okn um einkaleyfi}}, 
-  patreqde         = {{ums\'okn um \'yskt einkaleyfi}{ums\'okn um \'yskt einkaleyfi}},
+  patreq           = {{ums\'okn um einkaleyfi}{ums\'okn um einkaleyfi}},
+  patreqde         = {{ums\'okn um \th\'yskt einkaleyfi}{ums\'okn um \th\'yskt einkaleyfi}},
   patreqeu         = {{ums\'okn um evr\'opskt einkaleyfi}{ums\'okn um evr\'opskt einkaleyfi}},
   patreqfr         = {{ums\'okn um franskt einkaleyfi}{ums\'okn um franskt einkaleyfi}},
   patrequk         = {{ums\'okn um breskt einkaleyfi}{ums\'okn um breskt einkaleyfi}},