langsci (11feb23)

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

17 files changed, 421 insertions, 110 deletions

diff --git a/Master/texmf-dist/doc/xelatex/langsci/README.md b/Master/texmf-dist/doc/xelatex/langsci/README.md
index cbbe33bd1a1..0cb940a5ca3 100644
--- a/Master/texmf-dist/doc/xelatex/langsci/README.md
+++ b/Master/texmf-dist/doc/xelatex/langsci/README.md
@@ -1,7 +1,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Project: langsci
 %% Author: Language Science Press (http://langsci-press.org)
-%% Date: 2022-02-16 11:11:11 UTC
+%% Date: 2023-02-10 11:11:11 UTC
 %% Purpose: publishing boks with Language Science Press.
 %% Languages: LaTeX, tikz, eps
 %% Copyright 2012- Language Science Press
@@ -28,11 +28,9 @@
 %% tbls-refresh.pdf, tbls-report.pdf, tbls-r.pdf, tbls-test.pdf, tbls-tree.pdf,
 %% tbls-book.eps tbls-bulb.eps tbls-glass.eps tbls-law.eps
 %% - langsci-affiliations.sty:  Parse author affiliations
-%% - langsci-basic.sty for commands required by the standard template
 %% - langsci-bidi.sty: bidirectional text
 %% - langsci-gb4e.sty and langsci-cgloss.sty: typeset linguistic examples
 %% - langsci-lgr.sty: shortcuts for the Leipzig Glossing Rules
-%% - langsci-linguex.sty: a version of linguex which does not break gb4e
 %% - langsci-optional.sty: additional useful commands
 %% - langsci-subparts.sty: adds an additional sectioning level between part and chapter
 %% - langsci-tbls.sty: macros for the textbook series Textbooks in Language Sciences
@@ -51,10 +49,8 @@ The main file is the file langscibook.cls. This defines the basic structure of t
 
 The following optional packages are also provided, but have to be included manually if desired:
 
-    langsci-basic.sty to set the branding to Language Science Press
     langsci-optional.sty: additional useful commands
     langsci-gb4e.sty and langsci-cgloss.sty typeset linguistic examples
-    langsci-linguex.sty: a version of linguex which does not break gb4e
     langsci-lgr.sty: the Leipzig glossing rule definitions
     langsci-bidi.sty: bidirectional text
     langsci-tbls.sty: macros for the textbook series Textbooks in Language Sciences
diff --git a/Master/texmf-dist/doc/xelatex/langsci/documentation/langsci-doc.pdf b/Master/texmf-dist/doc/xelatex/langsci/documentation/langsci-doc.pdf
index f3d05b6ef2a..63af7b51358 100644
--- a/Master/texmf-dist/doc/xelatex/langsci/documentation/langsci-doc.pdf
+++ b/Master/texmf-dist/doc/xelatex/langsci/documentation/langsci-doc.pdf
diff --git a/Master/texmf-dist/doc/xelatex/langsci/documentation/langsci-doc.tex b/Master/texmf-dist/doc/xelatex/langsci/documentation/langsci-doc.tex
index 3cbbd63bc0e..d20c8c5ba07 100644
--- a/Master/texmf-dist/doc/xelatex/langsci/documentation/langsci-doc.tex
+++ b/Master/texmf-dist/doc/xelatex/langsci/documentation/langsci-doc.tex
@@ -32,7 +32,7 @@
 
 \mainmatter
 \chapter{Introduction}
-This document describes the {\LaTeX} class langscibook.cls. This class is used for typesetting books with Language Science Press. Language Science Press publish open access monographs and edited volumes in linguistics.
+This document describes the {\LaTeX} class langscibook.cls. This class is used for typesetting books with Language Science Press. Language Science Press publishes open access monographs and edited volumes in linguistics.
 
 
 \chapter{The class}
@@ -143,13 +143,12 @@ Papers can be compiled standalone. You can use the command \verb+\papernote+ in
 This will set your chapter number to 23 when compiled standalone (rather than 1) and will display text in the chapter footer.
 
 \chapter{Options}
-The class has flag options to toggle certain behaviour and string options to set metadata values.
+The class has flag options to toggle certain behaviours and string options to set metadata values.
 
 \section{Flag options}
 \option{collection}{Make the book an edited volume}{false}
 \option{draftmode}{Switch to draft mode (adds: draft stamp, indication of overlong lines, date)}{false}
 \option{openreview}{Switch to open review mode}{false}
-\option{multiauthors}{Set editor suffix to eds. instead of ed.}{false}
 \option{minimal}{Load a very bare class optimized for compilation speed}{false}
 \option{nobabel}{Do not use the Babel package in the class}{false}
 \option{showindex}{Show indexed terms in margin}{false}
@@ -221,7 +220,7 @@ Redefine the following commands to further alter the appearance:
 \option{{\textbackslash}lsCoverSubTitleFont}{Font for the subtitle}{{\textbackslash}sffamily{\textbackslash}addfontfeatures\{Scale=MatchUppercase\}\\ {\textbackslash}fontsize\{25pt\}\{10mm\}{\textbackslash}selectfont}
 \option{{\textbackslash}lsCoverTitleFont}{Font for the title}{{\textbackslash}sffamily{\textbackslash}addfontfeatures{Scale=MatchUppercase}\\ {\textbackslash}fontsize{52pt}{17.25mm}{\textbackslash}selectfont}
 \option{{\textbackslash}lsEditorPrefix}{How editors are indicated on title page. Useful for localization.}{{{\textbackslash}LARGE Edited by{\textbackslash}{\textbackslash}}}
-\option{{\textbackslash}lsEditorSuffix}{How editors are indicated in the colophon}{(ed.)/(eds.)\rmfamily, depending on the value of the option \texttt{multiauthors}}
+\option{{\textbackslash}lsEditorSuffix}{How editors are indicated in the colophon}{(ed.)/(eds.)}
 
 \option{{\textbackslash}lsLanguageIndexTitle}{The title of the language index. Change this for non-English works}{Language index}
 \option{{\textbackslash}lsNameIndexTitle}{The title of the name index. Change this for non-English works}{Name index}
diff --git a/Master/texmf-dist/doc/xelatex/langsci/examples/samplemonograph.pdf b/Master/texmf-dist/doc/xelatex/langsci/examples/samplemonograph.pdf
index 7529effb1ee..4e64daeaae1 100644
--- a/Master/texmf-dist/doc/xelatex/langsci/examples/samplemonograph.pdf
+++ b/Master/texmf-dist/doc/xelatex/langsci/examples/samplemonograph.pdf
diff --git a/Master/texmf-dist/doc/xelatex/langsci/examples/samplepaper.pdf b/Master/texmf-dist/doc/xelatex/langsci/examples/samplepaper.pdf
index 4d955f64ee0..c28bf02404a 100644
--- a/Master/texmf-dist/doc/xelatex/langsci/examples/samplepaper.pdf
+++ b/Master/texmf-dist/doc/xelatex/langsci/examples/samplepaper.pdf
diff --git a/Master/texmf-dist/doc/xelatex/langsci/examples/samplevolume.pdf b/Master/texmf-dist/doc/xelatex/langsci/examples/samplevolume.pdf
index 38176ca4c3c..76dc1161883 100644
--- a/Master/texmf-dist/doc/xelatex/langsci/examples/samplevolume.pdf
+++ b/Master/texmf-dist/doc/xelatex/langsci/examples/samplevolume.pdf
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-affiliations.sty b/Master/texmf-dist/tex/xelatex/langsci/langsci-affiliations.sty
index edc044ec635..452010496e2 100644
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci-affiliations.sty
+++ b/Master/texmf-dist/tex/xelatex/langsci/langsci-affiliations.sty
@@ -17,10 +17,10 @@
 %% langsci-affiliations was developed at Language Science Press to help in the
 %% production of scientific texts in linguistics.
 %% 
-%% Copyright (C) 2021 by Felix Kopecky, Language Science Press
+%% Copyright (C) 2022 by Felix Kopecky, Language Science Press
 %% 
 %% This work consists of the file  langsci-affiliations.dtx
-%%           and the derived files langsci-affiliations.ins,
+%%           and the derived files langsci-affiliations.sty,
 %%                                 langsci-affiliations.pdf.
 %% 
 %% It may be distributed and/or modified under the conditions of the
@@ -45,9 +45,10 @@
 
 
 
+
 \RequirePackage{xparse}
 \ProvidesExplPackage {langsci-affiliations}
-{2021-11-30} {1.0.4}
+{2022-10-11} {1.1}
 {A LaTeX3 package to collect and order authors and affiliations}
 
 \NewDocumentCommand{\ResolveAffiliations}{ O{} +m }
@@ -58,6 +59,8 @@
     \group_end:
   }
 
+\ProvideDocumentCommand{\LinkToORCIDinAffiliations}{ +m }{ #1 }
+
 \NewExpandableDocumentCommand{\CountAuthorsFromAffiliations}{ O{} +m }
   {%
     \group_begin:
@@ -80,6 +83,10 @@
         = \l__affiliations_output_affiliation_bool,
     output~affiliation .initial:n
         = { true },
+    orcid~placement .tl_set:N
+        = \l__affiliations_orcid_place_tl,
+    orcid~placement .initial:n
+        = { none },
     output~in~groups .bool_set:N
         = \l__affiliations_output_grouped_bool,
     output~in~groups .initial:n
@@ -126,17 +133,20 @@
 \clist_new:N \l__affiliations_tmpa_clist
 \int_new:N \l__affiliations_tmpa_int
 \int_new:N \g__affiliations_num_authors_int
-\prop_new:N \l__affiliations_tmpa_prop
 \seq_new:N \l__affiliations_affiliations_seq
 \seq_new:N \l__affiliations_authors_seq
 \seq_new:N \l__affiliations_names_seq
 \seq_new:N \l__affiliations_tmpa_seq
 \seq_new:N \l__affiliations_tmpb_seq
+\seq_new:N \l__affiliations_tmp_affil_seq
+\seq_new:N \l__affiliations_tmp_orcid_seq
 \tl_new:N \l__affiliations_tmpa_tl
 \tl_new:N \l__affiliations_tmpb_tl
 \tl_new:N \l__affiliations_tmpc_tl
+\prop_new:N \l__affiliations_tmpa_prop
 \prop_new:N \l__affiliations_output_prop
 \prop_new:N \l__affiliations_affiliations_prop
+\prop_new:N \l__affiliations_orcids_prop
 \prop_const_from_keyval:Nn \l__affiliations_icons_prop
   {
      0 = \char"2460,  1 = \char"2461,  2 = \char"2462,  3 = \char"2463,
@@ -242,10 +252,34 @@
             \seq_use:Nn \l__affiliations_tmpb_seq
                         {\l__affiliations_afil_separator_tl}
           }
-        \seq_put_right:Nx \l__affiliations_tmpa_seq
+        \str_case_e:nn { \l__affiliations_orcid_place_tl }
           {
-            \tl_rescan:nn {} {##1}
-            \exp_not:N \textsuperscript{\tl_use:N \l__affiliations_tmpb_tl}
+            {none}
+            {
+              \seq_put_right:Nx \l__affiliations_tmpa_seq
+                {
+                  \tl_rescan:nn {} {##1}
+                  \exp_not:N \textsuperscript{\tl_use:N \l__affiliations_tmpb_tl}
+                }
+            }
+            {before}
+            {
+              \seq_put_right:Nx \l__affiliations_tmpa_seq
+                {
+                  \exp_not:N \__affiliations_recover_orcid:n { ##1 }
+                  \tl_rescan:nn {} {##1}
+                  \exp_not:N \textsuperscript{\tl_use:N \l__affiliations_tmpb_tl}
+                }
+            }
+            {after}
+            {
+              \seq_put_right:Nx \l__affiliations_tmpa_seq
+                {
+                  \tl_rescan:nn {} {##1}
+                  \exp_not:N \__affiliations_recover_orcid:n { ##1 }
+                  \exp_not:N \textsuperscript{\tl_use:N \l__affiliations_tmpb_tl}
+                }
+            }
           }
       }
     \seq_use:Nnnn \l__affiliations_tmpa_seq
@@ -265,12 +299,36 @@
                        \l__affiliations_tmpc_tl
     \seq_map_inline:Nn \l__affiliations_names_seq
       {
-        \seq_clear_new:N \l__affiliations_names_tmp_seq
-        \seq_set_split:Nnn \l__affiliations_names_tmp_seq { \affiliation }
-                           { ##1 }
+        \tl_clear_new:N \l__affiliations_names_tmp_tl
+        \tl_set:Nn \l__affiliations_names_tmp_tl { ##1 }
+
+
+        \regex_extract_once:nnN
+          {\c{affiliation} \cB. (\c[^BE].*) \cE.}
+          { ##1 }
+          \l__affiliations_tmp_affil_seq
+
+        \regex_extract_once:nnN
+          {\c{orcid} \cB. (\c[^BE].*) \cE.}
+          { ##1 }
+          \l__affiliations_tmp_orcid_seq
+
+
+        \regex_replace_all:nnN {\c{orcid} \cB. (\c[^BE].*) \cE.}
+                               {}
+                               \l__affiliations_names_tmp_tl
+        \regex_replace_all:nnN {\c{affiliation} \cB. (\c[^BE].*) \cE.}
+                               {}
+                               \l__affiliations_names_tmp_tl
+
+
         \prop_put:Nxx \l__affiliations_tmpa_prop
-        { \seq_item:Nn \l__affiliations_names_tmp_seq {1} }
-        { \seq_item:Nn \l__affiliations_names_tmp_seq {2} }
+        { \tl_use:N \l__affiliations_names_tmp_tl }
+        { \seq_item:Nn \l__affiliations_tmp_affil_seq {2} }
+
+        \prop_put:Nxx \l__affiliations_orcids_prop
+        { \tl_use:N \l__affiliations_names_tmp_tl }
+        { \seq_item:Nn \l__affiliations_tmp_orcid_seq {2} }
       }
     \bool_if:NTF \l__affiliations_output_affiliation_bool
       {
@@ -291,16 +349,52 @@
             \seq_clear:N \l__affiliations_tmpa_seq
             \prop_map_inline:Nn \l__affiliations_tmpa_prop
               {
-                \seq_put_right:Nx \l__affiliations_tmpa_seq
+                \str_case_e:nn { \l__affiliations_orcid_place_tl }
                   {
-                    \group_begin:
-                      \exp_not:N \__affiliations_output_authors_font:
-                      \tl_rescan:nn {} {##1}\\[0.5ex]
-                    \group_end:
-                    \group_begin:
-                      \exp_not:N \__affiliations_output_affiliation_font:
-                      \tl_rescan:nn {} {##2}
-                    \group_end:
+                    {none}
+                    {
+                      \seq_put_right:Nx \l__affiliations_tmpa_seq
+                        {
+                          \group_begin:
+                            \exp_not:N \__affiliations_output_authors_font:
+                            \tl_rescan:nn {} {##1}\\[0.5ex]
+                          \group_end:
+                          \group_begin:
+                            \exp_not:N \__affiliations_output_affiliation_font:
+                            \tl_rescan:nn {} {##2}
+                          \group_end:
+                        }
+                    }
+                    {before}
+                    {
+                      \seq_put_right:Nx \l__affiliations_tmpa_seq
+                        {
+                          \group_begin:
+                            \exp_not:N \__affiliations_output_authors_font:
+                            \exp_not:N \__affiliations_recover_orcid:n { ##1 }
+                            \tl_rescan:nn {} {##1}\\[0.5ex]
+                          \group_end:
+                          \group_begin:
+                            \exp_not:N \__affiliations_output_affiliation_font:
+                            \tl_rescan:nn {} {##2}
+                          \group_end:
+                        }
+                    }
+                    {after}
+                    {
+                      \seq_put_right:Nx \l__affiliations_tmpa_seq
+                        {
+                          \group_begin:
+                            \exp_not:N \__affiliations_output_authors_font:
+                            \tl_rescan:nn {} {##1}
+                            \exp_not:N \__affiliations_recover_orcid:n { ##1 }\\[0.5ex]
+                          \group_end:
+                          \group_begin:
+                            \exp_not:N \__affiliations_output_affiliation_font:
+                            \tl_rescan:nn {} {##2}
+                          \group_end:
+                        }
+                    }
                   }
               }
             \seq_use:Nnnn \l__affiliations_tmpa_seq
@@ -315,8 +409,30 @@
         \seq_clear:N \l__affiliations_tmpa_seq
         \prop_map_inline:Nn \l__affiliations_tmpa_prop
           {
-            \seq_put_right:Nx \l__affiliations_tmpa_seq
-                              {\tl_rescan:nn {} {##1} }
+            \str_case_e:nn { \l__affiliations_orcid_place_tl }
+              {
+                {none}
+                  {
+                    \seq_put_right:Nx \l__affiliations_tmpa_seq
+                                      { \tl_rescan:nn {} {##1} }
+                  }
+                {before}
+                  {
+                    \seq_put_right:Nx \l__affiliations_tmpa_seq
+                                      {
+                                        \exp_not:N \__affiliations_recover_orcid:n { ##1 }
+                                        \tl_rescan:nn {} {##1}
+                                      }
+                  }
+                {after}
+                  {
+                    \seq_put_right:Nx \l__affiliations_tmpa_seq
+                                      {
+                                        \tl_rescan:nn {} {##1}
+                                        \exp_not:N \__affiliations_recover_orcid:n { ##1 }
+                                      }
+                  }
+                }
           }
         \seq_use:Nnnn \l__affiliations_tmpa_seq
                         {\l__affiliations_separator_between_two_tl}
@@ -337,6 +453,21 @@
     \int_gset:Nn \g__affiliations_num_authors_int
       {  \seq_count:N \l__affiliations_names_seq  }
   }
+\cs_new:Npn \__affiliations_recover_orcid:n #1
+  {
+    \prop_get:NnNTF \l__affiliations_orcids_prop { #1 }
+      \l__affiliations_tmpd_tl
+      {
+        \tl_if_empty:NTF \l__affiliations_tmpd_tl
+          % No ORCID present; no action done.
+          { }
+          {
+            \LinkToORCIDinAffiliations{\tl_use:N \l__affiliations_tmpd_tl}
+          }
+      }
+      % No database entry for author; no action done.
+      { }
+  }
 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-basic.sty b/Master/texmf-dist/tex/xelatex/langsci/langsci-basic.sty
deleted file mode 100644
index 0887c74c171..00000000000
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci-basic.sty
+++ /dev/null
@@ -1,12 +0,0 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%      File: langsci-basic.sty
-%%    Author: Language Science Press (http://langsci-press.org)
-%%      Date: 2022-02-16 16:47:43 UTC
-%%   Purpose: This file contains essential macros and is included
-%%            into langscibook.cls
-%%  Language: LaTeX
-%%   Licence:
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-% The content of this file has been moved to langsci-branding.sty and langsci-optional.sty
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-gb4e.sty b/Master/texmf-dist/tex/xelatex/langsci/langsci-gb4e.sty
index d5d81439d48..bead897229a 100644
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci-gb4e.sty
+++ b/Master/texmf-dist/tex/xelatex/langsci/langsci-gb4e.sty
@@ -1,15 +1,15 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%      File: langsci-gb4e.sty
 %%    Author: Language Science Press (http://langsci-press.org)
-%%      Date: 2022-02-16 16:47:43 UTC
+%%      Date: 2022-10-21
 %%   Purpose: This file contains an adapted version of the gb4e package
 %%            for typetting linguistic examples. It also includes
 %%            adapted versions of the cgloss and jambox packages
 %%  Language: LaTeX
-%%   Licence:
+%%   Licence: The LaTeX Project Public License, Version 1.3c
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\ProvidesPackage{langsci-gb4e}[2020/01/01]
+\ProvidesPackage{langsci-gb4e}[2022/10/21]
 
 \usepackage{etoolbox}
 
@@ -17,8 +17,10 @@
 \toggletrue{cgloss}
 \newtoggle{jambox}
 \toggletrue{jambox}
+\newtoggle{gb4eLowerPenalty}
 \DeclareOption{nocgloss}{\togglefalse{cgloss}}
 \DeclareOption{nojambox}{\togglefalse{jambox}}
+\DeclareOption{lowerpenalty}{\toggletrue{gb4eLowerPenalty}}
 \DeclareOption*{\PackageWarning{langsci-gb4e}{Unknown option ‘\CurrentOption’}}
 \ProcessOptions\relax
 
@@ -256,10 +258,12 @@
                         \begin{list}{(\thexnumi)}%
                         {\usecounter{xnumi}\@subex{#1}{\@gblabelsep}{0em}%
                         \setcounter{xnumi}{\value{equation}}}%
+                        \iftoggle{gb4eLowerPenalty}{\@itempenalty-1000}{}
                  \else%
                         \begin{list}{(\roman{xnumi})}%
                         {\usecounter{xnumi}\@subex{(iiv)}{\@gblabelsep}{\footexindent}%
                         \setcounter{xnumi}{\value{fnx}}}%
+                        \iftoggle{gb4eLowerPenalty}{\@itempenalty-1000}{}
                  \fi}
 
 
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-lgr.sty b/Master/texmf-dist/tex/xelatex/langsci/langsci-lgr.sty
index 25710fed5bd..384987f1df3 100644
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci-lgr.sty
+++ b/Master/texmf-dist/tex/xelatex/langsci/langsci-lgr.sty
@@ -1,7 +1,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%      File: langsci-lgr.sty
 %%    Author: Language Science Press (http://langsci-press.org)
-%%      Date: 2022-02-16 16:47:43 UTC
+%%      Date: 2020-08-31 16:47:43 UTC
 %%   Purpose: This file contains shortcuts for the Leipzig Glossing
 %%            Rules.
 %%  Language: LaTeX
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-optional.sty b/Master/texmf-dist/tex/xelatex/langsci/langsci-optional.sty
index 17e9f0df598..6f7ec69a22f 100644
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci-optional.sty
+++ b/Master/texmf-dist/tex/xelatex/langsci/langsci-optional.sty
@@ -1,7 +1,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%      File: langsci-optional.sty
 %%    Author: Language Science Press (http://langsci-press.org)
-%%      Date: 2022-02-16 16:47:43 UTC
+%%      Date: 2016-01-16 16:47:43 UTC
 %%   Purpose: This file contains useful, but not essential,
 %%            macros for books using langscibook.cls
 %%  Language: LaTeX
@@ -389,3 +389,6 @@
                        separator between final two = {~\&~}
                       }
   }
+
+
+\newcommand{\licencebox}[2][]{\parbox{#1\textwidth}{\tiny\raggedright #2}}
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-series.def b/Master/texmf-dist/tex/xelatex/langsci/langsci-series.def
index 22ce8e61371..d321d70082f 100644
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci-series.def
+++ b/Master/texmf-dist/tex/xelatex/langsci/langsci-series.def
@@ -5,6 +5,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
+\newcommand{\ahl}{ahl}
 \newcommand{\algad}{algad}
 \newcommand{\calseries}{calseries}
 \newcommand{\cam}{cam}
@@ -16,6 +17,7 @@
 \newcommand{\eotms}{eotms}
 \newcommand{\eotmsig}{eotmsig}
 \newcommand{\eurosla}{eurosla}
+\newcommand{\ela}{ela}
 \newcommand{\hpls}{hpls}
 \newcommand{\loc}{loc}
 \newcommand{\lv}{lv}            %Language Variation
@@ -23,6 +25,7 @@
 \newcommand{\nc}{nc}		%Niger Congo
 \newcommand{\ogs}{ogs}		%Open Generative Syntax
 \newcommand{\ogl}{ogl}      %  Open Germanic Linguistics
+\newcommand{\orl}{orl}		%Open Romance Linguistics
 \newcommand{\osl}{osl}		%Open Slavic Linguistics
 \newcommand{\pmwe}{pmwe}		%Phraseology and Multi-Word Expressions
 \newcommand{\rcg}{rcg} %
@@ -39,6 +42,28 @@
 \newcommand{\lsSeriesFontColor}{white}
 
 \AtBeginDocument{
+\ifx\lsSeries\ahl
+	\newcommand{\lsSeriesTitle}{Advances in Historical Linguistics}
+	\newcommand{\lsSeriesColor}{lsRed}
+%	\renewcommand{\lsISSN}{}
+	\renewcommand{\lsSeriesText}{
+            Editors:
+            Klaus Grübl (Leipzig University, Germany),
+            Judith Huber (LMU Munich, Germany),
+            Simon Pickl (University of Salzburg, Austria),
+            Lea Schäfer (University of Düsseldorf, Germany),
+            Markus Schiegg (University of Erlangen-Nürnberg, Germany)
+
+
+            \bigskip
+
+            In this series:
+
+%            \begin{enumerate}
+%            \item
+%            \end{enumerate}
+        }
+\fi
 \ifx\lsSeries\algad
 	\newcommand{\lsSeriesTitle}{African Language Grammars \newlineCover and Dictionaries}
 	\newcommand{\lsSeriesColor}{lsLightOrange}
@@ -56,8 +81,9 @@
             \item Brindle, Jonathan. A dictionary and grammatical outline of Chakali.
             \item Friesen, Dianne. A grammar of Moloko.
             \item Ali, Mark, Scott Grimm \& Adams Bodomo. A dictionary and  grammatical sketch of Dagaare.
-            \end{enumerate}
             \item  Namyalo, Saudah,   Alena Witzlack-Makarevich,   Anatole Kiriggwajjo,   Amos Atuhairwe,   Zarina Molochieva,   Ruth Gimbo Mukama   \& Margaret Zellers. A dictionary and grammatical sketch of Ruruuli-Lunyala.
+            \item Gunnink, Hilde. A grammar of Fwe.
+            \end{enumerate}
         }
 \fi
 \ifx\lsSeries\calseries %\cal is already taken as a command
@@ -108,6 +134,8 @@
           \item Pinto, Jorge \& Nélia Alexandre (eds.).  Multilingualism and third language acquisition: Learning and teaching trends.
           \item Hakimov, Nikolay. Explaining Russian-German code-mixing: A usage-based approach.
           \item Sánchez Moreano, Santiago \& Élodie Blestel. Prácticas lingüísticas heterogéneas: Nuevas perspectivas para el estudio del español en contacto con lenguas amerindias.
+          \item Migge, Bettina \& Shelome Gooden.  Social and structural aspects of language contact and change.
+          \item Coler, Matt \& Andrew Nevins (eds.). Contemporary research in minoritized and diaspora languages of Europe.
         \end{enumerate}
         }
 \fi
@@ -135,6 +163,7 @@
 
         \begin{enumerate}
           \item Shim, Ji Young. OV and VO variation in code-switching.
+          \item Rodríguez González, Eva \& Rosita L. Rivera (eds.). Language assessment in multilingual settings: Innovative practices across formal and informal environments.
         \end{enumerate}
         }
 \fi
@@ -182,7 +211,7 @@
 
             \bigskip
 
-            In this series:
+            \textbf{In this series:}
 
             \begin{enumerate}
             \item Enfield, N. J. {Natural causes of language}.
@@ -192,6 +221,7 @@
             \item Asoulin, Eran. Language and scientific explanation: Where does semantics fit in?
             \item Boeckx, Cedric. Reflections on language evolution: From minimalism to pluralism.
             \item Archangeli, Diana \& Douglas Pulleyblank. Emergent phonology.
+            \item Lund, Kristine, Pierluigi Basso Fossali, Audrey Mazur \& Magali Ollagnier-Beldame (eds.). Language is a complex adaptive system: Explorations and evidence.
             \end{enumerate}
 
             }
@@ -214,6 +244,8 @@
             \item Jacques, Guillaume. A grammar of Japhug.
             \item Grimm, Nadine. A grammar of Gyeli.
             \item Maurer-Cecchini, Philippe. A grammar of Tuatschin: A Sursilvan Romansh dialect.
+            \item Visser, Eline. A grammar of Kalamang.
+            \item Caballero, Gabriela. A grammar of Choguita Rarámuri: In collaboration with Luz Elena León Ramírez, Sebastián Fuentes Holguín, Bertha Fuentes Loya and other Choguita Rarámuri language experts.
             \end{enumerate}
 
 
@@ -312,7 +344,8 @@
             \item Crysmann, Berthold \& Manfred Sailer (eds.). One-to-many relations in morphology, syntax, and semantics.
             \item Zinova, Yulia. Russian verbal prefixation: A frame semantic analysis.
             \item  Müller, Stefan, Anne Abeillé, Robert D. Borsley \& Jean-Pierre Koenig. Head-Driven Phrase Structure Grammar: The handbook.
-	    \item Diewald, Gabriele \& Katja Politt (eds.). Paradigms regained: Theoretical and empirical arguments for the reassessment of the notion of paradigm.	    
+	    \item Diewald, Gabriele \& Katja Politt (eds.). Paradigms regained: Theoretical and empirical arguments for the reassessment of the notion of paradigm.
+	    \item Freywald, Ulrike,   Horst J. Simon   \& Stefan Müller (eds.). Headedness and/or grammatical anarchy?
             \end{enumerate}
             }
 \fi
@@ -330,7 +363,7 @@
 
             \bigskip
 
-            Editor: 
+            Editor:
             Amanda Edmonds, Université Côte d'Azur\smallskip\\
             Associate editors:\\
             Gabriele Pallotti, University of Modena and Reggio Emilia\\
@@ -346,9 +379,37 @@
             \item Bardel, Camilla \& Laura Sánchez (eds.). Third language acquisition: Age, proficiency and multilingualism.
             \item  Edmonds, Amanda, Pascale Leclercq \& Aarnes Gudmestad (eds.), Interpreting  language-learning data.
             \item Berthele, Raphael \& Isabelle Udry (eds.). Individual differences in early instructed language learning: The role of language aptitude, cognition, and motivation.
+            \item McManus, Kevin \& Monika S. Schmid (eds.). How special are early birds? Foreign language teaching and learning.
             \end{enumerate}
 	}
 \fi
+\ifx\lsSeries\ela
+        \newcommand{\elatitle}{Estudios de Lingüística Amerindia}
+        \newcommand{\elaeditor}{Editores:}
+        \newcommand{\elainthisseries}{En esta serie:}
+	\newcommand{\lsSeriesTitle}{\elatitle}
+	\newcommand{\lsSeriesColor}{lsMidDarkBlue}
+
+	\renewcommand{\lsSeriesText}{
+            {\large  \elatitle}
+
+            \bigskip
+
+            \elaeditor
+
+    Carolina González. Florida State University\\
+    Siri Tuttle. Navajo Technical University in New Mexico\\
+    Thiago Chacon. University of Brasilia\\
+    Heriberto Avelino. National Institute for Anthropology and History\\
+
+            \bigskip
+
+            \elainthisseries
+
+            %\begin{enumerate}
+            %\end{enumerate}
+	}
+\fi
 \ifx\lsSeries\hpls
 	\newcommand{\lsSeriesTitle}{History and Philosophy of the Language Sciences}
 	\newcommand{\lsSeriesColor}{black}
@@ -372,8 +433,10 @@
             \item Van Rooy, Raf. Greece’s labyrinth of language: A study in the early modern discovery of dialect diversity.
             \item Aussant, Émilie \& Jean-Michel Fortis. Historical journey in a linguistic archipelago: Case studies on concepts, fields, and commitments.
             \item McElvenny, James \& Ploder, Andrea. Holisms of communication: The early history of audio-visual sequence analysis.
+            \item Anderson, Stephen R. Phonology in the Twentieth Century: Second edition, revised and expanded.
             \end{enumerate}
-            \item Anderson, Stephen R. Phonology in the Twentieth Century : Second edition, revised and expanded.
+            \item McElvenny, James. Interviews in the history of linguistics: Volume I.
+
 
             }
 \fi
@@ -426,6 +489,7 @@
             \item Dellert, Johannes. Information-theoretic causal inference of lexical flow.
             \item Zimmer, Christian (ed.). German(ic) in language contact: Grammatical and sociolinguistic dynamics.
             \item Tahmasebi, Nina, Lars Borin, Adam Jatowt, Yang Xu and Simon Hengchen (eds.). Computational approaches to semantic change.
+            \item Paulsen, Ingrid. The emergence of American English as a discursive variety: Tracing enregisterment processes in nineteenth-century U.S. newspapers.
             \end{enumerate}
             }
 \fi
@@ -487,7 +551,7 @@
 \ifx\lsSeries\ogl
 	\newcommand{\lsSeriesTitle}{Open Germanic Linguistics}
 	\newcommand{\lsSeriesColor}{lsMidDarkBlue}
-	\renewcommand{\lsISSNelectronic}{ISSN 2750-557X} %online
+	\renewcommand{\lsISSNelectronic}{2750-557X} %online
 	\renewcommand{\lsISSNprint}{2750-5588} %Print
 	\renewcommand{\lsSeriesText}{
             {\large  Open Germanic Linguistics
@@ -505,6 +569,8 @@
             
             \begin{enumerate}
             \item Lemke, Robin. Experimental investigations on the syntax and usage of fragments.
+            \item Larsson, Ida \& Erik Petzell (eds.). Morphosyntactic change in Late Modern Swedish.
+            \item Hall, Tracy Alan. Velar fronting in German dialects: A study in synchronic and diachronic phonology.
             \end{enumerate}
  }
          }
@@ -545,6 +611,32 @@
             \end{enumerate}
             }
 \fi
+\ifx\lsSeries\orl
+	\newcommand{\lsSeriesTitle}{Open Romance Linguistics}
+	\newcommand{\lsSeriesColor}{lsDarkWine}
+	\renewcommand{\lsISSNelectronic}{2940-1100} % Online
+	\renewcommand{\lsISSNprint}{2940-1097}% (Print)
+	\renewcommand{\lsSeriesText}{
+            {\large Open Romance Linguistics}
+
+            \bigskip
+
+            \textbf{Editors:} \\
+            Lorenzo Filipponio (HU Berlin)\\
+            Richard Waltereit (HU Berlin)\\
+            Esme Winter-Froemel (Julius-Maximilians-Universität Würzburg)\\
+            Anne C. Wolfsgruber (HU Berlin)\\
+
+            \bigskip
+
+            \textbf{In this series:}
+
+            \begin{enumerate}
+            \item Kocher, Anna. Complementizers on edge: On the boundaries between syntax and pragmatics in Ibero-Romance.
+            \item Bullock, Barbara E. Cinzia Russi \& Almeida Jacqueline Toribio (eds.). A half century of Romance linguistics: Selected proceedings of the 50th Linguistic Symposium on Romance Languages.
+            \end{enumerate}
+            }
+\fi
 \ifx\lsSeries\osl
 	\newcommand{\lsSeriesTitle}{Open Slavic Linguistics}
 	\newcommand{\lsSeriesColor}{lsMidGreen}
@@ -623,6 +715,7 @@
 
             \begin{enumerate}
                 \item  Bahrt, Nicklas N. Voice syncretism.
+                \item  Veselinova, Ljuba \& Arja Hamari (eds.). The Negative Existential Cycle.
             \end{enumerate}
             }
 \fi
@@ -699,9 +792,9 @@
             \item Edwards, Owen. Metathesis and unmetathesis in Amarasi.
             \item Bergqvist, Henrik \& Seppo Kittilä (eds). Evidentiality, egophoricity, and engagement.
             \item Floyd, Simeon, Giovanni Rossi \& N. J. Enfield (eds.). Getting others to do things: A pragmatic typology of recruitments.
+            \item Hölzl, Andreas  \& Thomas E. Payne. Tungusic languages: Past and present.
             \item Enke, Dankmar W., Larry M. Hyman, Johanna Nichols, Guido Seiler \& Thilo Weber (eds.). Language change for the worse.
             }
-
             }
 \fi
 \ifx\lsSeries\silp
@@ -737,6 +830,7 @@
             \item Ben Hedia, Sonia. Gemination and degemination in English affixation: Investigating the interplay between morphology, phonology and phonetics.
             \item Easterday, Shelece. Highly complex syllable structure: A typological and diachronic study.
             \item Roessig, Simon. Categoriality and continuity in prosodic prominence.
+            \item Schmitz, Dominic. Production, perception, and comprehension of subphonemic detail: Word-Final /s/ in English.
             \end{enumerate}
 
             }
@@ -750,7 +844,7 @@
              
              \bigskip
              
-             Editors: Stefan Müller, Martin Haspelmath\\
+             Editors: Stefan Müller, Antonio Machicao y Priemer\\
              Editorial Board: Claude Hagège, Marianne Mithun, Anatol Stefanowitsch, Foong Ha Yap
              
              \bigskip
@@ -766,6 +860,9 @@
              \item Ferreira, Marcelo. Curso de semântica formal.
              \item Stefanowitsch, Anatol. Corpus linguistics: A guide to the methodology.
              \item Müller, Stefan. {\tblseight}.
+             \item Hejná, Míša  \& George Walkden. A history of English.
+             \item Kahane, Sylvain \& Kim Gerdes. Syntaxe théorique et formelle. Vol. 1: Modélisation, unités, structures.
+             \item Freitas, Maria João, Marisa Lousada \& Dina Caetano Alves (eds.). Linguística clínica: Modelos, avaliação e intervenção.
              \end{enumerate}
              }
 \fi
@@ -834,6 +931,11 @@
             \item Tra\&Co Group (ed.). Translation, interpreting, cognition: The way out of the box.
             \item Nitzke, Jean \& Silvia Hansen-Schirra. A short guide to post-editing.
             \item Hoberg, Felix. Informationsintegration in mehrsprachigen Textchats: Der Skype Translator im Sprachenpaar Katalanisch-Deutsch.
+            \item Kenny, Dorothy (ed.). Machine translation for everyone: Empowering users in the age of artificial intelligence.
+            \item Kajzer-Wietrzny, Marta, Adriano Ferraresi,   Ilmari Ivaska \& Silvia Bernardini. Mediated discourse at the European Parliament: Empirical investigations.
+            \item Marzouk, Shaimaa. Sprachkontrolle im Spiegel der Maschinellen Übersetzung: Untersuchung zur Wechselwirkung ausgewählter Regeln der Kontrollierten Sprache mit verschiedenen Ansätzen der Maschinellen Übersetzung.
+            \item Frittella, Francesca Maria. Usability research for interpreter-centred technology: The case study of SmarTerp.
+            \item Prandi, Bianca. Computer-assisted simultaneous interpreting: A cognitive-experimental study on terminology.
             }
             }
 \fi
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-tbls.sty b/Master/texmf-dist/tex/xelatex/langsci/langsci-tbls.sty
index 6b2c2c04bd2..12be79a600f 100644
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci-tbls.sty
+++ b/Master/texmf-dist/tex/xelatex/langsci/langsci-tbls.sty
@@ -1,4 +1,4 @@
-\ProvidesPackage{langsci-tbls}[2021/01/06 langsci-tbls]
+\ProvidesPackage{langsci-tbls}[2023/01/06 langsci-tbls]
 
 \RequirePackage{etoolbox}
 \newbool{langsci@tbls@tcolorbox}
@@ -42,7 +42,17 @@
         left = 0mm,
         right = 0mm,
         borderline horizontal = {#2}{0pt}{#3},
-        beforeafter skip balanced = \baselineskip
+        beforeafter skip balanced = \baselineskip,
+        subtitle style = 
+          {
+            top = 3.25ex,
+            boxrule = 0pt,
+            colback = white,
+            enhanced,
+            interior hidden,
+            frame hidden,
+            fontupper = \normalfont\sffamily\bfseries\large
+          } 
       }
     \DeclareTColorBox{tblsfilled}{m O{black!12}}
       {
@@ -56,7 +66,17 @@
         right = 5mm,
         frame engine = path,
         frame style = {fill=#2},
-        sharp corners = all
+        sharp corners = all,
+        subtitle style = 
+          {
+            top = 3.25ex,
+            boxrule = 0pt,
+            colback = #2,
+            enhanced,
+            interior hidden,
+            frame hidden,
+            fontupper = \normalfont\sffamily\bfseries\large
+          } 
       }
     \DeclareTColorBox{tblsframed}{m O{0.8mm} O{\lsSeriesColor}}
       {
@@ -69,7 +89,17 @@
         left = 5mm,
         right = 5mm,
         borderline = {#2}{0pt}{#3},
-        beforeafter skip balanced = \baselineskip
+        beforeafter skip balanced = \baselineskip,
+        subtitle style = 
+          {
+            top = 3.25ex,
+            boxrule = 0pt,
+            colback = white,
+            enhanced,
+            interior hidden,
+            frame hidden,
+            fontupper = \normalfont\sffamily\bfseries\large
+          } 
       }
     \DeclareTColorBox{tblsfilledsymbol}{m O{black!12} m}
       {
@@ -99,7 +129,17 @@
                 line width = 0.8mm
               ] at (frame.north west) 
               {{\color{#2}\includegraphics[width=10mm]{tbls-#3.pdf}}};
-          }
+          },
+        subtitle style = 
+          {
+            top = 3.25ex,
+            boxrule = 0pt,
+            colback = #2,
+            enhanced,
+            interior hidden,
+            frame hidden,
+            fontupper = \normalfont\sffamily\bfseries\large
+          } 
       }
     \DeclareTColorBox{tblsframedsymbol}{m O{\lsSeriesColor} O{0.8mm} m}
       {
@@ -127,7 +167,17 @@
                 line width = #3
               ] at (frame.north west) 
               {{\color{#2}\includegraphics[width=10mm]{tbls-#4.pdf}}};
-          }
+          },
+        subtitle style = 
+          {
+            top = 3.25ex,
+            boxrule = 0pt,
+            colback = white,
+            enhanced,
+            interior hidden,
+            frame hidden,
+            fontupper = \normalfont\sffamily\bfseries\large
+          } 
       }
   }
 
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-unified.bbx b/Master/texmf-dist/tex/xelatex/langsci/langsci-unified.bbx
index 6872c4fe03b..f406db38c5c 100644
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci-unified.bbx
+++ b/Master/texmf-dist/tex/xelatex/langsci/langsci-unified.bbx
@@ -1,6 +1,6 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%      File: langscibook.cls
 %%    Author: Language Science Press (http://langsci-press.org)
-%%      Date: 2022-02-16 13:12 UTC
+%%      Date: 2019-03-06 13:12 UTC
 %%   Purpose: An implementation of the Unified Style Sheet for Linguistics bibliographies (https://www.linguisticsociety.org/resource/unified-style-sheet)
 %%  This work is based on the styles provided by Semantics \& Pragmatics 
 %%  Language: LaTeX
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-unified.cbx b/Master/texmf-dist/tex/xelatex/langsci/langsci-unified.cbx
index d0a00977525..7563a8feafe 100644
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci-unified.cbx
+++ b/Master/texmf-dist/tex/xelatex/langsci/langsci-unified.cbx
@@ -1,6 +1,6 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%      File: langscibook.cls
 %%    Author: Language Science Press (http://langsci-press.org)
-%%      Date: 2022-02-16 13:12 UTC
+%%      Date: 2019-03-06 13:12 UTC
 %%   Purpose: An implementation of the Unified Style Sheet for Linguistics bibliographies (https://www.linguisticsociety.org/resource/unified-style-sheet). 
 %%  This work is based on the styles provided by Semantics \& Pragmatics 
 %%  Language: LaTeX
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-unified.dbx b/Master/texmf-dist/tex/xelatex/langsci/langsci-unified.dbx
index 4af639c1e50..e218879e754 100644
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci-unified.dbx
+++ b/Master/texmf-dist/tex/xelatex/langsci/langsci-unified.dbx
@@ -1,6 +1,2 @@
-\DeclareDatamodelFields[type=list, datatype=name]
-  {%
-     indexauthor,
-     indexeditor
-  }
+\DeclareDatamodelFields[type=list, datatype=name]{indexauthor,indexeditor}
 \DeclareDatamodelEntryfields{indexauthor,indexeditor}
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langscibook.cls b/Master/texmf-dist/tex/xelatex/langsci/langscibook.cls
index c9f356d2d44..2451286e337 100644
--- a/Master/texmf-dist/tex/xelatex/langsci/langscibook.cls
+++ b/Master/texmf-dist/tex/xelatex/langsci/langscibook.cls
@@ -1,7 +1,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%      
 %%      File: langscibook.cls
 %%    Author: Language Science Press (http://langsci-press.org)
-%%      Date: 2022-02-08 14:00 CET
+%%      Date: 2023-02-08 14:00 CET
 %%   Purpose: This file defines the basic document class
 %%            for books published with Language Science Press.
 %%  Language: LaTeX
@@ -49,7 +49,7 @@
 %   \- Miscellaneous
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{langscibook}[2022/02/08 Language Science Press]
+\ProvidesClass{langscibook}[2023/02/08 Language Science Press]
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %    Early load packages
@@ -151,6 +151,8 @@
 \newbool{lsISBNTwoDigitAddon}
 \newbool{lsFloatCounterWithoutChapter}
     \booltrue{lsFloatCounterWithoutChapter}
+\newbool{lsImportPackagesWhenStandalone}
+\newbool{infn}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %     Option handling
@@ -249,13 +251,16 @@
   }
 }
 
+
 \DeclareVoidOption{arabicfont}
   {
-	\newfontfamily\arabicfont[Script=Arabic,ItalicFont=*,Scale=1.4]{arabtype.ttf}
-% 	\newcommand{\textarabic}[1]{{\arabicfont #1}}
+  \AtEndPreamble{
+        \newfontfamily\arabicfont[Script=Arabic,ItalicFont=*,Scale=1.4]{ScheherazadeRegOT_Jazm.ttf}
 	\AdditionalFontImprint{Arabtype}
+	\usepackage{langsci-bidi}
+%         \newcommand{\textarab}[1]{\RL{\arabicfont #1}} %has to be moved to localcommands
   }
-
+}
 \DeclareVoidOption{hebrewfont}
   {
 	\newfontfamily\hebrewfont[Script=Hebrew,ItalicFont=*, Scale=0.9]{SBLHebrew.ttf}
@@ -271,6 +276,7 @@
   }
 
 \DeclareVoidOption{tblseight}{\booltrue{tblseight}}
+\DeclareVoidOption{infn}{\booltrue{infn}}
 
 \ProcessKeyvalOptions*
 
@@ -308,7 +314,9 @@
     fontsize=\lsFontsize,% default is 11pt
     footnotes=multiple,
     numbers=noenddot,% no point after last number of chapters/sections
-    toc=bibliography,
+    \notbool{collection}{
+      toc=bib, % make bibliography appear in toc
+    }{}
     index=totoc,
     headings=optiontohead,
     footnotes=multiple
@@ -322,6 +330,7 @@
     \ifbool{paper}
       {% The same is applied to papers.
         \KOMAoptions{chapterprefix=true}
+        \booltrue{lsImportPackagesWhenStandalone}
       }
       {}
   }
@@ -499,6 +508,7 @@
 %we define a command to better encapsulate the logic
 \newcommand{\setuptitle}{%
     \renewcommand{\maketitle}{%first we treat covers to get them out of the way
+
         \ifbool{coverBODhc}{%
             \bodHCcover
             \end{document}
@@ -539,7 +549,6 @@
                 \null\newpage\thispagestyle{empty}
             }
             \end{titlepage}
-    %         \fi
         }{} %end book
 
         \ifbool{guidelines}{%
@@ -551,8 +560,6 @@
             \end{titlepage}
         }{} %end guidelines
 
-        % \null\newpage\thispagestyle{empty}
-        \hypersetup{colorlinks=false, citecolor=brown, pdfborder={0 0 0}}  % for hyperref
         \color{black}
         \lsInsideFont
 
@@ -611,6 +618,10 @@
         \let\eachwordone=\itshape
         \fi
         
+        \ifx\lsSeries\rcg
+        \let\eachwordone=\itshape
+        \fi
+        
         \ifx\lsSeries\eotms
         \renewcommand{\sectref}[1]{Section~\ref{#1}}
         \fi
@@ -897,6 +908,9 @@
 % }
 
 \input{langsci-series.def}
+\ifbool{guidelines}
+  {\let\lsSeries\guidelines}
+  {}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %    Cover
@@ -911,7 +925,7 @@
   {%
     \int_compare:nNnTF
         {\g__affiliations_num_authors_int} > {1}
-        {\booltrue{multiauthors}} {\boolfalse{multiauthors}}
+        {\booltrue{multiauthors}} {}
   }
 \ExplSyntaxOff
 
@@ -1260,7 +1274,7 @@ ISBN: &
 Cover and concept of design:
 Ulrike Harbort \\
 \if\@translator\empty\else
-Translator:
+Translation:
 \@translator \\
 \fi
 \if\@typesetter\empty\else
@@ -1538,10 +1552,7 @@ Storage and cataloguing done by \storageinstitution\\[3ex]
 	autolang=hyphen,
 	\ifbool{resetcapitals}{language=english,}{}
 	backend=\lsBiblatexBackend,
-	indexing=cite,
-	\notbool{collection}{
-		toc=bib, % make bibliography appear in toc
-        }{}
+	indexing=cite
 ]{biblatex}
 
 %% DOIs are handled after hyperref.
@@ -1625,19 +1636,16 @@ Storage and cataloguing done by \storageinstitution\\[3ex]
 
 % For papers that have appendices, a replacement for \appendix.
 % Usage: \begin{paperappendix} \section{Title} ... \end{paperappendix}
-\newenvironment{paperappendix}{%
-    \newcommand*{\appendixmore}{%
-    \renewcommand*\thesection{\Alph{section}}
-    \renewcommand*{\sectionformat}{%
-    \appendixname~\thesection\autodot\enskip}%
-    \renewcommand*{\sectionmarkformat}{%
-    \appendixname~\thesection\autodot\enskip}}
-    \appendix
-}{}
+\newenvironment{paperappendix}
+  {%
+    \let\section\appendixsection
+    \let\subsection\appendixsubsection
+  }
+  {}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %    Indexes
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \usepackage{index} %% Wie im Stylefile, aber ohne \MakeUppercase
 \renewenvironment{theindex}{%
@@ -1683,15 +1691,25 @@ Storage and cataloguing done by \storageinstitution\\[3ex]
 \indexproofstyle{\setlength{\overfullrule}{0pt}\raggedright\footnotesize}
 
 %% \index inside footnote
-\def\infn#1#2{% 	\hyperpage{#2}n#1%  99n2
-% 	\hyperpage{#2}*%   99*
-	\hyperpage{#2}\textsuperscript{#1}%  99²
-}%
-\newcommand{\footnoteindex}[2]{\index{#2|infn{#1}}}
-\newcommand{\footnoteindex@sbj}[2]{\index[sbj]{#2|infn{#1}}}
-\newcommand{\footnoteindex@lan}[2]{\index[lan]{#2|infn{#1}}}
-\newcommand{\footnoteindex@wrd}[2]{\index[wrd]{#2|infn{#1}}}
-
+\ifbool{infn}{
+  \def\infn#1#2{% 	\hyperpage{#2}n#1%  99n2
+  % 	\hyperpage{#2}*%   99*
+          \hyperpage{#2}\textsuperscript{#1}%  99²
+  }%
+  \newcommand{\footnoteindex}[2]{\index{#2|infn{#1}}}
+  \newcommand{\footnoteindex@sbj}[2]{\index[sbj]{#2|infn{#1}}}
+  \newcommand{\footnoteindex@lan}[2]{\index[lan]{#2|infn{#1}}}
+  \newcommand{\footnoteindex@wrd}[2]{\index[wrd]{#2|infn{#1}}}
+}{%else
+  \def\infn#1#2{% 	\hyperpage{#2}n#1%  99n2
+  % 	\hyperpage{#2}*%   99*
+          \hyperpage{#2}\textsuperscript{#1}%  99²
+  }%
+  \newcommand{\footnoteindex}[2]{\index{#2}}
+  \newcommand{\footnoteindex@sbj}[2]{\index[sbj]{#2}}
+  \newcommand{\footnoteindex@lan}[2]{\index[lan]{#2}}
+  \newcommand{\footnoteindex@wrd}[2]{\index[wrd]{#2}}
+}
 
 % Author index
 \newcommand{\ia}[1]{%
@@ -1763,9 +1781,9 @@ Storage and cataloguing done by \storageinstitution\\[3ex]
 \newcommand{\name}[3][]{%add person names to text and author index
 #2 %output first name
 \ifstrempty{#1}{%if no optional argument present
-\ia{#3, #2@#3, #2}%add lastname, firstname to index
+\ia{#3, #2}%add lastname, firstname to index
 }{%if optional argument present
-\ia{#1@#1}% add optional argument to index
+\ia{#1}% add optional argument to index
 }%
 #3}%output last name in text
 
@@ -1774,16 +1792,17 @@ Storage and cataloguing done by \storageinstitution\\[3ex]
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \usepackage[
-	bookmarks=true,bookmarksopen=true,bookmarksopenlevel=1,%
+	bookmarks=true,bookmarksopen=true,bookmarksopenlevel=1,
 	bookmarksdepth=5,
 	bookmarksnumbered=true,
-	hyperindex=true,%
+	hyperindex=true,
 	breaklinks=true,
 	draft=false,
 	plainpages=false,
-	pdfusetitle=true,  % puts author and title in automatically, maybe only in final mode?
+	pdfborder={0 0 0},
+	pdfusetitle=true,
 	pdfkeywords={},
-	pdfpagelayout=TwoPageRight,   % first page is separate
+	pdfpagelayout=TwoPageRight,% first page is separate
 	hyperfootnotes=false,
 	%ps2pdf=true
 	]{hyperref}
@@ -1793,6 +1812,17 @@ Storage and cataloguing done by \storageinstitution\\[3ex]
 %% http://tex.stackexchange.com/questions/66722/tex-live-2012-xelatex-moderncv-error-failed-to-convert-input-string-to-utf1
 \hypersetup{unicode,pdfencoding=auto,bookmarksopenlevel=0}
 
+%% Reset sections in the Backmatter to the top level.
+\usepackage{bookmark}
+\apptocmd{\backmatter}
+         {\bookmarksetup{startatroot}}
+         {}
+         {%
+           \AtEndDocument{\typeout{langscibook Warning:}
+                          \typeout{It was not possible to set option 'staratroot'}
+                          \typeout{for bookmarks in the backmatter.}}
+         }
+
 %% autoref (part of hyperref)
 \ifx\lsBookLanguage\lsBookLanguageEnglish
 \renewcommand{\partautorefname}{Part}%
@@ -2001,6 +2031,18 @@ Storage and cataloguing done by \storageinstitution\\[3ex]
 }{} %end paper
 
 
+% A command that imports the files localpackages.tex, but only if output==paper
+\NewDocumentCommand{\lsConditionalSetupForPaper}{O{localbibliography.bib}}
+  {%
+    \ifbool{lsImportPackagesWhenStandalone}
+           {\input{localpackages.tex}
+            \input{localhyphenation.tex}
+            \input{localcommands.tex}
+            \addbibresource{#1}}
+           {}
+  }
+
+
 %writeout page numbers for separation of chapters
 
 % \usepackage{newfile}