6 files changed, 47 insertions, 45 deletions
diff --git a/Master/texmf-dist/doc/xelatex/langsci/README.md b/Master/texmf-dist/doc/xelatex/langsci/README.md
index b59c1eea551..11daef3b041 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: 2020-03-17 11:11:11 UTC
+%% Date: 2021-03-17 11:11:11 UTC
 %% Purpose: publishing boks with Language Science Press.
 %% Languages: LaTeX, tikz, eps
 %% Copyright 2012- Language Science Press
@@ -27,9 +27,9 @@
 %% tbls-pencil.pdf, tbls-people.pdf, tbls-plus.pdf, tbls-receipt.pdf,
 %% 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-forest-setup.sty: definitions for linguistic trees
 %% - 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
@@ -37,8 +37,6 @@
 %% - langsci-subparts.sty: adds an additional sectioning level between part and chapter
 %% - langsci-tbls.sty: macros for the textbook series Textbooks in Language Sciences
 %% - langsci-textipa.sty: provide some Unicode replacements for TIPA phonetic commands
-%% - langsci-tikz.sty: provide some custom commands
-%% - langsci-tobi.sty: provide commands for Tone and Break indices (ToBI)
 %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -48,20 +46,20 @@ Here you find files to produce books for Language Science Press
 The main file is the file langscibook.cls. This defines the basic structure of the book. It makes reference to the following auxiliary files:
 
     langsci-series.def: metadata for series
-    langsci-basic.sty for commands required by the standard template
     bib style definitions
     eps and pdf files for the logos used in the textbook series Textbooks in Language Sciences
 
 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-forest-setup.sty: definitions for linguistic trees
     langsci-bidi.sty: bidirectional text
     langsci-tbls.sty: macros for the textbook series Textbooks in Language Sciences
     langsci-subparts.sty: adds an additional sectioning level between part and chapter
+    langsci-textipa.sty: provide some Unicode replacements for TIPA phonetic commands
 
 
 Documentation is found in the folder documentation/.
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 fb37f4beb44..9a804344d87 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 fb56271f88b..1da97e8bfa5 100644
--- a/Master/texmf-dist/doc/xelatex/langsci/documentation/langsci-doc.tex
+++ b/Master/texmf-dist/doc/xelatex/langsci/documentation/langsci-doc.tex
@@ -1,5 +1,5 @@
 \documentclass[%
-output=guidelines]{../langscibook}
+output=guidelines,guidelines]{langscibook}
 \author{Sebastian Nordhoff}
 \title{The \texttt{langscibook} {\LaTeX} class}
 \subtitle{}
@@ -37,9 +37,10 @@ This document describes the {\LaTeX} class langscibook.cls. This class is used f
 
 
 \chapter{The class}
-The class is loaded via \verb+\documentclass{langscibook}+. The standard use case is the creation of a book. If used without an \texttt{output=} option, the option \texttt{output=book} is loaded. The class can also be used to create dust jackets for books with different measurements via the output option values
-\texttt{covercreatespace} (for \url{http://www.createspace.com}) and
-\texttt{coverbodsc/coverbodhc} (for \url{http://www.bod.de}).
+The class is loaded via \verb+\documentclass{langscibook}+. The standard use case is the creation of a book. If used without an \texttt{output=} option, the option \texttt{output=book} is loaded.
+% The class can also be used to create dust jackets for books with different measurements via the output option values
+% \texttt{covercreatespace} (for \url{http://www.createspace.com}) and
+% \texttt{coverbodsc/coverbodhc} (for \url{http://www.bod.de}).
 
 The class provides for the following:
 \begin{itemize}
@@ -56,7 +57,7 @@ The class provides for the following:
  \item DOI (per book and per chapter)
 \end{itemize}
 
-When used to create dust jackets, the class will produce a large pdf with a collation of backcover, spine and frontcover, from left to right, surrounded by bleed.
+% When used to create dust jackets, the class will produce a large pdf with a collation of backcover, spine and frontcover, from left to right, surrounded by bleed.
 
 
 \chapter{Requirements}
@@ -68,15 +69,17 @@ A couple of additional style files come with the class. Documents using this cla
 
 \begin{itemize}
  \item \texttt{langsci-basic.sty}: Commands used in all Language Science Press books
+ \item \texttt{langsci-affiliations.sty}: Parse author affiliations
  \item \texttt{langsci-bidi.sty}: Package for typesetting right-to-left text
  \item \texttt{langsci-optional.sty}: Further commands useful for some typical books
  \item \texttt{langsci-cgloss.sty}: Helper package for \texttt{langsci-gb4e}
  \item \texttt{langsci-gb4e.sty}: Package for linguistic examples
- \item \texttt{langsci-forest-setup.sty}: Set up the forest package for linguistic trees
-%  \item \texttt{langsci-lgr.sty}:
- \item \texttt{langsci-tbls.sty}: Package for the textbook series Textbooks in Language Sciences
 %  \item \texttt{langsci-glyphs.sty}: some shortcuts for font workarounds
+%  \item \texttt{langsci-forest-setup.sty}: Set up the forest package for linguistic trees
+ \item \texttt{langsci-lgr.sty}: The glosses defined in the Leipzig Glossing Rules
  \item \texttt{langsci-subparts.sty}: adds an additional sectioning level between part and chapter
+ \item \texttt{langsci-tbls.sty}: Package for the textbook series Textbooks in Language Sciences
+ \item \texttt{langsci-textipa.sty}: Unicode renderings of some common TIPA glyphs
 
 \end{itemize}
 
@@ -116,7 +119,9 @@ Provide the following additional information if necessary:
 
 
 \section{Creating an edited volume}
-Proceed as for a monograph, but use the option \texttt{collection}. Use \verb+\author+ for the editor(s). Use the option \texttt{multiauthors} if there is more than one editor. You may want to use the further options \texttt{collectionchapter} and \texttt{collectiontoclong}. Chapters are included via \verb+\includepaper{}+. Set the bibliography resource for all papers in the main file.
+Proceed as for a monograph, but use the option \texttt{collection}. Use \verb+\author+ for the editor(s). Use the option \texttt{multiauthors} if there is more than one editor.
+%You may want to use the further options \texttt{collectionchapter} and \texttt{collectiontoclong}.
+Chapters are included via \verb+\includepaper{}+. Set the bibliography resource for all papers in the main file.
 
 
 \section{Creating a paper for an edited volume}
@@ -148,8 +153,8 @@ This will set your chapter number to 23 when compiled standalone (rather than 1)
 
 
 
-\chapter{Creating a dust jacket}
-Use the option \texttt{coverbodhc}, \texttt{coverbodsc} or \texttt{covercreatespace} and set the option \texttt{spinewidth}. Run {\XeLaTeX} twice. Upload to the respective websites to see whether the lengths were chosen correctly.
+% \chapter{Creating a dust jacket}
+% Use the option \texttt{coverbodhc}, \texttt{coverbodsc} or \texttt{covercreatespace} and set the option \texttt{spinewidth}. Run {\XeLaTeX} twice. Upload to the respective websites to see whether the lengths were chosen correctly.
 
 \chapter{Options}
 The class has flag options to toggle certain behaviour and string options to set metadata values.
@@ -167,7 +172,7 @@ The class has flag options to toggle certain behaviour and string options to set
 % \option{biblatex}{Use Bib\LaTeX}{true}
 % \option{bibtex}{Use Bibtex}{false}
 \option{collection}{Make the book an edited volume}{false}
-\option{collectionchapter}{Add numeric chapter prefix to each contribution.}{false}
+% \option{collectionchapter}{Add numeric chapter prefix to each contribution.}{false}
 % \option{collectiontoclong}{More detailed table of content in edited volumes}{false}
 \option{draftmode}{Switch to draft mode (adds: draft stamp, indication of overlong lines, date)}{false}
 \option{openreview}{Switch to open review mode}{false}
@@ -178,7 +183,7 @@ The class has flag options to toggle certain behaviour and string options to set
 \option{nobabel}{Do not use the Babel package in the class}{false}
 % \option{nonflat}{Use elaborate directory structure. If set to true, fonts, packages etc will be loaded from subfolders. If set to false, they will be loaded from the working directory}{false}
 \option{showindex}{Show indexed terms in margin}{false}
-\option{smallfont}{Use a smaller font for books above 500 pages}{false}
+% \option{smallfont}{Use a smaller font for books above 500 pages}{false}
 % \option{undecapitalize}{Do not decapitalize titles in the list of references}{false}
 \option{chinesefont}{Load fonts for Chinese and update font info in colophon}{false}
 \option{japanesefont}{Load fonts for Japanese and update font info in colophon}{false}
@@ -194,12 +199,12 @@ The class has flag options to toggle certain behaviour and string options to set
 \item \texttt{paper}: Contribution to edited volume
 \item \texttt{minimal}: Optimise for speed. Some features might not work. Useful for drafts.
 \item \texttt{guidelines}: Choose color grey; condense frontmatter
-\item \texttt{coverbodhc}: Create a two-page wide cover  (back-spine-front) for use with BoD hardcover books
-\item \texttt{coverbodsc}: Create a two-page wide cover  (back-spine-front) for use with BoD softcover books
-\item \texttt{covercreatespace}: Create a two-page wide cover  (back-spine-front) for use with CreateSpace
+% \item \texttt{coverbodhc}: Create a two-page wide cover  (back-spine-front) for use with BoD hardcover books
+% \item \texttt{coverbodsc}: Create a two-page wide cover  (back-spine-front) for use with BoD softcover books
+% \item \texttt{covercreatespace}: Create a two-page wide cover  (back-spine-front) for use with CreateSpace
 \end{itemize}
 
-\option{spinewidth}{The width of the spine (for cover creation)}{20mm}
+% \option{spinewidth}{The width of the spine (for cover creation)}{20mm}
 \option{booklanguage}{Load babel for the specified language and change the custom headers for list of references and indexes}{english}
 \option{copyright}{The license chosen}{"CC-BY"}
 % \option{biblatexbackend}{The backend of BibLaTeX}{"biber"}
diff --git a/Master/texmf-dist/doc/xelatex/langsci/examples/samplemonograph.tex b/Master/texmf-dist/doc/xelatex/langsci/examples/samplemonograph.tex
index f1896c4ce01..6f8a937bf9f 100644
--- a/Master/texmf-dist/doc/xelatex/langsci/examples/samplemonograph.tex
+++ b/Master/texmf-dist/doc/xelatex/langsci/examples/samplemonograph.tex
@@ -1,4 +1,4 @@
-\documentclass{./langscibook}
+\documentclass{langscibook}
 \author{Pat Jaeung}
 \title{Sample monograph}
 \subtitle{}
diff --git a/Master/texmf-dist/doc/xelatex/langsci/examples/samplepaper.tex b/Master/texmf-dist/doc/xelatex/langsci/examples/samplepaper.tex
index f901301246c..30da90509fc 100644
--- a/Master/texmf-dist/doc/xelatex/langsci/examples/samplepaper.tex
+++ b/Master/texmf-dist/doc/xelatex/langsci/examples/samplepaper.tex
@@ -1,28 +1,29 @@
 \documentclass[output=paper]{langscibook}
 \title{Introduction}
 \author{%
- Chap ter Author\affiliation{University of Eden}\and
- Noam Chimpsky\affiliation{University of Pluto}\lastand
+ Chap ter Author\affiliation{University of Eden} and
+ Noam Chimpsky\affiliation{University of Pluto} and
  Jane Wilson\affiliation{National Institute for Language}
 }
 \abstract{
 Abstract goes here
 }
 
-\IfFileExists{../main.tex}{%adjust to name of your master file
-  \bibliography{langsci-test}
-  \papernote{\scriptsize\normalfont
-    To appear in:
-    Change Volume Editor.
-    Change volume title.
-    Berlin: Language Science Press. [preliminary page numbering]
-  }
-  \pagenumbering{roman}
-  \setcounter{chapter}{23}%adjust the chapter number
-  \addtocounter{chapter}{-1}
-}{}
-
-
+% \IfFileExists{../main.tex}{%adjust to name of your master file
+% \IfFileExists{samplevolume.tex}{
+%   \bibliography{langsci-test}
+%   \papernote{\scriptsize\normalfont
+%     To appear in:
+%     Change Volume Editor.
+%     Change volume title.
+%     Berlin: Language Science Press. [preliminary page numbering]
+%   }
+%   \pagenumbering{roman}
+%   \setcounter{chapter}{23}%adjust the chapter number
+%   \addtocounter{chapter}{-1}
+% }{}
+
+% \usepackage{langsci-optional}
 \begin{document}
 
 \maketitle
@@ -38,12 +39,12 @@ Sed nisi urna, dignissim sit amet posuere ut, luctus ac lectus. Fusce vel ornare
 \caption{Frequencies of word classes}
 \label{tab:1:frequencies}
  \begin{tabular}{lrrrr}
-  \lsptoprule
+%   \lsptoprule
             & nouns & verbs & adjectives & adverbs\\
   \midrule
   absolute  &   12 &    34  &    23     & 13\\
   relative  &   3.1 &   8.9 &    5.7    & 3.2\\
-  \lspbottomrule
+%   \lspbottomrule
  \end{tabular}
 \end{table}
 
diff --git a/Master/texmf-dist/doc/xelatex/langsci/examples/samplevolume.tex b/Master/texmf-dist/doc/xelatex/langsci/examples/samplevolume.tex
index 4132dff2a24..9a4e84e84e8 100644
--- a/Master/texmf-dist/doc/xelatex/langsci/examples/samplevolume.tex
+++ b/Master/texmf-dist/doc/xelatex/langsci/examples/samplevolume.tex
@@ -1,7 +1,6 @@
 \documentclass[output=book
 	        ,collection
-	        ,collectionchapter
-		  ]{./langscibook}
+		  ]{langscibook}
 
 \author{Jane Doe}
 \title{Sample edited volume}
@@ -38,7 +37,6 @@
 
 \mainmatter
 
-\mainmatter
 \includepaper{samplepaper}
 
 \backmatter