biblatex-chicago (6dec12)

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

20 files changed, 4665 insertions, 155 deletions

diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty b/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty
index 709bd122d7a..fce7c22a511 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/biblatex-chicago.sty
@@ -1,4 +1,4 @@
-% $Id: biblatex-chicago.sty,v 0.1.1.43 2012/07/26 13:21:52 dfussner Exp $
+% $Id: biblatex-chicago.sty,v 0.1.1.46 2012/12/06 12:19:45 dfussner Exp $
 
 % Copyright (c) 2009-2012 David Fussner.  This package is
 % author-maintained.
@@ -13,12 +13,13 @@
 % but not limited to, the implied warranties of merchantability and
 % fitness for a particular purpose.
 
-\ProvidesPackage{biblatex-chicago}[2012/07/26 v 2.0 biblatex style]
+\ProvidesPackage{biblatex-chicago}[2012/12/06 v 2.4 biblatex style]
 
 \RequirePackage{etoolbox}
 
 \DeclareOption{authordate}{\def\cms@style{authordate}}
 \DeclareOption{notes}{\def\cms@style{notes}}
+\DeclareOption{authordate-trad}{\def\cms@style{authordatetrad}}
 \DeclareOption{authordate15}{\def\cms@style{authordateold}}
 \DeclareOption{notes15}{\def\cms@style{notesold}}
 \DeclareOption*{\eappto\cms@options{\CurrentOption,}}
@@ -63,6 +64,15 @@
     usecompiler=true,loccittracker=constrict,dateabbrev=false,
     maxbibnames=10,minbibnames=7,sorting=\cms@choose,sortcase=false}}
 
+\def\cms@authordatetrad{%
+  \RequirePackage[style=chicago-authordate-trad]{biblatex}%
+  \ExecuteBibliographyOptions{%
+    pagetracker=true,autocite=inline,alldates=comp,labelyear=true,
+    uniquename=minfull,useeditor=true,usetranslator=true,usecompiler=true,
+    ibidtracker=constrict,sorting=cms,punctfont,cmslos=true,nodates,
+    uniquelist=minyear,maxbibnames=10,minbibnames=7,sortcase=false,
+    abbreviate=false,dateabbrev=false,avdate=true}}
+
 \def\cms@authordateold{%
   \RequirePackage[style=chicago-authordate15]{biblatex}%
   \ExecuteBibliographyOptions{%
@@ -82,6 +92,7 @@
 \csuse{cms@\cms@style}
 \undef\cms@authordate
 \undef\cms@notes
+\undef\cms@authordatetrad
 \undef\cms@authordateold
 \undef\cms@notesold
 \expandafter\ExecuteBibliographyOptions\expandafter{\cms@options}
@@ -120,9 +131,13 @@
     {}}}%
 {\DeclareLanguageMapping{english}{cms-american}}
 
+\DeclareLanguageMapping{british}{cms-british}
 \DeclareLanguageMapping{german}{cms-german}
 \DeclareLanguageMapping{french}{cms-french}
 \DeclareLanguageMapping{ngerman}{cms-ngerman}
+\DeclareLanguageMapping{icelandic}{cms-icelandic}
+\DeclareLanguageMapping{norsk}{cms-norsk}
+\DeclareLanguageMapping{nynorsk}{cms-nynorsk}
 
 \@ifpackagelater{biblatex}{2012/06/30}
 {\def\cms@choose{%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad.bbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad.bbx
new file mode 100644
index 00000000000..b8e33676f28
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad.bbx
@@ -0,0 +1,5 @@
+\ProvidesFile{chicago-authordate-trad.bbx}
+
+\RequireBibliographyStyle{chicago-authordate}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad.cbx
new file mode 100644
index 00000000000..809bcbf8c7b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate-trad.cbx
@@ -0,0 +1,2323 @@
+% $Id: chicago-authordate-trad.cbx,v 0.8.1.27 2012/12/06 11:45:44 dfussner Exp $
+% This is a biblatex citation style file, adapted from Lehman's
+% authoryear-comp.cbx.  It is heavily modified, with the intention of
+% providing inline citations (and a reference list) for the
+% author-date style of the Chicago Manual of Style, 16th edition.
+
+\ProvidesFile{chicago-authordate.cbx}[2012/12/06 v 2.4 biblatex citation style]
+
+%%%% Biblatex initialization + Chicago options + Toggles %%%%
+
+\newbool{cbx:parens}
+
+\providecommand*{\mkibid}[1]{#1}
+
+\providetoggle{cms@inlineibid}
+\providetoggle{cms@origlabel}
+\providetoggle{cms@bothlabelold}
+\providetoggle{cms@bothlabelnew}
+\providetoggle{cms@fulldate}
+\providetoggle{cms@reprint}
+\providetoggle{cms@switchdates}
+\providetoggle{cms@los}
+%\providetoggle{cms@oneyear}
+\providetoggle{cms@avdate}
+\providetoggle{cms@nodates}
+\providetoggle{cms@authorparens}
+
+\providetoggle{cms@url}% These are for the field-exclusion options
+\providetoggle{cms@doi}
+\providetoggle{cms@doionly}
+\providetoggle{cms@eprint}
+\providetoggle{cms@isbn}
+\providetoggle{cms@numbermonth}
+\providetoggle{cms@bookpages}
+
+\providetoggle{cms@jrcomma}% Comma after Jr./Sr.
+
+\providetoggle{cms@headlessnote}% Keep
+\providetoggle{cms@noibid}% Keep
+\providetoggle{cms@usecompiler}% Keep
+\providetoggle{cms@origpublished}% Keep
+\providetoggle{cms@annotation}% Keep
+\providetoggle{cms@postposit}% Keep
+\providetoggle{cms@fullshhand}
+
+\AtEveryCitekey{%
+  \iffieldundef{userc}%
+  {}%
+  {\nocite{\thefield{userc}}}%
+  \iffieldequalstr{pubstate}{reprint}%
+  {\toggletrue{cms@reprint}}%
+  {\togglefalse{cms@reprint}}}%
+
+\DeclareBibliographyOption{avdate}[true]{%
+  \ifcsdef{cms@opt@avdate@#1}%
+  {\csuse{cms@opt@avdate@#1}}
+  {\blx@err@invopt{avdate=#1}{}}}
+\def\cms@opt@avdate@true{%
+  \@ifpackagelater{biblatex}{2012/11/20}% for biblatex 2.4
+  {\DeclareLabelyear[music,review,video]{\field{eventyear}%
+      \field{origyear} \field{year} \field{urlyear}}}%
+  {\DeclareLabelyear[music,review,video]{eventyear,origyear,year,urlyear}}%
+  \toggletrue{cms@avdate}}%
+\def\cms@opt@avdate@false{%
+  \togglefalse{cms@avdate}}
+
+\DeclareBibliographyOption{cmsdate}{% Trying to implement origyear as
+  \ifcsdef{cms@opt@cmsdate@#1}% labelyear. Sorting will be an issue.
+  {\csuse{cms@opt@cmsdate@#1}}
+  {\blx@err@invopt{cmsdate=#1}{}}}
+
+\DeclareEntryOption{cmsdate}[off]{% Trying to implement origyear as
+  \ifcsdef{cms@opt@cmsdate@#1}% labelyear. Sorting will be an issue.
+  {\iftoggle{cms@origlabel}
+    {\togglefalse{cms@origlabel}%
+      \def\@cms@tempdate{cms@origlabel}}%
+    {\iftoggle{cms@bothlabelnew}%
+      {\togglefalse{cms@bothlabelnew}%
+        \def\@cms@tempdate{cms@bothlabelnew}}%
+      {\iftoggle{cms@bothlabelold}%
+        {\togglefalse{cms@bothlabelold}%
+          \def\@cms@tempdate{cms@bothlabelold}}%
+        {}}}%
+    \csuse{cms@opt@cmsdate@#1}}%
+  {\blx@err@invopt{cmsdate=#1}{}}}
+\def\cms@opt@cmsdate@on{%
+  \toggletrue{cms@origlabel}}
+\def\cms@opt@cmsdate@new{%
+  \toggletrue{cms@bothlabelnew}}
+\def\cms@opt@cmsdate@old{%
+  \toggletrue{cms@bothlabelold}}
+\def\cms@opt@cmsdate@both{%
+  \toggletrue{cms@bothlabelold}}
+\def\cms@opt@cmsdate@full{%
+  \toggletrue{cms@fulldate}}
+\def\cms@opt@cmsdate@off{}
+
+\DeclareBibliographyOption{annotation}[true]{%
+  \global\toggletrue{cms@annotation}}
+
+\DeclareBibliographyOption{cmslos}[true]{%
+  \global\settoggle{cms@los}{#1}}
+
+\DeclareBibliographyOption{noibid}[true]{%
+  \global\toggletrue{cms@noibid}}
+
+\DeclareBibliographyOption{usecompiler}[true]{%
+  \settoggle{cms@usecompiler}{#1}}
+
+\DeclareBibliographyOption{nodates}[true]{%
+  \settoggle{cms@nodates}{#1}}
+
+\DeclareEntryOption{usecompiler}[true]{%
+  \settoggle{cms@usecompiler}{#1}}
+
+\DeclareBibliographyOption{juniorcomma}[true]{%
+  \settoggle{cms@jrcomma}{#1}}
+
+\DeclareEntryOption{juniorcomma}[true]{%
+  \settoggle{cms@jrcomma}{#1}}
+
+\DeclareBibliographyOption{shorthandfull}[true]{%
+  \settoggle{cms@fullshhand}{#1}}
+
+\DeclareBibliographyOption{headline}[true]{%
+  \renewcommand{\MakeSentenceCase}{\@ifstar\relax\relax}}
+
+% The field-exclusion options %
+
+\DeclareBibliographyOption{isbn}[true]{%
+  \settoggle{cms@isbn}{#1}}
+\DeclareBibliographyOption{url}[true]{%
+  \settoggle{cms@url}{#1}}
+\DeclareBibliographyOption{doi}[true]{%
+  \ifcsdef{cms@opt@doi@#1}%
+  {\csuse{cms@opt@doi@#1}}
+  {\blx@err@invopt{doi=#1}{}}}
+\def\cms@opt@doi@true{%
+  \toggletrue{cms@doi}}
+\def\cms@opt@doi@false{%
+  \togglefalse{cms@doi}}
+\def\cms@opt@doi@only{%
+  \toggletrue{cms@doionly}}
+\DeclareBibliographyOption{eprint}[true]{%
+  \settoggle{cms@eprint}{#1}}
+\DeclareBibliographyOption{numbermonth}[true]{%
+  \settoggle{cms@numbermonth}{#1}}
+\DeclareBibliographyOption{bookpages}[true]{%
+  \settoggle{cms@bookpages}{#1}}
+\DeclareBibliographyOption{includeall}[true]{%
+  \settoggle{cms@isbn}{#1}%
+  \settoggle{cms@url}{#1}%
+  \settoggle{cms@doi}{#1}%
+  \settoggle{cms@eprint}{#1}%
+  \settoggle{cms@numbermonth}{#1}%
+  \settoggle{cms@bookpages}{#1}}
+
+\DeclareEntryOption{isbn}[true]{%
+  \settoggle{cms@isbn}{#1}}
+\DeclareEntryOption{url}[true]{%
+  \settoggle{cms@url}{#1}}
+\DeclareEntryOption{doi}[true]{%
+  \ifcsdef{cms@opt@doi@#1}%
+  {\iftoggle{cms@doi}%
+    {\togglefalse{cms@doi}%
+      \iftoggle{cms@doionly}%
+      {\togglefalse{cms@doionly}}% !!
+      {}}%
+    {\toggletrue{cms@doi}}% !!
+    \csuse{cms@opt@doi@#1}}
+  {\blx@err@invopt{doi=#1}{}}}
+\DeclareEntryOption{eprint}[true]{%
+  \settoggle{cms@eprint}{#1}}
+\DeclareEntryOption{numbermonth}[true]{%
+  \settoggle{cms@numbermonth}{#1}}
+\DeclareEntryOption{bookpages}[true]{%
+  \settoggle{cms@bookpages}{#1}}
+
+\ExecuteBibliographyOptions{includeall}%
+
+% More authordate options %
+
+\DeclareSortingScheme{cms}{
+  \sort{
+    \field{presort}
+  }
+  \sort[final]{
+    \field{sortkey}
+  }
+  \sort{
+    \name{sortname}
+    \name{author}
+    \name{namea}
+    \name{editor}
+    \name{nameb}
+    \name{translator}
+    \name{namec}
+    \field{sorttitle}
+    \field{journaltitle}
+    \list{organization}
+    \field{title}
+  }
+  \sort{
+    \field{sortyear}
+    \field{year}
+  }
+  \sort{
+    \field{sorttitle}
+    \field{title}
+  }
+  \sort{
+    \field[padside=left,padwidth=4,padchar=0]{volume}
+    \literal{0000}
+  }
+}
+
+\@ifpackagelater{biblatex}{2012/11/20}% for biblatex 2.4
+{\DeclareLabelname{\field{shortauthor} \field{author}%
+    \field{shorteditor} \field{namea} \field{editor}%
+    \field{nameb} \field{translator} \field{namec}}}
+{\DeclareLabelname{shortauthor,author,shorteditor,namea,%
+    editor,nameb,translator,namec}}
+
+\DeclareEntryOption{switchdates}[true]{%
+  \settoggle{cms@switchdates}{#1}}
+
+\DeclareBibliographyOption{strict}[true]{%
+  \let\splitfootnoterule\footnoterule
+  \renewcommand\footnoterule{}%
+  \advance\skip\footins 4\p@\@plus2\p@\relax
+  \gdef\split@prev{0}
+  \let\pagefootnoterule\footnoterule
+  % \def\splitfootnoterule{\kern-3\p@ \hrule \kern2.6\p@}
+  \def\footnoterule{\relax
+    \ifnum\split@prev=\z@
+    \pagefootnoterule
+    \else
+    \splitfootnoterule
+    \fi
+    \xdef\split@prev{\the\insertpenalties}%
+  }}
+
+\protected\def\blx@newcunit{%
+  \global\let\blx@unitpunct\newcunitpunct
+  \global\toggletrue{blx@unit}}%
+
+\appto\blx@blxinit{%
+  \let\newcunit\blx@newcunit}
+
+\newcommand*{\newcunitpunct}{\addcomma\space}
+
+\def\mkbibcurdinal#1{%
+  \@tempcnta0#1 \the\@tempcnta}%
+
+\@ifpackagelater{biblatex}{2011/01/04}
+{}
+{\PackageError{biblatex}
+  {Outdated 'biblatex' package}
+  {The Chicago style requires biblatex v1.1 or later.\MessageBreak
+    You are using: '\csuse{ver@biblatex.sty}'.\MessageBreak
+    This is a fatal error. I'm aborting now.}%
+  \endinput}
+
+% American-specific punctuation change for 16th edition %
+
+\DefineBibliographyExtras{american}{%
+  \DeclarePunctuationPairs{comma}{*!?}}
+
+%%%% Initialize and define bibstrings %%%%
+
+% \NewBibliographyString{origpubyear} % Already in .lbx files?
+
+% \DefineBibliographyStrings{american}{%
+%   origpubyear = {first published\addspace},}
+
+%%%% This one needed for 16th edition. Others in cms-*.lbx %%%%
+
+%%%% Macros from authoryear-comp.cbx, revised for CMS %%%%
+
+\newbibmacro*{cite:init}{%
+  \ifnumless{\value{multicitecount}}{2}
+    {\global\boolfalse{cbx:parens}%
+     \global\undef\cbx@lasthash
+     \global\undef\cbx@lastyear}
+    {\iffieldundef{prenote}
+       {}
+       {\global\undef\cbx@lasthash
+	\global\undef\cbx@lastyear}}}
+
+\newbibmacro*{cite:reinit}{%
+  \global\undef\cbx@lasthash
+  \global\undef\cbx@lastyear}
+
+\newbibmacro*{cite}{%
+  \ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
+  {\usebibmacro{cite:ibid}}%
+  {\iffieldequalstr{entrysubtype}{classical}% Similar to notes+bib
+    {\iffieldundef{shorthand}%
+      {\ifthenelse{\ifnameundef{labelname}\OR
+          \iffieldequalstr{entrytype}{inreference}\OR
+          \iffieldequalstr{entrytype}{reference}}% Simplified for CMS
+        {\usebibmacro{cite:label}%
+          \setunit{\addspace}%
+          \usebibmacro{cite:reinit}}
+        {\iffieldequals{namehash}{\cbx@lasthash}%
+          {\iffieldundef{postnote}%
+            {\setunit{\compcitedelim}}%
+            {}%
+            \usebibmacro{cite:label}}
+          {\iffieldequals{namehash}{\cbx@lastyear}%
+            {}%
+            {\usebibmacro{cmsbracketname}% For names in []
+              \iffieldequalstr{entrytype}{customc}%
+              {\newcunit}%
+              {\setunit{\addspace}}}%
+            \usebibmacro{cite:label}%
+            \iffieldundef{postnote}%
+            {\savefield{namehash}{\cbx@lasthash}}%
+            {\savefield{namehash}{\cbx@lastyear}}}}}%
+      {\usebibmacro{cite:shorthand+title}}}
+    {\iffieldundef{shorthand}%
+      {\ifthenelse{\ifnameundef{labelname}\OR
+          \iffieldequalstr{entrytype}{inreference}\OR
+          \iffieldequalstr{entrytype}{reference}}% Simplified for CMS
+        {\usebibmacro{cite:label}%
+          \setunit{\addspace}%
+          \usebibmacro{cmscitesortdate}%
+          \usebibmacro{cite:reinit}}
+        {\iffieldequals{namehash}{\cbx@lasthash}%
+          {\iffieldundef{postnote}%
+            {\setunit{\compcitedelim}}%
+            {}%
+            \usebibmacro{cmscitesortdate}}
+          {\iffieldequals{namehash}{\cbx@lastyear}% Is this right?
+            {}%
+            {\usebibmacro{cmsbracketname}%
+              \setunit{\nameyeardelim}}%
+            \usebibmacro{cmscitesortdate}%
+            \iffieldundef{postnote}%
+            {\savefield{namehash}{\cbx@lasthash}}%
+            {\savefield{namehash}{\cbx@lastyear}}}}}%
+      {\usebibmacro{cite:shorthand}}}}%
+  \setunit{\multicitedelim}}% ???
+
+\newbibmacro*{cmsbracketname}{%
+  \iffieldequalstr{authortype}{anon}%
+  {\bibleftbracket\printnames{labelname}%
+    \bibrightbracket}%
+  {\iffieldequalstr{authortype}{anon?}%
+    {\bibleftbracket\printnames{labelname}?%
+      \bibrightbracket}%
+    {\printnames{labelname}}}}
+
+\newbibmacro*{citeyear}{%
+  \iffieldequalstr{entrysubtype}{classical}%
+  {\iffieldundef{shorthand}%
+    {\usebibmacro{citeyear:noshort}}%
+    {\iftoggle{cms@los}%
+      {\usebibmacro{citeyear:noshort}}%
+      {\usebibmacro{cite:shorthand+title}}}}%
+  {\iffieldundef{shorthand}%
+    {\usebibmacro{citeyear:noshort}}%
+    {\iftoggle{cms@los}%
+      {\usebibmacro{citeyear:noshort}}%
+      {\usebibmacro{cite:shorthand}}}}%
+  \setunit{\multicitedelim}}
+
+\newbibmacro*{citeyear:noshort}{%
+  \iffieldequalstr{entrysubtype}{classical}% Altered for CMS
+  {\iffieldequals{namehash}{\cbx@lasthash}%
+    {\iffieldundef{postnote}%
+      {\setunit{\compcitedelim}}%
+      {}%
+      \usebibmacro{cite:label}}
+    {\usebibmacro{cite:label}%
+      \iffieldundef{postnote}%
+      {\savefield{namehash}{\cbx@lasthash}}%
+      {}}}
+  {\iffieldequals{namehash}{\cbx@lasthash}%
+    {\iffieldundef{postnote}%
+      {\setunit{\compcitedelim}}%
+      {}%
+      \usebibmacro{cmscitesortdate}}
+    {\usebibmacro{cmscitesortdate}%
+      \iffieldundef{postnote}%
+      {\savefield{namehash}{\cbx@lasthash}}%
+      {}}}}%
+
+\newbibmacro*{textcite}{%
+  \iftoggle{cms@los}%
+  {\usebibmacro{textcite:authshort}}%
+  {\usebibmacro{textcite:citeshort}}}
+
+\newbibmacro*{textcite:authshort}{%
+  \iffieldequals{namehash}{\cbx@lasthash}
+  {\iffieldundef{postnote}%
+    {\iffieldequals{namehash}{\cbx@lastyear}%
+      {\setunit{\multicitedelim}%
+        \global\undef\cbx@lastyear}%
+      {\setunit{\compcitedelim}}}%
+    {\setunit{\multicitedelim}}%
+    \iffieldequalstr{entrysubtype}{classical}%
+    {\usebibmacro{cite:label}}%
+    {\usebibmacro{cmscitesortdate}}}%
+  {\iffieldundef{shorthand}
+    {\ifthenelse{\ifnameundef{labelname}\OR
+        \iffieldequalstr{entrytype}{inreference}\OR
+        \iffieldequalstr{entrytype}{reference}}%
+      {\iffieldequalstr{entrysubtype}{classical}%
+        {\setunit{%
+            \global\booltrue{cbx:parens}%
+            \addspace\bibopenparen}%
+          \ifnumequal{\value{citecount}}{1}%
+          {\usebibmacro{prenote}}
+          {}%
+          \usebibmacro{cite:label}}
+        {\usebibmacro{cite:label}%
+          \setunit{%
+            \global\booltrue{cbx:parens}%
+            \addspace\bibopenparen}%
+          \ifnumequal{\value{citecount}}{1}
+          {\usebibmacro{prenote}}
+          {}%
+          \usebibmacro{cmscitesortdate}}}
+      {\printnames{labelname}%
+	\setunit{%
+	  \global\booltrue{cbx:parens}%
+	  \addspace\bibopenparen}%
+	\ifnumequal{\value{citecount}}{1}
+        {\usebibmacro{prenote}}
+        {}%
+        \iffieldequalstr{entrysubtype}{classical}%
+        {\usebibmacro{cite:label}}
+        {\usebibmacro{cmscitesortdate}}%
+        \savefield{namehash}{\cbx@lasthash}}}
+    {\printfield{shorthand}%
+      \setunit{%
+        \global\booltrue{cbx:parens}%
+        \addspace\bibopenparen}%
+      \ifnumequal{\value{citecount}}{1}%
+      {\usebibmacro{prenote}}%
+      {}%
+      \iffieldequalstr{entrysubtype}{classical}%
+      {\usebibmacro{cite:label}}
+      {\usebibmacro{cmscitesortdate}}%
+      \savefield{namehash}{\cbx@lasthash}}}%
+  \setunit{%
+    \ifbool{cbx:parens}%
+    {\bibcloseparen\global\boolfalse{cbx:parens}}%
+    {}%
+    \multicitedelim}}
+
+\newbibmacro*{textcite:citeshort}{%
+  \iffieldequals{namehash}{\cbx@lasthash}
+  {\iffieldundef{shorthand}
+    {\iffieldundef{postnote}%
+      {\iffieldequals{namehash}{\cbx@lastyear}%
+        {\setunit{\multicitedelim}%
+          \global\undef\cbx@lastyear}%
+        {\setunit{\compcitedelim}}}%
+      {\setunit{\multicitedelim}}%
+      \iffieldequalstr{entrysubtype}{classical}%
+      {\usebibmacro{cite:label}}%
+      {\usebibmacro{cmscitesortdate}}}
+    {\iffieldundef{postnote}%
+      {\iffieldequals{namehash}{\cbx@lastyear}%
+        {\setunit{\multicitedelim}%
+          \global\undef\cbx@lastyear}%
+        {\setunit{\compcitedelim}}}%
+      {\setunit{\multicitedelim}}%
+      \printtext[bibhyperref]{%
+        \printfield{shorthand}}}}%
+  {\ifthenelse{\ifnameundef{labelname}\OR
+      \iffieldequalstr{entrytype}{inreference}\OR
+      \iffieldequalstr{entrytype}{reference}}%
+    {\iffieldundef{shorthand}
+      {\iffieldequalstr{entrysubtype}{classical}%
+        {\setunit{%
+            \global\booltrue{cbx:parens}%
+            \addspace\bibopenparen}%
+          \ifnumequal{\value{citecount}}{1}%
+          {\usebibmacro{prenote}}
+          {}%
+          \usebibmacro{cite:label}}
+        {\usebibmacro{cite:label}%
+          \setunit{%
+            \global\booltrue{cbx:parens}%
+            \addspace\bibopenparen}%
+          \ifnumequal{\value{citecount}}{1}
+          {\usebibmacro{prenote}}
+          {}%
+          \usebibmacro{cmscitesortdate}}}
+      {\printtext[bibhyperref]{%
+          \printfield{shorthand}}}}
+    {\printnames{labelname}%
+      \setunit{%
+        \global\booltrue{cbx:parens}%
+        \addspace\bibopenparen}%
+      \ifnumequal{\value{citecount}}{1}
+      {\usebibmacro{prenote}}
+      {}%
+      \iffieldundef{shorthand}
+      {\iffieldequalstr{entrysubtype}{classical}%
+        {\usebibmacro{cite:label}}
+        {\usebibmacro{cmscitesortdate}}}%
+      {\printtext[bibhyperref]{%
+          \printfield{shorthand}}}%
+      \savefield{namehash}{\cbx@lasthash}}}%
+  \setunit{%
+    \ifbool{cbx:parens}
+    {\bibcloseparen\global\boolfalse{cbx:parens}}
+    {}%
+    \multicitedelim}}
+
+\newbibmacro*{textcite:postnote}{%
+  \iffieldundef{postnote}%
+  {}%
+  {\savefield{namehash}{\cbx@lastyear}%
+    \setunit{\postnotedelim}%
+    \printfield{postnote}}%
+  \ifthenelse{\value{multicitecount}=\value{multicitetotal}}%
+  {\setunit{}%
+    \printtext{%
+      \ifbool{cbx:parens}
+      {\bibcloseparen\global\boolfalse{cbx:parens}}
+      {}}}%
+  {\setunit{%
+      \ifbool{cbx:parens}
+      {\bibcloseparen\global\boolfalse{cbx:parens}}
+      {}%
+      \multicitedelim}}}
+
+\newbibmacro*{cite:shorthand}{%
+  \iftoggle{cms@los}%
+  {\iffieldequals{namehash}{\cbx@lasthash}%
+    {\printtext[bibhyperref]{%
+        \setunit{\compcitedelim}%
+        \usebibmacro{cmscitesortdate}}}
+    {\printtext[bibhyperref]{%
+        \printfield{shorthand}%
+        \setunit{\nameyeardelim}%
+        \usebibmacro{cmscitesortdate}}%
+      \savefield{namehash}{\cbx@lasthash}}}%
+  {\printtext[bibhyperref]{\printfield{shorthand}}%
+    \usebibmacro{cite:reinit}}}
+
+\newbibmacro*{cite:shorthand+title}{%
+  \iftoggle{cms@los}%
+  {\iffieldequals{namehash}{\cbx@lasthash}%
+    {\printtext[bibhyperref]{%
+        \setunit{\compcitedelim}%
+        \usebibmacro{cite:label}}}
+    {\printtext[bibhyperref]{%
+        \printfield{shorthand}%
+        \setunit{\nameyeardelim}%
+        \usebibmacro{cite:label}}%
+      \savefield{namehash}{\cbx@lasthash}}}%
+  {\printtext[bibhyperref]{\printfield{shorthand}}%
+    \usebibmacro{cite:reinit}}}
+
+\newbibmacro*{cite:label}{% Test this
+  \iffieldundef{label}%
+  {\ifthenelse{\iffieldequalstr{entrysubtype}{magazine}\AND\NOT%
+      \iffieldequalstr{entrytype}{periodical}}% Simplifies .bib creation
+    {\printtext[bibhyperref]{\printfield[journaltitle]{journaltitle}}}%
+    {\iffieldequalstr{entrytype}{manual}%
+      {\printtext[bibhyperref]{\printlist{organization}}}%
+      {\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}}}}%
+  {\printtext[bibhyperref]{\printfield{label}}}}
+
+\newbibmacro*{cite:labelyear+extrayear}{%
+  \ifboolexpr{ (
+    test {\iffieldequalstr{entrytype}{music}}%
+    or
+    test {\iffieldequalstr{entrytype}{review}}%
+    or
+    test {\iffieldequalstr{entrytype}{video}}%
+    )
+    and
+    togl {cms@avdate}
+  }%
+  {\usebibmacro{cite:av+labelyear+extrayear}}%
+  {\usebibmacro{cite:standard+labelyear+extrayear}}}
+
+\newbibmacro*{cite:standard+labelyear+extrayear}{%
+  \iffieldundef{labelyear}
+  {\ifboolexpr{
+      test {\iffieldequalstr{entrytype}{misc}}
+      or
+      test {\iffieldequalstr{entrytype}{inreference}}
+      or
+      test {\iffieldequalstr{entrytype}{reference}}
+      or
+      not togl {cms@nodates}
+    }%
+    {}%
+    {\printtext[bibhyperref]{\bibstring{nodate}}}}% For CMS?
+  {\printtext[bibhyperref]{%
+      \iffieldundef{year}%
+      {\iffieldundef{eventyear}
+        {\iffieldundef{origyear}%
+          {\printfield{labelyear}%
+            \iffieldundef{extrayear}%
+            {}%
+            {\setunit*{}%
+              \printfield{extrayear}}%
+            \iffieldundef{urlendyear}%
+            {}%
+            {\iffieldequalstr{urlendyear}{}%
+              {\mbox{\bibdatedash}}%
+              {}}}%
+          {\printfield{labelyear}%
+            \iffieldundef{extrayear}%
+            {}%
+            {\setunit*{}%
+              \printfield{extrayear}}%
+            \iffieldundef{origendyear}%
+            {}%
+            {\iffieldequalstr{origendyear}{}%
+              {\mbox{\bibdatedash}}%
+              {}}}}
+        {\printfield{labelyear}%
+          \iffieldundef{extrayear}%
+          {}%
+          {\setunit*{}%
+            \printfield{extrayear}}%
+          \iffieldundef{eventendyear}%
+          {}%
+          {\iffieldequalstr{eventendyear}{}%
+            {\mbox{\bibdatedash}}%
+            {}}}}
+      {\printfield{labelyear}%
+        \iffieldundef{extrayear}%
+        {}%
+        {\setunit*{}%
+          \printfield{extrayear}}%
+        \iffieldundef{endyear}% DATE FIX
+        {}%
+        {\iffieldequalstr{endyear}{}%
+          {\mbox{\bibdatedash}}%
+          {}}}}}}
+
+\newbibmacro*{cite:av+labelyear+extrayear}{%
+  \iffieldundef{labelyear}
+  {\ifboolexpr{
+      test {\iffieldequalstr{entrytype}{misc}}
+      or
+      test {\iffieldequalstr{entrytype}{inreference}}
+      or
+      test {\iffieldequalstr{entrytype}{reference}}
+      or
+      not togl {cms@nodates}
+    }%
+    {}%
+    {\printtext[bibhyperref]{\bibstring{nodate}}}}% For CMS?
+  {\printtext[bibhyperref]{%
+      \iffieldundef{eventyear}%
+      {\iffieldundef{origyear}
+        {\iffieldundef{year}%
+          {\printfield{labelyear}%
+            \iffieldundef{extrayear}%
+            {}%
+            {\setunit*{}%
+              \printfield{extrayear}}%
+            \iffieldundef{urlendyear}%
+            {}%
+            {\iffieldequalstr{urlendyear}{}%
+              {\mbox{\bibdatedash}}%
+              {}}}%
+          {\printfield{labelyear}%
+            \iffieldundef{extrayear}%
+            {}%
+            {\setunit*{}%
+              \printfield{extrayear}}%
+            \iffieldundef{endyear}%
+            {}%
+            {\iffieldequalstr{endyear}{}%
+              {\mbox{\bibdatedash}}%
+              {}}}}
+        {\printfield{labelyear}%
+          \iffieldundef{extrayear}%
+          {}%
+          {\setunit*{}%
+            \printfield{extrayear}}%
+          \iffieldundef{origendyear}%
+          {}%
+          {\iffieldequalstr{origendyear}{}%
+            {\mbox{\bibdatedash}}%
+            {}}}}
+      {\printfield{labelyear}%
+        \iffieldundef{extrayear}%
+        {}%
+        {\setunit*{}%
+          \printfield{extrayear}}%
+        \iffieldundef{eventendyear}% DATE FIX
+        {}%
+        {\iffieldequalstr{eventendyear}{}%
+          {\mbox{\bibdatedash}}%
+          {}}}}}}
+
+\newbibmacro*{cmscitesortdate}{% Attempt to solve date-related problems
+  \ifboolexpr{%
+    test {\iffieldundef{origyear}}
+    or
+    not test {\iffieldint{origyear}}
+  }%
+  {\usebibmacro{cmsciteyear}}%
+  {\iffieldint{year}%
+    {\ifboolexpr{% Needed for date ranges
+        test {\iffieldundef{endyear}}%
+        or
+        not test {\iffieldnum{endyear}}
+      }%
+      {\ifthenelse{\thefield{origyear}>\thefield{year}}%
+        {\toggletrue{cms@switchdates}%
+          \usebibmacro{cmsciteyear}}%
+        {\usebibmacro{cmsciteyear}}}%
+      {\ifthenelse{\thefield{origyear}>\thefield{endyear}}%
+        {\toggletrue{cms@switchdates}%
+          \usebibmacro{cmsciteyear}}%
+        {\usebibmacro{cmsciteyear}}}}%
+    {\usebibmacro{cmsciteyear}}}}
+
+\newbibmacro*{cmsciteyear}{%
+  \iftoggle{cms@origlabel}%
+  {\usebibmacro{cite:origyear+labelyear}}%
+  {\iftoggle{cms@bothlabelnew}%
+    {\usebibmacro{cite:bothyear+oldstyle}}%
+    {\iftoggle{cms@bothlabelold}%
+      {\usebibmacro{cite:bothyear+oldstyle}}%
+      {\iftoggle{cms@fulldate}%
+        {\newcunit\printdate}%
+        {\usebibmacro{cite:labelyear+extrayear}}}}}%
+  \ifcsdef{@cms@tempdate}%
+  {\toggletrue{\@cms@tempdate}}%
+  {}}
+
+\newbibmacro*{cite:origyear+labelyear}{%
+  \iftoggle{cms@switchdates}%
+  {\usebibmacro{cite:labelyear+extrayear}}
+  {\iffieldundef{origyear}%
+    {\usebibmacro{cite:labelyear+extrayear}}%
+    {\printtext[bibhyperref]{%
+        \printfield{origyear}}}}}
+
+\newbibmacro*{cite:bothyear+oldstyle}{%
+  \iftoggle{cms@switchdates}%
+  {\printtext[bibhyperref]{%
+      \bibopenparen%
+      \usebibmacro{cite:labelyear+extrayear}%
+      \bibcloseparen%
+      \addspace\printfield{origyear}}}%
+  {\iffieldundef{origyear}%
+    {\usebibmacro{cite:labelyear+extrayear}}%
+    {\printtext[bibhyperref]{%
+        \printfield[parens]{origyear}%
+        \addspace\printfield{labelyear}}}}}
+
+\newbibmacro*{cite:save}{%
+  \savefield{entrykey}{\cbx@lastkey}}
+
+\newbibmacro*{cite:ibid}{%
+  \iftoggle{cms@noibid}%
+  {\blx@ibidreset%
+    \usebibmacro{cite}}%
+  {\ifthenelse{\iffieldundef{prenote}\AND%
+      \iffieldundef{postnote}}%
+    {\blx@ibidreset%
+      \usebibmacro{cite}%
+      \PackageWarning{biblatex-chicago}%
+      {Empty Ibidem citation}}%
+    {\toggletrue{cms@inlineibid}}}}
+
+%%%% Citation Commands, internal and external %%%%
+
+\DeclareCiteCommand{\cite}
+  {\usebibmacro{cite:init}%
+    \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}}
+  {}%\multicitedelim
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand*{\cite}
+  {\usebibmacro{cite:init}%
+    \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{citeyear}}
+  {}%\multicitedelim
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\parencite}[\mkbibparens]
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}}
+  {}%\setunit{\multicitedelim}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand*{\parencite}[\mkbibparens]
+  {\usebibmacro{cite:init}%
+    \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{citeyear}}
+  {}%\setunit{\multicitedelim}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\footcite}[\mkbibfootnote]
+  {\usebibmacro{cite:init}%
+    \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}}
+  {}%\multicitedelim
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\footcitetext}[\mkbibfootnotetext]
+  {\usebibmacro{cite:init}%
+   \usebibmacro{prenote}}
+  {\usebibmacro{citeindex}%
+   \usebibmacro{cite}}
+  {}
+  {\usebibmacro{postnote}}
+
+\DeclareCiteCommand{\textcite}
+  {\usebibmacro{cite:init}}
+  {\usebibmacro{citeindex}%
+    \usebibmacro{textcite}}
+  {}
+  {\usebibmacro{textcite:postnote}}
+
+\DeclareMultiCiteCommand{\cites}{\cite}{\setunit{\multicitedelim}}
+
+\DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite}%
+   {\setunit{\multicitedelim}}
+
+\DeclareMultiCiteCommand{\footcites}[\mkbibfootnote]{\footcite}%
+   {\setunit{\multicitedelim}}
+
+\DeclareMultiCiteCommand{\footcitetexts}[\mkbibfootnotetext]%
+   {\footcitetext}{\setunit{\multicitedelim}}
+
+\DeclareMultiCiteCommand{\textcites}{\textcite}{}
+
+\DeclareCiteCommand{\bibxrefcite}
+  {\usebibmacro{cite:init}}%\usebibmacro{clearalmostall}} (?)
+  {\usebibmacro{cms-in:}%
+    \blx@ibidreset% For authordate style
+    \usebibmacro{cite}}
+  {}
+  {}
+
+\DeclareCiteCommand{\origfullcite}
+  {\nopunct\unspace%
+  \savebibmacro{cmsbibsortdate}%
+  \renewbibmacro*{cmsbibsortdate}{}}%
+  {\usedriver
+    {\DeclareNameAlias{sortname}{default}\clearfield{postnote}
+      \clearname{author}\clearfield{userf}%\toggletrue{cms@fullnote}%
+      \toggletrue{cms@headlessnote}\frenchspacing}%
+    {\thefield{entrytype}}}%
+  {\multicitedelim}%
+  {\restorebibmacro{cmsbibsortdate}}
+
+\DeclareCiteCommand{\origpublcite}% Similar to above, w/o title.
+  {\nopunct\unspace%
+    \savebibmacro{cmsbibsortdate}%
+    \renewbibmacro*{cmsbibsortdate}{}}%
+  {\usedriver
+    {\DeclareNameAlias{sortname}{default}\clearfield{postnote}%
+      \usebibmacro{clearpublin}%
+      \toggletrue{cms@headlessnote}%\toggletrue{cms@fullnote}%
+      \toggletrue{cms@origpublished}\frenchspacing}%
+    {\thefield{entrytype}}}%
+  {\multicitedelim}%
+  {\restorebibmacro{cmsbibsortdate}}
+
+%%%% List Formats %%%%
+
+\DeclareListFormat{language}{%
+  \ifthenelse{\value{listcount}=1}%
+  {\bibleftbracket\bibstring{inlang}%\addspace - for inflected langs.
+    \ifbibstring{#1}
+    {\bibstring{#1}}
+    {\ifbibstring{lang#1}
+      {\bibstring{lang#1}}
+      {#1}}%
+    \ifthenelse{\value{listtotal}=1}%
+    {\bibrightbracket}%
+    {}}%
+  {\ifthenelse{\value{listcount}=\value{listtotal}}%
+    {\multilangdelim%
+      \ifbibstring{#1}
+      {\bibstring{#1}}
+      {\ifbibstring{lang#1}
+        {\bibstring{lang#1}}
+        {#1}}%
+      \bibrightbracket}%
+    {\multilangdelim%
+      \ifbibstring{#1}
+      {\bibstring{#1}}
+      {\ifbibstring{lang#1}
+        {\bibstring{lang#1}}
+        {#1}}}}%
+  \usebibmacro{langlist:andothers}}
+
+\DeclareListFormat{publisher}{%
+  \ifthenelse{\value{listtotal}<2}%
+  {#1\isdot}%
+  {\ifthenelse{\value{listcount}=1}%
+    {#1}%
+    {\multipubsdelim #1\isdot}}}
+
+\DeclareListFormat{periodplace}{\mkbibparens{#1}}
+
+\DeclareListFormat{lista}{% 
+  \ifthenelse{\value{listtotal}<2}
+  {s\adddot v\adddot\addspace\mkbibquote{#1\isdot}}%
+  {\ifthenelse{\value{listcount}=1}%
+    {s\adddot vv\adddot\addspace \mkbibquote{#1\isdot}\addcomma}%
+    {\ifthenelse{\value{listcount}<\value{listtotal}}%
+      {\addspace\mkbibquote{#1\isdot}\addcomma}%
+      {\addspace\mkbibquote{#1\isdot}}}}}
+
+%%%% Field Formats -- Title, Citetitle, Lostitle %%%%
+
+\DeclareFieldFormat[article]{title}{%
+  \iffieldundef{title}%
+  {}%
+  {\MakeSentenceCase*{#1}}}
+
+\DeclareFieldAlias[article]{citetitle}[article]{lostitle}
+
+\DeclareFieldFormat[article]{lostitle}{\MakeSentenceCase*{#1}}
+
+\DeclareFieldFormat[artwork]{title}{%
+  \iffieldundef{entrysubtype}%
+  {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
+  {\MakeSentenceCase*{#1}\isdot}}
+
+\DeclareFieldAlias[artwork]{citetitle}[artwork]{title}
+
+\DeclareFieldAlias[artwork]{lostitle}[artwork]{title}
+
+\DeclareFieldFormat[book]{title}{%
+  \mkbibemph{\MakeSentenceCase*{#1}}\isdot}
+
+\DeclareFieldAlias[book]{citetitle}[book]{title}
+
+\DeclareFieldAlias[book]{lostitle}[book]{title}
+
+\DeclareFieldAlias[bookinbook]{title}[book]{title}
+
+\DeclareFieldAlias[bookinbook]{citetitle}[book]{title}
+
+\DeclareFieldAlias[bookinbook]{lostitle}[book]{title}
+
+\DeclareFieldAlias[collection]{title}[book]{title}
+
+\DeclareFieldAlias[collection]{citetitle}[book]{title}
+
+\DeclareFieldAlias[collection]{lostitle}[book]{lostitle}
+
+\DeclareFieldFormat[periodical]{title}{\mkbibemph{#1}\isdot}
+
+\DeclareFieldFormat[periodical]{citetitle}{\mkbibemph{#1}\isdot}
+
+\DeclareFieldFormat[periodical]{lostitle}{\mkbibemph{#1}\isdot}
+
+\DeclareFieldAlias[image]{title}[artwork]{title}
+
+\DeclareFieldAlias[image]{citetitle}[artwork]{title}
+
+\DeclareFieldAlias[image]{lostitle}[artwork]{lostitle}
+
+\DeclareFieldAlias[incollection]{title}[article]{title}% Change article?
+
+\DeclareFieldAlias[incollection]{citetitle}[article]{title}
+
+\DeclareFieldAlias[incollection]{lostitle}[article]{lostitle}
+
+\DeclareFieldAlias[inreference]{title}[book]{title}
+
+\DeclareFieldAlias[inreference]{citetitle}[book]{title}
+
+\DeclareFieldAlias[inreference]{lostitle}[book]{lostitle}
+
+\DeclareFieldAlias[reference]{title}[book]{title}
+
+\DeclareFieldAlias[reference]{citetitle}[book]{title}
+
+\DeclareFieldAlias[reference]{lostitle}[book]{lostitle}
+
+\DeclareFieldFormat[letter]{title}{#1\isdot}
+
+\DeclareFieldFormat[letter]{citetitle}{#1\isdot}
+
+\DeclareFieldFormat[letter]{lostitle}{#1\isdot}
+
+\DeclareFieldAlias[inproceedings]{title}[article]{title}% As above
+
+\DeclareFieldAlias[inproceedings]{citetitle}[article]{title}
+
+\DeclareFieldAlias[inproceedings]{lostitle}[article]{lostitle}
+
+\DeclareFieldAlias[thesis]{title}[article]{title}
+
+\DeclareFieldAlias[thesis]{citetitle}[article]{title}
+
+\DeclareFieldAlias[thesis]{lostitle}[article]{lostitle}
+
+\DeclareFieldAlias[patent]{title}[article]{lostitle}% 16th ed.
+
+\DeclareFieldAlias[patent]{citetitle}[article]{title}
+
+\DeclareFieldAlias[patent]{lostitle}[article]{lostitle}
+
+\DeclareFieldAlias[unpublished]{title}[article]{title}
+
+\DeclareFieldAlias[unpublished]{citetitle}[article]{citetitle}
+
+\DeclareFieldAlias[unpublished]{lostitle}[article]{lostitle}
+
+\DeclareFieldFormat{postnote}{% Removed \isdots -- required
+  \iffieldundef{pagination}%    elsewhere also?
+  {#1}%
+  {\mkpageprefix[pagination]{#1}}}
+
+\DeclareFieldFormat[inreference]{postnote}{%
+  \iffieldundef{pagination}%
+    {s\adddot v\adddot\addspace\mkbibquote{#1}}
+    {\mkpageprefix[pagination]{#1}}}% Removed \isdots here, also.
+
+\DeclareFieldFormat{pages}{%
+  \iffieldundef{bookpagination}%
+  {#1\isdot}%
+  {\mkpageprefix[bookpagination]{#1\isdot}}}
+
+\DeclareFieldFormat{bibnote}{\MakeCapital{#1}}
+
+\DeclareFieldFormat{edlang}{%
+  \ifbibstring{#1}
+  {\bibstring{#1}}
+  {\ifbibstring{ed#1}
+    {\bibstring{ed#1}}
+    {\ifcapital{\MakeCapital{#1}}{#1}}}}
+
+\DeclareFieldAlias[inbook]{title}[article]{title}
+
+\DeclareFieldAlias[inbook]{citetitle}[article]{title}
+
+\DeclareFieldAlias[inbook]{lostitle}[article]{lostitle}
+
+\DeclareFieldFormat[suppbook]{title}{%
+  \mkbibemph{\MakeSentenceCase*{#1}}\isdot}
+
+\DeclareFieldAlias[suppbook]{citetitle}[suppbook]{lostitle}
+
+\DeclareFieldFormat[suppbook]{lostitle}{%
+  \usebibmacro{inforaft}%
+  \addspace%
+  \mkbibemph{\MakeSentenceCase*{#1}}\isdot}
+
+\DeclareFieldFormat[customc]{title}{%
+  \iffieldundef{nameaddon}%
+  {\mkbibemph{\bibstring{see}}%
+    \addspace%
+    #1}%
+  {#1}}
+
+\DeclareFieldFormat[customc]{citetitle}{%
+  \ifnameundef{author}%
+  {#1}
+  {\iffieldundef{nameaddon}%
+    {\mkbibemph{\bibstring{see}}%
+      \addspace%
+      #1}%
+    {\printfield{nameaddon}\addspace #1}}}
+
+\DeclareFieldAlias[suppcollection]{title}[suppbook]{title}
+
+\DeclareFieldAlias[suppcollection]{citetitle}[suppbook]{lostitle}
+
+\DeclareFieldAlias[suppcollection]{lostitle}[suppbook]{lostitle}
+
+\DeclareFieldAlias[booklet]{title}[book]{title}
+
+\DeclareFieldAlias[booklet]{citetitle}[book]{citetitle}
+
+\DeclareFieldAlias[booklet]{lostitle}[book]{lostitle}
+
+\DeclareFieldAlias[manual]{title}[book]{title}
+
+\DeclareFieldAlias[manual]{citetitle}[book]{citetitle}
+
+\DeclareFieldAlias[manual]{lostitle}[book]{lostitle}
+
+\DeclareFieldAlias[report]{title}[book]{title}
+
+\DeclareFieldAlias[report]{citetitle}[book]{citetitle}
+
+\DeclareFieldAlias[report]{lostitle}[book]{lostitle}
+
+\DeclareFieldFormat[misc]{title}{%
+  \iffieldundef{entrysubtype}%
+  {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
+  {\ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}}
+
+\DeclareFieldAlias[misc]{citetitle}[misc]{title}
+
+\DeclareFieldAlias[misc]{lostitle}[misc]{title}
+
+\DeclareFieldFormat[review]{title}{%
+  \ifcapital{\MakeCapital{#1\isdot}}%
+  {#1\isdot}}
+
+\DeclareFieldAlias[review]{lostitle}[review]{title}
+
+\DeclareFieldAlias[review]{citetitle}[review]{title}
+
+\DeclareFieldAlias[suppperiodical]{title}[review]{title}
+
+\DeclareFieldAlias[suppperiodical]{citetitle}[review]{title}
+
+\DeclareFieldAlias[suppperiodical]{lostitle}[review]{title}
+
+\DeclareFieldAlias[online]{title}[article]{title}
+
+\DeclareFieldAlias[online]{citetitle}[article]{title}
+
+\DeclareFieldAlias[online]{lostitle}[article]{lostitle}
+
+\DeclareFieldFormat{booktitle}{\mkbibemph{\MakeSentenceCase*{#1}}}
+
+\DeclareFieldFormat{maintitle}{\mkbibemph{\MakeSentenceCase*{#1}}}
+
+\DeclareFieldFormat[video]{title}{%
+  \iffieldundef{booktitle}%
+  {\mkbibemph{\MakeSentenceCase*{#1}}\isdot}%
+  {\MakeSentenceCase*{#1}\isdot}}
+
+\DeclareFieldAlias[video]{citetitle}[video]{title}
+
+\DeclareFieldAlias[video]{lostitle}[video]{title}
+
+\DeclareFieldAlias[music]{title}[video]{title}
+
+\DeclareFieldAlias[music]{citetitle}[video]{title}
+
+\DeclareFieldAlias[music]{lostitle}[video]{title}
+
+\DeclareFieldAlias[audio]{title}[video]{title}
+
+\DeclareFieldAlias[audio]{citetitle}[video]{title}
+
+\DeclareFieldAlias[audio]{lostitle}[video]{title}
+
+%%%% Other Field Formats %%%%
+
+\DeclareNumChars*{:}%
+
+\DeclareFieldFormat{letterday}{\mkbibcurdinal{#1}}
+
+\DeclareFieldFormat{note}{%
+  \ifcapital{\MakeCapital{#1}}{#1}}%
+
+\DeclareFieldFormat[suppbook]{type}{%
+  \ifbibstring{#1}%
+  {\bibstring{#1}}%
+  {\ifcapital%
+    {\MakeCapital{#1}}%
+    {#1}}}
+
+\DeclareFieldFormat[artwork]{type}{%
+  \ifcapital%
+  {\MakeCapital{#1}}%
+  {#1}}
+
+\DeclareFieldAlias[image]{type}[artwork]{type}
+
+\DeclareFieldAlias[suppcollection]{type}[suppbook]{type}
+
+\DeclareFieldAlias[video]{type}[suppbook]{type}
+
+\DeclareFieldAlias[music]{type}[suppbook]{type}
+
+\DeclareFieldAlias[audio]{type}[suppbook]{type}
+
+\DeclareFieldFormat{url}{\url{#1}}
+
+\DeclareFieldFormat{doi}{%
+  \textrm{doi}\addcolon
+  \ifhyperref
+    {\href{http://dx.doi.org/#1}{\nolinkurl{#1}}}
+    {\nolinkurl{#1}}}
+
+\DeclareFieldFormat{urldate}{% 16th ed.
+  \iffieldundef{userd}%
+  {\bibstring{urlseen}\space #1}%
+  {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat[video]{urldate}{% 16th ed.
+  \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{eventyear}}%
+  {\bibstring{urlseen}\space #1}%
+  {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat[music]{urldate}{% 16th ed.
+  \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{eventyear}%
+    \OR\NOT\iffieldundef{origyear}}%
+  {\bibstring{urlseen}\space #1}%
+  {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat[music]{origdate}{% 16th ed.
+  \iftoggle{cms@reprint}% Date fix
+  {#1}%
+  {\ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{eventyear}}%
+    {\bibstring{recorded}\space #1}%
+    {\printfield{userd}\addspace #1}}}
+
+\DeclareFieldFormat[music]{eventdate}{% 16th ed.
+  \iffieldundef{userd}%
+  {\bibstring{recorded}\space #1}%
+  {\printfield{userd}\addspace #1}}
+
+\DeclareFieldFormat[video]{eventdate}{% 16th ed.
+  \iffieldundef{userd}%
+  {\bibstring{broadcast}\space #1}%
+  {\printfield{userd}\addspace #1}}
+
+\DeclareFieldAlias{userd}{titleaddon}% 16th ed.
+
+\DeclareFieldFormat{nameaddon}{\mkbibbrackets{#1\bibsentence}}% ?!
+
+\DeclareFieldFormat[review]{nameaddon}{#1\bibsentence}% 16th ed.
+
+\DeclareFieldFormat[customc]{nameaddon}{% For cross-refs
+  \ifbibstring{#1}%
+  {\mkbibemph{\bibstring{#1}}}%
+  {#1}}%
+
+\DeclareFieldFormat{edition}{% New in 0.8
+  \ifinteger{#1}
+  {\mkbibordinal{#1}~\bibstring{edition}}%
+  {\ifcapital
+    {\MakeCapital{#1\isdot}}%
+    {#1\isdot}}}
+
+\DeclareFieldFormat{usere}{[#1]} % Better than mkbibbrackets?
+
+\DeclareFieldFormat{titleaddon}{%
+  \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}%\custpunctc?
+
+\DeclareFieldAlias{booktitleaddon}{titleaddon}
+
+\DeclareFieldAlias{maintitleaddon}{titleaddon}
+
+\DeclareFieldFormat{issuetitle}{\MakeSentenceCase*{#1\isdot}}
+
+\DeclareFieldFormat{jourser}{%
+  \ifinteger{#1}%
+  {\mkbibordinal{#1}%
+    \addnbspace%
+    \bibstring{jourser}}%
+  {\ifbibstring{#1}{\bibstring{#1}}{#1}}}
+
+\DeclareFieldFormat{journum}{% Revised for 0.9.5
+  \ifboolexpr{%
+    test {\ifnumerals{#1}}
+    and
+    not test {\ifnumeral{#1}}
+  }%
+  {\bibstring{numbers}\addspace #1}%
+  {\bibstring{number}\addspace #1}}
+
+\DeclareFieldFormat{sernum}{%
+  \ifnumeral{#1}%
+  {\addnbspace #1}%
+  {\addcomma\addspace #1}}
+
+\DeclareFieldFormat{addendum}{%
+  \ifcapital{\MakeCapital{#1\isdot}}{#1\isdot}}
+
+% This works better here than in the entrytail macro -- userf use is
+% no longer a problem, though the page breaking still isn't ideal.
+
+\DeclareFieldFormat{annotation}{\par\nobreak \vskip \bibitemsep #1}
+
+\DeclareFieldFormat{part}{\addcomma\bibstring{partvolume}~#1}
+
+\DeclareFieldAlias[review]{volume}[article]{volume}
+
+\DeclareFieldAlias[suppperiodical]{volume}[article]{volume}
+
+%%%% Commands, for users and internal %%%%
+
+\newcommand*{\cbytypeeditor}{% Needed?
+  \iffieldundef{editortype}
+    {\bibstring{cbytypeeditor}}
+    {\bibstring{cbytype\thefield{editortype}}}}
+
+\renewcommand*{\multicitedelim}{\addsemicolon\space}
+
+\renewcommand*{\nameyeardelim}{%
+  \iffieldundef{origyear}% Is this test correct?
+  {\iffieldundef{year}%
+    {\addspace}
+    {\NumCheckSetup{\renewcommand{\mkbibbrackets}{\expandonce}%
+        \DeclareNumChars*{[?]s}}% For bracketed dates, and decades.
+      \iffieldnums{year}% This one works.
+    {\addspace}%
+    {\iffieldequalstr{year}{\bibstring{nodate}}% This also works.
+      {\addspace}
+      {\addcomma\addspace}}}}%
+  {\addspace}}
+
+\newcommand{\classicpunct}{%
+  \ifthenelse{\iffieldequalstr{entrysubtype}{classical}\OR%
+    \iffieldequalstr{entrytype}{letter}}%
+  {\setunit*{\addspace}}%
+  {\setunit*{\addcomma\addspace}}}
+
+\newcommand{\parttrans}{%
+  {\bibstring{bytranslator}\space}}%
+
+\newcommand{\partedit}{%
+  \iftoggle{cms@postposit}% Kludge to make it work in French.
+  {\bibstring{byeditoralt}\addspace}%
+  {\bibstring{byeditor}\addspace}}%
+
+\newcommand{\partcomp}{%
+  {\bibstring{bycompiler}\space}}%
+
+\newcommand{\parteditandcomp}{%
+  {\bibstring{byeditorcp}\space}}%
+
+\newcommand{\parttransandcomp}{%
+  {\bibstring{bytranslatorcp}\space}}%
+
+\newcommand{\partedittransandcomp}{%
+  {\bibstring{byeditortrcp}\space}}%
+
+\newcommand{\parteditandtrans}{%
+  {\bibstring{byeditortr}\space}}%
+
+\newcommand{\reprint}{\bibstring{reprint}}%
+
+\newcommand*{\multipubsdelim}{\addnbspace/\addspace}
+
+\newcommand*{\multilocsdelim}{%
+  \ifthenelse{\value{listcount}<\value{liststop}}%
+    {\ifthenelse{\numexpr\value{listcount}+1<\value{liststop}}%
+       {\addcomma\addspace}%
+       {\ifthenelse{\value{liststop}>2}%
+         {\addcomma\addspace\bibstring{and}\addspace}%
+         {\addspace\bibstring{and}\addspace}}}%
+       {}}
+
+\newcommand*{\multilangdelim}{%
+  \ifthenelse{\value{listtotal}<3}%
+  {\addspace\bibstring{and}\addspace}%
+  {\ifthenelse{\value{listcount}<\value{listtotal}}%
+    {\addcomma\addspace}%
+    {\addcomma\addspace\bibstring{and}\addspace}}}
+
+\renewcommand*{\postnotedelim}{%
+  \iftoggle{cms@inlineibid}%
+  {\togglefalse{cms@inlineibid}}%
+  {\iffieldequalstr{entrysubtype}{classical}% For Notes+Bib, too?
+    {\NumCheckSetup{\DeclareNumChars*{abcdeABCDE}}%
+      \iffieldpages{postnote}%
+      {\addspace}%
+      {\addcomma\addspace}}%
+    {\addcomma\addspace}}}
+
+\newcommand*{\editordelim}{% Otherwise you get an inaccurate comma.
+  \iffieldequalstr{editortype}{none}%
+  {\addperiod\addspace}%
+  {\addcomma\addspace}}
+
+\newcommand*{\lbx@cfromlang}{%
+  \iffieldundef{userf}
+  {\iffieldundef{origlanguage}
+    {\unspace}
+    {\bibstring{cfrom\thefield{origlanguage}}}}%
+  {\unspace}}
+
+\@ifpackagelater{biblatex}{2011/11/12}
+{\renewcommand*{\lbx@fromlang}{%
+    \iffieldundef{userf}
+    {\iffieldundef{origlanguage}
+      {\unspace}
+      {\bibstring{from\thefield{origlanguage}}}}%
+    {\unspace}}}
+{\@ifpackagelater{biblatex}{2011/07/28}
+  {\newcommand*{\lbx@fromlang}{%
+      \iffieldundef{userf}
+      {\iffieldundef{origlanguage}
+        {\unspace}
+        {\bibstring{from\thefield{origlanguage}}}}%
+      {\unspace}}}%
+  {\renewcommand*{\lbx@fromlang}{%
+      \iffieldundef{userf}
+      {\iffieldundef{origlanguage}
+        {\unspace}
+        {\bibstring{from\thefield{origlanguage}}}}%
+      {\unspace}}}}
+
+\renewcommand*{\lbx@lfromlang}{%
+  \iffieldundef{userf}
+  {\iffieldundef{origlanguage}
+    {\unspace}
+    {\biblstring{from\thefield{origlanguage}}}}%
+  {\unspace}}
+
+\renewcommand*{\lbx@sfromlang}{%
+  \iffieldundef{userf}
+  {\iffieldundef{origlanguage}
+    {\unspace}
+    {\bibsstring{from\thefield{origlanguage}}}}%
+  {\unspace}}
+
+%%%% Formatting macros, called both by cbx and bbx %%%%
+
+\newbibmacro*{finentry}{%{\finentry} To make annotated bibliography
+  \ifbibliography
+    {\usebibmacro{entrytail}}
+    {}%
+  \finentry}
+
+\newbibmacro*{entrytail}{% From reading.bbx, for annotated bibliography
+  \newunit\newblock
+  \iftoggle{cms@annotation}
+    {\usebibmacro{annotation}%
+     \newunit\newblock}
+    {}}%
+
+\newbibmacro*{author+holder}{%
+  \ifnameundef{author}
+    {\let\bbx@lasthash\undefined}
+    {\usebibmacro{author/editor}%
+     \ifthenelse{\ifnameundef{holder}\OR
+                 \ifnamesequal{author}{holder}}
+       {}
+       {\setunit{\addspace}%
+        \printtext[parens]{\printnames{holder}}}}}
+
+\renewbibmacro*{byauthor}{%
+  \ifthenelse{\ifuseauthor\OR
+              \ifnameundef{author}}
+    {}
+    {\bibstring{by}\addspace
+     \printnames[byauthor]{author}}}
+
+\newbibmacro*{byauthorpunct}{%
+  \ifthenelse{\ifuseauthor\OR\ifnameundef{author}}%
+  {\addperiod\addspace}%
+  {\newcunit}}
+
+\renewbibmacro*{bybookauthor}{%
+  \ifnameundef{bookauthor}
+    {}
+    {\ifnamesequal{author}{bookauthor}
+      {}
+      {\bibstring{by}\addspace\printnames[default]{bookauthor}%
+     \newcunit\newblock}}}
+
+\newbibmacro*{editorpunct}{%
+  \ifthenelse{\(\iffieldundef{booktitle}\AND\iffieldundef{maintitle}\)%
+    \OR\iffieldsequal{booktitle}{title}%  Changed these for crossrefed
+    \OR\iffieldsequal{maintitle}{title}}% entries.  Create problems?
+  {\iffieldequalstr{entrytype}{video}%
+    {\newcunit\newblock}%
+    {\newunit\newblock}}%
+  {\newcunit\newblock}}
+
+\newbibmacro*{edition}{%
+  \printfield{edition}%
+    \clearfield{edition}}%
+
+\newbibmacro*{inforaft}{%
+  \ifnameundef{introduction}%
+  {\ifnameundef{afterword}%
+    {\ifnameundef{foreword}%
+      {\printfield{type}}%
+      {\bibstring{forewordto}%
+        \clearname{foreword}}}%
+    {\bibstring{afterwordto}%
+      \clearname{afterword}}}%
+  {\bibstring{introductionto}%
+    \clearname{introduction}}}
+
+\newbibmacro*{langlist:andothers}{%
+  \ifthenelse{\value{listcount}=\value{liststop}\AND
+              \ifmoreitems}
+    {\ifnum\value{liststop}>1 \finalandcomma\fi
+     \andmoredelim\bibstring{andmore}\bibrightbracket}
+    {}}
+
+\newbibmacro*{reference+title}{%
+  \ifthenelse{\iffieldequals{title}{\bbx@lasthash}\AND\NOT
+      \iffirstonpage}%
+    {\bibnamedash\addperiod\addspace}%
+    {\usebibmacro{italtitle+stitle}%
+      \savefield{title}{\bbx@lasthash}}}
+
+\newbibmacro*{mag+news+author}{%
+  \ifnameundef{author}%
+  {\ifthenelse{\iffieldequals{journaltitle}{\bbx@lasthash}\AND\NOT
+      \iffirstonpage}%
+    {\bibnamedash\addperiod\addspace}%
+    {\usebibmacro{journal+sub}%
+      \setunit*{\addspace}%
+      \printlist[periodplace]{location}%
+      \savefield{journaltitle}{\bbx@lasthash}}}%
+  {\usebibmacro{author}}}
+
+\newbibmacro*{cmag+news+author}{%
+  \ifnameundef{author}%
+  {\usebibmacro{journal+sub}%
+    \setunit*{\addspace}%
+    \printlist[periodplace]{location}}%
+  {\usebibmacro{author}}}
+
+\newbibmacro*{type+inst+year}{%
+  \printfield{type}
+  \newcunit
+  \printlist{institution}%
+  \setunit*{\addcomma\space}%
+  \printfield{year}}
+
+\newbibmacro*{institution+organization}{%
+  \iflistundef{organization}%
+  {\iflistundef{institution}%
+    {}%
+    {\printlist{institution}}}%
+  {\printlist{organization}%
+    \newcunit%
+    \printlist{institution}}}
+
+\newbibmacro*{author+org}{%
+  \ifnameundef{author}%
+  {\ifnameundef{editor}%
+    {\iflistundef{organization}%
+      {\let\bbx@lasthash\undefined}%
+      {\ifboolexpr{
+          test {\iflistequals{organization}{\bbx@lasthash}}
+          and
+          not test {\iffirstonpage}
+        }%
+        {\bibnamedash\addperiod\addspace}%
+        {\iftoggle{cms@authorparens}%
+          {\bibopenparen\printlist{organization}\bibcloseparen}%
+          {\printlist{organization}}%
+          \savelist{organization}{\bbx@lasthash}}}}%
+    {\usebibmacro{editor}}}%
+  {\usebibmacro{author/editor}}}
+
+\newbibmacro*{cbytypestrg}[2]{%
+  \iffieldundef{#1type}
+    {\bibstring{by#2}}
+    {\bibstring{by\thefield{#1type}}}}
+
+\newbibmacro*{cbyeditor}{%
+  \ifnameundef{editor}
+    {}
+    {\usebibmacro{cbytypestrg}{editor}{editor}%
+     \setunit{\addspace}%
+     \printnames[byeditor]{editor}%
+     \newcunit}%
+  \usebibmacro{cbyeditorx}}
+
+\newbibmacro*{cbyeditorx}{%
+  \ifnameundef{editora}
+    {}
+    {\usebibmacro{cbytypestrg}{editora}{editor}%
+     \setunit{\addspace}%
+     \printnames[byeditora]{editora}%
+     \newcunit}%
+  \ifnameundef{editorb}
+    {}
+    {\usebibmacro{cbytypestrg}{editorb}{editor}%
+     \setunit{\addspace}%
+     \printnames[byeditorb]{editorb}%
+     \newcunit}%
+  \ifnameundef{editorc}
+    {}
+    {\usebibmacro{cbytypestrg}{editorc}{editor}%
+     \setunit{\addspace}%
+     \printnames[byeditorc]{editorc}%
+     \newcunit}}
+
+\newbibmacro*{cbytranslator}{%
+  \ifnameundef{translator}
+  {}
+  {\bibstring{bytranslator}%
+    \addspace
+    \printnames[bytranslator]{translator}}}
+
+\newbibmacro*{cbycompiler}{%
+  \ifnameundef{namec}
+    {}
+    {\bibstring{cbycompiler}\addspace
+     \printnames[bycompiler]{namec}}}
+
+\newbibmacro*{cbyredactor}{%
+  \ifnameundef{redactor}
+    {}
+    {\bibstring{cbyredactor}\addspace
+     \printnames[byredactor]{redactor}}}
+
+\newbibmacro*{cwithcommentator}{%
+  \ifnameundef{commentator}
+    {}
+    {\bibstring{withcommentator}\addspace
+     \printnames[withcommentator]{commentator}}}
+
+\newbibmacro*{cwithannotator}{%
+  \ifnameundef{annotator}
+    {}
+    {\bibstring{withannotator}\addspace
+     \printnames[withannotator]{annotator}}}
+
+\newbibmacro*{cwithintroduction}{%
+  \ifnameundef{introduction}
+    {}
+    {\bibstring{withintroduction}\addspace
+     \printnames[withintroduction]{introduction}}}
+
+\newbibmacro*{cwithforeword}{%
+  \ifnameundef{foreword}
+    {}
+    {\bibstring{withforeword}\addspace
+     \printnames[withforeword]{foreword}}}
+
+\newbibmacro*{cwithafterword}{%
+  \ifnameundef{afterword}
+    {}
+    {\bibstring{withafterword}\addspace
+     \printnames[withafterword]{afterword}}}
+
+\newbibmacro*{cbyeditor+others}{%
+  \ifthenelse{\NOT\ifnameundef{editor}\AND
+    \(\iffieldundef{editortype}\OR
+    \iffieldequalstr{editortype}{editor}\)}
+  {\def\@tempa{cbyeditor}%
+    \ifnamesequal{editor}{translator}
+    {\edef\@tempa{\@tempa tr}%
+      \clearname{translator}}
+    {}%
+    \ifnamesequal{editor}{namec}
+    {\edef\@tempa{\@tempa cp}%
+      \clearname{namec}}
+    {}%
+    \ifnamesequal{editor}{commentator}
+    {\edef\@tempa{\@tempa co}%
+      \clearname{commentator}}
+    {\ifnamesequal{editor}{annotator}
+      {\edef\@tempa{\@tempa an}%
+        \clearname{annotator}}
+      {}}%
+    \ifnamesequal{editor}{introduction}
+    {\edef\@tempa{\@tempa in}%
+      \clearname{introduction}}
+    {\ifnamesequal{editor}{foreword}
+      {\edef\@tempa{\@tempa fo}%
+        \clearname{foreword}}
+      {\ifnamesequal{editor}{afterword}
+        {\edef\@tempa{\@tempa af}%
+          \clearname{afterword}}
+        {}}}%
+    \bibstring{\@tempa}\space
+    \printnames[byeditor]{editor}%
+    \clearname{editor}%
+    \newcunit%
+    \usebibmacro{cbyeditorx}}%
+  {\usebibmacro{cbyeditor}}%
+  \usebibmacro{cbytranslator+others}}
+
+\newbibmacro*{cbytranslator+others}{%
+  \ifnameundef{translator}
+    {}
+    {\def\@tempa{cbytranslator}%
+      \ifnamesequal{translator}{namec}
+      {\edef\@tempa{\@tempa cp}%
+        \clearname{namec}}
+      {}%
+     \ifnamesequal{translator}{commentator}
+       {\edef\@tempa{\@tempa co}%
+        \clearname{commentator}}
+       {\ifnamesequal{translator}{annotator}
+          {\edef\@tempa{\@tempa an}%
+           \clearname{annotator}}
+          {}}%
+     \ifnamesequal{translator}{introduction}
+       {\edef\@tempa{\@tempa in}%
+        \clearname{introduction}}
+       {\ifnamesequal{translator}{foreword}
+          {\edef\@tempa{\@tempa fo}%
+           \clearname{foreword}}
+          {\ifnamesequal{translator}{afterword}
+             {\edef\@tempa{\@tempa af}%
+              \clearname{afterword}}
+             {}}}%
+     \bibstring{\@tempa}\space
+     \printnames[bytranslator]{translator}%
+     \clearname{translator}%
+     \newcunit}%
+  \usebibmacro{cbycompiler+others}}
+
+\newbibmacro*{cbycompiler+others}{%
+  \ifnameundef{namec}
+    {}
+    {\def\@tempa{cbycompiler}%
+     \ifnamesequal{namec}{commentator}
+       {\edef\@tempa{\@tempa co}%
+        \clearname{commentator}}
+       {\ifnamesequal{namec}{annotator}
+          {\edef\@tempa{\@tempa an}%
+           \clearname{annotator}}
+          {}}%
+     \ifnamesequal{namec}{introduction}
+       {\edef\@tempa{\@tempa in}%
+        \clearname{introduction}}
+       {\ifnamesequal{namec}{foreword}
+          {\edef\@tempa{\@tempa fo}%
+           \clearname{foreword}}
+          {\ifnamesequal{namec}{afterword}
+             {\edef\@tempa{\@tempa af}%
+              \clearname{afterword}}
+             {}}}%
+     \bibstring{\@tempa}\space
+     \printnames[bycompiler]{namec}%
+     \clearname{namec}%
+     \newcunit}%
+  \usebibmacro{cbyothers}}
+
+\newbibmacro*{cbyothers}{%
+  \usebibmacro{cbytranslator}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{cbycompiler}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{cbyredactor}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{cwithcommentator}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{cwithannotator}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{cwithintroduction}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{cwithforeword}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{cwithafterword}}
+
+\newbibmacro*{cms-in:}{% Fix for 0.9a compat.
+  \iftoggle{cms@origpublished}%
+  {}%
+  {\bibstring{in}%
+    \setunit{\addspace}}}
+
+\newbibmacro*{alt-in:}{%
+  \iffieldundef{booktitle}%
+  {}
+  {\bibstring{in}%
+    \setunit{\addspace}}}
+
+\newbibmacro*{chapincoll}{%
+  \iffieldundef{chapter}%
+  {}
+  {\printfield{chapter}\addspace}}
+
+\newbibmacro*{chapinscore}{%
+  \iffieldundef{chapter}%
+  {\ifthenelse{\iffieldequalstr{entrytype}{music}%
+      \AND\NOT\iffieldundef{booktitle}}%
+    {\bibstring{on}\setunit{\addspace}}%
+    {}}%
+  {\printfield{chapter}%
+    \addspace\bibstring{of}\setunit{\addspace}}}
+
+\newbibmacro*{music+ser+num}{%
+  \iffieldundef{series}%
+  {\iffieldundef{number}%
+    {}%
+    {\printfield{number}}}
+  {\printfield{series}%
+    \setunit{\addspace}%
+    \printfield{number}}}%
+
+\newbibmacro*{music+publisher}{%
+  \iffieldundef{howpublished}%
+  {\iffieldundef{pubstate}%
+    {}%
+    {\printfield{pubstate}}}%
+  {\printfield{howpublished}}}%
+
+\newbibmacro*{music+origdate}{%
+  \iftoggle{cms@reprint}% 16th ed.
+  {}%
+  {\iftoggle{cms@switchdates}% Date fix
+    {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}%
+      {}%
+      {\usebibmacro{cmsorigdate}}}%
+    {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}}%
+      {}%
+      {\usebibmacro{cmsorigdate}}}}}%
+
+\newbibmacro*{music+eventdate}{% Date fix
+  \ifthenelse{\iffieldundef{eventyear}\AND\iffieldundef{eventmonth}}%
+  {}%
+  {\printeventdate}}
+
+\newbibmacro*{ser+num}{%
+  \printfield{series}%
+  \printfield[sernum]{number}%
+  \newunit}
+
+\newbibmacro*{video+title}{%
+  \printtext{%
+    \printfield{title}%
+    \setunit{\addcolon\addspace}%
+    \printfield[title]{subtitle}}}
+
+\newbibmacro*{italtitle+stitle}{%
+  \printtext{%
+    \printfield{title}%
+    \setunit{\addcolon\addspace}%
+    \printfield[title]{subtitle}}%
+  \newunit\newblock%
+  \printfield{titleaddon}%
+  \setunit{\addspace}%
+  \usebibmacro{language+transtitle}%
+  \newunit\newblock}
+
+\newbibmacro*{mag+news+title}{%
+  \printtext{%
+       \printfield{title}%
+       \setunit{\addcolon\addspace}%
+       \printfield[title]{subtitle}}%
+     \newunit%\setunit{\addcomma\addspace}
+     \printfield{titleaddon}%
+     }%\newcunit\newblock
+
+\newbibmacro*{language+transtitle}{%
+  \iffieldundef{usere}%
+  {\printlist[][-\value{listtotal}]{language}}%
+  {\printfield{usere}}}
+
+\newbibmacro*{issuetitle}{%
+  \iffieldundef{issuetitle}%
+  {}
+  {\ifthenelse{\iffieldequalstr{entrytype}{article}\OR%
+      \iffieldequalstr{entrytype}{review}\OR%
+      \iffieldequalstr{entrytype}{suppperiodical}}% This test is for
+    {\usebibmacro{cms-in:}}% periodical entries
+    {}%
+    \printtext{%
+      \printfield{issuetitle}%
+      \setunit{\addcolon\addspace}%
+      \printfield[issuetitle]{issuesubtitle}}}}
+
+\newbibmacro*{btitle+bstitle}{%
+  \iffieldundef{booktitle}
+    {}
+    {\printtext{%
+       \printfield{booktitle}%
+       \setunit{\addcolon\addspace}%
+       \printfield[booktitle]{booksubtitle}}%
+     \newcunit
+     \printfield{booktitleaddon}}}
+
+\newbibmacro*{publ+loc+year}{%
+  \printlist{location}%
+  \iflistundef{publisher}%
+  {\setunit*{\addcomma\addspace}}%
+  {\setunit*{\addcolon\addspace}}%
+  \printlist{publisher}%
+  \setunit*{\addcomma\addspace}
+  \usebibmacro{date}% For the author-date style.  Tricky.
+}%
+
+\newbibmacro*{origpubl+loc+year}{% 16th ed.
+  \printlist{origlocation}%
+  \iflistundef{origpublisher}%
+  {\setunit*{\addcomma\addspace}}%
+  {\setunit*{\addcolon\addspace}}%
+  \printlist{origpublisher}%
+%  \setunit*{\addcomma\addspace}%
+%  \usebibmacro{cmsorigdate}%
+}
+
+\newbibmacro*{howpubl+loc+year}{%
+  \printlist{location}%
+  \iffieldundef{howpublished}%
+  {\setunit*{\addcomma\space}}%
+  {\setunit*{\addcolon\space}}%
+  \printfield{howpublished}%
+  \setunit*{\addcomma\space}%
+  \usebibmacro{date}%
+}%
+
+\newbibmacro*{inst+loc+year}{%
+  \printlist{location}%
+  \iflistundef{institution}%
+  {\setunit*{\addcomma\space}}%
+  {\setunit*{\addcolon\space}}%
+  \printlist{institution}%
+  \setunit*{\addcomma\space}%
+  \usebibmacro{date}%
+}%
+
+\newbibmacro*{originally+published+as}{% Punctuation fix now in 
+  \iffieldundef{userf}%                  \origfullcite for 0.8e. 
+  {\iffieldundef{reprinttitle}%
+    {}
+    {\bibstring{origpublin}%
+      \origpublcite{\thefield{reprinttitle}}%
+      \newunit}}
+  {\iffieldundef{origlanguage}%
+    {\bibstring{origpub}%
+      \origfullcite{\thefield{userf}}
+      \newunit}%
+    {\iftoggle{cms@postposit}%
+      {\bibstring{origedition}%
+        \setunit{\addspace}%
+        \printfield[edlang]{origlanguage}%
+        \addcolon%
+        \origfullcite{\thefield{userf}}%
+        \newunit}%
+      {\printfield[edlang]{origlanguage}%
+        \setunit{\addspace}%
+        \bibstring{origedition}%
+        \origfullcite{\thefield{userf}}
+        \newunit}}}}
+
+\newbibmacro*{org+publ+loc+year}{% What was wrong with \ifthenelse here?
+  \printlist{location}%
+  \iflistundef{organization}%
+  {\iflistundef{publisher}%
+    {\setunit*{\addcomma\addspace}}%
+    {\setunit*{\addcolon\addspace}}}%
+  {\setunit*{\addcolon\addspace}}%
+  \printlist{organization}%
+  \setunit*{\addcomma\space}%
+  \printlist{publisher}%
+  \setunit*{\addcomma\addspace}%
+  \usebibmacro{date}}
+
+\newbibmacro*{year+in+parens}{%
+  \iffieldundef{volume}%
+  {noformat}%
+  {parens}}
+
+\newbibmacro*{letter+date}{% New for 0.9
+  \iflistundef{origlocation}%
+  {}%
+  {\printlist{origlocation}%
+    \newcunit\newblock}%
+  \iftoggle{cms@switchdates}%
+  {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}%
+    {}%
+    {\cms@datelongalt}}%
+  {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}}%
+    {}%
+    {\cms@datelong}}}
+
+\newbibmacro*{unpubl+letter+date}{% For the Misc type.
+  \iflistundef{origlocation}%
+  {}%
+  {\printlist{origlocation}%
+    \newcunit\newblock}%
+  \iftoggle{cms@switchdates}%
+  {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}%
+    {}%
+    {\cms@datelongalt}}%
+  {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}}%
+    {\printdate}% For interviews and other dated non-letters
+    {\cms@datelong}}}
+
+\newbibmacro*{cmsbookdate}{%
+  \ifthenelse{\iffieldundef{year}\AND\iffieldundef{origyear}}%
+  {\newunit}%
+  {\iftoggle{cms@switchdates}%
+    {\iffieldundef{origyear}%
+      {\newunit}%
+      {\newcunit\printorigdate}}%
+    {\iffieldundef{year}%
+      {\newunit}%
+      {\newcunit\printdate}}}}
+
+\renewbibmacro*{date}{% Adding the test solved some issues in 0.9 with
+  \iftoggle{cms@switchdates}
+  {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}
+    \AND\iffieldundef{origday}}%
+    {}%
+    {\printorigdate}}%
+  {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}
+    \AND\iffieldundef{day}}%  punctuation in some entry types (Misc).  The 
+    {}%                   whole \printdate thing may need further work. 
+    {\printdate}}}
+
+\newcommand*{\cms@datelong}{% Modified for 0.9
+  \iffieldundef{origmonth}%
+  {\printfield{origyear}}%
+  {\printfield[letterday]{origday}\setunit{\nobreakspace}%
+    \mkbibmonth{\thefield{origmonth}}\setunit{\nobreakspace}%
+    \printfield{origyear}}}%
+
+\newcommand*{\cms@datelongalt}{% Modified for 0.9
+  \iffieldundef{month}%
+  {\printfield{year}}%
+  {\printfield[letterday]{day}\setunit{\nobreakspace}%
+    \mkbibmonth{\thefield{month}}\setunit{\nobreakspace}%
+    \printfield{year}}}%
+
+\newcommand*{\letterdatelong}{% Modified for 0.9
+  \iftoggle{cms@switchdates}% This one for users
+  {\iffieldundef{year}% Previous two for internal use
+    {}%
+    {\iffieldundef{month}%
+      {\printfield{year}}%
+      {\printfield[letterday]{day}\setunit{\nobreakspace}%
+        \mkbibmonth{\thefield{month}}\setunit{\nobreakspace}%
+        \printfield{year}}}}%
+  {\iffieldundef{origyear}%
+    {}%
+    {\iffieldundef{origmonth}%
+      {\printfield{origyear}}%
+      {\printfield[letterday]{origday}\setunit{\nobreakspace}%
+        \mkbibmonth{\thefield{origmonth}}\setunit{\nobreakspace}%
+        \printfield{origyear}}}}}%
+
+\newbibmacro*{cjournal+ser+vol+num}{%
+  \usebibmacro{journal+sub}%
+  \setunit*{\addspace}%
+  \printlist[periodplace]{location}%
+  \setunit*{\addspace}%
+  \iffieldundef{series}
+    {}
+    {\newcunit
+      \printfield[jourser]{series}%
+      \newcunit}%\setunit*{\addspace}?
+  \ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}%
+  {\iffieldundef{volume}%
+    {\newcunit%
+      \printfield[journum]{number}%
+      \clearfield{number}%
+      \setunit{\addcomma\addspace}}
+    {\printfield[jourvol]{volume}%
+      \setunit{\addcomma\addspace}}}%
+  {\printfield[jourvol]{volume}%
+    \newcunit%
+    \printfield[journum]{number}%
+    \clearfield{number}%
+    \setunit{\addcomma\addspace}}% need * here?
+  \printfield{eid}%
+  \newunit}
+
+\newbibmacro*{cperiodical+ser+vol+num}{% For periodical entries,
+  \printtext{% article subtype
+    \printfield{title}%
+    \setunit{\addcolon\addspace}%
+    \printfield[title]{subtitle}}% 
+  \setunit*{\addspace}%
+  \printlist[periodplace]{location}%
+  \setunit*{\addspace}%
+  \iffieldundef{series}
+  {}
+  {\newcunit
+    \printfield[jourser]{series}%
+    \newcunit}%\setunit*{\addspace}?
+  \ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}%
+  {\printfield[jourvol]{volume}%
+    \setunit{\addcomma\addspace}}%
+  {\printfield[jourvol]{volume}%
+    \setunit{\addcomma\addspace}% need * here?
+    \printfield[journum]{number}%
+    \clearfield{number}%
+    \setunit{\addcomma\addspace}}%
+  \printfield{eid}%
+  \newunit}
+
+\newbibmacro*{journal+sub}{%
+  \iffieldundef{journaltitle}
+    {}
+    {\printtext[journaltitle]{%
+       \printfield[noformat]{journaltitle}%
+       \setunit{\addcolon\addspace}%
+       \printfield[noformat]{journalsubtitle}}}}
+
+% \newbibmacro*{url+date}{% Changed for 0.9: No longer used?
+%   \printfield{url}%
+%   \iffieldundef{urlyear}
+%     {}
+%     {\setunit{\addspace}%
+%      \printtext[urldate]{\printurldate}}}
+
+\newbibmacro*{chap+pag}{%
+  \printfield{chapter}%
+  \setunit*{\addcomma\space}%
+  \printfield{pages}}
+
+\newbibmacro*{mag+news+date}{%
+  \ifnameundef{author}%
+  {\usebibmacro{date+issue}}%
+  {\usebibmacro{mag+date+issue}}}
+
+\newbibmacro*{date+issue}{%
+  \iffieldundef{issue}
+  {\iffieldundef{number}%
+    {\usebibmacro{date}}%
+    {\iftoggle{cms@numbermonth}%
+      {\usebibmacro{date}}%
+      {\usebibmacro{cmsyear}}%
+      \setunit*{\addcomma\addspace}% Starred version for when the 
+      \printfield[journum]{number}}}% month isn't printed because of
+  {\printfield{issue}% the toggle.
+    \setunit{\addspace}%
+    \usebibmacro{cmsyear}}}
+
+\newbibmacro*{mag+date+issue}{%
+  \usebibmacro{journal+sub}%
+  \setunit*{\addspace}%
+  \printlist[periodplace]{location}%
+  \newcunit\newblock
+  \printfield{usera}% For network ID and possible section of newspaper.
+  \newcunit\newblock
+  \usebibmacro{date+issue}}
+
+\newbibmacro*{cmsyear}{%
+  \iftoggle{cms@switchdates}%
+  {\printfield{origyear}}%
+  {\printfield{year}}}
+
+\newbibmacro*{cmsorigdate}{% New for 0.9
+  \iftoggle{cms@switchdates}%
+  {\printdate}%
+  {\printorigdate}}
+
+\newbibmacro*{periodical+date+issue}{% For periodical type &
+  \printtext[title]{% magazine subtype
+    \printfield[noformat]{title}%
+    \setunit{\addcolon\addspace}%
+    \printfield[noformat]{subtitle}}%
+  \setunit*{\addspace}%
+  \printlist[periodplace]{location}%
+  \newcunit\newblock
+  \printfield{usera}% For network ID and possible section of newspaper.
+  \newcunit\newblock
+  \usebibmacro{date+issue}}
+
+\newbibmacro*{cmtitle+mstitle+vol+part+title+stitle}{%
+  \iffieldundef{maintitle}
+  {}
+  {\iffieldundef{volume}
+    {\printtext{%
+        \printfield{maintitle}%
+      \setunit{\addcolon\addspace}%
+      \printfield[maintitle]{mainsubtitle}}%
+    \newcunit
+    \printfield{maintitleaddon}}
+  {\printfield{volume}%
+    \printfield{part}%
+    \setunit{\addspace}
+    \bibstring{ofseries}%
+    \setunit{\addspace}
+    \printtext{%
+      \printfield{maintitle}%
+      \setunit{\addcolon\addspace}%
+      \printfield[maintitle]{mainsubtitle}}%
+    \newcunit
+    \printfield{maintitleaddon}}}}
+
+\newbibmacro*{cmtitle+mstitle+vol+part+btitle+bstitle}{%
+  \usebibmacro{btitle+bstitle}%
+  \newcunit
+  \iffieldundef{maintitle}
+  {}
+  {\iffieldundef{volume}
+    {\printtext{%
+        \printfield{maintitle}%
+      \setunit{\addcolon\addspace}%
+      \printfield[maintitle]{mainsubtitle}}%
+    \newcunit
+    \printfield{maintitleaddon}}
+  {\printfield{volume}%
+    \printfield{part}%
+    \setunit{\addspace}
+    \bibstring{ofseries}%
+    \setunit{\addspace}
+    \printtext{%
+      \printfield{maintitle}%
+      \setunit{\addcolon\addspace}%
+      \printfield[maintitle]{mainsubtitle}}%
+    \newcunit
+    \printfield{maintitleaddon}}}}
+
+\renewbibmacro*{postnote}{%
+  \iffieldundef{postnote}%
+  {}%
+  {\setunit{\postnotedelim}%
+  \printfield{postnote}}}
+
+\newbibmacro*{part+editor+translator}{%
+  \ifnameundef{namea}%
+  {\ifnameundef{nameb}%
+    {}
+    {\bibstring{bytranslator}\space%
+    \printnames[bytranslator]{nameb}}}%
+{\ifnamesequal{namea}{nameb}%
+  {\bibstring{byeditortr}\space%
+    \printnames[byeditor]{namea}}%
+  {\bibstring{byeditor}\space%
+    \printnames[byeditor]{namea}%
+    \ifnameundef{nameb}%
+    {}
+    {\newunit
+      \bibstring{bytranslator}\space%
+      \printnames[bytranslator]{nameb}}}}}
+
+\newbibmacro*{compilestrg}{%
+  \ifthenelse{\value{namec}>1\OR\ifandothers{namec}}
+  {\bibstring{compilers}}
+  {\bibstring{compiler}}
+  \clearname{namec}}
+
+\newbibmacro*{transstrg}{%
+  \ifthenelse{\value{translator}>1\OR\ifandothers{translator}}
+    {\ifnamesequal{translator}{namec}%
+      {\bibstring{transcompilers}%
+        \clearname{namec}}%
+      {\bibstring{translators}}}%
+    {\ifnamesequal{translator}{namec}%
+      {\bibstring{transcompiler}%
+        \clearname{namec}}%
+      {\bibstring{translator}}}
+    \clearname{translator}}
+
+\newbibmacro*{parttransstrg}{%
+  \ifthenelse{\value{nameb}>1\OR\ifandothers{nameb}}
+    {\ifnamesequal{nameb}{namec}%
+      {\bibstring{transcompilers}%
+        \clearname{namec}}%
+      {\bibstring{translators}}}%
+    {\ifnamesequal{nameb}{namec}%
+      {\bibstring{transcompiler}%
+        \clearname{namec}}%
+      {\bibstring{translator}}}
+    \clearname{nameb}}
+
+\newbibmacro*{editstrg}{% Test added for 0.9
+  \ifthenelse{\iffieldundef{editortype}\OR
+    \iffieldequalstr{editortype}{editor}}
+  {\ifthenelse{\value{editor}>1\OR\ifandothers{editor}}
+    {\ifthenelse{\ifnamesequal{editor}{translator}\AND
+        \ifnamesequal{editor}{namec}}
+      {\bibstring{editortranscompilers}%
+        \clearname{translator}%
+        \clearname{namec}}%
+      {\ifnamesequal{editor}{namec}%
+        {\bibstring{editorcompilers}%
+          \clearname{namec}}%
+        {\ifnamesequal{editor}{translator}%
+          {\bibstring{editortranslators}%
+            \clearname{translator}}%
+          {\bibstring{editors}}}}}%
+    {\ifthenelse{\ifnamesequal{editor}{translator}\AND
+        \ifnamesequal{editor}{namec}}
+      {\bibstring{editortranscompiler}%
+        \clearname{translator}%
+        \clearname{namec}}%
+      {\ifnamesequal{editor}{namec}%
+        {\bibstring{editorcompiler}%
+          \clearname{namec}}%
+        {\ifnamesequal{editor}{translator}%
+          {\bibstring{editortranslator}%
+            \clearname{translator}}%
+          {\bibstring{editor}}}}}}%
+  {\ifthenelse{\value{editor}>1\OR\ifandothers{editor}}
+    {\bibstring{\thefield{editortype}s}}
+    {\bibstring{\thefield{editortype}}}}
+  \clearname{editor}}
+
+\newbibmacro*{parteditstrg}{%
+  \ifthenelse{\value{namea}>1\OR\ifandothers{namea}}
+    {\ifthenelse{\ifnamesequal{namea}{nameb}\AND
+        \ifnamesequal{namea}{namec}}
+      {\bibstring{editortranscompilers}%
+        \clearname{nameb}%
+        \clearname{namec}}%
+      {\ifnamesequal{namea}{namec}%
+        {\bibstring{editorcompilers}%
+          \clearname{namec}}%
+        {\ifnamesequal{namea}{nameb}%
+          {\bibstring{editortranslators}%
+            \clearname{nameb}}%
+          {\bibstring{editors}}}}}%
+    {\ifthenelse{\ifnamesequal{namea}{nameb}\AND
+        \ifnamesequal{namea}{namec}}
+      {\bibstring{editortranscompiler}%
+        \clearname{nameb}%
+        \clearname{namec}}%
+      {\ifnamesequal{namea}{namec}%
+        {\bibstring{editorcompiler}%
+          \clearname{namec}}%
+        {\ifnamesequal{namea}{nameb}%
+          {\bibstring{editortranslator}%
+            \clearname{nameb}}%
+          {\bibstring{editor}}}}}%
+    \clearname{namea}}
+
+\newbibmacro*{clearpublin}{%
+  \clearname{author}%
+  \clearname{namea}%
+  \clearname{nameb}%
+  \clearfield{nameaddon}%
+  \clearfield{title}%
+  \clearfield{subtitle}%
+  \clearfield{titleaddon}%
+  \clearfield{reprinttitle}%
+  \clearfield{usere}%
+  \clearlist{language}%
+}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
index 6b2d48b7709..36b6b6e12c2 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.bbx
@@ -1,10 +1,10 @@
-% $Id: chicago-authordate.bbx,v 0.8.1.18 2012/07/05 11:03:42 dfussner Exp $
+% $Id: chicago-authordate.bbx,v 0.8.1.23 2012/12/06 11:40:16 dfussner Exp $
 % This is a biblatex style file, adapted mainly from Lehman's
 % standard.bbx and from chicago-notes.bbx.  It provides the
 % reference list formatting for the Chicago author-date style.
 
 
-\ProvidesFile{chicago-authordate.bbx}[2012/07/05 v 1.7 biblatex
+\ProvidesFile{chicago-authordate.bbx}[2012/12/06 v 2.4 biblatex
 bibliography style]
 
 %%%% Initialize and format bibliography and los %%%%
@@ -1518,9 +1518,14 @@ bibliography style]
   \newunit\newblock
   \ifthenelse{\iffieldundef{urlyear}\AND\iffieldundef{urlmonth}}%
   {}%
-  {\printtext[urldate]{\printurldate}}%
+  {\printurldate}% Date fix
   \newunit\newblock
-  \printfield{doi}%
+  \iftoggle{cms@doionly}%
+  {\iffieldundef{doi}%
+    {}%
+    {\printfield{doi}%
+      \clearfield{url}}}%
+  {\printfield{doi}}%
   \newunit\newblock%
   \usebibmacro{eprint}%
   \newunit\newblock
@@ -2059,10 +2064,7 @@ bibliography style]
   \printfield{nameaddon}%
   \newunit\newblock
   \ifundef\bbx@lasthash{%
-  \printtext[title]{%
-    \printfield[noformat]{title}%
-    \setunit{\addcolon\addspace}%
-    \printfield[noformat]{subtitle}}%
+  \usebibmacro{video+title}% Simplifies trad style
   \iffieldundef{booktitle}% Comma after italics, period after quotes
   {\newcunit}
   {\newunit}%\setunit{\addspace}\newblock%
@@ -2073,10 +2075,7 @@ bibliography style]
   \usebibmacro{cmsbibsortdate}%
   \newunit\newblock
   \ifundef\bbx@lasthash{}{%
-  \printtext[title]{%
-    \printfield[noformat]{title}%
-    \setunit{\addcolon\addspace}%
-    \printfield[noformat]{subtitle}}%
+  \usebibmacro{video+title}% Simplifies trad style
   \iffieldundef{booktitle}% Comma after italics, period after quotes
   {\newcunit}
   {\newunit}%\setunit{\addspace}\newblock%
@@ -2173,11 +2172,16 @@ bibliography style]
 \newbibmacro*{bib+doi+url}{% 16th ed.
   \ifthenelse{\iffieldundef{urlyear}\AND\iffieldundef{urlmonth}}%
   {}%
-  {\printtext[urldate]{\printurldate}}%
+  {\printurldate}% Date fix
   \newunit\newblock
-  \iftoggle{cms@doi}%
-  {\printfield{doi}}%
-  {}%
+  \iftoggle{cms@doionly}%
+  {\iffieldundef{doi}%
+    {}%
+    {\printfield{doi}%
+      \clearfield{url}}}%
+  {\iftoggle{cms@doi}%
+    {\printfield{doi}}%
+    {}}%
   \newunit\newblock
   \iftoggle{cms@eprint}%
   {\usebibmacro{eprint}}%
@@ -2439,9 +2443,13 @@ bibliography style]
 \newbibmacro*{pubstate}{%
   \iftoggle{cms@reprint}%
   {\iftoggle{cms@switchdates}%
-    {}
+    {\iffieldundef{year}% Fix for consistency???
+      {}%
+      {\printtext{% 16th ed.
+          \usebibmacro{choosepubstring}%
+          \printdate\addperiod}\nopunct}}
     {\iffieldundef{origyear}%
-      {}
+      {}%
       {\printtext{% 16th ed.
           \usebibmacro{choosepubstring}%
           \printorigdate\addperiod}\nopunct}}}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
index 8ff2919f00f..b73c23d5fa4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate.cbx
@@ -1,10 +1,10 @@
-% $Id: chicago-authordate.cbx,v 0.8.1.19 2012/07/05 11:04:14 dfussner Exp $
+% $Id: chicago-authordate.cbx,v 0.8.1.25 2012/12/06 11:43:37 dfussner Exp $
 % This is a biblatex citation style file, adapted from Lehman's
 % authoryear-comp.cbx.  It is heavily modified, with the intention of
 % providing inline citations (and a reference list) for the
-% author-date style of the Chicago Manual of Style, 15th edition.
+% author-date style of the Chicago Manual of Style, 16th edition.
 
-\ProvidesFile{chicago-authordate.cbx}[2012/07/05 v 1.7 biblatex citation style]
+\ProvidesFile{chicago-authordate.cbx}[2012/12/06 v 2.4 biblatex citation style]
 
 %%%% Biblatex initialization + Chicago options + Toggles %%%%
 
@@ -27,6 +27,7 @@
 
 \providetoggle{cms@url}% These are for the field-exclusion options
 \providetoggle{cms@doi}
+\providetoggle{cms@doionly}
 \providetoggle{cms@eprint}
 \providetoggle{cms@isbn}
 \providetoggle{cms@numbermonth}
@@ -55,7 +56,10 @@
   {\csuse{cms@opt@avdate@#1}}
   {\blx@err@invopt{avdate=#1}{}}}
 \def\cms@opt@avdate@true{%
-  \DeclareLabelyear[music,review,video]{eventyear,origyear,year,urlyear}%
+  \@ifpackagelater{biblatex}{2012/11/20}% for biblatex 2.4
+  {\DeclareLabelyear[music,review,video]{\field{eventyear}%
+      \field{origyear} \field{year} \field{urlyear}}}%
+  {\DeclareLabelyear[music,review,video]{eventyear,origyear,year,urlyear}}%
   \toggletrue{cms@avdate}}%
 \def\cms@opt@avdate@false{%
   \togglefalse{cms@avdate}}
@@ -64,12 +68,6 @@
   \ifcsdef{cms@opt@cmsdate@#1}% labelyear. Sorting will be an issue.
   {\csuse{cms@opt@cmsdate@#1}}
   {\blx@err@invopt{cmsdate=#1}{}}}
-\def\cms@opt@cmsdate@on{%
-  \toggletrue{cms@origlabel}}
-\def\cms@opt@cmsdate@new{%
-  \toggletrue{cms@bothlabelnew}}
-\def\cms@opt@cmsdate@old{%
-  \toggletrue{cms@bothlabelold}}
 
 \DeclareEntryOption{cmsdate}[off]{% Trying to implement origyear as
   \ifcsdef{cms@opt@cmsdate@#1}% labelyear. Sorting will be an issue.
@@ -131,7 +129,15 @@
 \DeclareBibliographyOption{url}[true]{%
   \settoggle{cms@url}{#1}}
 \DeclareBibliographyOption{doi}[true]{%
-  \settoggle{cms@doi}{#1}}
+  \ifcsdef{cms@opt@doi@#1}%
+  {\csuse{cms@opt@doi@#1}}
+  {\blx@err@invopt{doi=#1}{}}}
+\def\cms@opt@doi@true{%
+  \toggletrue{cms@doi}}
+\def\cms@opt@doi@false{%
+  \togglefalse{cms@doi}}
+\def\cms@opt@doi@only{%
+  \toggletrue{cms@doionly}}
 \DeclareBibliographyOption{eprint}[true]{%
   \settoggle{cms@eprint}{#1}}
 \DeclareBibliographyOption{numbermonth}[true]{%
@@ -148,10 +154,18 @@
 
 \DeclareEntryOption{isbn}[true]{%
   \settoggle{cms@isbn}{#1}}
+\DeclareEntryOption{doi}[true]{%
+  \ifcsdef{cms@opt@doi@#1}%
+  {\iftoggle{cms@doi}%
+    {\togglefalse{cms@doi}%
+      \iftoggle{cms@doionly}%
+      {\togglefalse{cms@doionly}}% !!
+      {}}%
+    {\toggletrue{cms@doi}}% !!
+    \csuse{cms@opt@doi@#1}}
+  {\blx@err@invopt{doi=#1}{}}}
 \DeclareEntryOption{url}[true]{%
   \settoggle{cms@url}{#1}}
-\DeclareEntryOption{doi}[true]{%
-  \settoggle{cms@doi}{#1}}
 \DeclareEntryOption{eprint}[true]{%
   \settoggle{cms@eprint}{#1}}
 \DeclareEntryOption{numbermonth}[true]{%
@@ -197,8 +211,12 @@
   }
 }
 
-\DeclareLabelname{shortauthor,author,shorteditor,namea,editor,%
-nameb,translator,namec}
+\@ifpackagelater{biblatex}{2012/11/20}% for biblatex 2.4
+{\DeclareLabelname{\field{shortauthor} \field{author}%
+    \field{shorteditor} \field{namea} \field{editor}%
+    \field{nameb} \field{translator} \field{namec}}}
+{\DeclareLabelname{shortauthor,author,shorteditor,namea,%
+    editor,nameb,translator,namec}}
 
 \DeclareEntryOption{switchdates}[true]{%
   \settoggle{cms@switchdates}{#1}}
@@ -742,7 +760,13 @@ nameb,translator,namec}
   \iftoggle{cms@noibid}%
   {\blx@ibidreset%
     \usebibmacro{cite}}%
-  {\toggletrue{cms@inlineibid}}}
+  {\ifthenelse{\iffieldundef{prenote}\AND%
+      \iffieldundef{postnote}}%
+    {\blx@ibidreset%
+      \usebibmacro{cite}%
+      \PackageWarning{biblatex-chicago}%
+      {Empty Ibidem citation}}%
+    {\toggletrue{cms@inlineibid}}}}
 
 %%%% Citation Commands, internal and external %%%%
 
@@ -851,7 +875,7 @@ nameb,translator,namec}
 
 \DeclareListFormat{language}{%
   \ifthenelse{\value{listcount}=1}%
-  {\bibleftbracket\bibstring{inlang}\addspace%
+  {\bibleftbracket\bibstring{inlang}%\addspace - for inflected langs.
     \ifbibstring{#1}
     {\bibstring{#1}}
     {\ifbibstring{lang#1}
@@ -1187,9 +1211,11 @@ nameb,translator,namec}
   {\printfield{userd}\addspace #1}}
 
 \DeclareFieldFormat[music]{origdate}{% 16th ed.
-  \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{eventyear}}%
-  {\bibstring{recorded}\space #1}%
-  {\printfield{userd}\addspace #1}}
+  \iftoggle{cms@reprint}% Date fix
+  {#1}%
+  {\ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{eventyear}}%
+    {\bibstring{recorded}\space #1}%
+    {\printfield{userd}\addspace #1}}}
 
 \DeclareFieldFormat[music]{eventdate}{% 16th ed.
   \iffieldundef{userd}%
@@ -1770,24 +1796,30 @@ nameb,translator,namec}
 \newbibmacro*{music+origdate}{%
   \iftoggle{cms@reprint}% 16th ed.
   {}%
-  {\iftoggle{cms@switchdates}%
+  {\iftoggle{cms@switchdates}% Date fix
     {\ifthenelse{\iffieldundef{year}\AND\iffieldundef{month}}%
       {}%
-      {\printtext[origdate]{\usebibmacro{cmsorigdate}}}}%
+      {\usebibmacro{cmsorigdate}}}%
     {\ifthenelse{\iffieldundef{origyear}\AND\iffieldundef{origmonth}}%
       {}%
-      {\printtext[origdate]{\usebibmacro{cmsorigdate}}}}}}%
+      {\usebibmacro{cmsorigdate}}}}}%
 
-\newbibmacro*{music+eventdate}{%
+\newbibmacro*{music+eventdate}{% Date fix
   \ifthenelse{\iffieldundef{eventyear}\AND\iffieldundef{eventmonth}}%
   {}%
-  {\printtext[eventdate]{\printeventdate}}}
+  {\printeventdate}}
 
 \newbibmacro*{ser+num}{%
   \printfield{series}%
   \printfield[sernum]{number}%
   \newunit}
 
+\newbibmacro*{video+title}{% Simplifies trad style.
+  \printtext[title]{%
+    \printfield[noformat]{title}%
+    \setunit{\addcolon\addspace}%
+    \printfield[noformat]{subtitle}}}
+
 \newbibmacro*{italtitle+stitle}{%
   \printtext[title]{%
     \printfield[noformat]{title}%
@@ -2055,12 +2087,12 @@ nameb,translator,namec}
        \setunit{\addcolon\addspace}%
        \printfield[noformat]{journalsubtitle}}}}
 
-\newbibmacro*{url+date}{% Changed for 0.9
-  \printfield{url}%
-  \iffieldundef{urlyear}
-    {}
-    {\setunit{\addspace}%
-     \printtext[urldate]{\printurldate}}}
+% \newbibmacro*{url+date}{% Changed for 0.9: No longer called?
+%   \printfield{url}%
+%   \iffieldundef{urlyear}
+%     {}
+%     {\setunit{\addspace}%
+%      \printtext[urldate]{\printurldate}}}
 
 \newbibmacro*{chap+pag}{%
   \printfield{chapter}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.bbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.bbx
index 02dc9423276..15b959db4ff 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.bbx
@@ -1,11 +1,11 @@
-% $Id: chicago-authordate15.bbx,v 0.8.1.15 2012/07/05 10:39:57 dfussner Exp $
+% $Id: chicago-authordate15.bbx,v 0.8.1.16 2012/12/06 12:17:19 dfussner Exp $
 % This is a biblatex style file, adapted mainly from Lehman's
 % standard.bbx and from chicago-notes.bbx.  It provides the
 % reference list formatting for the Chicago author-date style,
 % _15th_ edition.
 
 \ProvidesFile{chicago-authordate15.bbx}
-[2012/07/05 v 1.7 biblatex bibliography style]
+[2012/12/06 v 2.4 biblatex bibliography style]
 
 %%%% Initialize and format bibliography and los %%%%
 
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.cbx
index 715ab6a4efc..390c0b9d176 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-authordate15.cbx
@@ -1,11 +1,11 @@
-% $Id: chicago-authordate15.cbx,v 0.8.1.15 2012/07/05 10:39:31 dfussner Exp $
+% $Id: chicago-authordate15.cbx,v 0.8.1.20 2012/12/06 12:16:45 dfussner Exp $
 % This is a biblatex citation style file, adapted from Lehman's
 % authoryear-comp.cbx.  It is heavily modified, with the intention of
 % providing inline citations (and a reference list) for the
 % author-date style of the Chicago Manual of Style, _15th_ edition.
 
 \ProvidesFile{chicago-authordate15.cbx}
-[2012/07/05 v 1.7 biblatex citation style]
+[2012/12/06 v 2.4 biblatex citation style]
 
 %%%% Biblatex initialization + Chicago options + Toggles %%%%
 
@@ -191,8 +191,12 @@
   }
 }
 
-\DeclareLabelname{shortauthor,author,shorteditor,namea,editor,%
-nameb,translator,namec}
+\@ifpackagelater{biblatex}{2012/11/20}% for biblatex 2.4
+{\DeclareLabelname{\field{shortauthor} \field{author}%
+    \field{shorteditor} \field{namea} \field{editor}%
+    \field{nameb} \field{translator} \field{namec}}}
+{\DeclareLabelname{shortauthor,author,shorteditor,namea,%
+    editor,nameb,translator,namec}}
 
 \DeclareEntryOption{switchdates}[true]{%
   \settoggle{cms@switchdates}{#1}}
@@ -771,7 +775,7 @@ nameb,translator,namec}
 
 \DeclareListFormat{language}{%
   \ifthenelse{\value{listcount}=1}%
-  {\bibleftbracket\bibstring{inlang}\addspace%
+  {\bibleftbracket\bibstring{inlang}%\addspace - for inflected langs.
     \ifbibstring{#1}
     {\bibstring{#1}}
     {\ifbibstring{lang#1}
@@ -1898,7 +1902,7 @@ nameb,translator,namec}
   \printtext{% article subtype
     \printfield{title}%
     \setunit{\addcolon\addspace}%
-    \printfield{subtitle}}% 
+    \printfield[title]{subtitle}}% 
   \setunit*{\addspace}%
   \printlist[periodplace]{location}%
   \setunit*{\addspace}%
@@ -1930,8 +1934,8 @@ nameb,translator,namec}
   \printfield{url}%
   \ifthenelse{\iffieldundef{urlyear}\AND\iffieldundef{urlmonth}}%
     {}%
-    {\setunit{\addspace}%
-     \printtext[urldate]{\printurldate}}}
+    {\setunit{\addspace}% Date fix
+     \printurldate}}
 
 \newbibmacro*{chap+pag}{%
   \printfield{chapter}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx
index e5093e0efc2..0e41d319d0e 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.bbx
@@ -1,10 +1,10 @@
-% $Id: chicago-notes.bbx,v 0.9.7.20 2012/07/05 10:50:42 dfussner Exp $
+% $Id: chicago-notes.bbx,v 0.9.7.24 2012/12/06 11:50:31 dfussner Exp $
 % This is a biblatex style file, adapted mainly from Lehman's standard.bbx
 % It provides the bibliography formatting for the Chicago notes + 
 % bibliography style.
 
 
-\ProvidesFile{chicago-notes.bbx}[2012/07/05 v 1.7 biblatex bibliography style]
+\ProvidesFile{chicago-notes.bbx}[2012/12/06 v 2.4 biblatex bibliography style]
 
 %%%% Initialize and format bibliography and los %%%%
 
@@ -1410,9 +1410,14 @@
   \newunit\newblock
   \iffieldundef{urlyear}
   {}
-  {\printtext[urldate]{\printurldate}}%
+  {\printurldate}% Date fix
   \newunit\newblock
-  \printfield{doi}%
+  \iftoggle{cms@doionly}%
+  {\iffieldundef{doi}%
+    {}%
+    {\printfield{doi}%
+      \clearfield{url}}}%
+  {\printfield{doi}}%
   \newunit\newblock
   \usebibmacro{eprint}%
   \newunit\newblock
@@ -1941,11 +1946,16 @@
 \newbibmacro*{bib+doi+url}{% 16th ed.
   \iffieldundef{urlyear}
   {}
-  {\printtext[urldate]{\printurldate}}%
+  {\printurldate}% Date fix
   \newunit\newblock
-  \iftoggle{cms@doi}%
-  {\printfield{doi}}%
-  {}%
+  \iftoggle{cms@doionly}%
+  {\iffieldundef{doi}%
+    {}%
+    {\printfield{doi}%
+      \clearfield{url}}}%
+  {\iftoggle{cms@doi}%
+    {\printfield{doi}}%
+    {}}%
   \newunit\newblock
   \iftoggle{cms@eprint}%
   {\usebibmacro{eprint}}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx
index eb980243c43..bd39d98c705 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes.cbx
@@ -1,10 +1,10 @@
-% $Id: chicago-notes.cbx,v 0.9.7.34 2012/07/05 10:50:34 dfussner Exp $
+% $Id: chicago-notes.cbx,v 0.9.7.40 2012/12/06 11:58:41 dfussner Exp $
 % This is a biblatex citation style file, adapted from Lehman's
 % authortitle-cverb.cbx.  It is heavily modified, with the intention
 % of providing footnote citations and a bibliography formatted
 % according to the specifications of the Chicago Manual of Style.
 
-\ProvidesFile{chicago-notes.cbx}[2012/07/05 v 1.7 biblatex citation style]
+\ProvidesFile{chicago-notes.cbx}[2012/12/06 v 2.4 biblatex citation style]
 
 %%%% Biblatex initialization + Chicago options + Toggles %%%%
 
@@ -18,6 +18,7 @@
 
 \providetoggle{cms@url}% These are for the field-exclusion options
 \providetoggle{cms@doi}
+\providetoggle{cms@doionly}
 \providetoggle{cms@eprint}
 \providetoggle{cms@isbn}
 \providetoggle{cms@numbermonth}
@@ -100,7 +101,15 @@
 \DeclareBibliographyOption{url}[true]{%
   \settoggle{cms@url}{#1}}
 \DeclareBibliographyOption{doi}[true]{%
-  \settoggle{cms@doi}{#1}}
+  \ifcsdef{cms@opt@doi@#1}%
+  {\csuse{cms@opt@doi@#1}}
+  {\blx@err@invopt{doi=#1}{}}}
+\def\cms@opt@doi@true{%
+  \toggletrue{cms@doi}}
+\def\cms@opt@doi@false{%
+  \togglefalse{cms@doi}}
+\def\cms@opt@doi@only{%
+  \toggletrue{cms@doionly}}
 \DeclareBibliographyOption{eprint}[true]{%
   \settoggle{cms@eprint}{#1}}
 \DeclareBibliographyOption{numbermonth}[true]{%
@@ -131,7 +140,15 @@
 \DeclareEntryOption{url}[true]{%
   \settoggle{cms@url}{#1}}
 \DeclareEntryOption{doi}[true]{%
-  \settoggle{cms@doi}{#1}}
+  \ifcsdef{cms@opt@doi@#1}%
+  {\iftoggle{cms@doi}%
+    {\togglefalse{cms@doi}%
+      \iftoggle{cms@doionly}%
+      {\togglefalse{cms@doionly}}% !!
+      {}}%
+    {\toggletrue{cms@doi}}% !!
+    \csuse{cms@opt@doi@#1}}
+  {\blx@err@invopt{doi=#1}{}}}
 \DeclareEntryOption{eprint}[true]{%
   \settoggle{cms@eprint}{#1}}
 \DeclareEntryOption{numbermonth}[true]{%
@@ -321,11 +338,11 @@
 
 \newbibmacro*{cms:shorthandintro}{% For changing the citedas phrase
   \iffieldundef{shorthandintro}%
-  {\setunit{\addspace}%
+  {\addspace%\setunit{\addspace}% Fix for after postnote field
     \printtext[parens]{%
       \bibstring{citedas}\space%
       \printfield{shorthand}}}%
-  {\setunit{\addspace}%
+  {\addspace%\setunit{\addspace}% Ditto
     \printfield{shorthandintro}}}
 
 \newbibmacro*{cite:ibid}{%
@@ -588,6 +605,24 @@
 
 \DeclareMultiCiteCommand{\citetitles}{citetitle}{\multicitedelim}
 
+\DeclareCiteCommand{\textcite}[\cbx@textcite\cbx@textcite@i]
+  {\boolfalse{citetracker}%
+   \gdef\cbx@savedkeys{}}
+  {\printnames{labelname}%
+   \xappto\cbx@savedkeys{\thefield{entrykey},}}
+  {\multinamedelim}
+  {\protected@xappto\cbx@savedcites{%
+     [\thefield{prenote}][\thefield{postnote}]{\cbx@savedkeys}}}
+
+\DeclareMultiCiteCommand{\textcites}[\cbx@textcite\cbx@textcites@i]
+  {\textcite}{\multinamedelim}
+
+\newrobustcmd{\cbx@textcite}[2]{\def\cbx@savedcites{#1}#2\cbx@savedcites}
+\newrobustcmd{\cbx@textcite@i}{%
+  \iffootnote{\newcunit\bibstring{in}\addspace\headlesscite}{\footcite}}
+\newrobustcmd{\cbx@textcites@i}{%
+  \iffootnote{\newcunit\bibstring{in}\addspace\cites}{\footcites}}
+
 %%%% Drivers for the Long Note Format %%%%
 
 \DeclareBibliographyDriver{cite:article}{%
@@ -1606,9 +1641,14 @@
   \setunit{\addcomma\addspace}%
   \iffieldundef{urlyear}%
   {}%
-  {\printtext[urldate]{\printurldate}}%
+  {\printurldate}% Date fix
   \newcunit\newblock
-  \printfield{doi}%
+  \iftoggle{cms@doionly}%
+  {\iffieldundef{doi}%
+    {}%
+    {\printfield{doi}%
+      \clearfield{url}}}%
+  {\printfield{doi}}%
   \newcunit\newblock
   \usebibmacro{eprint}%
   \newcunit\newblock
@@ -2087,9 +2127,9 @@
   \usebibmacro{cnotefield}%
   \newcunit\newblock
   \usebibmacro{cpubl+loc+year}%
-  \usebibmacro{fullpostnote}%
   \newcunit\newblock
-  \printfield{type}%
+  \printfield{type}% Order of this and next?
+  \usebibmacro{fullpostnote}%
   \newcunit\newblock
   \usebibmacro{caddendum}%
   \newcunit\newblock
@@ -2106,7 +2146,7 @@
 
 \DeclareListFormat{language}{%
   \ifthenelse{\value{listcount}=1}%
-  {\bibleftbracket\bibstring{inlang}\addspace%
+  {\bibleftbracket\bibstring{inlang}%\addspace - for inflected langs.
     \ifbibstring{#1}
     {\bibstring{#1}}
     {\ifbibstring{lang#1}
@@ -2162,32 +2202,6 @@
   {#1\isdot}%
   {\mkbibquote{#1\isdot}}}
 
-\newcommand*{\long@kludge}{% 16th edition places commas after these
-  \ifboolexpr{%              punctuation marks.
-    (
-    test {\ifpunctmark{?}}
-    or
-    test {\ifpunctmark{!}}
-    )
-    and
-    not togl {cms@fullnote}%test {\ifcitation}
-  }%
-  {\spacefactor\blx@sf@dot}%\blx@postpunct\addperiod}%
-  {\isdot}}%
-
-\newcommand*{\short@kludge}{% 16th edition places commas after these
-  \ifboolexpr{%               punctuation marks. Needed?
-    (
-    test {\ifpunctmark{?}}
-    or
-    test {\ifpunctmark{!}}
-    )
-    and
-    not test {\iffieldundef{postnote}}
-  }%
-  {\isdot\midsentence}%
-  {\isdot}}%
-
 \DeclareFieldFormat[article]{lostitle}{%
   \iffieldundef{title}%
   {#1\isdot}%
@@ -2405,13 +2419,6 @@
 
 %%%% Other Field Formats %%%%
 
-% \InitializeCitationStyle{\numgdef{\cbx@resetcount}{\cbx@resetcount+1}}
-% \DeclareFieldFormat{bibhyperlink}{%
-%   \bibhyperlink{\iffootnote{f}{t}:\cbx@resetcount:\thefield{entrykey}}{#1}}
-% \DeclareFieldFormat{bibhypertarget}{%
-%   \bibhypertarget{\iffootnote{f}{t}:\cbx@resetcount:\thefield{entrykey}}{#1}}
-% \newcommand*{\cbx@resetcount}{0}
-
 \DeclareNumChars*{:}% For proper ibidem with multi-volume works.
 
 \DeclareFieldFormat{letterday}{\mkbibcurdinal{#1}}
@@ -2466,9 +2473,11 @@
   {\printfield{userd}\addspace #1}}
 
 \DeclareFieldFormat[music]{origdate}{% 16th ed.
-  \ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{eventyear}}%
-  {\bibstring{recorded}\space #1}%
-  {\printfield{userd}\addspace #1}}
+  \iftoggle{cms@reprint}% Date fix
+  {#1}%
+  {\ifthenelse{\iffieldundef{userd}\OR\NOT\iffieldundef{eventyear}}%
+    {\bibstring{recorded}\space #1}%
+    {\printfield{userd}\addspace #1}}}
 
 \DeclareFieldFormat[music]{eventdate}{% 16th ed.
   \iffieldundef{userd}%
@@ -3149,12 +3158,12 @@
   {}%
   {\iffieldundef{origyear}%
     {}%
-    {\printtext[origdate]{\usebibmacro{cmsorigdate}}}}}
+    {\usebibmacro{cmsorigdate}}}}% Date fix
 
 \newbibmacro*{music+eventdate}{%
   \iffieldundef{eventyear}%
   {}%
-  {\printtext[eventdate]{\printeventdate}}}
+  {\printeventdate}}% Date fix
 
 \newbibmacro*{ctitle+stitle}{%
   \printtext[title]{%:\thefield{entrytype}]{%(Changed for 0.7 to work)
@@ -3586,11 +3595,16 @@
 \newbibmacro*{cite+doi+url}{% 16th ed.
   \iffieldundef{urlyear}
   {}
-  {\printtext[urldate]{\printurldate}}%
+  {\printurldate}% Date fix
   \newcunit\newblock
-  \iftoggle{cms@doi}%
-  {\printfield{doi}}%
-  {}%
+  \iftoggle{cms@doionly}%
+  {\iffieldundef{doi}%
+    {}%
+    {\printfield{doi}%
+      \clearfield{url}}}%
+  {\iftoggle{cms@doi}%
+    {\printfield{doi}}%
+    {}}%
   \newcunit\newblock
   \iftoggle{cms@eprint}%
   {\usebibmacro{eprint}}%
@@ -3859,8 +3873,12 @@
             {\printnames[labelname]{namec}}%
             {}}}}}}}%
 
-\DeclareLabelname{shortauthor,author,shorteditor,namea,%
-  editor,nameb,translator,namec}
+\@ifpackagelater{biblatex}{2012/11/20}% for biblatex 2.4
+{\DeclareLabelname{\field{shortauthor} \field{author}%
+    \field{shorteditor} \field{namea} \field{editor}%
+    \field{nameb} \field{translator} \field{namec}}}
+{\DeclareLabelname{shortauthor,author,shorteditor,namea,%
+    editor,nameb,translator,namec}}
 
 \DeclareDataInheritance{collection}{suppcollection}{%
   \inherit{title}{title}
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.bbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.bbx
index 216e91b145b..4000aed9950 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.bbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.bbx
@@ -1,11 +1,11 @@
-% $Id: chicago-notes15.bbx,v 0.9.7.13 2012/07/05 10:35:12 dfussner Exp $
+% $Id: chicago-notes15.bbx,v 0.9.7.14 2012/12/06 12:15:47 dfussner Exp $
 % This is a biblatex style file, adapted mainly from Lehman's standard.bbx
 % It provides the bibliography formatting for the Chicago notes + 
 % bibliography style, _15th_ edition.
 
 
 \ProvidesFile{chicago-notes15.bbx}
-[2012/07/05 v 1.7 biblatex bibliography style]
+[2012/12/06 v 2.4 biblatex bibliography style]
 
 %%%% Initialize and format bibliography and los %%%%
 
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.cbx b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.cbx
index 93a7d6ba6ec..4d09088a2f4 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.cbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/chicago-notes15.cbx
@@ -1,11 +1,11 @@
-% $Id: chicago-notes15.cbx,v 0.9.7.18 2012/07/05 10:35:21 dfussner Exp $
+% $Id: chicago-notes15.cbx,v 0.9.7.21 2012/12/06 12:14:29 dfussner Exp $
 % This is a biblatex citation style file, adapted from Lehman's
 % authortitle-cverb.cbx.  It is heavily modified, with the intention
 % of providing footnote citations and a bibliography formatted
 % according to the specifications of the Chicago Manual of Style,
 % _15th_ edition.
 
-\ProvidesFile{chicago-notes15.cbx}[2012/07/05 v 1.7 biblatex citation style]
+\ProvidesFile{chicago-notes15.cbx}[2012/12/06 v 2.4 biblatex citation style]
 
 %%%% Biblatex initialization + Chicago options + Toggles %%%%
 
@@ -2030,7 +2030,7 @@
 
 \DeclareListFormat{language}{%
   \ifthenelse{\value{listcount}=1}%
-  {\bibleftbracket\bibstring{inlang}\addspace%
+  {\bibleftbracket\bibstring{inlang}%\addspace - for inflected langs.
     \ifbibstring{#1}
     {\bibstring{#1}}
     {\ifbibstring{lang#1}
@@ -3402,8 +3402,8 @@
   \printfield{url}%
   \iffieldundef{urlyear}
     {}
-    {\setunit{\addspace}%
-     \printtext[urldate]{\printurldate}}}
+    {\setunit{\addspace}% Date fix
+     \printurldate}}
 
 \newbibmacro*{chap+pag}{%
   \printfield{chapter}%
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx
index c3ee6e682d5..4835b7cb453 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-american.lbx
@@ -1,6 +1,6 @@
-% $Id: cms-american.lbx,v 0.10.1.27 2012/07/05 11:08:46 dfussner Exp $	
+% $Id: cms-american.lbx,v 0.10.1.30 2012/12/06 12:04:24 dfussner Exp $	
 
-\ProvidesFile{cms-american.lbx}[2012/07/05 v 1.7 biblatex localization]
+\ProvidesFile{cms-american.lbx}[2012/12/06 v 2.4 biblatex localization]
 
 \InheritBibliographyExtras{american}
 
@@ -311,7 +311,7 @@
   pseudonym = {{pseud\adddot}{pseud\adddot}},
   patentfiled = {{filed}{filed}},
   patentissued = {{issued}{issued}},
-  inlang = {{in}{in}},
+  inlang = {{in\addspace}{in\addspace}},
   langrussian    = {{Russian}{Russian}},
   fromrussian    = {{from the Russian}{from the Russian}}
   edamerican     = {{American}{American}},
@@ -809,7 +809,7 @@
 \protected\gdef\lbx@cms@mkbibrangetrunc@long#1#2{%
   \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
   {}
-  {\printtext{%
+  {\printtext[#2date]{%
     \iffieldsequal{#2year}{#2endyear}
     {\csuse{mkbibdate#1}{}{#2month}{#2day}}
     {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
@@ -832,7 +832,7 @@
 \protected\gdef\lbx@cms@mkbibrangetrunc@short#1#2{%
   \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
   {}
-  {\printtext{%
+  {\printtext[#2date]{%
       \iffieldsequal{#2year}{#2endyear}
       {\csuse{mkbibdate#1}{}{#2month}{#2day}}
       {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
@@ -846,7 +846,7 @@
 \protected\gdef\lbx@cms@mkbibrangefull#1#2{%
   \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
   {}%
-  {\printtext{%
+  {\printtext[#2date]{%
       \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
       \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}
       {}
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-british.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-british.lbx
new file mode 100644
index 00000000000..cb4b5511806
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-british.lbx
@@ -0,0 +1,73 @@
+% $Id: cms-british.lbx,v 0.4 2012/12/06 12:10:09 dfussner Exp $	
+
+\ProvidesFile{cms-british.lbx}[2012/12/06 v 2.4 biblatex localization]
+
+\InheritBibliographyExtras{british}
+
+\DeclareBibliographyExtras{%
+  \savecommand\cms@datelong
+  \savecommand\cms@datelongalt
+  \savecommand\mkbibrangecomp
+  \savecommand\mkbibrangeterse
+  \savecommand\mkbibrangefull
+  \protected\def\mkbibrangecomp{%
+    \lbx@cms@mkbibrangetrunc{long}}%
+  \protected\def\mkbibrangeterse{%
+    \lbx@cms@mkbibrangetrunc{short}}%
+  \protected\def\mkbibrangefull{%
+    \lbx@cms@mkbibrangefull}
+  \def\cms@datelong{\printorigdate}%
+  \def\cms@datelongalt{\printdate}}%
+
+\UndeclareBibliographyExtras{%
+  \restorecommand\cms@datelong
+  \restorecommand\cms@datelongalt
+  \restorecommand\mkbibrangecomp%
+  \restorecommand\mkbibrangefull%
+  \restorecommand\mkbibrangeterse}%
+
+\InheritBibliographyStrings{cms-american}
+
+\protected\gdef\lbx@cms@mkbibrangetrunc#1#2{%  DATE FIX
+  \iffieldundef{#2year}%
+  {\iffieldundef{#2month}
+    {}
+    {\printtext[#2date]{%
+        \iffieldsequal{#2month}{#2endmonth}
+        {\csuse{mkbibdate#1}{}{}{#2day}}
+        {\csuse{mkbibdate#1}{}{#2month}{#2day}}%
+        \iffieldundef{#2endyear}
+        {\iffieldundef{#2endmonth}
+          {}
+          {\bibdatedash
+            \csuse{mkbibdate#1}{}{#2endmonth}{#2endday}}}
+        {\iffieldequalstr{#2endyear}{}
+          {\mbox{\bibdatedash}}
+          {\bibdatedash
+            \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+  {\printtext[#2date]{%
+      \iffieldsequal{#2year}{#2endyear}
+      {\iffieldsequal{#2month}{#2endmonth}
+        {\csuse{mkbibdate#1}{}{}{#2day}}
+        {\csuse{mkbibdate#1}{}{#2month}{#2day}}}
+      {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+      \iffieldundef{#2endyear}
+      {}
+      {\iffieldequalstr{#2endyear}{}
+        {\mbox{\bibdatedash}}
+        {\bibdatedash
+          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+
+\protected\gdef\lbx@cms@mkbibrangefull#1#2{%
+  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
+  {}%
+  {\printtext[#2date]{%
+      \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}
+      {}
+      {\iffieldequalstr{#2endyear}{}
+        {\mbox{\bibdatedash}}
+        {\bibdatedash
+          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx
index 9555cc2fad9..25de5e7b404 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-french.lbx
@@ -1,6 +1,6 @@
-% $Id: cms-french.lbx,v 0.9.5.20 2012/07/05 11:08:56 dfussner Exp $	
+% $Id: cms-french.lbx,v 0.9.5.23 2012/12/06 12:05:19 dfussner Exp $	
 
-\ProvidesFile{cms-french.lbx}[2012/07/05 v 1.7 biblatex localization]
+\ProvidesFile{cms-french.lbx}[2012/12/06 v 2.4 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Some strings still missing
@@ -318,7 +318,7 @@
   pseudonym = {{pseudonym}{pseudonym}},% ?
   patentfiled = {{d\'epos\'e}{d\'epos\'e}},
   patentissued = {{d\'elivr\'e}{d\'elivr\'e}},
-  inlang = {{en}{en}},
+  inlang = {{en\addspace}{en\addspace}},
   langrussian = {{russe}{russe}},
   fromrussian    = {{du russe}{du russe}}
   edamerican     = {{am\'ericaine}{am\'ericaine}},
@@ -786,7 +786,7 @@
   \iffieldundef{#2year}%
   {\iffieldundef{#2month}
     {}
-    {\printtext{%
+    {\printtext[#2date]{%
         \iffieldsequal{#2month}{#2endmonth}
         {\csuse{mkbibdate#1}{}{}{#2day}}
         {\csuse{mkbibdate#1}{}{#2month}{#2day}}%
@@ -799,7 +799,7 @@
           {\mbox{\bibdatedash}}
           {\bibdatedash
             \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-  {\printtext{%
+  {\printtext[#2date]{%
       \iffieldsequal{#2year}{#2endyear}
       {\iffieldsequal{#2month}{#2endmonth}
         {\csuse{mkbibdate#1}{}{}{#2day}}
@@ -815,7 +815,7 @@
 \protected\gdef\lbx@cms@mkbibrangefull#1#2{%
   \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
   {}%
-  {\printtext{%
+  {\printtext[#2date]{%
       \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
       \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}
       {}
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx
index ccbeb71d6ba..1daac95fd30 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-german.lbx
@@ -1,6 +1,6 @@
-% $Id: cms-german.lbx,v 0.9.5.20 2012/07/05 11:09:04 dfussner Exp $	
+% $Id: cms-german.lbx,v 0.9.5.23 2012/12/06 12:06:28 dfussner Exp $	
 
-\ProvidesFile{cms-german.lbx}[2012/07/05 v 1.7 biblatex localization]
+\ProvidesFile{cms-german.lbx}[2012/12/06 v 2.4 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated strings and formatting decisions need review by native
@@ -326,7 +326,7 @@
   pseudonym = {{Pseud\adddot}{Pseud\adddot}},
   patentfiled = {{eingereicht}{eingereicht}},% Are these 2 correct?
   patentissued = {{erteilt}{erteilt}},% ?
-  inlang = {{auf}{auf}},
+  inlang = {{auf\addspace}{auf\addspace}},
   langrussian = {{Russisch}{Russisch}},
   fromrussian = {{aus dem Russischen}{aus dem Russischen}},
   edamerican     = {{amerikanische}{amerikanische}},
@@ -946,7 +946,7 @@
   \iffieldundef{#2year}%
   {\iffieldundef{#2month}
     {}
-    {\printtext{%
+    {\printtext[#2date]{%
         \iffieldsequal{#2month}{#2endmonth}
         {\csuse{mkbibdate#1}{}{}{#2day}}
         {\csuse{mkbibdate#1}{}{#2month}{#2day}}%
@@ -959,7 +959,7 @@
           {\mbox{\bibdatedash}}
           {\bibdatedash
             \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-  {\printtext{%
+  {\printtext[#2date]{%
       \iffieldsequal{#2year}{#2endyear}
       {\iffieldsequal{#2month}{#2endmonth}
         {\csuse{mkbibdate#1}{}{}{#2day}}
@@ -975,7 +975,7 @@
 \protected\gdef\lbx@cms@mkbibrangefull#1#2{%
   \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
   {}%
-  {\printtext{%
+  {\printtext[#2date]{%
       \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
       \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}
       {}
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-icelandic.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-icelandic.lbx
new file mode 100644
index 00000000000..77bda016fa2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-icelandic.lbx
@@ -0,0 +1,498 @@
+% $Id: cms-icelandic.lbx,v 0.6 2012/12/06 12:11:26 dfussner Exp $	
+
+\ProvidesFile{cms-icelandic.lbx}[2012/12/06 v 2.4 biblatex localization]
+
+% STATUS OF THIS FILE
+% - Translated by a native speaker (Baldur Kristinsson).
+% - Depends on icelandic.lbx from the biblatex project
+% - Many bibstrings remain untranslated.
+% - Needs fine tuning, since declension of Icelandic nouns (names + titles)
+%   makes straight translations difficult in some cases.
+% - Last worked on: 2012-06-15
+% - Date handling altered by dfussner, along with a few other small
+%   fixes.  I have added placeholders for 9 audio-visual strings, but
+%   need help from a native speaker to provide the actual strings.
+%   See "bydirector," "cbydirector," "byconductor," "cbyconductor,"
+%   "byproducer," "cbyproducer," "broadcast," "recorded," and "on."
+
+\InheritBibliographyExtras{icelandic}
+
+\DeclareBibliographyExtras{%
+  \savecommand\cms@datelong
+  \savecommand\cms@datelongalt
+  \savecommand\mkbibrangecomp
+  \savecommand\mkbibrangeterse
+  \savecommand\mkbibrangefull
+  \protected\def\mkbibrangecomp{%
+    \lbx@cms@mkbibrangetrunc{long}}%
+  \protected\def\mkbibrangeterse{%
+    \lbx@cms@mkbibrangetrunc{short}}%
+  \protected\def\mkbibrangefull{%
+    \lbx@cms@mkbibrangefull}
+  \def\cms@datelong{\printorigdate}%
+  \def\cms@datelongalt{\printdate}}%
+
+\UndeclareBibliographyExtras{%
+  \restorecommand\cms@datelong
+  \restorecommand\cms@datelongalt
+  \restorecommand\mkbibrangecomp%
+  \restorecommand\mkbibrangefull%
+  \restorecommand\mkbibrangeterse}%
+
+\NewBibliographyString{bynone}
+\NewBibliographyString{bycompiler}
+\NewBibliographyString{byconductor}
+\NewBibliographyString{bydirector}
+\NewBibliographyString{byproducer}
+\NewBibliographyString{byeditorcp}
+\NewBibliographyString{byeditortrcp}
+\NewBibliographyString{byeditortrcpco}
+\NewBibliographyString{byeditortrcpan}
+\NewBibliographyString{byeditortrcpin}
+\NewBibliographyString{byeditortrcpfo}
+\NewBibliographyString{byeditortrcpaf}
+\NewBibliographyString{byeditortrcpcoin}
+\NewBibliographyString{byeditortrcpcofo}
+\NewBibliographyString{byeditortrcpcoaf}
+\NewBibliographyString{byeditortrcpanin}
+\NewBibliographyString{byeditortrcpanfo}
+\NewBibliographyString{byeditortrcpanaf}
+\NewBibliographyString{byeditorcpco}
+\NewBibliographyString{byeditorcpan}
+\NewBibliographyString{byeditorcpin}
+\NewBibliographyString{byeditorcpfo}
+\NewBibliographyString{byeditorcpaf}
+\NewBibliographyString{byeditorcpcoin}
+\NewBibliographyString{byeditorcpcofo}
+\NewBibliographyString{byeditorcpcoaf}
+\NewBibliographyString{byeditorcpanin}
+\NewBibliographyString{byeditorcpanfo}
+\NewBibliographyString{byeditorcpanaf}
+\NewBibliographyString{bytranslatorcp}
+\NewBibliographyString{bytranslatorcpco}
+\NewBibliographyString{bytranslatorcpan}
+\NewBibliographyString{bytranslatorcpin}
+\NewBibliographyString{bytranslatorcpfo}
+\NewBibliographyString{bytranslatorcpaf}
+\NewBibliographyString{bytranslatorcpcoin}
+\NewBibliographyString{bytranslatorcpcofo}
+\NewBibliographyString{bytranslatorcpcoaf}
+\NewBibliographyString{bytranslatorcpanin}
+\NewBibliographyString{bytranslatorcpanfo}
+\NewBibliographyString{bytranslatorcpanaf}
+\NewBibliographyString{bycompilerco}
+\NewBibliographyString{bycompileran}
+\NewBibliographyString{bycompilerin}
+\NewBibliographyString{bycompilerfo}
+\NewBibliographyString{bycompileraf}
+\NewBibliographyString{bycompilercoin}
+\NewBibliographyString{bycompilercofo}
+\NewBibliographyString{bycompilercoaf}
+\NewBibliographyString{bycompileranin}
+\NewBibliographyString{bycompileranfo}
+\NewBibliographyString{bycompileranaf}
+\NewBibliographyString{cbynone}
+\NewBibliographyString{cbyauthor}
+\NewBibliographyString{cbyeditor}
+\NewBibliographyString{cbytranslator}
+\NewBibliographyString{cbycompiler}
+\NewBibliographyString{cbyredactor}
+\NewBibliographyString{cbycommentator}
+\NewBibliographyString{cbyannotator}
+\NewBibliographyString{cbyfounder}
+\NewBibliographyString{cbycontinuator}
+\NewBibliographyString{cbycollaborator}
+\NewBibliographyString{cbyconductor}
+\NewBibliographyString{cbydirector}
+\NewBibliographyString{cbyproducer}
+\NewBibliographyString{cbyeditortr}
+\NewBibliographyString{cbyeditorcp}
+\NewBibliographyString{cbyeditorco}
+\NewBibliographyString{cbyeditoran}
+\NewBibliographyString{cbyeditorin}
+\NewBibliographyString{cbyeditorfo}
+\NewBibliographyString{cbyeditoraf}
+\NewBibliographyString{cbyeditortrcp}
+\NewBibliographyString{cbyeditortrco}
+\NewBibliographyString{cbyeditortran}
+\NewBibliographyString{cbyeditortrin}
+\NewBibliographyString{cbyeditortrfo}
+\NewBibliographyString{cbyeditortraf}
+\NewBibliographyString{cbyeditortrcpco}
+\NewBibliographyString{cbyeditortrcpan}
+\NewBibliographyString{cbyeditortrcpin}
+\NewBibliographyString{cbyeditortrcpfo}
+\NewBibliographyString{cbyeditortrcpaf}
+\NewBibliographyString{cbyeditorcoin}
+\NewBibliographyString{cbyeditorcofo}
+\NewBibliographyString{cbyeditorcoaf}
+\NewBibliographyString{cbyeditoranin}
+\NewBibliographyString{cbyeditoranfo}
+\NewBibliographyString{cbyeditoranaf}
+\NewBibliographyString{cbyeditortrcoin}
+\NewBibliographyString{cbyeditortrcofo}
+\NewBibliographyString{cbyeditortrcoaf}
+\NewBibliographyString{cbyeditortranin}
+\NewBibliographyString{cbyeditortranfo}
+\NewBibliographyString{cbyeditortranaf}
+\NewBibliographyString{cbyeditortrcpcoin}
+\NewBibliographyString{cbyeditortrcpcofo}
+\NewBibliographyString{cbyeditortrcpcoaf}
+\NewBibliographyString{cbyeditortrcpanin}
+\NewBibliographyString{cbyeditortrcpanfo}
+\NewBibliographyString{cbyeditortrcpanaf}
+\NewBibliographyString{cbyeditorcpco}
+\NewBibliographyString{cbyeditorcpan}
+\NewBibliographyString{cbyeditorcpin}
+\NewBibliographyString{cbyeditorcpfo}
+\NewBibliographyString{cbyeditorcpaf}
+\NewBibliographyString{cbyeditorcpcoin}
+\NewBibliographyString{cbyeditorcpcofo}
+\NewBibliographyString{cbyeditorcpcoaf}
+\NewBibliographyString{cbyeditorcpanin}
+\NewBibliographyString{cbyeditorcpanfo}
+\NewBibliographyString{cbyeditorcpanaf}
+\NewBibliographyString{cbytranslatorcp}
+\NewBibliographyString{cbytranslatorco}
+\NewBibliographyString{cbytranslatoran}
+\NewBibliographyString{cbytranslatorin}
+\NewBibliographyString{cbytranslatorfo}
+\NewBibliographyString{cbytranslatoraf}
+\NewBibliographyString{cbytranslatorcpco}
+\NewBibliographyString{cbytranslatorcpan}
+\NewBibliographyString{cbytranslatorcpin}
+\NewBibliographyString{cbytranslatorcpfo}
+\NewBibliographyString{cbytranslatorcpaf}
+\NewBibliographyString{cbytranslatorcoin}
+\NewBibliographyString{cbytranslatorcofo}
+\NewBibliographyString{cbytranslatorcoaf}
+\NewBibliographyString{cbytranslatoranin}
+\NewBibliographyString{cbytranslatoranfo}
+\NewBibliographyString{cbytranslatoranaf}
+\NewBibliographyString{cbytranslatorcpcoin}
+\NewBibliographyString{cbytranslatorcpcofo}
+\NewBibliographyString{cbytranslatorcpcoaf}
+\NewBibliographyString{cbytranslatorcpanin}
+\NewBibliographyString{cbytranslatorcpanfo}
+\NewBibliographyString{cbytranslatorcpanaf}
+\NewBibliographyString{cbycompilerco}
+\NewBibliographyString{cbycompileran}
+\NewBibliographyString{cbycompilerin}
+\NewBibliographyString{cbycompilerfo}
+\NewBibliographyString{cbycompileraf}
+\NewBibliographyString{cbycompilercoin}
+\NewBibliographyString{cbycompilercofo}
+\NewBibliographyString{cbycompilercoaf}
+\NewBibliographyString{cbycompileranin}
+\NewBibliographyString{cbycompileranfo}
+\NewBibliographyString{cbycompileranaf}
+\NewBibliographyString{partvolume}
+\NewBibliographyString{by}
+\NewBibliographyString{of}
+\NewBibliographyString{on}
+\NewBibliographyString{afterwordto}
+\NewBibliographyString{forewordto}
+\NewBibliographyString{introductionto}
+\NewBibliographyString{origpub}
+\NewBibliographyString{origpublin}
+\NewBibliographyString{origpubyear}
+\NewBibliographyString{origreleaseyear}
+\NewBibliographyString{origshownyear}
+\NewBibliographyString{origedition}
+\NewBibliographyString{revisededition}
+\NewBibliographyString{broadcast}
+\NewBibliographyString{recorded}
+\NewBibliographyString{numbers}
+\NewBibliographyString{nodate}
+\NewBibliographyString{pseudonym}
+\NewBibliographyString{patentfiled}
+\NewBibliographyString{patentissued}
+\NewBibliographyString{inlang}
+\NewBibliographyString{langrussian}
+\NewBibliographyString{fromrussian}
+\NewBibliographyString{edamerican}
+\NewBibliographyString{edbrazilian}
+\NewBibliographyString{eddanish}
+\NewBibliographyString{eddutch}
+\NewBibliographyString{edenglish}
+\NewBibliographyString{edfrench}
+\NewBibliographyString{edgerman}
+\NewBibliographyString{edgreek}
+\NewBibliographyString{editalian}
+\NewBibliographyString{edlatin}
+\NewBibliographyString{ednorwegian}
+\NewBibliographyString{edportuguese}
+\NewBibliographyString{edrussian}
+\NewBibliographyString{edspanish}
+\NewBibliographyString{edswedish}
+\NewBibliographyString{review}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{section}
+\NewBibliographyString{sections}
+\NewBibliographyString{compiler}
+\NewBibliographyString{compilers}
+\NewBibliographyString{conductor}
+\NewBibliographyString{conductors}
+\NewBibliographyString{director}
+\NewBibliographyString{directors}
+\NewBibliographyString{none}
+\NewBibliographyString{nones}
+\NewBibliographyString{producer}
+\NewBibliographyString{producers}
+\NewBibliographyString{transcompiler}
+\NewBibliographyString{transcompilers}
+\NewBibliographyString{editortranscompiler}
+\NewBibliographyString{editorcompiler}
+\NewBibliographyString{editortranslator}
+\NewBibliographyString{editortranscompilers}
+\NewBibliographyString{editorcompilers}
+\NewBibliographyString{editortranslators}
+
+\DeclareBibliographyStrings{%
+  inherit = {icelandic},
+  afterwordto = {{eftirm\'ali vi}{eftirm\'ali vi}},
+  forewordto = {{form\'ali vi}{form\'ali vi}},
+  introductionto = {{inngangur a}{inngangur a}},
+  partvolume = {{\addspace hl\adddot}{\addspace hl\adddot}},
+  by = {{eftir}{eftir}},
+  of = {{af}{af}},
+%  on = {{}{}},
+  compiler = {{ritstj\adddot}{ritstj\adddot}},% Same as editor
+  compilers = {{ritstj\adddot}{ritstj\adddot}},
+  transcompiler = {{ritstj\adddot\addabbrvspace og \'y\adddot}%
+    {ritstj\adddot\addabbrvspace og \'y\adddot}},
+  transcompilers = {{ritstj\adddot\addabbrvspace og \'y\adddot}%
+    {ritstj\adddot\addabbrvspace og \'y\adddot}},
+  editortranscompiler = {{ritstj\adddot\addabbrvspace og \'y\adddot}%
+    {ritstj\adddot\addabbrvspace og \'y\adddot}},
+  editorcompiler = {{ritstj\adddot}{ritstj\adddot}},
+  editortranslator = {{ritstj\adddot\addabbrvspace og \'y\adddot}%
+    {ritstj\adddot\addabbrvspace og \'y\adddot}},
+  editortranscompilers = {{ritstj\adddot\addabbrvspace og \'y\adddot}%
+    {ritstj\adddot\addabbrvspace og \'y\adddot}},
+  editorcompilers = {{ritstj\adddot}{ritstj\adddot}},
+  editortranslators = {{ritstj\adddot\addabbrvspace og \'y\adddot}%
+    {ritstj\adddot\addabbrvspace og \'y\adddot}},
+  conductor = {{stj\'ornandi}{stj\'ornandi}},
+  conductors = {{stj\'ornenduur}{stj\'ornendur}},
+  director = {{leikstj\adddot}{leikstj\adddot}},
+  directors = {{leikstj\adddot}{leikstj\adddot}},
+  none = {{}{}},
+  nones = {{}{}},
+  producer = {{framleiandi}{framl\adddot}},
+  producers = {{framleiendur}{framl\adddot}},
+  editor = {{ritstj\adddot}{ritstj\adddot}},
+  editors = {{ritstj\adddot}{ritstj\adddot}},
+  ibidem = {{sama heimild}{s\adddot h\adddot}},
+  origpub = {{upphaflega birt sem}%
+    {upph\adddot\ birt sem}},
+  origpublin = {{birtist upphaflega \'{\i}}%
+    {birtist upph\adddot \'{\i}}},
+  origpubyear = {{birtist upphaflega \'ari}%
+    {birtist upph\adddot\ \'ari}},
+  origreleaseyear = {{upphaflegt \'ut\'ar\addspace}%
+    {upph\adddot \'utg\'afu\'ar\addspace}},
+  origshownyear = {{upphaflega s\'ynt \'ari}%
+    {upph\adddot\ s\'ynt \'ari}},
+  origedition = {{\'utg\'afa\addcolon}%
+    {\'utg\adddot\addcolon}},
+  revisededition = {{endurskou \'utg\'afa}%
+    {endursk\adddot \'utg\adddot}},
+%  broadcast = {{}{}},
+%  recorded = {{}{}},
+  numbers = {{nr\adddot}{nr\adddot}},
+  nodate = {{\'an \'ars}{\'an \'ars}},
+  pseudonym = {{dulnefni}{dulnefni}},
+  patentfiled = {{lagt fram til skr\'aningar}{lagt fram til skr\'aningar}},%
+  patentissued = {{veitt}{veitt}},% ?
+  inlang = {{}{}}, % if this is translated "\'a",%
+%  it would lead to "\'a r\'ussneska", etc.
+  langrussian = {{r\'ussneska}{r\'ussneska}},
+  fromrussian = {{\'ur r\'ussnesku}{\'ur r\'ussnesku}},
+  edamerican     = {{bandar\'{\i}sk}{bandar\'{\i}sk}},
+  edbrazilian    = {{brasil\'{\i}sk}{brasil\'{\i}sk}},
+  eddanish       = {{d\"onsk}{d\"onsk}},
+  eddutch        = {{hollensk}{hollensk}},
+  edenglish      = {{bresk}{bresk}},
+  edfrench       = {{fr\"onsk}{fr\"onsk}},
+  edgerman       = {{\'ysk}{\'ysk}},
+  edgreek        = {{gr\'{\i}sk}{gr\'{\i}sk}},
+  editalian      = {{\'{\i}t\"olsk}{\'{\i}t\"olsk}},
+  edlatin        = {{latnesk}{latnesk}},
+  ednorwegian    = {{norsk}{norsk}},
+  edportuguese   = {{port\'ug\"olsk}{port\'ug\"olsk}},
+  edrussian      = {{r\'ussnesk}{r\'ussnesk}},
+  edspanish      = {{sp\ae{}nsk}{sp\ae{}nsk}},
+  edswedish      = {{s\ae{}nsk}{s\ae{}nsk}},
+  translator = {{\'y\adddot}{\'y\adddot}},
+  translators = {{\'y\adddot}{\'y\adddot}},
+  redactor = {{ritstj\adddot}{ritstj\adddot}}, % same as editor
+  redactors = {{ritstj\adddot}{ritstj\adddot}},
+  founder          = {{stofnandi}{stofnandi}},
+  founders         = {{stofnendur}{stofnendur}},
+  continuator      = {{haldi \'afram af}{haldi \'afram af}},
+  continuators     = {{haldi \'afram af}{haldi \'afram af}},
+  collaborator     = {{samstarfsmaur}{samstarfsmaur}},
+  collaborators    = {{samstarfsmenn}{samstarfsmenn}},
+  annotator        = {{me sk\'yringum eftir}{me sk\'yringum eftir}},
+  annotators       = {{me sk\'yringum eftir}{me sk\'yringum eftir}},
+  review = {{ritd\'omur}{ritd\'omur}},
+  reviewof = {{ritd\'omur um}{ritd\'omur um}},
+  reprint = {{endurprentun}{endurpr\adddot}},
+  shorthands = {{skammstafanir}{skammstafanir}},
+  newseries = {{n\'y ritr\"o}{n\adddot rr\adddot}},
+  bynone = {{}{}},
+  cbynone = {{}{}},
+  cbyauthor         = {{eftir}{eftir}},
+  cbyeditor         = {{ritstj\adddot}{ritstj\adddot}},
+  cbycompiler       = {{teki saman af}{teki saman af}},
+  cbyredactor       = {{endurskoa af}{endurskoa af}},
+% The following translations have been taken directly from my version of
+% icelandic.lbx for biblatex (without the "c" in front).
+  cbytranslator     = {{\'y\adddot\addspace\lbx@lfromlang}%
+    {\'y\adddot\addspace\lbx@sfromlang}},%
+  cbycommentator    = {{sk\'yringar:}{sk\'yringar:}},
+  cbyannotator      = {{sk\'yringar:}{sk\'yringar:}},
+%  cbyconductor      = {{}{}},
+%  cbydirector       = {{}{}},
+%  cbyproducer       = {{}{}},
+  cbyeditortr       = {{\'utg.~og \'y\adddot \lbx@lfromlang}%
+                      {\'utg.~og \'y\adddot}},
+  cbyeditorco       = {{\'utg.~og sk\'yringar:}%
+                      {\'utg.~og sk\'yringar:}},
+  cbyeditoran       = {{\'utg.~og sk\'yringar:}%
+                      {\'utg. og sk\'yringar:}},
+  cbyeditorin       = {{\'utg. og  inng\adddot:}%
+                      {\'utg. og  inng\adddot:}},
+  cbyeditorfo       = {{\'utg. og  form\'ali:}%
+                      {\'utg. og  form\'ali:}},
+  cbyeditoraf       = {{\'utg. og  eftirm\'ali:}%
+                      {\'utg. og  eftirm\'ali:}},
+  cbyeditortrco     = {{\'utg., \'y\adddot \lbx@sfromlang\ og sk\'yringar:}%
+                      {\'utg., \'y\adddot \lbx@sfromlang\ og sk\'yringar:}},
+  cbyeditortran     = {{\'utg., \'y\adddot \lbx@sfromlang\ og sk\'yringar:}%
+                      {\'utg., \'y\adddot \lbx@sfromlang\ og sk\'yringar:}},
+  cbyeditortrin     = {{\'utg., \'y\adddot \lbx@sfromlang\ og  inng\adddot:}%
+                      {\'utg., \'y\adddot \lbx@sfromlang\ og  inng\adddot:}},
+  cbyeditortrfo     = {{\'utg., \'y\adddot \lbx@sfromlang\ og  form\'ali:}%
+                      {\'utg., \'y\adddot \lbx@sfromlang\ og  form\'ali:}},
+  cbyeditortraf     = {{\'utg., \'y\adddot \lbx@sfromlang\ og  eftirm\'ali:}%
+                      {\'utg., \'y\adddot \lbx@sfromlang\ og  eftirm\'ali:}},
+  cbyeditorcoin     = {{\'utg., sk\'yringar og  inng\adddot:}%
+                      {\'utg., sk\'yringar og  inng\adddot:}},
+  cbyeditorcofo     = {{\'utg., sk\'yringar og  form\'ali:}%
+                      {\'utg., sk\'yringar og  form\'ali:}},
+  cbyeditorcoaf     = {{\'utg., sk\'yringar og  eftirm\'ali:}%
+                      {\'utg., sk\'yringar og  eftirm\'ali:}},
+  cbyeditoranin     = {{\'utg., sk\'yringar og  inng\adddot:}%
+                      {\'utg., sk\'yringar og  inng\adddot:}},
+  cbyeditoranfo     = {{\'utg., sk\'yringar og  form\'ali:}%
+                      {\'utg., sk\'yringar og  form\'ali:}},
+  cbyeditoranaf     = {{\'utg., sk\'yringar og  eftirm\'ali:}%
+                      {\'utg., sk\'yringar og  eftirm\'ali:}},
+  cbyeditortrcoin   = {{\'utg., \'y\adddot \lbx@sfromlang\ og  sk\'yringar og inng\adddot:}%
+                      {\'utg., \'y\adddot \lbx@sfromlang\ og  sk\'yringar og inng\adddot:}},
+  cbyeditortrcofo   = {{\'utg., \'y\adddot \lbx@sfromlang\ og  sk\'yringar og form\'ali:}%
+                      {\'utg., \'y\adddot \lbx@sfromlang\ og  sk\'yringar og form\'ali:}},
+  cbyeditortrcoaf   = {{\'utg., \'y\adddot \lbx@sfromlang\ og  sk\'yringar og eftirm\'ali:}%
+                      {\'utg., \'y\adddot \lbx@sfromlang\ og  sk\'yringar og eftirm\'ali:}},
+  cbyeditortranin   = {{\'utg., \'y\adddot \lbx@sfromlang\ og  sk\'yringar og inng\adddot:}%
+                      {\'utg., \'y\adddot \lbx@sfromlang\ og  sk\'yringar og inng\adddot:}}, 
+  cbyeditortranfo   = {{\'utg., \'y\adddot \lbx@sfromlang\ og  sk\'yringar og form\'ali:}%
+                      {\'utg., \'y\adddot \lbx@sfromlang\ og  sk\'yringar og form\'ali:}},
+  cbyeditortranaf   = {{\'utg., \'y\adddot \lbx@sfromlang\ og  sk\'yringar og eftirm\'ali:}%
+                      {\'utg., \'y\adddot \lbx@sfromlang\ og  sk\'yringar og eftirm\'ali:}}, 
+  cbytranslatorco   = {{\'y\adddot \lbx@lfromlang\ og sk\'yringar:}%
+                      {\'y\adddot \lbx@lfromlang\ og sk\'yringar:}},
+  cbytranslatoran   = {{\'y\adddot \lbx@lfromlang\ og sk\'yringar:}%
+                      {\'y\adddot \lbx@lfromlang\ og sk\'yringar:}}, 
+  cbytranslatorin   = {{\'y\adddot \lbx@lfromlang\ og  inng\adddot:}%
+                      {\'y\adddot \lbx@lfromlang\ og  inng\adddot:}},
+  cbytranslatorfo   = {{\'y\adddot \lbx@lfromlang\ og  form\'ali:}%
+                      {\'y\adddot \lbx@lfromlang\ og  form\'ali:}},
+  cbytranslatoraf   = {{\'y\adddot \lbx@lfromlang\ og  eftirm\'ali:}%
+                      {\'y\adddot \lbx@lfromlang\ og  eftirm\'ali:}},
+  cbytranslatorcoin = {{\'y\adddot \lbx@lfromlang, sk\'yringar og  inng\adddot:}%
+                      {\'y\adddot \lbx@lfromlang, sk\'yringar og  inng\adddot:}},
+  cbytranslatorcofo = {{\'y\adddot \lbx@lfromlang, sk\'yringar og  form\'ali:}%
+                      {\'y\adddot \lbx@lfromlang, sk\'yringar og  form\'ali:}},
+  cbytranslatorcoaf = {{\'y\adddot \lbx@lfromlang, sk\'yringar og  eftirm\'ali:}%
+                      {\'y\adddot \lbx@lfromlang, sk\'yringar og  eftirm\'ali:}},
+  cbytranslatoranin = {{\'y\adddot \lbx@lfromlang, sk\'yringar og  inng\adddot:}%
+                      {\'y\adddot \lbx@lfromlang, sk\'yringar og  inng\adddot:}},
+  cbytranslatoranfo = {{\'y\adddot \lbx@lfromlang, sk\'yringar og  form\'ali:}%
+                      {\'y\adddot \lbx@lfromlang, sk\'yringar og  form\'ali:}},
+  cbytranslatoranaf = {{\'y\adddot \lbx@lfromlang, sk\'yringar og  eftirm\'ali:}%
+                      {\'y\adddot \lbx@lfromlang, sk\'yringar og  eftirm\'ali:}},
+  % Missing: cbycompilerco, cbycompileran, cbycompilerin, cbycompilerfo, cbycompileraf,
+  %          cbycompilercoin, cbycompilercofo, cbycompilercoaf, cbycompileranin,
+  %          cbycompileranfo, cbycompileranaf
+  volume = {{bindi}{bindi}},
+  volumes = {{bindi}{bindi}},
+  jourvol = {{\'arg\adddot}{\'arg\adddot}},
+  jourser = {{ritr\"o}{rr\adddot}},
+  oldseries = {{g\"omul ritr\"o}{g\adddot rr\adddot}},
+  edition = {{\'utg\adddot}{\'utg\adddot}},
+  page = {{bls\adddot}{bls\adddot}},
+  pages = {{bls\adddot}{bls\adddot}},
+  column = {{d\'alkur}{dlk\adddot}},
+  columns = {{d\'alkar}{dlk\adddot}},
+  line = {{l\'{\i}na}{l\adddot}},
+  lines = {{l\'{\i}nur}{l\adddot}},
+  paragraph = {{mgr\adddot}{mgr\adddot}},
+  paragraphs = {{mgr\adddot}{mgr\adddot}},
+  section = {{\S}{\S}},
+  sections = {{\S\S}{\S\S}},
+  verse = {{erindi}{er\adddot}},
+  verses = {{erindi}{er\adddot}},
+  number = {{nr\adddot}{nr\adddot}},
+  chapter = {{kafli}{k\adddot}},
+%  byconductor = {{}{}},
+%  bydirector = {{}{}},
+%  byproducer = {{}{}},
+  % A lot of keys already present in in icelandic.lbx omitted here
+}
+
+\protected\gdef\lbx@cms@mkbibrangetrunc#1#2{%  DATE FIX
+  \iffieldundef{#2year}%
+  {\iffieldundef{#2month}
+    {}
+    {\printtext[#2date]{%
+        \iffieldsequal{#2month}{#2endmonth}
+        {\csuse{mkbibdate#1}{}{}{#2day}}
+        {\csuse{mkbibdate#1}{}{#2month}{#2day}}%
+        \iffieldundef{#2endyear}
+        {\iffieldundef{#2endmonth}
+          {}
+          {\bibdatedash
+            \csuse{mkbibdate#1}{}{#2endmonth}{#2endday}}}
+        {\iffieldequalstr{#2endyear}{}
+          {\mbox{\bibdatedash}}
+          {\bibdatedash
+            \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+  {\printtext[#2date]{%
+      \iffieldsequal{#2year}{#2endyear}
+      {\iffieldsequal{#2month}{#2endmonth}
+        {\csuse{mkbibdate#1}{}{}{#2day}}
+        {\csuse{mkbibdate#1}{}{#2month}{#2day}}}
+      {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+      \iffieldundef{#2endyear}
+      {}
+      {\iffieldequalstr{#2endyear}{}
+        {\mbox{\bibdatedash}}
+        {\bibdatedash
+          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+
+\protected\gdef\lbx@cms@mkbibrangefull#1#2{%
+  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
+  {}%
+  {\printtext[#2date]{%
+      \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}
+      {}
+      {\iffieldequalstr{#2endyear}{}
+        {\mbox{\bibdatedash}}
+        {\bibdatedash
+          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx
index 49861be8f5e..5f96c95e8e6 100644
--- a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-ngerman.lbx
@@ -1,6 +1,6 @@
-% $Id: cms-german.lbx,v 0.9.5.20 2012/07/05 11:09:04 dfussner Exp $	
+% $Id: cms-german.lbx,v 0.9.5.23 2012/12/06 12:06:28 dfussner Exp $	
 
-\ProvidesFile{cms-ngerman.lbx}[2012/07/05 v 1.7 biblatex localization]
+\ProvidesFile{cms-ngerman.lbx}[2012/12/06 v 2.4 biblatex localization]
 
 % STATUS OF THIS FILE
 % - Translated strings and formatting decisions need review by native
@@ -326,7 +326,7 @@
   pseudonym = {{Pseud\adddot}{Pseud\adddot}},
   patentfiled = {{eingereicht}{eingereicht}},% Are these 2 correct?
   patentissued = {{erteilt}{erteilt}},% ?
-  inlang = {{auf}{auf}},
+  inlang = {{auf\addspace}{auf\addspace}},
   langrussian = {{Russisch}{Russisch}},
   fromrussian = {{aus dem Russischen}{aus dem Russischen}},
   edamerican     = {{amerikanische}{amerikanische}},
@@ -946,7 +946,7 @@
   \iffieldundef{#2year}%
   {\iffieldundef{#2month}
     {}
-    {\printtext{%
+    {\printtext[#2date]{%
         \iffieldsequal{#2month}{#2endmonth}
         {\csuse{mkbibdate#1}{}{}{#2day}}
         {\csuse{mkbibdate#1}{}{#2month}{#2day}}%
@@ -959,7 +959,7 @@
           {\mbox{\bibdatedash}}
           {\bibdatedash
             \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-  {\printtext{%
+  {\printtext[#2date]{%
       \iffieldsequal{#2year}{#2endyear}
       {\iffieldsequal{#2month}{#2endmonth}
         {\csuse{mkbibdate#1}{}{}{#2day}}
@@ -975,7 +975,7 @@
 \protected\gdef\lbx@cms@mkbibrangefull#1#2{%
   \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
   {}%
-  {\printtext{%
+  {\printtext[#2date]{%
       \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
       \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}
       {}
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norsk.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norsk.lbx
new file mode 100644
index 00000000000..0d51cd11176
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norsk.lbx
@@ -0,0 +1,14 @@
+% $Id: cms-norsk.lbx,v 1.2 2012/12/06 11:34:59 dfussner Exp $
+
+\ProvidesFile{cms-norsk.lbx}[2012/12/06 v 2.4 biblatex localization]
+
+% STATUS OF THIS FILE
+% - Placeholder for cms-norwegian.lbx, as in standard biblatex.
+% - Strings in cms-norwegian.lbx translated by a native speaker
+%   (H{\aa}kon Malmedal).
+% - Date handling there modified by dfussner.
+
+\InheritBibliographyExtras{cms-norwegian}
+\InheritBibliographyStrings{cms-norwegian}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norwegian.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norwegian.lbx
new file mode 100644
index 00000000000..c79e0abd76b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-norwegian.lbx
@@ -0,0 +1,755 @@
+% $Id: cms-norwegian.lbx,v 1.2 2012/12/06 11:34:06 dfussner Exp $
+
+\ProvidesFile{cms-norwegian.lbx}[2012/12/06 v 2.4 biblatex localization]
+
+% STATUS OF THIS FILE
+% - Translated by a native speaker (H{\aa}kon Malmedal).
+% - Date handling modified by dfussner.
+
+\InheritBibliographyExtras{norwegian}
+
+\DeclareBibliographyExtras{%
+  \savecommand\cms@datelong
+  \savecommand\cms@datelongalt
+  \savecommand\mkbibrangecomp
+  \savecommand\mkbibrangeterse
+  \savecommand\mkbibrangefull
+  \protected\def\mkbibrangecomp{%
+    \lbx@cms@mkbibrangetrunc{long}}%
+  \protected\def\mkbibrangeterse{%
+    \lbx@cms@mkbibrangetrunc{short}}%
+  \protected\def\mkbibrangefull{%
+    \lbx@cms@mkbibrangefull}
+  \def\cms@datelong{\printorigdate}%
+  \def\cms@datelongalt{\printdate}}%
+
+\UndeclareBibliographyExtras{%
+  \restorecommand\cms@datelong
+  \restorecommand\cms@datelongalt
+  \restorecommand\mkbibrangecomp%
+  \restorecommand\mkbibrangefull%
+  \restorecommand\mkbibrangeterse}%
+
+\NewBibliographyString{bynone}
+\NewBibliographyString{bycompiler}
+\NewBibliographyString{byconductor}
+\NewBibliographyString{bydirector}
+\NewBibliographyString{byproducer}
+\NewBibliographyString{byeditorcp}
+\NewBibliographyString{byeditortrcp}
+\NewBibliographyString{byeditortrcpco}
+\NewBibliographyString{byeditortrcpan}
+\NewBibliographyString{byeditortrcpin}
+\NewBibliographyString{byeditortrcpfo}
+\NewBibliographyString{byeditortrcpaf}
+\NewBibliographyString{byeditortrcpcoin}
+\NewBibliographyString{byeditortrcpcofo}
+\NewBibliographyString{byeditortrcpcoaf}
+\NewBibliographyString{byeditortrcpanin}
+\NewBibliographyString{byeditortrcpanfo}
+\NewBibliographyString{byeditortrcpanaf}
+\NewBibliographyString{byeditorcpco}
+\NewBibliographyString{byeditorcpan}
+\NewBibliographyString{byeditorcpin}
+\NewBibliographyString{byeditorcpfo}
+\NewBibliographyString{byeditorcpaf}
+\NewBibliographyString{byeditorcpcoin}
+\NewBibliographyString{byeditorcpcofo}
+\NewBibliographyString{byeditorcpcoaf}
+\NewBibliographyString{byeditorcpanin}
+\NewBibliographyString{byeditorcpanfo}
+\NewBibliographyString{byeditorcpanaf}
+\NewBibliographyString{bytranslatorcp}
+\NewBibliographyString{bytranslatorcpco}
+\NewBibliographyString{bytranslatorcpan}
+\NewBibliographyString{bytranslatorcpin}
+\NewBibliographyString{bytranslatorcpfo}
+\NewBibliographyString{bytranslatorcpaf}
+\NewBibliographyString{bytranslatorcpcoin}
+\NewBibliographyString{bytranslatorcpcofo}
+\NewBibliographyString{bytranslatorcpcoaf}
+\NewBibliographyString{bytranslatorcpanin}
+\NewBibliographyString{bytranslatorcpanfo}
+\NewBibliographyString{bytranslatorcpanaf}
+\NewBibliographyString{bycompilerco}
+\NewBibliographyString{bycompileran}
+\NewBibliographyString{bycompilerin}
+\NewBibliographyString{bycompilerfo}
+\NewBibliographyString{bycompileraf}
+\NewBibliographyString{bycompilercoin}
+\NewBibliographyString{bycompilercofo}
+\NewBibliographyString{bycompilercoaf}
+\NewBibliographyString{bycompileranin}
+\NewBibliographyString{bycompileranfo}
+\NewBibliographyString{bycompileranaf}
+\NewBibliographyString{cbynone}
+\NewBibliographyString{cbyauthor}
+\NewBibliographyString{cbyeditor}
+\NewBibliographyString{cbytranslator}
+\NewBibliographyString{cbycompiler}
+\NewBibliographyString{cbyredactor}
+\NewBibliographyString{cbycommentator}
+\NewBibliographyString{cbyannotator}
+\NewBibliographyString{cbyfounder}
+\NewBibliographyString{cbycontinuator}
+\NewBibliographyString{cbycollaborator}
+\NewBibliographyString{cbyconductor}
+\NewBibliographyString{cbydirector}
+\NewBibliographyString{cbyproducer}
+\NewBibliographyString{cbyeditortr}
+\NewBibliographyString{cbyeditorcp}
+\NewBibliographyString{cbyeditorco}
+\NewBibliographyString{cbyeditoran}
+\NewBibliographyString{cbyeditorin}
+\NewBibliographyString{cbyeditorfo}
+\NewBibliographyString{cbyeditoraf}
+\NewBibliographyString{cbyeditortrcp}
+\NewBibliographyString{cbyeditortrco}
+\NewBibliographyString{cbyeditortran}
+\NewBibliographyString{cbyeditortrin}
+\NewBibliographyString{cbyeditortrfo}
+\NewBibliographyString{cbyeditortraf}
+\NewBibliographyString{cbyeditortrcpco}
+\NewBibliographyString{cbyeditortrcpan}
+\NewBibliographyString{cbyeditortrcpin}
+\NewBibliographyString{cbyeditortrcpfo}
+\NewBibliographyString{cbyeditortrcpaf}
+\NewBibliographyString{cbyeditorcoin}
+\NewBibliographyString{cbyeditorcofo}
+\NewBibliographyString{cbyeditorcoaf}
+\NewBibliographyString{cbyeditoranin}
+\NewBibliographyString{cbyeditoranfo}
+\NewBibliographyString{cbyeditoranaf}
+\NewBibliographyString{cbyeditortrcoin}
+\NewBibliographyString{cbyeditortrcofo}
+\NewBibliographyString{cbyeditortrcoaf}
+\NewBibliographyString{cbyeditortranin}
+\NewBibliographyString{cbyeditortranfo}
+\NewBibliographyString{cbyeditortranaf}
+\NewBibliographyString{cbyeditortrcpcoin}
+\NewBibliographyString{cbyeditortrcpcofo}
+\NewBibliographyString{cbyeditortrcpcoaf}
+\NewBibliographyString{cbyeditortrcpanin}
+\NewBibliographyString{cbyeditortrcpanfo}
+\NewBibliographyString{cbyeditortrcpanaf}
+\NewBibliographyString{cbyeditorcpco}
+\NewBibliographyString{cbyeditorcpan}
+\NewBibliographyString{cbyeditorcpin}
+\NewBibliographyString{cbyeditorcpfo}
+\NewBibliographyString{cbyeditorcpaf}
+\NewBibliographyString{cbyeditorcpcoin}
+\NewBibliographyString{cbyeditorcpcofo}
+\NewBibliographyString{cbyeditorcpcoaf}
+\NewBibliographyString{cbyeditorcpanin}
+\NewBibliographyString{cbyeditorcpanfo}
+\NewBibliographyString{cbyeditorcpanaf}
+\NewBibliographyString{cbytranslatorcp}
+\NewBibliographyString{cbytranslatorco}
+\NewBibliographyString{cbytranslatoran}
+\NewBibliographyString{cbytranslatorin}
+\NewBibliographyString{cbytranslatorfo}
+\NewBibliographyString{cbytranslatoraf}
+\NewBibliographyString{cbytranslatorcpco}
+\NewBibliographyString{cbytranslatorcpan}
+\NewBibliographyString{cbytranslatorcpin}
+\NewBibliographyString{cbytranslatorcpfo}
+\NewBibliographyString{cbytranslatorcpaf}
+\NewBibliographyString{cbytranslatorcoin}
+\NewBibliographyString{cbytranslatorcofo}
+\NewBibliographyString{cbytranslatorcoaf}
+\NewBibliographyString{cbytranslatoranin}
+\NewBibliographyString{cbytranslatoranfo}
+\NewBibliographyString{cbytranslatoranaf}
+\NewBibliographyString{cbytranslatorcpcoin}
+\NewBibliographyString{cbytranslatorcpcofo}
+\NewBibliographyString{cbytranslatorcpcoaf}
+\NewBibliographyString{cbytranslatorcpanin}
+\NewBibliographyString{cbytranslatorcpanfo}
+\NewBibliographyString{cbytranslatorcpanaf}
+\NewBibliographyString{cbycompilerco}
+\NewBibliographyString{cbycompileran}
+\NewBibliographyString{cbycompilerin}
+\NewBibliographyString{cbycompilerfo}
+\NewBibliographyString{cbycompileraf}
+\NewBibliographyString{cbycompilercoin}
+\NewBibliographyString{cbycompilercofo}
+\NewBibliographyString{cbycompilercoaf}
+\NewBibliographyString{cbycompileranin}
+\NewBibliographyString{cbycompileranfo}
+\NewBibliographyString{cbycompileranaf}
+\NewBibliographyString{cfromamerican}
+\NewBibliographyString{cfrombrazilian}
+\NewBibliographyString{cfromdanish}
+\NewBibliographyString{cfromdutch}
+\NewBibliographyString{cfromenglish}
+\NewBibliographyString{cfromfrench}
+\NewBibliographyString{cfromgerman}
+\NewBibliographyString{cfromgreek}
+\NewBibliographyString{cfromitalian}
+\NewBibliographyString{cfromlatin}
+\NewBibliographyString{cfromnorwegian}
+\NewBibliographyString{cfromportuguese}
+\NewBibliographyString{cfromrussian}
+\NewBibliographyString{cfromspanish}
+\NewBibliographyString{cfromswedish}
+\NewBibliographyString{partvolume}
+\NewBibliographyString{by}
+\NewBibliographyString{of}
+\NewBibliographyString{on}
+\NewBibliographyString{afterwordto}
+\NewBibliographyString{forewordto}
+\NewBibliographyString{introductionto}
+\NewBibliographyString{origpub}
+\NewBibliographyString{origpublin}
+\NewBibliographyString{origpubyear}
+\NewBibliographyString{origpubyearalt}
+\NewBibliographyString{origreleaseyear}
+\NewBibliographyString{origshownyear}
+\NewBibliographyString{origedition}
+\NewBibliographyString{revisededition}
+\NewBibliographyString{broadcast}
+\NewBibliographyString{recorded}
+\NewBibliographyString{numbers}
+\NewBibliographyString{nodate}
+\NewBibliographyString{pseudonym}
+\NewBibliographyString{patentfiled}% Needed for CMS style patent entries
+\NewBibliographyString{patentissued}%
+\NewBibliographyString{inlang}
+\NewBibliographyString{langrussian}
+\NewBibliographyString{fromrussian}
+\NewBibliographyString{edamerican}
+\NewBibliographyString{edbrazilian}
+\NewBibliographyString{eddanish}
+\NewBibliographyString{eddutch}
+\NewBibliographyString{edenglish}
+\NewBibliographyString{edfrench}
+\NewBibliographyString{edgerman}
+\NewBibliographyString{edgreek}
+\NewBibliographyString{editalian}
+\NewBibliographyString{edlatin}
+\NewBibliographyString{ednorwegian}
+\NewBibliographyString{edportuguese}
+\NewBibliographyString{edrussian}
+\NewBibliographyString{edspanish}
+\NewBibliographyString{edswedish}
+\NewBibliographyString{review}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{section}
+\NewBibliographyString{sections}
+\NewBibliographyString{compiler}
+\NewBibliographyString{compilers}
+\NewBibliographyString{conductor}
+\NewBibliographyString{conductors}
+\NewBibliographyString{director}
+\NewBibliographyString{directors}
+\NewBibliographyString{none}
+\NewBibliographyString{nones}
+\NewBibliographyString{producer}
+\NewBibliographyString{producers}
+\NewBibliographyString{transcompiler}
+\NewBibliographyString{transcompilers}
+\NewBibliographyString{editortranscompiler}
+\NewBibliographyString{editorcompiler}
+\NewBibliographyString{editortranslator}
+\NewBibliographyString{editortranscompilers}
+\NewBibliographyString{editorcompilers}
+\NewBibliographyString{editortranslators}
+
+\DeclareBibliographyStrings{%
+  inherit = {norwegian},
+  afterwordto = {{etterord til}{etterord til}},
+  forewordto = {{forord til}{forord til}},
+  introductionto = {{innledning til}{innl\adddot\space til}},
+  partvolume = {{\addspace del}{\addspace del}},
+  by = {{av}{av}},
+  of = {{av}{av}},
+  on = {{p{\aa}}{p{\aa}}},
+  compiler = {{komp\adddot}{komp\adddot}},
+  compilers = {{komp\adddot}{komp\adddot}},
+  transcompiler = {{overs\adddot\addspace og komp\adddot}%
+    {overs\adddot\addspace og komp\adddot}},
+  transcompilers = {{overs\adddot\addspace og komp\adddot}%
+    {overs\adddot\addspace og komp\adddot}},
+  editortranscompiler = {{red\adddot\addcomma\addspace
+      overs\adddot\addcomma\addspace og komp\adddot}%
+    {red\adddot\addcomma\addspace
+      overs\adddot\addcomma\addspace og komp\adddot}},
+  editorcompiler = {{red\adddot\addspace og komp\adddot}%
+    {red\adddot\addspace og komp\adddot}},
+  editortranslator = {{red\adddot\addspace og overs\adddot}%
+    {red\adddot\addspace og overs\adddot}},
+  editortranscompilers = {{red\adddot\addcomma\addspace
+      overs\adddot\addcomma\addspace og komp\adddot}%
+    {red\adddot\addcomma\addspace
+      overs\adddot\addcomma\addspace og komp\adddot}},
+  editorcompilers = {{red\adddot\addspace og komp\adddot}%
+    {red\adddot\addspace og komp\adddot}},
+  editortranslators = {{red\adddot\addspace og overs\adddot}%
+    {red\adddot\addspace og overs\adddot}},
+  conductor = {{dir\adddot}{dir\adddot}},
+  conductors = {{dir\adddot}{dir\adddot}},
+  director = {{regi}{regi}},
+  directors = {{regi}{regi}},
+  none = {{}{}},
+  nones = {{}{}},
+  producer = {{prod\adddot}{prod\adddot}},
+  producers = {{prod\adddot}{prod\adddot}},
+  editor = {{red\adddot}{red\adddot}},
+  editors = {{red\adddot}{red\adddot}},
+  ibidem = {{sst\adddot}{sst\adddot}},
+  origpub = {{opprinnelig utgitt som}%
+    {oppr\adddot\ utg\adddot\ som}},
+  origpublin = {{opprinnelig utgitt i\addspace}%
+    {oppr\adddot\ utg\adddot\addspace i\addspace}},
+  origpubyear = {{opprinnelig utgitt i\addspace}%
+    {oppr\adddot\ utg\adddot\addspace}},
+  origpubyearalt = {{f{\o}rst utgitt\addspace}%
+    {f{\o}rst utg\adddot\addspace}},
+  origreleaseyear = {{opprinnelig utgitt i\addspace}%
+    {oppr\adddot\ utg\adddotspace}},
+  origshownyear = {{opprinnelig vist i\addspace}%
+    {oppr\adddot\ vist\addspace}},
+  origedition ={{utgave\addcolon\addspace}%
+    {utg\adddot\addcolon\addspace}},
+  revisededition = {{rev\adddot\addspace utg\adddot}%
+    {rev\adddot\addspace utg\adddot}},
+  broadcast = {{kringkastet}{kringkastet}},
+  recorded = {{spilt inn}{spilt inn}},
+  numbers = {{nr\adddot}{nr\adddot}},
+  nodate = {{udatert}{udatert}},
+  pseudonym = {{pseud\adddot}{pseud\adddot}},
+  patentfiled = {{s{\o}kt}{s{\o}kt}},
+  patentissued = {{meddelt}{meddelt}},
+  inlang = {{p{\aa}\addspace}{p{\aa}\addspace}},
+  edamerican     = {{amerikansk}{amerikansk}},
+  edbrazilian    = {{brasiliansk}{brasiliansk}},
+  eddanish       = {{dansk}{dansk}},
+  eddutch        = {{nederlandsk}{nederlandsk}},
+  edenglish      = {{engelsk}{engelsk}},
+  edfrench       = {{fransk}{fransk}},
+  edgerman       = {{tysk}{tysk}},
+  edgreek        = {{gresk}{gresk}},
+  editalian      = {{italiensk}{italiensk}},
+  edlatin        = {{latin}{latin}},
+  ednorwegian    = {{norsk}{norsk}},
+  edportuguese   = {{portugisisk}{portugisisk}},
+  edrussian      = {{russisk}{russisk}}
+  edspanish      = {{spansk}{spansk}},
+  edswedish      = {{svensk}{svensk}},
+  translator       = {{overs\adddot}{overs\adddot}},
+  translators      = {{overs\adddot}{overs\adddot}},
+  redactor         = {{bearb\adddot}{bearb\adddot}},
+  redactors        = {{bearb\adddot}{bearb\adddot}},
+  founder          = {{grunnl\adddot}{grunnl\adddot}},
+  founders         = {{grunnl\adddot}{grunnl\adddot}},
+  continuator      = {{videref\adddot}{videref\adddot}},
+  continuators     = {{videref\adddot}{videref\adddot}},
+  collaborator     = {{samarb\adddot}{samarb\adddot}},
+  collaborators    = {{samarb\adddot}{samarb\adddot}},
+  annotator        = {{forkl\adddot}{forkl\adddot}},
+  annotators       = {{forkl\adddot}{forkl\adddot}},
+  review = {{omtale}{omtale}},
+  reviewof = {{omtale av}{omtale av}},
+  cbynone = {{}{}},
+  cbyauthor = {{av}{av}},
+  cbyeditor = {{red\adddot}{red\adddot}},
+  cbytranslator     = {{overs\adddot\addspace\lbx@cfromlang}%
+    {overs\adddot\addspace\lbx@cfromlang}},
+  cbycompiler = {{komp\adddot}{komp\adddot}},
+  cbyredactor = {{bearb\adddot}{bearb\adddot}},
+  cbycommentator = {{komm\adddot}{komm\adddot}},
+  cbyannotator = {{forkl\addot}{forkl\addot}},
+  cbyfounder        = {{grunnl\adddot}{grunnl\adddot}},
+  cbycontinuator    = {{videref\adddot}{videref\adddot}},
+  cbycollaborator   = {{i samarb\adddotspace med}%
+    {i samarb\adddotspace med}},
+  cbyconductor = {{dir\adddot}{dir\adddot}},
+  cbydirector = {{regi}{regi}},
+  cbyproducer = {{prod\adddot}{prod\adddot}},
+  cbyeditortr    = {{red\adddot\space og
+      overs\adddot\addspace\lbx@cfromlang}%
+    {red\adddot\space og overs\adddot\addspace\lbx@cfromlang}},
+  cbyeditorcp = {{red\adddot\space og komp\adddot}%
+    {red\adddot\space og komp\adddot}},
+  cbyeditorco    = {{red\adddot\space og komm\adddot}%
+    {red\adddot\space og komm\adddot}},
+  cbyeditoran = {{red\adddot\space og forkl\adddot}%
+    {red\adddot\space og forkl\adddot}},
+  cbyeditorin = {{red.,\addabbrvspace med innl., av}%
+    {red.,\addabbrvspace med innl., av}},
+  cbyeditorfo = {{red.,\addabbrvspace med forord, av}%
+    {red.,\addabbrvspace med forord, av}},
+  cbyeditoraf = {{red.,\addabbrvspace med etterord, av}%
+    {red.,\addabbrvspace med etterord, av}},
+  cbyeditortrcp = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang og
+      komp\adddot}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp\adddot}},
+  cbyeditortrco = {{red.,\addabbrvspace
+    overs\adddot\addspace\lbx@fromlang\space og
+    komm\adddot}%
+  {red.,\addabbrvspace
+    overs\adddot\addspace\lbx@fromlang\space og komm\adddot}},
+  cbyeditortran = {{red.,\addabbrvspace
+    overs\adddot\addspace\lbx@fromlang\space og
+    forkl\adddot}%
+  {red.,\addabbrvspace
+    overs\adddot\addspace\lbx@fromlang\space og forkl\adddot}},
+  cbyeditortrin = {{red\adddotspace og overs\adddot\ \lbx@sfromlang, med innl., av}%
+    {red\adddotspace og overs\adddot\ \lbx@sfromlang, med innl., av}},
+  cbyeditortrfo = {{red\adddotspace og overs\adddot\ \lbx@sfromlang, med forord, av}%
+    {red\adddotspace og overs\adddot\ \lbx@sfromlang, med forord, av}},
+  cbyeditortraf = {{red\adddotspace og overs\adddot\ \lbx@sfromlang, med etterord, av}%
+    {red\adddotspace og overs\adddot\ \lbx@sfromlang, med etterord, av}},
+  cbyeditorcpco = {{red.,\addabbrvspace komp. og komm\adddot}%
+    {red.,\addabbrvspace komp. og komm\adddot}},
+  cbyeditorcpan = {{red.,\addabbrvspace komp. og forkl\adddot}%
+    {red.,\addabbrvspace komp. og forkl\adddot}},
+  cbyeditorcpin = {{red\adddot\space og komp., med innl., av}%
+    {red\adddot\space og komp., med innl., av}},
+  cbyeditorcpfo = {{red\adddot\space og komp., med forord, av}%
+    {red\adddot\space og komp., med forord, av}},
+  cbyeditorcpaf = {{red\adddot\space og komp., med etterord, av}%
+    {red\adddot\space og komp., med etterord, av}},
+  cbyeditorcpcoin = {{red.,\addabbrvspace komp. og komm., med innl., av}%
+    {red.,\addabbrvspace komp. og komm., med innl., av}},
+  cbyeditorcpcofo = {{red.,\addabbrvspace komp. og komm., med forord, av}%
+    {red.,\addabbrvspace komp. og komm., med forord, av}},
+  cbyeditorcpcoaf = {{red.,\addabbrvspace komp. og komm., med etterord, av}%
+    {red.,\addabbrvspace komp. og komm., med etterord, av}},
+  cbyeditorcpanin = {{red.,\addabbrvspace komp. og forkl., med innl., av}%
+    {red.,\addabbrvspace komp. og forkl., med innl., av}},
+  cbyeditorcpanfo = {{red.,\addabbrvspace komp. og forkl., med forord, av}%
+    {red.,\addabbrvspace komp. og forkl., med forord, av}},
+  cbyeditorcpanaf = {{red.,\addabbrvspace komp. og forkl., med etterord, av}%
+    {red.,\addabbrvspace komp. og forkl., med etterord, av}},
+  cbyeditortrcpco = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang,
+      komp. og komm\adddot}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og komm\adddot}},
+  cbyeditortrcpan = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang,
+      komp. og forkl\adddot}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og forkl\adddot}},
+  cbyeditortrcpin = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp., med innl., av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp.,
+      med innl., av}},
+  cbyeditortrcpfo = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp., med forord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp.,
+      med forord, av}},
+  cbyeditortrcpaf = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp., med etterord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp.,
+      med etterord, av}},
+  cbyeditortrcpcoin = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang,
+      komp. og komm., med innl., av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og komm., med innl., av}},
+  cbyeditortrcpcofo = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang,
+      komp. og komm., med forord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og komm., med forord, av}},
+  cbyeditortrcpcoaf = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang,
+      komp. og komm., med etterord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og komm., med etterord, av}},
+  cbyeditortrcpanin = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang,
+      komp. og forkl., med innl., av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og forkl., med innl., av}},
+  cbyeditortrcpanfo = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang,
+      komp. og forkl., med forord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og forkl., med forord, av}},
+  cbyeditortrcpanaf = {{red.,\addabbrvspace overs.\addspace\lbx@fromlang,
+      komp. og forkl., med etterord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og forkl., med etterord, av}},
+  cbyeditorcoin = {{red\adddot\space og komm., med innl., av}%
+    {red\adddot\space og komm., med innl., av}},
+  cbyeditorcofo = {{red\adddot\space og komm., med forord, av}%
+    {red\adddot\space og komm., med forord, av}},
+  cbyeditorcoaf = {{red\adddot\space og komm., med etterord, av}%
+    {red\adddot\space og komm., med etterord, av}},
+  cbyeditoranin = {{red\adddot\space og forkl., med innl., av}%
+    {red\adddot\space og forkl., med innl., av}},
+  cbyeditoranfo = {{red\adddot\space og forkl., med forord, av}%
+    {red\adddot\space og forkl., med forord, av}},
+  cbyeditoranaf = {{red\adddot\space og forkl., med etterord, av}%
+    {red\adddot\space og forkl., med etterord, av}},
+  cbyeditortrcoin = {{red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og komm., med innl., av}%
+  {red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og komm., med innl., av}},
+  cbyeditortrcofo = {{red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og komm., med forord, av}%
+  {red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og komm., med forord, av}},
+  cbyeditortrcoaf = {{red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og komm., med etterord, av}%
+  {red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og komm., med etterord, av}},
+  cbyeditortranin = {{red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og forkl., med innl., av}%
+  {red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og forkl., med innl., av}},
+  cbyeditortranfo = {{red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og forkl., med forord, av}%
+  {red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og forkl., med forord, av}},
+  cbyeditortranaf = {{red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og forkl., med etterord, av}%
+  {red.,\addabbrvspace overs\adddot\addspace\lbx@fromlang\space og forkl., med etterord, av}},
+  cbytranslatorcp = {{overs\adddot\addspace\lbx@fromlang\ og komp\adddot}%
+    {overs\adddot\addspace\lbx@fromlang\ og komp\adddot}},
+  cbytranslatorco = {{overs\adddot\addspace\lbx@fromlang\ og komm\adddot}%
+    {overs\adddot\addspace\lbx@fromlang\ og komm\adddot}},
+  cbytranslatoran = {{overs\adddot\addspace\lbx@fromlang\ og forkl\adddot}%
+    {overs\adddot\addspace\lbx@fromlang\ og forkl\adddot}},
+  cbytranslatorin = {{overs\adddot\addspace\lbx@fromlang, med innl., av}%
+    {overs\adddot\addspace\lbx@fromlang, med innl., av}},
+  cbytranslatorfo = {{overs\adddot\addspace\lbx@fromlang, med forord, av}%
+    {overs\adddot\addspace\lbx@fromlang, med forord, av}},
+  cbytranslatoraf = {{overs\adddot\addspace\lbx@fromlang, med etterord, av}%
+    {overs\adddot\addspace\lbx@fromlang, med etterord, av}},
+  cbytranslatorcoin = {{overs\adddot\addspace\lbx@fromlang\ og komm.,
+      med innl., av}%
+    {overs\adddot\addspace\lbx@fromlang\ og komm., med innl., av}},
+  cbytranslatorcofo = {{overs\adddot\addspace\lbx@fromlang\ og komm.,
+      med forord, av}%
+    {overs\adddot\addspace\lbx@fromlang\ og komm., med forord, av}},
+  cbytranslatorcoaf = {{overs\adddot\addspace\lbx@fromlang\ og komm.,
+      med etterord, av}%
+    {overs\adddot\addspace\lbx@fromlang\ og komm., med etterord, av}},
+  cbytranslatoranin = {{overs\adddot\addspace\lbx@fromlang\ og forkl.,
+      med innl., av}%
+    {overs\adddot\addspace\lbx@fromlang\ og forkl., med innl., av}},
+  cbytranslatoranfo = {{overs\adddot\addspace\lbx@fromlang\ og forkl.,
+      med forord, av}%
+    {overs\adddot\addspace\lbx@fromlang\ og forkl., med forord, av}},
+  cbytranslatoranaf = {{overs\adddot\addspace\lbx@fromlang\ og forkl.,
+      med etterord, av}%
+    {overs\adddot\addspace\lbx@fromlang\ og forkl., med etterord, av}},
+  cbytranslatorcpco = {{overs\adddot\addspace\lbx@fromlang, komp. og komm\adddot}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og komm\adddot}},
+  cbytranslatorcpan = {{overs\adddot\addspace\lbx@fromlang, komp. og forkl\adddot}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og forkl\adddot}},
+  cbytranslatorcpin = {{overs\adddot\addspace\lbx@fromlang\ og komp.,
+      med innl., av}%
+    {overs\adddot\addspace\lbx@fromlang\ og komp., med innl., av}},
+  cbytranslatorcpfo = {{overs\adddot\addspace\lbx@fromlang\ og komp.,
+      med forord, av}%
+    {overs\adddot\addspace\lbx@fromlang\ og komp., med forord, av}},
+  cbytranslatorcpaf = {{overs\adddot\addspace\lbx@fromlang\ og komp.,
+      med etterord, av}%
+    {overs\adddot\addspace\lbx@fromlang\ og komp., med etterord, av}},
+  cbytranslatorcpcoin = {{overs\adddot\addspace\lbx@fromlang, komp. og komm., med innl., av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og komm.,
+      med innl., av}},
+  cbytranslatorcpcofo = {{overs\adddot\addspace\lbx@fromlang, komp. og komm., med forord, av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og komm.,
+      med forord, av}},
+  cbytranslatorcpcoaf = {{overs\adddot\addspace\lbx@fromlang, komp. og komm., med etterord, av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og komm.,
+      med etterord, av}},
+  cbytranslatorcpanin = {{overs\adddot\addspace\lbx@fromlang, komp. og forkl., med innl., av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og forkl.,
+      med innl., av}},
+  cbytranslatorcpanfo = {{overs\adddot\addspace\lbx@fromlang, komp. og forkl., med forord, av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og forkl.,
+      med forord, av}},
+  cbytranslatorcpanaf = {{overs\adddot\addspace\lbx@fromlang, komp. og forkl., med etterord, av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og forkl.,
+      med etterord, av}},
+  cbycompilerco = {{komp\adddot\space og komm\adddot}%
+    {komp\adddot\space og komm\adddot}},
+  cbycompileran = {{komp\adddot\space og forkl\adddot}%
+    {komp\adddot\space og forkl\adddot}},
+  cbycompilerin = {{komp.,\addabbrvspace med innl., av}%
+    {komp.,\addabbrvspace med innl., av}},
+  cbycompilerfo = {{komp.,\addabbrvspace med forord, av}%
+    {komp.,\addabbrvspace med forord, av}},
+  cbycompileraf = {{komp.,\addabbrvspace med etterord, av}%
+    {komp.,\addabbrvspace med etterord, av}},
+  cbycompilercoin = {{komp\adddot\space og komm., med innl., av}%
+    {komp\adddot\space og komm., med innl., av}},
+  cbycompilercofo = {{komp\adddot\space og komm., med forord, av}%
+    {komp\adddot\space og komm., med forord, av}},
+  cbycompilercoaf = {{komp\adddot\space og komm., med etterord, av}%
+    {komp\adddot\space og komm., med etterord, av}},
+  cbycompileranin = {{komp\adddot\space og forkl., med innl., av}%
+    {komp\adddot\space og forkl., med innl., av}},
+  cbycompileranfo = {{komp\adddot\space og forkl., med forord, av}%
+    {komp\adddot\space og forkl., med forord, av}},
+  cbycompileranaf = {{komp\adddot\space og forkl., med etterord, av}%
+    {komp\adddot\space og forkl., med etterord, av}},
+  volume = {{bd\adddot}{bd\adddot}},
+  volumes = {{bd\adddot}{bd\adddot}},
+  jourvol = {{{\aa}rg\adddot}{{\aa}rg\adddot}},
+  jourser = {{ser\adddot}{ser\adddot}},
+  oldseries = {{gl\adddotspace ser\adddot}{gl\adddotspace ser\adddot}},
+  edition = {{utg\adddot}{utg\adddot}},
+  page = {{s\adddot}{s\adddot}},
+  pages = {{s\adddot}{s\adddot}},
+  column = {{sp\adddot}{sp\adddot}},
+  columns = {{sp\adddot}{sp\adddot}},
+  line = {{l\adddot}{l\adddot}},
+  lines = {{l\adddot}{l\adddot}},
+  paragraph = {{avsn\adddot}{avsn\adddot}},
+  paragraphs = {{avsn\adddot}{avsn\adddot}},
+  section = {{avsn\adddot}{avsn\adddot}},
+  sections = {{avsn\adddot}{avsn\adddot}},
+  verse = {{v\adddot}{v\adddot}},
+  verses = {{v\adddot}{v\adddot}},
+  number = {{nr\adddot}{nr\adddot}},
+  chapter = {{kap\adddot}{kap\adddot}},
+  cfromamerican     = {{fra amerikansk-engelsk av}{fra amerikansk-engelsk av}},
+  cfrombrazilian    = {{fra brasiliansk-portugisisk av}{fra brasiliansk-portugisisk av}},
+  cfromdanish       = {{fra dansk av}{fra dansk av}},
+  cfromdutch        = {{fra nederlandsk av}{fra nederlandsk av}},
+  cfromenglish      = {{fra engelsk av}{fra engelsk av}},
+  cfromfrench       = {{fra fransk av}{fra fransk av}},
+  cfromgerman       = {{fra tysk av}{fra tysk av}},
+  cfromgreek        = {{fra gresk av}{fra gresk av}},
+  cfromitalian      = {{fra italiensk av}{fra italiensk av}},
+  cfromlatin        = {{fra latin av}{fra latin av}},
+  cfromnorwegian    = {{fra norsk av}{fra norsk av}},
+  cfromportuguese   = {{fra portugisisk av}{fra portugisisk av}},
+  cfromrussian      = {{fra russisk av}{fra russisk av}},
+  cfromspanish      = {{fra spansk av}{fra spansk av}},
+  cfromswedish      = {{fra svensk av}{fra svensk av}},
+  bynone = {{}{}},
+  byconductor = {{dirigert av}{dir\adddot}},
+  bydirector = {{regissert av}{regi}},
+  byproducer = {{produsert av}{prod\adddot}},
+  byeditorcp = {{redigert og kompilert av}{red\adddot\space og komp\adddot}},
+  byeditortrcp = {{redigert, oversatt \lbx@fromlang og kompilert av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp\adddot}},
+  byeditortrcpco = {{redigert, oversatt \lbx@fromlang, kompilert og kommentert av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og komm\adddot}},
+  byeditortrcpan = {{redigert, oversatt \lbx@fromlang, kompilert og forklart av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og forkl\adddot}},
+  byeditortrcpin = {{redigert, oversatt \lbx@fromlang og kompilert, med innledning, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp\adddot,
+      med innledning, av}},
+  byeditortrcpfo = {{redigert, oversatt \lbx@fromlang og kompilert, med forord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp\adddot,
+      med forord, av}},
+  byeditortrcpaf = {{redigert, oversatt \lbx@fromlang og kompilert, med etterord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang og komp\adddot,
+      med etterord, av}},
+  byeditortrcpcoin = {{redigert, oversatt \lbx@fromlang, kompilert og kommentert, med innledning, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og komm\adddot, med innledning, av}},
+  byeditortrcpcofo = {{redigert, oversatt \lbx@fromlang, kompilert og kommentert, med forord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og komm\adddot, med forord, av}},
+  byeditortrcpcoaf = {{redigert, oversatt \lbx@fromlang, kompilert og kommentert, med etterord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og komm\adddot, med etterord, av}},
+  byeditortrcpanin = {{redigert, oversatt \lbx@fromlang, kompilert og forklart, med innledning, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og forkl\adddot, med innledning, av}},
+  byeditortrcpanfo = {{redigert, oversatt \lbx@fromlang, kompilert og forklart, med forord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og forkl\adddot, med forord, av}},
+  byeditortrcpanaf = {{redigert, oversatt \lbx@fromlang, kompilert og forklart, med etterord, av}%
+    {red.,\addabbrvspace overs.\addspace\lbx@fromlang, komp. og forkl\adddot, med etterord, av}},
+  byeditorcpco = {{redigert, kompilert og kommentert av}%
+    {red.,\addabbrvspace komp. og komm\adddot}},
+  byeditorcpan = {{redigert, kompilert og forklart av}%
+    {red.,\addabbrvspace komp. og forkl\adddot}},
+  byeditorcpin = {{redigert og kompilert, med innledning, av}%
+    {red\adddot\space og komp., med innledning, av}},
+  byeditorcpfo = {{redigert og kompilert, med forord, av}%
+    {red\adddot\space og komp., med forord, av}},
+  byeditorcpaf = {{redigert og kompilert, med etterord, av}%
+    {red\adddot\space og komp., med etterord, av}},
+  byeditorcpcoin = {{redigert, kompilert og kommentert, med innledning, av}%
+    {red.,\addabbrvspace komp. og komm., med innledning, av}},
+  byeditorcpcofo = {{redigert, kompilert og kommentert, med forord,
+      av}%
+    {red.,\addabbrvspace komp. og komm., med forord, av}},
+  byeditorcpcoaf = {{redigert, kompilert og kommentert, med etterord, av}%
+    {red.,\addabbrvspace komp. og komm., med etterord, av}},
+  byeditorcpanin = {{redigert, kompilert og forklart, med innledning, av}%
+    {red.,\addabbrvspace komp. og forkl., med innledning, av}},
+  byeditorcpanfo = {{redigert, kompilert og forklart, med forord,
+      av}%
+    {red.,\addabbrvspace komp. og forkl., med forord, av}},
+  byeditorcpanaf = {{redigert, kompilert og forklart, med etterord, av}%
+    {red.,\addabbrvspace komp. og forkl., med etterord, av}},
+  bytranslatorcp = {{oversatt \lbx@fromlang\ og kompilert av}%
+    {overs\adddot\addspace\lbx@fromlang\ og komp\adddot}},
+  bytranslatorcpco = {{oversatt \lbx@fromlang, kompilert og kommentert av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og komm\adddot}},
+  bytranslatorcpan = {{oversatt \lbx@fromlang, kompilert og forklart av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og forkl\adddot}},
+  bytranslatorcpin = {{oversatt \lbx@fromlang\  og kompilert, med innledning, av}%
+    {overs\adddot\addspace\lbx@fromlang\ og komp., med innledning, av}},
+  bytranslatorcpfo = {{oversatt \lbx@fromlang\ og kompilert, med forord, av}%
+    {overs\adddot\addspace\lbx@fromlang\ og komp., med forord, av}},
+  bytranslatorcpaf = {{oversatt \lbx@fromlang\ og kompilert, med etterord, av}%
+    {overs\adddot\addspace\lbx@fromlang\ og komp., med etterord, av}},
+  bytranslatorcpcoin = {{oversatt \lbx@fromlang, kompilert og kommentert,
+      med innledning, av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og komm., med innledning, av}},
+  bytranslatorcpcofo = {{oversatt \lbx@fromlang, kompilert og kommentert,
+      med forord, av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og komm.,
+      med forord, av}},
+  bytranslatorcpcoaf = {{oversatt \lbx@fromlang, kompilert og kommentert,
+      med etterord, av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og komm., med etterord, av}},
+  bytranslatorcpanin = {{oversatt \lbx@fromlang, kompilert og forklart,
+      med innledning, av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og forkl., med innledning, av}},
+  bytranslatorcpanfo = {{oversatt \lbx@fromlang, kompilert og forklart,
+      med forord, av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og forkl.,
+      med forord, av}},
+  bytranslatorcpanaf = {{oversatt \lbx@fromlang, kompilert og forklart,
+      med etterord, av}%
+    {overs\adddot\addspace\lbx@fromlang, komp. og forkl.,
+      med etterord, av}},
+  bycompilerco = {{kompilert og kommentert av}%
+    {komp\adddot\space og komm\adddot}},
+  bycompileran = {{kompilert og forklart av}%
+    {komp\adddot\space og forkl\adddot}},
+  bycompilerin = {{kompilert, med innledning, av}%
+    {komp\adddot, med innledning, av}},
+  bycompilerfo = {{kompilert, med forord, av}%
+    {komp\adddot, med forord, av}},
+  bycompileraf = {{kompilert, med etterord, av}%
+    {komp\adddot, med etterord, av}},
+  bycompilercoin = {{kompilert og kommentert, med innledning, av}%
+    {komp\adddot\space og komm\adddot, med innledning, av}},
+  bycompilercofo = {{kompilert og kommentert, med forord, av}%
+    {komp\adddot\space og komm\adddot, med forord, av}},
+  bycompilercoaf = {{kompilert og kommentert, med etterord, av}%
+    {komp\adddot\space og komm\adddot, med etterord, av}},
+  bycompileranin = {{kompilert og forklart, med innledning, av}%
+    {komp\adddot\space og forkl\adddot, med innledning, av}},
+  bycompileranfo = {{kompilert og forklart, med forord, av}%
+    {komp\adddot\space og forkl\adddot, med forord, av}},
+  bycompileranaf = {{kompilert og forklart, med etterord, av}%
+    {komp\adddot\space og forkl\adddot, med etterord, av}},
+}
+
+\protected\gdef\lbx@cms@mkbibrangetrunc#1#2{%  DATE FIX
+  \iffieldundef{#2year}%
+  {\iffieldundef{#2month}
+    {}
+    {\printtext[#2date]{%
+        \iffieldsequal{#2month}{#2endmonth}
+        {\csuse{mkbibdate#1}{}{}{#2day}}
+        {\csuse{mkbibdate#1}{}{#2month}{#2day}}%
+        \iffieldundef{#2endyear}
+        {\iffieldundef{#2endmonth}
+          {}
+          {\bibdatedash
+            \csuse{mkbibdate#1}{}{#2endmonth}{#2endday}}}
+        {\iffieldequalstr{#2endyear}{}
+          {\mbox{\bibdatedash}}
+          {\bibdatedash
+            \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+  {\printtext[#2date]{%
+      \iffieldsequal{#2year}{#2endyear}
+      {\iffieldsequal{#2month}{#2endmonth}
+        {\csuse{mkbibdate#1}{}{}{#2day}}
+        {\csuse{mkbibdate#1}{}{#2month}{#2day}}}
+      {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+      \iffieldundef{#2endyear}
+      {}
+      {\iffieldequalstr{#2endyear}{}
+        {\mbox{\bibdatedash}}
+        {\bibdatedash
+          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+
+\protected\gdef\lbx@cms@mkbibrangefull#1#2{%
+  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
+  {}%
+  {\printtext[#2date]{%
+      \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}
+      {}
+      {\iffieldequalstr{#2endyear}{}
+        {\mbox{\bibdatedash}}
+        {\bibdatedash
+          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/biblatex-chicago/cms-nynorsk.lbx b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-nynorsk.lbx
new file mode 100644
index 00000000000..26418fd213f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/biblatex-chicago/cms-nynorsk.lbx
@@ -0,0 +1,755 @@
+% $Id: cms-nynorsk.lbx,v 1.2 2012/12/06 11:32:01 dfussner Exp $
+
+\ProvidesFile{cms-nynorsk.lbx}[2012/12/06 v 2.4 biblatex localization]
+
+% STATUS OF THIS FILE
+% - Translated by a native speaker (H{\aa}kon Malmedal).
+% - Date handling modified by dfussner.
+
+\InheritBibliographyExtras{nynorsk}
+
+\DeclareBibliographyExtras{%
+  \savecommand\cms@datelong
+  \savecommand\cms@datelongalt
+  \savecommand\mkbibrangecomp
+  \savecommand\mkbibrangeterse
+  \savecommand\mkbibrangefull
+  \protected\def\mkbibrangecomp{%
+    \lbx@cms@mkbibrangetrunc{long}}%
+  \protected\def\mkbibrangeterse{%
+    \lbx@cms@mkbibrangetrunc{short}}%
+  \protected\def\mkbibrangefull{%
+    \lbx@cms@mkbibrangefull}
+  \def\cms@datelong{\printorigdate}%
+  \def\cms@datelongalt{\printdate}}%
+
+\UndeclareBibliographyExtras{%
+  \restorecommand\cms@datelong
+  \restorecommand\cms@datelongalt
+  \restorecommand\mkbibrangecomp%
+  \restorecommand\mkbibrangefull%
+  \restorecommand\mkbibrangeterse}%
+
+\NewBibliographyString{bynone}
+\NewBibliographyString{bycompiler}
+\NewBibliographyString{byconductor}
+\NewBibliographyString{bydirector}
+\NewBibliographyString{byproducer}
+\NewBibliographyString{byeditorcp}
+\NewBibliographyString{byeditortrcp}
+\NewBibliographyString{byeditortrcpco}
+\NewBibliographyString{byeditortrcpan}
+\NewBibliographyString{byeditortrcpin}
+\NewBibliographyString{byeditortrcpfo}
+\NewBibliographyString{byeditortrcpaf}
+\NewBibliographyString{byeditortrcpcoin}
+\NewBibliographyString{byeditortrcpcofo}
+\NewBibliographyString{byeditortrcpcoaf}
+\NewBibliographyString{byeditortrcpanin}
+\NewBibliographyString{byeditortrcpanfo}
+\NewBibliographyString{byeditortrcpanaf}
+\NewBibliographyString{byeditorcpco}
+\NewBibliographyString{byeditorcpan}
+\NewBibliographyString{byeditorcpin}
+\NewBibliographyString{byeditorcpfo}
+\NewBibliographyString{byeditorcpaf}
+\NewBibliographyString{byeditorcpcoin}
+\NewBibliographyString{byeditorcpcofo}
+\NewBibliographyString{byeditorcpcoaf}
+\NewBibliographyString{byeditorcpanin}
+\NewBibliographyString{byeditorcpanfo}
+\NewBibliographyString{byeditorcpanaf}
+\NewBibliographyString{bytranslatorcp}
+\NewBibliographyString{bytranslatorcpco}
+\NewBibliographyString{bytranslatorcpan}
+\NewBibliographyString{bytranslatorcpin}
+\NewBibliographyString{bytranslatorcpfo}
+\NewBibliographyString{bytranslatorcpaf}
+\NewBibliographyString{bytranslatorcpcoin}
+\NewBibliographyString{bytranslatorcpcofo}
+\NewBibliographyString{bytranslatorcpcoaf}
+\NewBibliographyString{bytranslatorcpanin}
+\NewBibliographyString{bytranslatorcpanfo}
+\NewBibliographyString{bytranslatorcpanaf}
+\NewBibliographyString{bycompilerco}
+\NewBibliographyString{bycompileran}
+\NewBibliographyString{bycompilerin}
+\NewBibliographyString{bycompilerfo}
+\NewBibliographyString{bycompileraf}
+\NewBibliographyString{bycompilercoin}
+\NewBibliographyString{bycompilercofo}
+\NewBibliographyString{bycompilercoaf}
+\NewBibliographyString{bycompileranin}
+\NewBibliographyString{bycompileranfo}
+\NewBibliographyString{bycompileranaf}
+\NewBibliographyString{cbynone}
+\NewBibliographyString{cbyauthor}
+\NewBibliographyString{cbyeditor}
+\NewBibliographyString{cbytranslator}
+\NewBibliographyString{cbycompiler}
+\NewBibliographyString{cbyredactor}
+\NewBibliographyString{cbycommentator}
+\NewBibliographyString{cbyannotator}
+\NewBibliographyString{cbyfounder}
+\NewBibliographyString{cbycontinuator}
+\NewBibliographyString{cbycollaborator}
+\NewBibliographyString{cbyconductor}
+\NewBibliographyString{cbydirector}
+\NewBibliographyString{cbyproducer}
+\NewBibliographyString{cbyeditortr}
+\NewBibliographyString{cbyeditorcp}
+\NewBibliographyString{cbyeditorco}
+\NewBibliographyString{cbyeditoran}
+\NewBibliographyString{cbyeditorin}
+\NewBibliographyString{cbyeditorfo}
+\NewBibliographyString{cbyeditoraf}
+\NewBibliographyString{cbyeditortrcp}
+\NewBibliographyString{cbyeditortrco}
+\NewBibliographyString{cbyeditortran}
+\NewBibliographyString{cbyeditortrin}
+\NewBibliographyString{cbyeditortrfo}
+\NewBibliographyString{cbyeditortraf}
+\NewBibliographyString{cbyeditortrcpco}
+\NewBibliographyString{cbyeditortrcpan}
+\NewBibliographyString{cbyeditortrcpin}
+\NewBibliographyString{cbyeditortrcpfo}
+\NewBibliographyString{cbyeditortrcpaf}
+\NewBibliographyString{cbyeditorcoin}
+\NewBibliographyString{cbyeditorcofo}
+\NewBibliographyString{cbyeditorcoaf}
+\NewBibliographyString{cbyeditoranin}
+\NewBibliographyString{cbyeditoranfo}
+\NewBibliographyString{cbyeditoranaf}
+\NewBibliographyString{cbyeditortrcoin}
+\NewBibliographyString{cbyeditortrcofo}
+\NewBibliographyString{cbyeditortrcoaf}
+\NewBibliographyString{cbyeditortranin}
+\NewBibliographyString{cbyeditortranfo}
+\NewBibliographyString{cbyeditortranaf}
+\NewBibliographyString{cbyeditortrcpcoin}
+\NewBibliographyString{cbyeditortrcpcofo}
+\NewBibliographyString{cbyeditortrcpcoaf}
+\NewBibliographyString{cbyeditortrcpanin}
+\NewBibliographyString{cbyeditortrcpanfo}
+\NewBibliographyString{cbyeditortrcpanaf}
+\NewBibliographyString{cbyeditorcpco}
+\NewBibliographyString{cbyeditorcpan}
+\NewBibliographyString{cbyeditorcpin}
+\NewBibliographyString{cbyeditorcpfo}
+\NewBibliographyString{cbyeditorcpaf}
+\NewBibliographyString{cbyeditorcpcoin}
+\NewBibliographyString{cbyeditorcpcofo}
+\NewBibliographyString{cbyeditorcpcoaf}
+\NewBibliographyString{cbyeditorcpanin}
+\NewBibliographyString{cbyeditorcpanfo}
+\NewBibliographyString{cbyeditorcpanaf}
+\NewBibliographyString{cbytranslatorcp}
+\NewBibliographyString{cbytranslatorco}
+\NewBibliographyString{cbytranslatoran}
+\NewBibliographyString{cbytranslatorin}
+\NewBibliographyString{cbytranslatorfo}
+\NewBibliographyString{cbytranslatoraf}
+\NewBibliographyString{cbytranslatorcpco}
+\NewBibliographyString{cbytranslatorcpan}
+\NewBibliographyString{cbytranslatorcpin}
+\NewBibliographyString{cbytranslatorcpfo}
+\NewBibliographyString{cbytranslatorcpaf}
+\NewBibliographyString{cbytranslatorcoin}
+\NewBibliographyString{cbytranslatorcofo}
+\NewBibliographyString{cbytranslatorcoaf}
+\NewBibliographyString{cbytranslatoranin}
+\NewBibliographyString{cbytranslatoranfo}
+\NewBibliographyString{cbytranslatoranaf}
+\NewBibliographyString{cbytranslatorcpcoin}
+\NewBibliographyString{cbytranslatorcpcofo}
+\NewBibliographyString{cbytranslatorcpcoaf}
+\NewBibliographyString{cbytranslatorcpanin}
+\NewBibliographyString{cbytranslatorcpanfo}
+\NewBibliographyString{cbytranslatorcpanaf}
+\NewBibliographyString{cbycompilerco}
+\NewBibliographyString{cbycompileran}
+\NewBibliographyString{cbycompilerin}
+\NewBibliographyString{cbycompilerfo}
+\NewBibliographyString{cbycompileraf}
+\NewBibliographyString{cbycompilercoin}
+\NewBibliographyString{cbycompilercofo}
+\NewBibliographyString{cbycompilercoaf}
+\NewBibliographyString{cbycompileranin}
+\NewBibliographyString{cbycompileranfo}
+\NewBibliographyString{cbycompileranaf}
+\NewBibliographyString{cfromamerican}
+\NewBibliographyString{cfrombrazilian}
+\NewBibliographyString{cfromdanish}
+\NewBibliographyString{cfromdutch}
+\NewBibliographyString{cfromenglish}
+\NewBibliographyString{cfromfrench}
+\NewBibliographyString{cfromgerman}
+\NewBibliographyString{cfromgreek}
+\NewBibliographyString{cfromitalian}
+\NewBibliographyString{cfromlatin}
+\NewBibliographyString{cfromnorwegian}
+\NewBibliographyString{cfromportuguese}
+\NewBibliographyString{cfromrussian}
+\NewBibliographyString{cfromspanish}
+\NewBibliographyString{cfromswedish}
+\NewBibliographyString{partvolume}
+\NewBibliographyString{by}
+\NewBibliographyString{of}
+\NewBibliographyString{on}
+\NewBibliographyString{afterwordto}
+\NewBibliographyString{forewordto}
+\NewBibliographyString{introductionto}
+\NewBibliographyString{origpub}
+\NewBibliographyString{origpublin}
+\NewBibliographyString{origpubyear}
+\NewBibliographyString{origpubyearalt}
+\NewBibliographyString{origreleaseyear}
+\NewBibliographyString{origshownyear}
+\NewBibliographyString{origedition}
+\NewBibliographyString{revisededition}
+\NewBibliographyString{broadcast}
+\NewBibliographyString{recorded}
+\NewBibliographyString{numbers}
+\NewBibliographyString{nodate}
+\NewBibliographyString{pseudonym}
+\NewBibliographyString{patentfiled}% Needed for CMS style patent entries
+\NewBibliographyString{patentissued}%
+\NewBibliographyString{inlang}
+\NewBibliographyString{langrussian}
+\NewBibliographyString{fromrussian}
+\NewBibliographyString{edamerican}
+\NewBibliographyString{edbrazilian}
+\NewBibliographyString{eddanish}
+\NewBibliographyString{eddutch}
+\NewBibliographyString{edenglish}
+\NewBibliographyString{edfrench}
+\NewBibliographyString{edgerman}
+\NewBibliographyString{edgreek}
+\NewBibliographyString{editalian}
+\NewBibliographyString{edlatin}
+\NewBibliographyString{ednorwegian}
+\NewBibliographyString{edportuguese}
+\NewBibliographyString{edrussian}
+\NewBibliographyString{edspanish}
+\NewBibliographyString{edswedish}
+\NewBibliographyString{review}
+\NewBibliographyString{reviewof}
+\NewBibliographyString{section}
+\NewBibliographyString{sections}
+\NewBibliographyString{compiler}
+\NewBibliographyString{compilers}
+\NewBibliographyString{conductor}
+\NewBibliographyString{conductors}
+\NewBibliographyString{director}
+\NewBibliographyString{directors}
+\NewBibliographyString{none}
+\NewBibliographyString{nones}
+\NewBibliographyString{producer}
+\NewBibliographyString{producers}
+\NewBibliographyString{transcompiler}
+\NewBibliographyString{transcompilers}
+\NewBibliographyString{editortranscompiler}
+\NewBibliographyString{editorcompiler}
+\NewBibliographyString{editortranslator}
+\NewBibliographyString{editortranscompilers}
+\NewBibliographyString{editorcompilers}
+\NewBibliographyString{editortranslators}
+
+\DeclareBibliographyStrings{%
+  inherit = {nynorsk},
+  afterwordto = {{etterord til}{etterord til}},
+  forewordto = {{f{\o}reord til}{f{\o}reord til}},
+  introductionto = {{innleiing til}{innl\adddot\space til}},
+  partvolume = {{\addspace del}{\addspace del}},
+  by = {{av}{av}},
+  of = {{av}{av}},
+  on = {{p{\aa}}{p{\aa}}},
+  compiler = {{komp\adddot}{komp\adddot}},
+  compilers = {{komp\adddot}{komp\adddot}},
+  transcompiler = {{oms\adddot\addspace og komp\adddot}%
+    {oms\adddot\addspace og komp\adddot}},
+  transcompilers = {{oms\adddot\addspace og komp\adddot}%
+    {oms\adddot\addspace og komp\adddot}},
+  editortranscompiler = {{red\adddot\addcomma\addspace
+      oms\adddot\addcomma\addspace og komp\adddot}%
+    {red\adddot\addcomma\addspace
+      oms\adddot\addcomma\addspace og komp\adddot}},
+  editorcompiler = {{red\adddot\addspace og komp\adddot}%
+    {red\adddot\addspace og komp\adddot}},
+  editortranslator = {{red\adddot\addspace og oms\adddot}%
+    {red\adddot\addspace og oms\adddot}},
+  editortranscompilers = {{red\adddot\addcomma\addspace
+      oms\adddot\addcomma\addspace og komp\adddot}%
+    {red\adddot\addcomma\addspace
+      oms\adddot\addcomma\addspace og komp\adddot}},
+  editorcompilers = {{red\adddot\addspace og komp\adddot}%
+    {red\adddot\addspace og komp\adddot}},
+  editortranslators = {{red\adddot\addspace og oms\adddot}%
+    {red\adddot\addspace og oms\adddot}},
+  conductor = {{dir\adddot}{dir\adddot}},
+  conductors = {{dir\adddot}{dir\adddot}},
+  director = {{regi}{regi}},
+  directors = {{regi}{regi}},
+  none = {{}{}},
+  nones = {{}{}},
+  producer = {{prod\adddot}{prod\adddot}},
+  producers = {{prod\adddot}{prod\adddot}},
+  editor = {{red\adddot}{red\adddot}},
+  editors = {{red\adddot}{red\adddot}},
+  ibidem = {{sst\adddot}{sst\adddot}},
+  origpub = {{opphavleg utgitt som}%
+    {opph\adddot\ utg\adddot\ som}},
+  origpublin = {{opphavleg utgitt i\addspace}%
+    {opph\adddot\ utg\adddot\addspace i\addspace}},
+  origpubyear = {{opphavleg utgitt i\addspace}%
+    {opph\adddot\ utg\adddot\addspace}},
+  origpubyearalt = {{fyrst utgitt\addspace}%
+    {fyrst utg\adddot\addspace}},
+  origreleaseyear = {{opphavleg utgitt i\addspace}%
+    {opph\adddot\ utg\adddotspace}},
+  origshownyear = {{opphavleg synt fram i\addspace}%
+    {opph\adddot\ synt fram\addspace}},
+  origedition ={{utg{\aa}ve\addcolon\addspace}%
+    {utg\adddot\addcolon\addspace}},
+  revisededition = {{rev\adddot\addspace utg\adddot}%
+    {rev\adddot\addspace utg\adddot}},
+  broadcast = {{kringkasta}{kringkasta}},
+  recorded = {{spelt inn}{spelt inn}},
+  numbers = {{nr\adddot}{nr\adddot}},
+  nodate = {{udatert}{udatert}},
+  pseudonym = {{pseud\adddot}{pseud\adddot}},
+  patentfiled = {{s{\o}kt}{s{\o}kt}},
+  patentissued = {{meldt}{meldt}},
+  inlang = {{p{\aa}\addspace}{p{\aa}\addspace}},
+  edamerican     = {{amerikansk}{amerikansk}},
+  edbrazilian    = {{brasiliansk}{brasiliansk}},
+  eddanish       = {{dansk}{dansk}},
+  eddutch        = {{nederlandsk}{nederlandsk}},
+  edenglish      = {{engelsk}{engelsk}},
+  edfrench       = {{fransk}{fransk}},
+  edgerman       = {{tysk}{tysk}},
+  edgreek        = {{gresk}{gresk}},
+  editalian      = {{italiensk}{italiensk}},
+  edlatin        = {{latin}{latin}},
+  ednorwegian    = {{norsk}{norsk}},
+  edportuguese   = {{portugisisk}{portugisisk}},
+  edrussian      = {{russisk}{russisk}}
+  edspanish      = {{spansk}{spansk}},
+  edswedish      = {{svensk}{svensk}},
+  translator       = {{oms\adddot}{oms\adddot}},
+  translators      = {{oms\adddot}{oms\adddot}},
+  redactor         = {{omarb\adddot}{omarb\adddot}},
+  redactors        = {{omarb\adddot}{omarb\adddot}},
+  founder          = {{grunnl\adddot}{grunnl\adddot}},
+  founders         = {{grunnl\adddot}{grunnl\adddot}},
+  continuator      = {{vidaref\adddot}{vidaref\adddot}},
+  continuators     = {{vidaref\adddot}{vidaref\adddot}},
+  collaborator     = {{samarb\adddot}{samarb\adddot}},
+  collaborators    = {{samarb\adddot}{samarb\adddot}},
+  annotator        = {{forkl\adddot}{forkl\adddot}},
+  annotators       = {{forkl\adddot}{forkl\adddot}},
+  review = {{omtale}{omtale}},
+  reviewof = {{omtale av}{omtale av}},
+  cbynone = {{}{}},
+  cbyauthor = {{av}{av}},
+  cbyeditor = {{red\adddot}{red\adddot}},
+  cbytranslator     = {{oms\adddot\addspace\lbx@cfromlang}%
+    {oms\adddot\addspace\lbx@cfromlang}},
+  cbycompiler = {{komp\adddot}{komp\adddot}},
+  cbyredactor = {{omarb\adddot}{omarb\adddot}},
+  cbycommentator = {{komm\adddot}{komm\adddot}},
+  cbyannotator = {{forkl\addot}{forkl\addot}},
+  cbyfounder        = {{grunnl\adddot}{grunnl\adddot}},
+  cbycontinuator    = {{vidaref\adddot}{vidaref\adddot}},
+  cbycollaborator   = {{i samarb\adddotspace med}%
+    {i samarb\adddotspace med}},
+  cbyconductor = {{dir\adddot}{dir\adddot}},
+  cbydirector = {{regi}{regi}},
+  cbyproducer = {{prod\adddot}{prod\adddot}},
+  cbyeditortr    = {{red\adddot\space og
+      oms\adddot\addspace\lbx@cfromlang}%
+    {red\adddot\space og oms\adddot\addspace\lbx@cfromlang}},
+  cbyeditorcp = {{red\adddot\space og komp\adddot}%
+    {red\adddot\space og komp\adddot}},
+  cbyeditorco    = {{red\adddot\space og komm\adddot}%
+    {red\adddot\space og komm\adddot}},
+  cbyeditoran = {{red\adddot\space og forkl\adddot}%
+    {red\adddot\space og forkl\adddot}},
+  cbyeditorin = {{red.,\addabbrvspace med innl., av}%
+    {red.,\addabbrvspace med innl., av}},
+  cbyeditorfo = {{red.,\addabbrvspace med f{\o}reord, av}%
+    {red.,\addabbrvspace med f{\o}reord, av}},
+  cbyeditoraf = {{red.,\addabbrvspace med etterord, av}%
+    {red.,\addabbrvspace med etterord, av}},
+  cbyeditortrcp = {{red.,\addabbrvspace oms.\addspace\lbx@fromlang og
+      komp\adddot}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang og komp\adddot}},
+  cbyeditortrco = {{red.,\addabbrvspace
+    oms\adddot\addspace\lbx@fromlang\space og
+    komm\adddot}%
+  {red.,\addabbrvspace
+    oms\adddot\addspace\lbx@fromlang\space og komm\adddot}},
+  cbyeditortran = {{red.,\addabbrvspace
+    oms\adddot\addspace\lbx@fromlang\space og
+    forkl\adddot}%
+  {red.,\addabbrvspace
+    oms\adddot\addspace\lbx@fromlang\space og forkl\adddot}},
+  cbyeditortrin = {{red\adddotspace og oms\adddot\ \lbx@sfromlang, med innl., av}%
+    {red\adddotspace og oms\adddot\ \lbx@sfromlang, med innl., av}},
+  cbyeditortrfo = {{red\adddotspace og oms\adddot\ \lbx@sfromlang, med f{\o}reord, av}%
+    {red\adddotspace og oms\adddot\ \lbx@sfromlang, med f{\o}reord, av}},
+  cbyeditortraf = {{red\adddotspace og oms\adddot\ \lbx@sfromlang, med etterord, av}%
+    {red\adddotspace og oms\adddot\ \lbx@sfromlang, med etterord, av}},
+  cbyeditorcpco = {{red.,\addabbrvspace komp. og komm\adddot}%
+    {red.,\addabbrvspace komp. og komm\adddot}},
+  cbyeditorcpan = {{red.,\addabbrvspace komp. og forkl\adddot}%
+    {red.,\addabbrvspace komp. og forkl\adddot}},
+  cbyeditorcpin = {{red\adddot\space og komp., med innl., av}%
+    {red\adddot\space og komp., med innl., av}},
+  cbyeditorcpfo = {{red\adddot\space og komp., med f{\o}reord, av}%
+    {red\adddot\space og komp., med f{\o}reord, av}},
+  cbyeditorcpaf = {{red\adddot\space og komp., med etterord, av}%
+    {red\adddot\space og komp., med etterord, av}},
+  cbyeditorcpcoin = {{red.,\addabbrvspace komp. og komm., med innl., av}%
+    {red.,\addabbrvspace komp. og komm., med innl., av}},
+  cbyeditorcpcofo = {{red.,\addabbrvspace komp. og komm., med f{\o}reord, av}%
+    {red.,\addabbrvspace komp. og komm., med f{\o}reord, av}},
+  cbyeditorcpcoaf = {{red.,\addabbrvspace komp. og komm., med etterord, av}%
+    {red.,\addabbrvspace komp. og komm., med etterord, av}},
+  cbyeditorcpanin = {{red.,\addabbrvspace komp. og forkl., med innl., av}%
+    {red.,\addabbrvspace komp. og forkl., med innl., av}},
+  cbyeditorcpanfo = {{red.,\addabbrvspace komp. og forkl., med f{\o}reord, av}%
+    {red.,\addabbrvspace komp. og forkl., med f{\o}reord, av}},
+  cbyeditorcpanaf = {{red.,\addabbrvspace komp. og forkl., med etterord, av}%
+    {red.,\addabbrvspace komp. og forkl., med etterord, av}},
+  cbyeditortrcpco = {{red.,\addabbrvspace oms.\addspace\lbx@fromlang,
+      komp. og komm\adddot}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang, komp. og komm\adddot}},
+  cbyeditortrcpan = {{red.,\addabbrvspace oms.\addspace\lbx@fromlang,
+      komp. og forkl\adddot}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang, komp. og forkl\adddot}},
+  cbyeditortrcpin = {{red.,\addabbrvspace oms.\addspace\lbx@fromlang og komp., med innl., av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang og komp.,
+      med innl., av}},
+  cbyeditortrcpfo = {{red.,\addabbrvspace oms.\addspace\lbx@fromlang og komp., med f{\o}reord, av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang og komp.,
+      med f{\o}reord, av}},
+  cbyeditortrcpaf = {{red.,\addabbrvspace oms.\addspace\lbx@fromlang og komp., med etterord, av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang og komp.,
+      med etterord, av}},
+  cbyeditortrcpcoin = {{red.,\addabbrvspace oms.\addspace\lbx@fromlang,
+      komp. og komm., med innl., av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang, komp. og komm., med innl., av}},
+  cbyeditortrcpcofo = {{red.,\addabbrvspace oms.\addspace\lbx@fromlang,
+      komp. og komm., med f{\o}reord, av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang, komp. og komm., med f{\o}reord, av}},
+  cbyeditortrcpcoaf = {{red.,\addabbrvspace oms.\addspace\lbx@fromlang,
+      komp. og komm., med etterord, av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang, komp. og komm., med etterord, av}},
+  cbyeditortrcpanin = {{red.,\addabbrvspace oms.\addspace\lbx@fromlang,
+      komp. og forkl., med innl., av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang, komp. og forkl., med innl., av}},
+  cbyeditortrcpanfo = {{red.,\addabbrvspace oms.\addspace\lbx@fromlang,
+      komp. og forkl., med f{\o}reord, av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang, komp. og forkl., med f{\o}reord, av}},
+  cbyeditortrcpanaf = {{red.,\addabbrvspace oms.\addspace\lbx@fromlang,
+      komp. og forkl., med etterord, av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang, komp. og forkl., med etterord, av}},
+  cbyeditorcoin = {{red\adddot\space og komm., med innl., av}%
+    {red\adddot\space og komm., med innl., av}},
+  cbyeditorcofo = {{red\adddot\space og komm., med f{\o}reord, av}%
+    {red\adddot\space og komm., med f{\o}reord, av}},
+  cbyeditorcoaf = {{red\adddot\space og komm., med etterord, av}%
+    {red\adddot\space og komm., med etterord, av}},
+  cbyeditoranin = {{red\adddot\space og forkl., med innl., av}%
+    {red\adddot\space og forkl., med innl., av}},
+  cbyeditoranfo = {{red\adddot\space og forkl., med f{\o}reord, av}%
+    {red\adddot\space og forkl., med f{\o}reord, av}},
+  cbyeditoranaf = {{red\adddot\space og forkl., med etterord, av}%
+    {red\adddot\space og forkl., med etterord, av}},
+  cbyeditortrcoin = {{red.,\addabbrvspace oms\adddot\addspace\lbx@fromlang\space og komm., med innl., av}%
+  {red.,\addabbrvspace oms\adddot\addspace\lbx@fromlang\space og komm., med innl., av}},
+  cbyeditortrcofo = {{red.,\addabbrvspace oms\adddot\addspace\lbx@fromlang\space og komm., med f{\o}reord, av}%
+  {red.,\addabbrvspace oms\adddot\addspace\lbx@fromlang\space og komm., med f{\o}reord, av}},
+  cbyeditortrcoaf = {{red.,\addabbrvspace oms\adddot\addspace\lbx@fromlang\space og komm., med etterord, av}%
+  {red.,\addabbrvspace oms\adddot\addspace\lbx@fromlang\space og komm., med etterord, av}},
+  cbyeditortranin = {{red.,\addabbrvspace oms\adddot\addspace\lbx@fromlang\space og forkl., med innl., av}%
+  {red.,\addabbrvspace oms\adddot\addspace\lbx@fromlang\space og forkl., med innl., av}},
+  cbyeditortranfo = {{red.,\addabbrvspace oms\adddot\addspace\lbx@fromlang\space og forkl., med f{\o}reord, av}%
+  {red.,\addabbrvspace oms\adddot\addspace\lbx@fromlang\space og forkl., med f{\o}reord, av}},
+  cbyeditortranaf = {{red.,\addabbrvspace oms\adddot\addspace\lbx@fromlang\space og forkl., med etterord, av}%
+  {red.,\addabbrvspace oms\adddot\addspace\lbx@fromlang\space og forkl., med etterord, av}},
+  cbytranslatorcp = {{oms\adddot\addspace\lbx@fromlang\ og komp\adddot}%
+    {oms\adddot\addspace\lbx@fromlang\ og komp\adddot}},
+  cbytranslatorco = {{oms\adddot\addspace\lbx@fromlang\ og komm\adddot}%
+    {oms\adddot\addspace\lbx@fromlang\ og komm\adddot}},
+  cbytranslatoran = {{oms\adddot\addspace\lbx@fromlang\ og forkl\adddot}%
+    {oms\adddot\addspace\lbx@fromlang\ og forkl\adddot}},
+  cbytranslatorin = {{oms\adddot\addspace\lbx@fromlang, med innl., av}%
+    {oms\adddot\addspace\lbx@fromlang, med innl., av}},
+  cbytranslatorfo = {{oms\adddot\addspace\lbx@fromlang, med f{\o}reord, av}%
+    {oms\adddot\addspace\lbx@fromlang, med f{\o}reord, av}},
+  cbytranslatoraf = {{oms\adddot\addspace\lbx@fromlang, med etterord, av}%
+    {oms\adddot\addspace\lbx@fromlang, med etterord, av}},
+  cbytranslatorcoin = {{oms\adddot\addspace\lbx@fromlang\ og komm.,
+      med innl., av}%
+    {oms\adddot\addspace\lbx@fromlang\ og komm., med innl., av}},
+  cbytranslatorcofo = {{oms\adddot\addspace\lbx@fromlang\ og komm.,
+      med f{\o}reord, av}%
+    {oms\adddot\addspace\lbx@fromlang\ og komm., med f{\o}reord, av}},
+  cbytranslatorcoaf = {{oms\adddot\addspace\lbx@fromlang\ og komm.,
+      med etterord, av}%
+    {oms\adddot\addspace\lbx@fromlang\ og komm., med etterord, av}},
+  cbytranslatoranin = {{oms\adddot\addspace\lbx@fromlang\ og forkl.,
+      med innl., av}%
+    {oms\adddot\addspace\lbx@fromlang\ og forkl., med innl., av}},
+  cbytranslatoranfo = {{oms\adddot\addspace\lbx@fromlang\ og forkl.,
+      med f{\o}reord, av}%
+    {oms\adddot\addspace\lbx@fromlang\ og forkl., med f{\o}reord, av}},
+  cbytranslatoranaf = {{oms\adddot\addspace\lbx@fromlang\ og forkl.,
+      med etterord, av}%
+    {oms\adddot\addspace\lbx@fromlang\ og forkl., med etterord, av}},
+  cbytranslatorcpco = {{oms\adddot\addspace\lbx@fromlang, komp. og komm\adddot}%
+    {oms\adddot\addspace\lbx@fromlang, komp. og komm\adddot}},
+  cbytranslatorcpan = {{oms\adddot\addspace\lbx@fromlang, komp. og forkl\adddot}%
+    {oms\adddot\addspace\lbx@fromlang, komp. og forkl\adddot}},
+  cbytranslatorcpin = {{oms\adddot\addspace\lbx@fromlang\ og komp.,
+      med innl., av}%
+    {oms\adddot\addspace\lbx@fromlang\ og komp., med innl., av}},
+  cbytranslatorcpfo = {{oms\adddot\addspace\lbx@fromlang\ og komp.,
+      med f{\o}reord, av}%
+    {oms\adddot\addspace\lbx@fromlang\ og komp., med f{\o}reord, av}},
+  cbytranslatorcpaf = {{oms\adddot\addspace\lbx@fromlang\ og komp.,
+      med etterord, av}%
+    {oms\adddot\addspace\lbx@fromlang\ og komp., med etterord, av}},
+  cbytranslatorcpcoin = {{oms\adddot\addspace\lbx@fromlang, komp. og komm., med innl., av}%
+    {oms\adddot\addspace\lbx@fromlang, komp. og komm.,
+      med innl., av}},
+  cbytranslatorcpcofo = {{oms\adddot\addspace\lbx@fromlang, komp. og komm., med f{\o}reord, av}%
+    {oms\adddot\addspace\lbx@fromlang, komp. og komm.,
+      med f{\o}reord, av}},
+  cbytranslatorcpcoaf = {{oms\adddot\addspace\lbx@fromlang, komp. og komm., med etterord, av}%
+    {oms\adddot\addspace\lbx@fromlang, komp. og komm.,
+      med etterord, av}},
+  cbytranslatorcpanin = {{oms\adddot\addspace\lbx@fromlang, komp. og forkl., med innl., av}%
+    {oms\adddot\addspace\lbx@fromlang, komp. og forkl.,
+      med innl., av}},
+  cbytranslatorcpanfo = {{oms\adddot\addspace\lbx@fromlang, komp. og forkl., med f{\o}reord, av}%
+    {oms\adddot\addspace\lbx@fromlang, komp. og forkl.,
+      med f{\o}reord, av}},
+  cbytranslatorcpanaf = {{oms\adddot\addspace\lbx@fromlang, komp. og forkl., med etterord, av}%
+    {oms\adddot\addspace\lbx@fromlang, komp. og forkl.,
+      med etterord, av}},
+  cbycompilerco = {{komp\adddot\space og komm\adddot}%
+    {komp\adddot\space og komm\adddot}},
+  cbycompileran = {{komp\adddot\space og forkl\adddot}%
+    {komp\adddot\space og forkl\adddot}},
+  cbycompilerin = {{komp.,\addabbrvspace med innl., av}%
+    {komp.,\addabbrvspace med innl., av}},
+  cbycompilerfo = {{komp.,\addabbrvspace med f{\o}reord, av}%
+    {komp.,\addabbrvspace med f{\o}reord, av}},
+  cbycompileraf = {{komp.,\addabbrvspace med etterord, av}%
+    {komp.,\addabbrvspace med etterord, av}},
+  cbycompilercoin = {{komp\adddot\space og komm., med innl., av}%
+    {komp\adddot\space og komm., med innl., av}},
+  cbycompilercofo = {{komp\adddot\space og komm., med f{\o}reord, av}%
+    {komp\adddot\space og komm., med f{\o}reord, av}},
+  cbycompilercoaf = {{komp\adddot\space og komm., med etterord, av}%
+    {komp\adddot\space og komm., med etterord, av}},
+  cbycompileranin = {{komp\adddot\space og forkl., med innl., av}%
+    {komp\adddot\space og forkl., med innl., av}},
+  cbycompileranfo = {{komp\adddot\space og forkl., med f{\o}reord, av}%
+    {komp\adddot\space og forkl., med f{\o}reord, av}},
+  cbycompileranaf = {{komp\adddot\space og forkl., med etterord, av}%
+    {komp\adddot\space og forkl., med etterord, av}},
+  volume = {{bd\adddot}{bd\adddot}},
+  volumes = {{bd\adddot}{bd\adddot}},
+  jourvol = {{{\aa}rg\adddot}{{\aa}rg\adddot}},
+  jourser = {{ser\adddot}{ser\adddot}},
+  oldseries = {{gl\adddotspace ser\adddot}{gl\adddotspace ser\adddot}},
+  edition = {{utg\adddot}{utg\adddot}},
+  page = {{s\adddot}{s\adddot}},
+  pages = {{s\adddot}{s\adddot}},
+  column = {{sp\adddot}{sp\adddot}},
+  columns = {{sp\adddot}{sp\adddot}},
+  line = {{l\adddot}{l\adddot}},
+  lines = {{l\adddot}{l\adddot}},
+  paragraph = {{avsn\adddot}{avsn\adddot}},
+  paragraphs = {{avsn\adddot}{avsn\adddot}},
+  section = {{avsn\adddot}{avsn\adddot}},
+  sections = {{avsn\adddot}{avsn\adddot}},
+  verse = {{v\adddot}{v\adddot}},
+  verses = {{v\adddot}{v\adddot}},
+  number = {{nr\adddot}{nr\adddot}},
+  chapter = {{kap\adddot}{kap\adddot}},
+  cfromamerican     = {{fr{\aa} amerikansk-engelsk av}{fr{\aa} amerikansk-engelsk av}},
+  cfrombrazilian    = {{fr{\aa} brasiliansk-portugisisk av}{fr{\aa} brasiliansk-portugisisk av}},
+  cfromdanish       = {{fr{\aa} dansk av}{fr{\aa} dansk av}},
+  cfromdutch        = {{fr{\aa} nederlandsk av}{fr{\aa} nederlandsk av}},
+  cfromenglish      = {{fr{\aa} engelsk av}{fr{\aa} engelsk av}},
+  cfromfrench       = {{fr{\aa} fransk av}{fr{\aa} fransk av}},
+  cfromgerman       = {{fr{\aa} tysk av}{fr{\aa} tysk av}},
+  cfromgreek        = {{fr{\aa} gresk av}{fr{\aa} gresk av}},
+  cfromitalian      = {{fr{\aa} italiensk av}{fr{\aa} italiensk av}},
+  cfromlatin        = {{fr{\aa} latin av}{fr{\aa} latin av}},
+  cfromnorwegian    = {{fr{\aa} norsk av}{fr{\aa} norsk av}},
+  cfromportuguese   = {{fr{\aa} portugisisk av}{fr{\aa} portugisisk av}},
+  cfromrussian      = {{fr{\aa} russisk av}{fr{\aa} russisk av}},
+  cfromspanish      = {{fr{\aa} spansk av}{fr{\aa} spansk av}},
+  cfromswedish      = {{fr{\aa} svensk av}{fr{\aa} svensk av}},
+  bynone = {{}{}},
+  byconductor = {{dirigert av}{dir\adddot}},
+  bydirector = {{regissert av}{regi}},
+  byproducer = {{produsert av}{prod\adddot}},
+  byeditorcp = {{redigert og kompilert av}{red\adddot\space og komp\adddot}},
+  byeditortrcp = {{redigert, omsett \lbx@fromlang og kompilert av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang og komp\adddot}},
+  byeditortrcpco = {{redigert, omsett \lbx@fromlang, kompilert og kommentert av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang, komp. og komm\adddot}},
+  byeditortrcpan = {{redigert, omsett \lbx@fromlang, kompilert og forklart av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang, komp. og forkl\adddot}},
+  byeditortrcpin = {{redigert, omsett \lbx@fromlang og kompilert, med innleiing, av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang og komp\adddot,
+      med innleiing, av}},
+  byeditortrcpfo = {{redigert, omsett \lbx@fromlang og kompilert, med f{\o}reord, av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang og komp\adddot,
+      med f{\o}reord, av}},
+  byeditortrcpaf = {{redigert, omsett \lbx@fromlang og kompilert, med etterord, av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang og komp\adddot,
+      med etterord, av}},
+  byeditortrcpcoin = {{redigert, omsett \lbx@fromlang, kompilert og kommentert, med innleiing, av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang, komp. og komm\adddot, med innleiing, av}},
+  byeditortrcpcofo = {{redigert, omsett \lbx@fromlang, kompilert og kommentert, med f{\o}reord, av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang, komp. og komm\adddot, med f{\o}reord, av}},
+  byeditortrcpcoaf = {{redigert, omsett \lbx@fromlang, kompilert og kommentert, med etterord, av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang, komp. og komm\adddot, med etterord, av}},
+  byeditortrcpanin = {{redigert, omsett \lbx@fromlang, kompilert og forklart, med innleiing, av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang, komp. og forkl\adddot, med innleiing, av}},
+  byeditortrcpanfo = {{redigert, omsett \lbx@fromlang, kompilert og forklart, med f{\o}reord, av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang, komp. og forkl\adddot, med f{\o}reord, av}},
+  byeditortrcpanaf = {{redigert, omsett \lbx@fromlang, kompilert og forklart, med etterord, av}%
+    {red.,\addabbrvspace oms.\addspace\lbx@fromlang, komp. og forkl\adddot, med etterord, av}},
+  byeditorcpco = {{redigert, kompilert og kommentert av}%
+    {red.,\addabbrvspace komp. og komm\adddot}},
+  byeditorcpan = {{redigert, kompilert og forklart av}%
+    {red.,\addabbrvspace komp. og forkl\adddot}},
+  byeditorcpin = {{redigert og kompilert, med innleiing, av}%
+    {red\adddot\space og komp., med innleiing, av}},
+  byeditorcpfo = {{redigert og kompilert, med f{\o}reord, av}%
+    {red\adddot\space og komp., med f{\o}reord, av}},
+  byeditorcpaf = {{redigert og kompilert, med etterord, av}%
+    {red\adddot\space og komp., med etterord, av}},
+  byeditorcpcoin = {{redigert, kompilert og kommentert, med innleiing, av}%
+    {red.,\addabbrvspace komp. og komm., med innleiing, av}},
+  byeditorcpcofo = {{redigert, kompilert og kommentert, med f{\o}reord,
+      av}%
+    {red.,\addabbrvspace komp. og komm., med f{\o}reord, av}},
+  byeditorcpcoaf = {{redigert, kompilert og kommentert, med etterord, av}%
+    {red.,\addabbrvspace komp. og komm., med etterord, av}},
+  byeditorcpanin = {{redigert, kompilert og forklart, med innleiing, av}%
+    {red.,\addabbrvspace komp. og forkl., med innleiing, av}},
+  byeditorcpanfo = {{redigert, kompilert og forklart, med f{\o}reord,
+      av}%
+    {red.,\addabbrvspace komp. og forkl., med f{\o}reord, av}},
+  byeditorcpanaf = {{redigert, kompilert og forklart, med etterord, av}%
+    {red.,\addabbrvspace komp. og forkl., med etterord, av}},
+  bytranslatorcp = {{omsett \lbx@fromlang\ og kompilert av}%
+    {oms\adddot\addspace\lbx@fromlang\ og komp\adddot}},
+  bytranslatorcpco = {{omsett \lbx@fromlang, kompilert og kommentert av}%
+    {oms\adddot\addspace\lbx@fromlang, komp. og komm\adddot}},
+  bytranslatorcpan = {{omsett \lbx@fromlang, kompilert og forklart av}%
+    {oms\adddot\addspace\lbx@fromlang, komp. og forkl\adddot}},
+  bytranslatorcpin = {{omsett \lbx@fromlang\  og kompilert, med innleiing, av}%
+    {oms\adddot\addspace\lbx@fromlang\ og komp., med innleiing, av}},
+  bytranslatorcpfo = {{omsett \lbx@fromlang\ og kompilert, med f{\o}reord, av}%
+    {oms\adddot\addspace\lbx@fromlang\ og komp., med f{\o}reord, av}},
+  bytranslatorcpaf = {{omsett \lbx@fromlang\ og kompilert, med etterord, av}%
+    {oms\adddot\addspace\lbx@fromlang\ og komp., med etterord, av}},
+  bytranslatorcpcoin = {{omsett \lbx@fromlang, kompilert og kommentert,
+      med innleiing, av}%
+    {oms\adddot\addspace\lbx@fromlang, komp. og komm., med innleiing, av}},
+  bytranslatorcpcofo = {{omsett \lbx@fromlang, kompilert og kommentert,
+      med f{\o}reord, av}%
+    {oms\adddot\addspace\lbx@fromlang, komp. og komm.,
+      med f{\o}reord, av}},
+  bytranslatorcpcoaf = {{omsett \lbx@fromlang, kompilert og kommentert,
+      med etterord, av}%
+    {oms\adddot\addspace\lbx@fromlang, komp. og komm., med etterord, av}},
+  bytranslatorcpanin = {{omsett \lbx@fromlang, kompilert og forklart,
+      med innleiing, av}%
+    {oms\adddot\addspace\lbx@fromlang, komp. og forkl., med innleiing, av}},
+  bytranslatorcpanfo = {{omsett \lbx@fromlang, kompilert og forklart,
+      med f{\o}reord, av}%
+    {oms\adddot\addspace\lbx@fromlang, komp. og forkl.,
+      med f{\o}reord, av}},
+  bytranslatorcpanaf = {{omsett \lbx@fromlang, kompilert og forklart,
+      med etterord, av}%
+    {oms\adddot\addspace\lbx@fromlang, komp. og forkl.,
+      med etterord, av}},
+  bycompilerco = {{kompilert og kommentert av}%
+    {komp\adddot\space og komm\adddot}},
+  bycompileran = {{kompilert og forklart av}%
+    {komp\adddot\space og forkl\adddot}},
+  bycompilerin = {{kompilert, med innleiing, av}%
+    {komp\adddot, med innleiing, av}},
+  bycompilerfo = {{kompilert, med f{\o}reord, av}%
+    {komp\adddot, med f{\o}reord, av}},
+  bycompileraf = {{kompilert, med etterord, av}%
+    {komp\adddot, med etterord, av}},
+  bycompilercoin = {{kompilert og kommentert, med innleiing, av}%
+    {komp\adddot\space og komm\adddot, med innleiing, av}},
+  bycompilercofo = {{kompilert og kommentert, med f{\o}reord, av}%
+    {komp\adddot\space og komm\adddot, med f{\o}reord, av}},
+  bycompilercoaf = {{kompilert og kommentert, med etterord, av}%
+    {komp\adddot\space og komm\adddot, med etterord, av}},
+  bycompileranin = {{kompilert og forklart, med innleiing, av}%
+    {komp\adddot\space og forkl\adddot, med innleiing, av}},
+  bycompileranfo = {{kompilert og forklart, med f{\o}reord, av}%
+    {komp\adddot\space og forkl\adddot, med f{\o}reord, av}},
+  bycompileranaf = {{kompilert og forklart, med etterord, av}%
+    {komp\adddot\space og forkl\adddot, med etterord, av}},
+}
+
+\protected\gdef\lbx@cms@mkbibrangetrunc#1#2{%  DATE FIX
+  \iffieldundef{#2year}%
+  {\iffieldundef{#2month}
+    {}
+    {\printtext[#2date]{%
+        \iffieldsequal{#2month}{#2endmonth}
+        {\csuse{mkbibdate#1}{}{}{#2day}}
+        {\csuse{mkbibdate#1}{}{#2month}{#2day}}%
+        \iffieldundef{#2endyear}
+        {\iffieldundef{#2endmonth}
+          {}
+          {\bibdatedash
+            \csuse{mkbibdate#1}{}{#2endmonth}{#2endday}}}
+        {\iffieldequalstr{#2endyear}{}
+          {\mbox{\bibdatedash}}
+          {\bibdatedash
+            \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+  {\printtext[#2date]{%
+      \iffieldsequal{#2year}{#2endyear}
+      {\iffieldsequal{#2month}{#2endmonth}
+        {\csuse{mkbibdate#1}{}{}{#2day}}
+        {\csuse{mkbibdate#1}{}{#2month}{#2day}}}
+      {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+      \iffieldundef{#2endyear}
+      {}
+      {\iffieldequalstr{#2endyear}{}
+        {\mbox{\bibdatedash}}
+        {\bibdatedash
+          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+
+\protected\gdef\lbx@cms@mkbibrangefull#1#2{%
+  \ifthenelse{\iffieldundef{#2year}\AND\iffieldundef{#2month}}%
+  {}%
+  {\printtext[#2date]{%
+      \csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+      \ifthenelse{\iffieldundef{#2endyear}\AND\iffieldundef{#2endmonth}}
+      {}
+      {\iffieldequalstr{#2endyear}{}
+        {\mbox{\bibdatedash}}
+        {\bibdatedash
+          \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
+
+\endinput