summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/xelatex/langsci
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-03-18 21:21:11 +0000
committerKarl Berry <karl@freefriends.org>2020-03-18 21:21:11 +0000
commit31a4495afa7a2bede260c99dd4eb3f4c98bd6b98 (patch)
tree7301d1c5cb62eec9c8890299986a3025fb0bd90e /Master/texmf-dist/tex/xelatex/langsci
parent7bcf8fc0e79263863dba7a42c54a439d3064bc07 (diff)
langsci (18mar20)
git-svn-id: svn://tug.org/texlive/trunk@54393 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/xelatex/langsci')
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/langsci-advertisement.tex17
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/langsci-basic.sty60
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/langsci-cgloss.sty466
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/langsci-colors.def1
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/langsci-forest-setup.sty107
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/langsci-gb4e.sty731
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/langsci-glyphs.sty28
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/langsci-lgr.sty2
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/langsci-optional.sty246
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/langsci-series.def532
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/langsci-textipa.sty12
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/langsci-unified.bbx78
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/langsci-unified.cbx42
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/langsci_logo_nocolor.pdfbin16508 -> 0 bytes
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/langsci_spinelogo_nocolor.pdfbin13610 -> 0 bytes
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/langscibook.cls901
16 files changed, 1743 insertions, 1480 deletions
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-advertisement.tex b/Master/texmf-dist/tex/xelatex/langsci/langsci-advertisement.tex
deleted file mode 100644
index 2d7d02e87ba..00000000000
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci-advertisement.tex
+++ /dev/null
@@ -1,17 +0,0 @@
-\thispagestyle{empty}
-\ifcsname tikz@library@external@loaded\endcsname\tikzexternaldisable\fi%Disable Externalisation if external library is loaded
-\pgfdeclarelayer{lspadvert_bg} % Please make sure to never use lspadvert_... PGF layers in any document
-\pgfsetlayers{lspadvert_bg,main}
-\begin{tikzpicture}[remember picture, overlay,bg/.style={outer sep=0}]
- \begin{pgfonlayer}{lspadvert_bg} % background layer
- \node at (current page.center) [bg, fill=lsGuidelinesGray, minimum height=22cm, minimum width=15cm] (lspadvert_bg1) {}; % Die können wir noch dynamisch bestimmen
- \end{pgfonlayer}
- \node [execute at begin node={}, font=\fontsize{52pt}{16.75mm}\selectfont, below right = 10mm and 7.5mm of lspadvert_bg1.north west, text width=13.7cm, align=left] (lspadvert_covertitle) {\color{black}\lsCoverTitleFont{Did you like this book?\par}}; % x = 15mm - 7.5mm ; y = 17.5mm - 7.5mm
-
- \node [font=\fontsize{25pt}{10mm}\selectfont,below = 8mm of lspadvert_covertitle.south, text width=137mm] (lspadvert_coversubtitle) {\color{black} \lsCoverSubTitleFont \nohyphens{This book was brought to you for free}\par};
-
- \node (lspadvert_logo) [above left = 10mm and 7.5mm of lspadvert_bg1.south east] {\color{black}\includegraphics{\logopath langsci_logo_nocolor.pdf}};
- \node [above right = 48.8mm and -.1mm of lspadvert_bg1.south west, rectangle, fill=white, minimum size=17pt] (lspadvert_square) {};
- \path let \p1 = (lspadvert_square.north east), \p2 = (lspadvert_covertitle.west) in node at (\x2,\y1) (lspadvert_seriesinfo) [font=\fontsize{17pt}{7.5mm}\selectfont, right, align=flush left, text width=90mm, anchor=north west] {\color{black}\lsCoverSeriesFont{\nohyphens{Please help us in providing free access to linguistic research worldwide. Visit \url{http://www.langsci-press.org/donate} to provide financial support or register as a community proofreader or typesetter \mbox{at \url{http://www.langsci-press.org/register}.}}\par}};
-\end{tikzpicture}%
-\ifcsname tikz@library@external@loaded\endcsname\tikzexternalenable\fi
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-basic.sty b/Master/texmf-dist/tex/xelatex/langsci/langsci-basic.sty
index ffd4bf87fcf..13a8050d4c2 100644
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci-basic.sty
+++ b/Master/texmf-dist/tex/xelatex/langsci/langsci-basic.sty
@@ -1,71 +1,31 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% File: langsci-basic.sty
%% Author: Language Science Press (http://langsci-press.org)
-%% Date: Date: 2019-03-31 13:12 UTC
+%% Date: 2020-03-17 13:12 UTC
%% Purpose: This file contains essential macros and is included
%% into langscibook.cls
%% Language: LaTeX
%% Licence:
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\newcommand{\sectref}[1]{§\ref{#1}}
-\newcommand{\chapref}[1]{Chapter~\ref{#1}}
-\newcommand{\partref}[1]{Part~\ref{#1}}
-\newcommand{\tabref}[1]{Table~\ref{#1}}
-\newcommand{\figref}[1]{Figure~\ref{#1}}
-
-
-\ifx\lsBookLanguage\lsBookLanguageFrench
- \newcommand{\chapref}[1]{Chapitre~\ref{#1}}
- \newcommand{\partref}[1]{Partie~\ref{#1}}
- \newcommand{\tabref}[1]{Tableau~\ref{#1}}
- \newcommand{\figref}[1]{Figure~\ref{#1}}
-\fi
-
-\ifx\lsBookLanguage\lsBookLanguageGerman
- \newcommand{\chapref}[1]{Kapitel~\ref{#1}}
- \newcommand{\partref}[1]{Teil~\ref{#1}}
- \newcommand{\tabref}[1]{Tabelle~\ref{#1}}
- \newcommand{\figref}[1]{Abbildung~\ref{#1}}
-\fi
-
-\ifx\lsBookLanguage\lsBookLanguagePortuguese
- \newcommand{\chapref}[1]{Capítulo~\ref{#1}}
- \newcommand{\partref}[1]{Parte~\ref{#1}}
- \newcommand{\tabref}[1]{Tabela~\ref{#1}}
- \newcommand{\figref}[1]{Figura~\ref{#1}}
-\fi
-
\newcommand{\lsptoprule}{\midrule\toprule}
\newcommand{\lspbottomrule}{\bottomrule\midrule}
\newcommand{\REF}[1]{(\ref{#1})}
-\newcommand{\isi}[1]{\is{#1}#1}
-\newcommand{\iai}[1]{\ia{#1}#1}
-\newcommand{\ili}[1]{\il{#1}#1}
-
\newcommand{\ob}{{\upshape [}} %opening bracket
\newcommand{\cb}{{\upshape ]}} %closing bracket
\newcommand{\op}{{\upshape (}} %opening paren
\newcommand{\cp}{{\upshape )}} %closing paren
\newcommand{\db}{\hspaceThis{[}} %dummy space for [ in IMT line
-\newcommand{\rmfnm}{{\upshape\footnotemark}} %romanfootnotemark
+% \newcommand{\rmfnm}{{\upshape\footnotemark}} %romanfootnotemark
\newcommand{\citegen}[2][]{\citeauthor{#2}'s (\citeyear*[#1]{#2})}
\newcommand{\citeapo}[2][]{\citeauthor{#2}' (\citeyear*[#1]{#2})}
-\newcommand{\protectedex}[1]{
-\noindent
-\parbox{\textwidth}{
-#1}
-}
+\newcommand{\protectedex}[1]{\noindent\parbox{\linewidth}{#1}}
-\newcommand{\largerpage}[1][1]{
-\enlargethispage{#1\baselineskip}
-}
-
-\newcommand\shorttitlerunninghead[1]{\rohead{\thechapter\hspace{.5em} #1}}
+\newcommand{\largerpage}[1][1]{\enlargethispage{#1\baselineskip}}
% old font commands
\renewcommand{\it}{\itshape}
@@ -76,14 +36,4 @@
% vertical space to structure tables
\newcommand{\tablevspace}{\\[-.5em]}
-\let\oldfootnotemark\footnotemark
-\renewcommand{\footnotemark}{\upshape\oldfootnotemark}
-
-\newcommand{\biberror}[1]{{\color{red}#1}}
-
-\newcommand{\markuptitle}[2]{
- \title{\texorpdfstring{#1}{#2}}
- \shorttitlerunninghead{#2}
- \renewcommand{\lsChapterFooterSize}{\scriptsize}
- \renewcommand{\lsCollectionPaperFooterTitle}{Add\noexpand\texttt{\textbackslash renewcommand\{\textbackslash lsCollectionPaperFooterTitle\}\{A new theory of \textbackslash noexpand\textbackslash textit\{This\} and \textbackslash noexpand\textbackslash textit\{that\}\}} to preamble}
-}
+\newcommand{\biberror}[1]{{\color{red}#1}}
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-cgloss.sty b/Master/texmf-dist/tex/xelatex/langsci/langsci-cgloss.sty
deleted file mode 100644
index 325ba04506c..00000000000
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci-cgloss.sty
+++ /dev/null
@@ -1,466 +0,0 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% File: langsci-cgloss.sty
-%% Author: Language Science Press (http://langsci-press.org)
-%% Date: 2016-01-16 16:47:43 UTC
-%% Purpose: This file contains an adpated version of the cgloss
-%% package for glossing linguistic examples.
-%% Language: LaTeX
-%% Licence:
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-% -*- LaTeX -*-
-
-% Modified version of cgloss4e.sty. Hacked and renamed cgloss.sty
-% by Alexis Dimitriadis (alexis@babel.ling.upenn.edu)
-
-% Following borrows from Covington's style files inspired by Midnight by M.
-% de Groot, adapted to be used with gb4e.sty: examples beginning with \ex can
-% contain glosses directly. Default is
-% Linguistic Inquiry style with all lines in \rm; to change a line (eg. to
-% \it for a particular journal, change the appropriate line: e.g.,
-% \let\eachwordone=\rm in a copy of this file. Note that it will NOT work
-% to put \it before the line as the words are parsed separately.
-
-% Use \singlegloss to force single-spaced glosses even in double-space
-% environments. Works also in footnotes (^M as delimiter replaced by
-% \\)---hpk
-%
-
-% Changes by Alexis Dimitriadis
-%
-% Removed flushleft environment and initial vskip to make macros usable
-% on the same line with earlier and/or later text, e.g.,
-% \item Q: \gll ... \\
-% ... \\ \hfill (Greek)
-% \trans Q: `...'
-% Note: Text following the gloss will appear on line one of the example;
-% To get a line break, insert one manually with \\ or use \trans or \glt.
-% (\gln does not end the line, since it was already the
-% case in cgloss4e that a translation must be ended with a line break).
-%
-% Modified \glt to keep translation on the same page as the text.
-
-% BUGS: does not work very gracefully with double spacing (struts are not
-% automatically inserted after the \vboxes used by the macros).
-% In double space mode without \nosinglegloss, when a translation
-% is not given, the next line of text is single-spaced from the glossed text.
-% With \nosinglegloss, the translation is set too close to the bottom line.
-
-
-%%%
-%%% Sentences with word-by-word glosses
-%%%
-
-% See covingtn.tex for full documentation. Some examples:
-%
-% Displayed sentence with gloss and translation:
-%
-% \gll Dit is een Nederlands voorbeeld.\\
-% This is a Dutch example.\\
-% \glt `This is an example in Dutch.'
-%
-% Same, using bracketing where words do not correspond one-to-one:
-%
-% \gll Dit is een voorbeeldje in het Nederlands.\\
-% This is a {little example} in {} Dutch.\\
-% \glt `This is a little example in Dutch.'
-%
-% If you want to align 3 lines rather than two, use \glll instead of \gll.
-%
-% Layout is critical between \gll (or \glll) and \glt (or \gln).
-%
-% Thanks to Marcel R. van der Goot for permission to reproduce code.
-\let\@gsingle=1
-\def\singlegloss{\let\@gsingle=1}
-\def\nosinglegloss{\let\@gsingle=0}
-\@ifundefined{new@fontshape}%
- {\def\@selfnt{\ifx\@currsize\normalsize\@normalsize\else\@currsize\fi}}
- {\def\@selfnt{\selectfont}}
-
-\def\gll% % Introduces 2-line text-and-gloss.
- {\raggedright%
- \bgroup %\begin{flushleft}
- \ifx\@gsingle1% conditionally force single spacing (hpk/MC)
- \def\baselinestretch{1}\@selfnt\fi
-% \vskip\baselineskip\def\baselinestretch{1}%
-% \@selfnt\vskip-\baselineskip\fi%
- \bgroup
- \twosent
-}
-
-\def\glll% % Introduces 3-line text-and-gloss.
- {\bgroup %\begin{flushleft}
- \ifx\@gsingle1% conditionally force single spacing (hpk/MC)
- \def\baselinestretch{1}\@selfnt\fi
-% \vskip\baselineskip\def\baselinestretch{1}%
-% \@selfnt\vskip-\baselineskip\fi%
- \bgroup
- \threesent
-}
-
-
-\def\gllll% % Introduces 4-line text-and-gloss.
- {\bgroup %\begin{flushleft}
- \ifx\@gsingle1% conditionally force single spacing (hpk/MC)
- \def\baselinestretch{1}\@selfnt\fi
-% \vskip\baselineskip\def\baselinestretch{1}%
-% \@selfnt\vskip-\baselineskip\fi%
- \bgroup
- \foursent
-}
-
-
-\def\glllll% % Introduces 5-line text-and-gloss.
- {\bgroup %\begin{flushleft}
- \ifx\@gsingle1% conditionally force single spacing (hpk/MC)
- \def\baselinestretch{1}\@selfnt\fi
-% \vskip\baselineskip\def\baselinestretch{1}%
-% \@selfnt\vskip-\baselineskip\fi%
- \bgroup
- \fivesent
-}
-
-
-\def\gllllll% % Introduces 6-line text-and-gloss.
- {\bgroup %\begin{flushleft}
- \ifx\@gsingle1% conditionally force single spacing (hpk/MC)
- \def\baselinestretch{1}\@selfnt\fi
-% \vskip\baselineskip\def\baselinestretch{1}%
-% \@selfnt\vskip-\baselineskip\fi%
- \bgroup
- \sixsent
-}
-
-
-\def\glllllll% % Introduces 7-line text-and-gloss.
- {\bgroup %\begin{flushleft}
- \ifx\@gsingle1% conditionally force single spacing (hpk/MC)
- \def\baselinestretch{1}\@selfnt\fi
-% \vskip\baselineskip\def\baselinestretch{1}%
-% \@selfnt\vskip-\baselineskip\fi%
- \bgroup
- \sevensent
-}
-
-
-\def\gllllllll% % Introduces 8-line text-and-gloss.
- {\bgroup %\begin{flushleft}
- \ifx\@gsingle1% conditionally force single spacing (hpk/MC)
- \def\baselinestretch{1}\@selfnt\fi
-% \vskip\baselineskip\def\baselinestretch{1}%
-% \@selfnt\vskip-\baselineskip\fi%
- \bgroup
- \eightsent
-}
-
-% \def\glt{\vskip.0\baselineskip}
-
-% redefine \gltoffset to set off translation from ex and gloss
-\@ifundefined{gltoffset}{\def\gltoffset{0pt}}{}
-
-\def\glt{\ifhmode\\*[\gltoffset]\else\nobreak\vskip\gltoffset\nobreak\fi}
-
-
-% Introduces a translation
-\let\trans\glt
-
-\def\gln{\relax}
-\def\glend{} % obsolete
- % Ends the gloss environment.
-
-% The following TeX code is adapted, with permission, from:
-% gloss.tex: Macros for vertically aligning words in consecutive sentences.
-% Version: 1.0 release: 26 November 1990
-% Copyright (c) 1991 Marcel R. van der Goot (marcel@cs.caltech.edu).
-% Original Midnight/gloss.tex and Midnight/gloss.doc are available from
-% csvax.cs.caltech.edu [131.215.131.131] in pub/tex
-% and many other anonymous ftp archives.
-
-\newbox\lineone % boxes with words from first line
-\newbox\linetwo
-\newbox\linethree
-\newbox\linefour
-\newbox\linefive
-\newbox\linesix
-\newbox\lineseven
-\newbox\lineeight
-\newbox\wordone % a word from the first line (hbox)
-\newbox\wordtwo
-\newbox\wordthree
-\newbox\wordfour
-\newbox\wordfive
-\newbox\wordsix
-\newbox\wordseven
-\newbox\wordeight
-\newbox\gline % the constructed double line (hbox)
-\newskip\glossglue % extra glue between glossed pairs or tuples
-\glossglue = 0pt plus 2pt minus 1pt % allow stretch/shrink between words
-%\glossglue = 5pt plus 2pt minus 1pt % allow stretch/shrink between words
-\newif\ifnotdone
-
-\@ifundefined{eachwordone}{\let\eachwordone=\upshape}{\relax}
-\@ifundefined{eachwordtwo}{\let\eachwordtwo=\upshape}{\relax}
-\@ifundefined{eachwordthree}{\let\eachwordthree=\upshape}{\relax}
-\@ifundefined{eachwordfour}{\let\eachwordfour=\upshape}{\relax}
-\@ifundefined{eachwordfive}{\let\eachwordfive=\upshape}{\relax}
-\@ifundefined{eachwordsix}{\let\eachwordsix=\upshape}{\relax}
-\@ifundefined{eachwordseven}{\let\eachwordseven=\upshape}{\relax}
-\@ifundefined{eachwordeight}{\let\eachwordeight=\upshape}{\relax}
-
-\def\lastword#1#2#3% #1 = \each, #2 = line box, #3 = word box
- {\setbox#2=\vbox{\unvbox#2%
- \global\setbox#3=\lastbox
- }%
- \ifvoid#3\global\setbox#3=\hbox{#1\strut{} }\fi
- % extra space following \strut in case #1 needs a space
- }
-
-\def\testdone
- {\ifdim\ht\lineone=0pt
- \ifdim\ht\linetwo=0pt \notdonefalse % tricky space after pt
- \else\notdonetrue
- \fi
- \else\notdonetrue
- \fi
- }
-
-\gdef\getwords(#1,#2)#3 #4\\% #1=linebox, #2=\each, #3=1st word, #4=remainder
- {\setbox#1=\vbox{\hbox{#2\strut#3{} }% adds space, the {} is needed for CJK otherwise the space
- % would be ignored
- \unvbox#1%
- }%
- \def\more{#4}%
- \ifx\more\empty\let\more=\donewords
- \else\let\more=\getwords
- \fi
- \more(#1,#2)#4\\%
- }
-
-\gdef\donewords(#1,#2)\\{}%
-
-\gdef\twosent#1\\ #2\\{% #1 = first line, #2 = second line
- \getwords(\lineone,\eachwordone)#1 \\%
- \getwords(\linetwo,\eachwordtwo)#2 \\%
- \loop\lastword{\eachwordone}{\lineone}{\wordone}%
- \lastword{\eachwordtwo}{\linetwo}{\wordtwo}%
- \global\setbox\gline=\hbox{\unhbox\gline
- \hskip\glossglue
- \vtop{\box\wordone % vtop was vbox
- \nointerlineskip
- \box\wordtwo
- }%
- }%
- \testdone
- \ifnotdone
- \repeat
- \egroup % matches \bgroup in \gloss
- \gl@stop}
-
-\gdef\threesent#1\\ #2\\ #3\\{% #1 = first line, #2 = second line, #3 = third
- \getwords(\lineone,\eachwordone)#1 \\%
- \getwords(\linetwo,\eachwordtwo)#2 \\%
- \getwords(\linethree,\eachwordthree)#3 \\%
- \loop\lastword{\eachwordone}{\lineone}{\wordone}%
- \lastword{\eachwordtwo}{\linetwo}{\wordtwo}%
- \lastword{\eachwordthree}{\linethree}{\wordthree}%
- \global\setbox\gline=\hbox{\unhbox\gline
- \hskip\glossglue
- \vtop{\box\wordone % vtop was vbox
- \nointerlineskip
- \box\wordtwo
- \nointerlineskip
- \box\wordthree
- }%
- }%
- \testdone
- \ifnotdone
- \repeat
- \egroup % matches \bgroup in \gloss
- \gl@stop}
-
-
-
-\gdef\foursent#1\\ #2\\ #3\\ #4\\{% #1 = first line, #2 = second line, #3 = third
- \getwords(\lineone,\eachwordone)#1 \\%
- \getwords(\linetwo,\eachwordtwo)#2 \\%
- \getwords(\linethree,\eachwordthree)#3 \\%
- \getwords(\linefour,\eachwordfour)#4 \\%
- \loop\lastword{\eachwordone}{\lineone}{\wordone}%
- \lastword{\eachwordtwo}{\linetwo}{\wordtwo}%
- \lastword{\eachwordthree}{\linethree}{\wordthree}%
- \lastword{\eachwordfour}{\linefour}{\wordfour}%
- \global\setbox\gline=\hbox{\unhbox\gline
- \hskip\glossglue
- \vtop{\box\wordone % vtop was vbox
- \nointerlineskip
- \box\wordtwo
- \nointerlineskip
- \box\wordthree
- \nointerlineskip
- \box\wordfour
- }%
- }%
- \testdone
- \ifnotdone
- \repeat
- \egroup % matches \bgroup in \gloss
- \gl@stop}
-
-
-
-\gdef\fivesent#1\\ #2\\ #3\\ #4\\ #5\\{% #1 = first line, #2 = second line, #3 = third
- \getwords(\lineone,\eachwordone)#1 \\%
- \getwords(\linetwo,\eachwordtwo)#2 \\%
- \getwords(\linethree,\eachwordthree)#3 \\%
- \getwords(\linefour,\eachwordfour)#4 \\%
- \getwords(\linefive,\eachwordfive)#5 \\%
- \loop\lastword{\eachwordone}{\lineone}{\wordone}%
- \lastword{\eachwordtwo}{\linetwo}{\wordtwo}%
- \lastword{\eachwordthree}{\linethree}{\wordthree}%
- \lastword{\eachwordfour}{\linefour}{\wordfour}%
- \lastword{\eachwordfive}{\linefive}{\wordfive}%
- \global\setbox\gline=\hbox{\unhbox\gline
- \hskip\glossglue
- \vtop{\box\wordone % vtop was vbox
- \nointerlineskip
- \box\wordtwo
- \nointerlineskip
- \box\wordthree
- \nointerlineskip
- \box\wordfour
- \nointerlineskip
- \box\wordfive
- }%
- }%
- \testdone
- \ifnotdone
- \repeat
- \egroup % matches \bgroup in \gloss
- \gl@stop}
-
-
-
-\gdef\sixsent#1\\ #2\\ #3\\ #4\\ #5\\ #6\\{% #1 = first line, #2 = second line, #3 = third
- \getwords(\lineone,\eachwordone)#1 \\%
- \getwords(\linetwo,\eachwordtwo)#2 \\%
- \getwords(\linethree,\eachwordthree)#3 \\%
- \getwords(\linefour,\eachwordfour)#4 \\%
- \getwords(\linefive,\eachwordfive)#5 \\%
- \getwords(\linesix,\eachwordsix)#6 \\%
- \loop\lastword{\eachwordone}{\lineone}{\wordone}%
- \lastword{\eachwordtwo}{\linetwo}{\wordtwo}%
- \lastword{\eachwordthree}{\linethree}{\wordthree}%
- \lastword{\eachwordfour}{\linefour}{\wordfour}%
- \lastword{\eachwordfive}{\linefive}{\wordfive}%
- \lastword{\eachwordsix}{\linesix}{\wordsix}%
- \global\setbox\gline=\hbox{\unhbox\gline
- \hskip\glossglue
- \vtop{\box\wordone % vtop was vbox
- \nointerlineskip
- \box\wordtwo
- \nointerlineskip
- \box\wordthree
- \nointerlineskip
- \box\wordfour
- \nointerlineskip
- \box\wordfive
- \nointerlineskip
- \box\wordsix
- }%
- }%
- \testdone
- \ifnotdone
- \repeat
- \egroup % matches \bgroup in \gloss
- \gl@stop}
-
-
-
-\gdef\sevensent#1\\ #2\\ #3\\ #4\\ #5\\ #6\\ #7\\{% #1 = first line, #2 = second line, #3 = third
- \getwords(\lineone,\eachwordone)#1 \\%
- \getwords(\linetwo,\eachwordtwo)#2 \\%
- \getwords(\linethree,\eachwordthree)#3 \\%
- \getwords(\linefour,\eachwordfour)#4 \\%
- \getwords(\linefive,\eachwordfive)#5 \\%
- \getwords(\linesix,\eachwordsix)#6 \\%
- \getwords(\lineseven,\eachwordseven)#7 \\%
- \loop\lastword{\eachwordone}{\lineone}{\wordone}%
- \lastword{\eachwordtwo}{\linetwo}{\wordtwo}%
- \lastword{\eachwordthree}{\linethree}{\wordthree}%
- \lastword{\eachwordfour}{\linefour}{\wordfour}%
- \lastword{\eachwordfive}{\linefive}{\wordfive}%
- \lastword{\eachwordsix}{\linesix}{\wordsix}%
- \lastword{\eachwordseven}{\lineseven}{\wordseven}%
- \global\setbox\gline=\hbox{\unhbox\gline
- \hskip\glossglue
- \vtop{\box\wordone % vtop was vbox
- \nointerlineskip
- \box\wordtwo
- \nointerlineskip
- \box\wordthree
- \nointerlineskip
- \box\wordfour
- \nointerlineskip
- \box\wordfive
- \nointerlineskip
- \box\wordsix
- \nointerlineskip
- \box\wordseven
- }%
- }%
- \testdone
- \ifnotdone
- \repeat
- \egroup % matches \bgroup in \gloss
- \gl@stop}
-
-
-
-\gdef\eightsent#1\\ #2\\ #3\\ #4\\ #5\\ #6\\ #7\\ #8\\{% #1 = first line, #2 = second line, #3 = third
- \getwords(\lineone,\eachwordone)#1 \\%
- \getwords(\linetwo,\eachwordtwo)#2 \\%
- \getwords(\linethree,\eachwordthree)#3 \\%
- \getwords(\linefour,\eachwordfour)#4 \\%
- \getwords(\linefive,\eachwordfive)#5 \\%
- \getwords(\linesix,\eachwordsix)#6 \\%
- \getwords(\lineseven,\eachwordseven)#7 \\%
- \getwords(\lineeight,\eachwordeight)#8 \\%
- \loop\lastword{\eachwordone}{\lineone}{\wordone}%
- \lastword{\eachwordtwo}{\linetwo}{\wordtwo}%
- \lastword{\eachwordthree}{\linethree}{\wordthree}%
- \lastword{\eachwordfour}{\linefour}{\wordfour}%
- \lastword{\eachwordfive}{\linefive}{\wordfive}%
- \lastword{\eachwordsix}{\linesix}{\wordsix}%
- \lastword{\eachwordseven}{\lineseven}{\wordseven}%
- \lastword{\eachwordeight}{\lineeight}{\wordeight}%
- \global\setbox\gline=\hbox{\unhbox\gline
- \hskip\glossglue
- \vtop{\box\wordone % vtop was vbox
- \nointerlineskip
- \box\wordtwo
- \nointerlineskip
- \box\wordthree
- \nointerlineskip
- \box\wordfour
- \nointerlineskip
- \box\wordfive
- \nointerlineskip
- \box\wordsix
- \nointerlineskip
- \box\wordseven
- \nointerlineskip
- \box\wordeight
- }%
- }%
- \testdone
- \ifnotdone
- \repeat
- \egroup % matches \bgroup in \gloss
- \gl@stop}
-
-%\def\gl@stop{{\hskip -\glossglue}\unhbox\gline\end{flushleft}}
-
-% \leavevmode puts us back in horizontal mode, so that a \\ will work
-\def\gl@stop{{\hskip -\glossglue}\unhbox\gline\leavevmode \egroup}
-
-\endinput
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-colors.def b/Master/texmf-dist/tex/xelatex/langsci/langsci-colors.def
deleted file mode 100644
index c043a57229f..00000000000
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci-colors.def
+++ /dev/null
@@ -1 +0,0 @@
-% moved to langscibook.cls \ No newline at end of file
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-forest-setup.sty b/Master/texmf-dist/tex/xelatex/langsci/langsci-forest-setup.sty
index 49e0a854caa..7a9f3e4ef6f 100644
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci-forest-setup.sty
+++ b/Master/texmf-dist/tex/xelatex/langsci/langsci-forest-setup.sty
@@ -33,12 +33,13 @@
% does not work with forest v1.05 did not check later versions
-\usepackage[external,linguistics]{forest}
-\tikzset{external/up to date check=simple}
+\usepackage[linguistics]{forest}
+%\usepackage[external,linguistics]{forest}
+%\tikzset{external/up to date check=simple}
% for texlive: -shell-escape, for miktex -enable-write18
% All externalized graphics go go the \externaldirectory
%\tikzexternalize[prefix=external-figures/,shell escape=-shell-escape]
-\tikzset{external/system call={xelatex \tikzexternalcheckshellescape -halt-on-error -interaction=batchmode -jobname "\image" "\texsource"}}
+%\tikzset{external/system call={xelatex \tikzexternalcheckshellescape -halt-on-error -interaction=batchmode -jobname "\image" "\texsource"}}
%\usepackage{morewrites}
@@ -48,10 +49,12 @@
% The version with apostrophe replaces it.
\forestset{default preamble'={
for tree={align=center,parent anchor=south, child anchor=north,anchor=north,base=bottom},
- before drawing tree={
- sort by=y,
- for min={tree}{baseline}
- }
+% This would align trees to the baseline. We do not want this for TAG
+% where several trees have to be aligned with respect to their center.
+% before drawing tree={
+% sort by=y,
+% for min={tree}{baseline}
+% }
}}
@@ -104,19 +107,53 @@
append translation/.style={
if={strequal("#1","")}{}{
append={[#1,no edge,inner xsep=0,inner ysep=0,outer ysep=0,
- tier=gloss,
+ tier=gloss, % does not work for TAG trees since the words are not aligned at the baseline
+ l=\baselineskip + 0.2ex,
+ ]}
+ }
+ }
+}
+
+\forestset{
+ with unaligned translation/.style={
+ l sep=0,inner xsep=0,
+ append unaligned translation/.expanded/.wrap pgfmath arg={\gettranslation{##1}}{content},
+ content/.expanded/.wrap pgfmath arg={\gettext{##1}}{content},
+ },
+ append unaligned translation/.style={
+ if={strequal("#1","")}{}{
+ append={[#1,no edge,inner xsep=0,inner ysep=0,outer ysep=0,
+ %tier=gloss, % does not work for TAG trees since the words are not aligned at the baseline
l=\baselineskip + 0.2ex,
]}
}
}
}
+
\def\gettext#1{\gettextA#1;;\endget}
\def\gettextA#1;#2;{\removesep#1;}
\def\gettranslation#1{\gettranslationA#1;;\endget}
\def\gettranslationA#1;#2;{\removesep#2;}
\def\removesep#1;#2\endget{#1}
+% copy of the above for TAG
+\forestset{
+ with translation TAG/.style={
+ l sep=0,inner xsep=0,
+ append translation TAG/.expanded/.wrap pgfmath arg={\gettranslation{##1}}{content},
+ content/.expanded/.wrap pgfmath arg={\gettext{##1}}{content},
+ },
+ append translation TAG/.style={
+ if={strequal("#1","")}{}{
+ append={[#1,no edge,inner xsep=0,inner ysep=0,outer ysep=0,
+ %tier=gloss, % does not work for TAG trees since the words are not aligned at the baseline
+ l=\baselineskip + 0.2ex,
+ ]}
+ }
+ }
+}
+
% a specific style that specifies the word tier: all nodes that do not have any children
% to do: make this style default and change all other figures explicitely as is described here:
@@ -163,42 +200,62 @@ dg junction/.style={no edge, tikz+={\draw (!p.east)--(!.west) (.east)--(!n.west)
%
% So cool! Thanks Sašo Živanović
%
- wg/.style={
+% modified to cope with multiple occurances of the same word (the, the1, the2)
+%
+ wg/.style={
for tree={
no edge,
draw,
outer ysep=1pt,
},
- copy label/.style={
- for children={
- if content={}{
- content/.pgfmath={content("!u")},
- calign with current,
- edge={draw,{-Triangle[open,reversed]}},
- copy label,
- !u.content/.pgfmath={content},
- !u.content+=',
- }{
- copy label,
- }
- }
- },
delay={
copy label,
- for tree={name/.pgfmath={content}},
+ for tree={nameN/.option=content},
},
for tree={content format={\strut\forestoption{content}}},
where n children={0}{
tier=word,
}{},
},
+ copy label/.style={
+ for children={
+ if content={}{
+ % content/.pgfmath={content("!u")},
+ content/.option=!u.content, % faster
+ calign with current,
+ edge={draw,{-Triangle[open,reversed]}},
+ copy label,
+ % !u.content/.pgfmath={content},
+ !u.content/.option=content, % faster
+ !u.content+=',
+ }{
+ copy label,
+ }
+ }
+ },
+ % 1. This is not effective if there's many clashes.
+ % 2. Register tempcounta must be free to use.
+ nameN/.style={
+ if nodewalk valid={name=#1}{
+ tempcounta=2,
+ @nameN=#1,
+ }{
+ name=#1,
+ },
+ },
+ @nameN/.style={
+ while nodewalk valid={name/.process=Rw1{tempcounta}{#1##1}}{
+ tempcounta+=1,
+ },
+ name/.process=Rw1{tempcounta}{#1##1},
+ },
%
%
% TAG
% http://tex.stackexchange.com/questions/207459/getting-old-school-trees-with-forest
% fit -> fit=band causes all nodes to have nothing below them
tag/.style={for tree={parent anchor=south, child anchor=north,align=center,base=top,fit=rectangle},
- where n children=0{delay=with translation}{},
+ where n children=0{delay=with translation TAG}{},
% the following breaks the alignments in sets
begin draw/.code={\begin{tikzpicture}[baseline=(current bounding box.center)]}
},
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-gb4e.sty b/Master/texmf-dist/tex/xelatex/langsci/langsci-gb4e.sty
index 23d718f9f94..54bceb4db18 100644
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci-gb4e.sty
+++ b/Master/texmf-dist/tex/xelatex/langsci/langsci-gb4e.sty
@@ -1,15 +1,28 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% File: langsci-gb4e.sty
%% Author: Language Science Press (http://langsci-press.org)
-%% Date: 2016-01-16 16:47:43 UTC
+%% Date: 2020-03-17 13:12 UTC
%% Purpose: This file contains an adapted version of the gb4e package
-%% for typetting linguistic examples.
+%% for typetting linguistic examples. It also includes
+%% adapted versions of the cgloss and jambox packages
%% Language: LaTeX
-%% Licence:
+%% Licence:
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ProvidesPackage{langsci-gb4e}[2000/09/05]
-\def\gbVersion{4e}
+\ProvidesPackage{langsci-gb4e}[2020/01/01]
+
+\usepackage{etoolbox}
+
+\newtoggle{cgloss}
+\toggletrue{cgloss}
+\newtoggle{jambox}
+\toggletrue{jambox}
+\DeclareOption{nocgloss}{\togglefalse{cgloss}}
+\DeclareOption{nojambox}{\togglefalse{jambox}}
+\DeclareOption*{\PackageWarning{examplepackage}{Unknown option ‘\CurrentOption’}}
+\ProcessOptions\relax
+
+% \def\gbVersion{4e}
%%%%%%%%%%%%%%%%%%%%%%%%
% Format of examples: %
@@ -58,25 +71,22 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%CGLOSS META
+% Modified version of cgloss4e.sty. Hacked and renamed cgloss.sty
+% by Alexis Dimitriadis (alexis@babel.ling.upenn.edu). Integrated into
+% langsci-gb4e.sty by Sebastian Nordhoff
+% EnD CGLOSS META
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% auxiliary files
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\usepackage{langsci-cgloss}
-% \input{jambox.sty}
\@ifundefined{new@fontshape}{\def\reset@font{}\let\mathrm\rm\let\mathit\mit}{}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% Font Specifications (Detmar)
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %%
+% Font Specifications %%
+% %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Define commands for fonts to be used:
%
@@ -86,7 +96,7 @@
% b. glossing line
\newcommand{\glossfont}{\normalsize\upshape}
% c. translation font
-\newcommand{\transfont}{\normalsize\upshape} % 08.01.2014 changed small to normalsize (Martin Haspelmath)
+\newcommand{\transfont}{\normalsize\upshape}
% d. example number
\newcommand{\exnrfont}{\exfont\upshape}
%
@@ -100,23 +110,20 @@
% d. example number
\newcommand{\fnexnrfont}{\fnexfont\upshape}
-% new user command for specifying translations:
-%\newcommand{\mytrans}[1]{{\trans`#1'}\vskip.6\baselineskip}
-
-
-
-\renewcommand{\eachwordone}{\exfont}
-\renewcommand{\eachwordtwo}{\glossfont}
-\renewcommand{\eachwordthree}{\glossfont} % same font for both gloss lines
+\newcommand{\examplesroman}{
+ \let\eachwordone=\upshape
+ \exfont{\upshape}
+}
+\newcommand{\examplesitalics}{
+ \let\eachwordone=\itshape
+ \exfont{\itshape}
+}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% %%
%% Macros for examples, roughly following Linguistic Inquiry style. %%
-%% From here on best not to tamper, else all the examples and cross- %%
-%% references will come out scrambled! (see also note below) - CT %%
-%% Completely rewritten for more robustness and flexibility. (hpk) %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% %%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\qlist{\begin{list}{\Alph{xnum}.}{\usecounter{xnum}%
@@ -127,8 +134,6 @@
\newif\if@xrec\@xrecfalse
\@definecounter{fnx}
-
-
% set a flag that we are in footnotes now and change the size of example fonts
\let\oldFootnotetext\@footnotetext
@@ -145,25 +150,22 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% counters %
-%
+%% %%
+%% counters %%
+%% %%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+% start counters with 1
\newcount\@xnumdepth \@xnumdepth = 0
+% define four levels of indentation
\@definecounter{xnumi}
\@definecounter{xnumii}
\@definecounter{xnumiii}
\@definecounter{xnumiv}
-%\@definecounter{equation}
-%\setcounter{equation}{0}
-% book
-%\renewcommand\theequation
-% {\ifnum \c@chapter>\z@ \thechapter.\fi \@arabic\c@equation}
-%\def\thexnumi{\@xsi{xnumi}}
+
+% use (1) on page, but (i) in footnotes
\def\thexnumi
{\if@noftnote%
\@arabic\@xsi{xnumi}%
@@ -199,7 +201,6 @@
\setcounter{rxnumiii}{\value{xnumiii}}%
\setcounter{rxnumiv}{\value{xnumiv}}}%
-
\def\reset@counters{%
\setcounter{xnumi}{\value{rxnumi}}%
\setcounter{xnumii}{\value{rxnumii}}%
@@ -207,38 +208,43 @@
\setcounter{xnumiv}{\value{rxnumiv}}}%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% widths %
-%
+%% %%
+%% widths %%
+%% %%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Control the width of example identifiers
\def\exewidth#1{\def\@exwidth{#1}}
-%\exewidth{(234)}
-\exewidth{(34)}
-%% St. M�. 02.05.2004
+\newcommand{\twodigitexamples}{\exewidth{(23)}}
+\newcommand{\threedigitexamples}{\exewidth{(234)}}
+\newcommand{\fourdigitexamples}{\exewidth{(2345)}}
+
\def\gblabelsep#1{\def\@gblabelsep{#1}}
\gblabelsep{1em}
-
-
-%% St. M�. 02.05.2004
\def\subexsep#1{\def\@subexsep{#1}}
\subexsep{1.5ex}
% set initial sizes of example number and judgement sizes
\exewidth{\exnrfont (35)}
+% how much should examples in footnotes be indented?
+\newlength{\footexindent}
+\setlength{\footexindent}{0pt}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% example lists %
-%
+%% %%
+%% example lists %%
+%% %%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\exe{%
- %\ifnum\value{equation}>9 \exewidth{(23)}\else\fi% inserted by LSP, for large example numbers
- \ifnum\value{equation}>98 \exewidth{(235)}\else\fi% inserted by LSP, for large example numbers
+ %\ifnum\value{equation}>9 \exewidth{(23)}\else\fi%
+ %inserted by LangSci, for large example numbers
+ \ifnum\value{equation}>98 \exewidth{(235)}\else\fi%
\@ifnextchar [{\@exe}{\@exe[\@exwidth]}}
+
\def\@exe[#1]{\ifnum \@xnumdepth >0%
\if@xrec\@exrecwarn\fi%
\if@noftnote\@exrecwarn\fi%
@@ -249,22 +255,14 @@
\if@noftnote%
\begin{list}{(\thexnumi)}%
{\usecounter{xnumi}\@subex{#1}{\@gblabelsep}{0em}%
- \setcounter{xnumi}{\value{equation}}}%
+ \setcounter{xnumi}{\value{equation}}
+ \nopagebreak}%
\else%
\begin{list}{(\roman{xnumi})}%
- % 1em is the indentation of footnotes in koma-script
- % if this does not work for everybody, use parameters ...
- {\usecounter{xnumi}\@subex{(iiv)}{\@gblabelsep}{1.5em}%
+ {\usecounter{xnumi}\@subex{(iiv)}{\@gblabelsep}{\footexindent}%
\setcounter{xnumi}{\value{fnx}}}%
\fi}
-% \begin{list}{(\thexnumi)}%
-% {\usecounter{xnumi}\@subex{#1}{1em}%
-% \if@noftnote%
-% \setcounter{xnumi}{\value{equation}}%
-% \else%
-% \setcounter{xnumi}{\value{fnx}}%
-% \fi}}
\def\endexe{\if@noftnote\setcounter{equation}{\value{xnumi}}%
\else\setcounter{fnx}{\value{xnumi}}%
@@ -315,10 +313,7 @@
%%% the example-items
\def\ex{\@ifnextchar [{\@ex}{\item}}
\def\@ex[#1]#2{\item\@exj[#1]{#2}}
-\def\@exj[#1]#2{\@exjbg{#1} #2 \end{list}}
-% without understanding anything:
-\def\exs#1{\item\begin{samepage}#1\end{samepage}}
-%-- end
+\def\@exj[#1]#2{\@exjbg{#1} #2 \end{list}\nopagebreak}
\def\exi#1{\item[#1]\@ifnextchar [{\@exj}{}}
\def\judgewidth#1{\def\@jwidth{#1}}
\judgewidth{??}
@@ -327,14 +322,6 @@
\def\exr#1{\exi{{(\ref{#1})}}}
\def\exp#1{\exi{{(\ref{#1}$'$)}}}
\def\sn{\exi{}}
-\def\bu{\item[$\bullet$]}
-
-%%% Lazy abbrevs (HANDLE WITH CARE!)
-%\def\ea{\ifnum\@xnumdepth=0\begin{exe}[(34)]\else\begin{xlist}[iv.]\fi\raggedright\ex} steht unten noch mal
-%\def\ea{\ifnum\@xnumdepth=0\begin{exe}[(\theequation)]\else\begin{xlist}[iv.]\fi\raggedright\ex}
-\def\easragged{\ifnum\@xnumdepth=0\begin{exe}[(34)]\else\begin{xlist}[iv.]\fi\raggedright\ex\begin{tabular}[t]{@{}b{\linewidth}@{}}}
-\def\eas{\ifnum\@xnumdepth=0\begin{exe}[(34)]\else\begin{xlist}[iv.]\fi\ex\begin{tabular}[t]{@{}b{\linewidth}@{}}}
-\def\eaa{\ifnum\@xnumdepth=0\begin{exe}[(\theequation)]\else\begin{xlist}[iv.]\fi\raggedright\ex}
\def\ex{\@ifnextchar [{\exnrfont\@ex}{\exnrfont\item\exfont}}
@@ -345,153 +332,497 @@
\def\ea{\ifnum\@xnumdepth=0\begin{exe}\else\begin{xlist}[iv.]\fi\raggedright\ex}
\def\eal{\begin{exe}\exnrfont\ex\begin{xlist}[iv.]\raggedright}
-\def\ealnoraggedright{\begin{exe}\exnrfont\ex\begin{xlist}[iv.]}
-\def\eanoraggedright{\ifnum\@xnumdepth=0\begin{exe}\else\begin{xlist}[iv.]\fi\ex}
-\def\glt{\nopagebreak\vskip.17\baselineskip\transfont\parindent0ex}
-
-
-
-% copied from here:
-% http://tex.stackexchange.com/questions/23677/command-for-paragraph-indentation-after-equations
+\def\eas{\ifnum\@xnumdepth=0\begin{exe}[(34)]\else\begin{xlist}[iv.]\fi\ex\begin{tabular}[t]{@{}p{\linewidth}@{}}}
-%% As Barbara Beeton has commented, forcing the first paragraph after an equation environment to
-%% indent can be achieved with \aftergroup -- use this command to add a \par after the group
-%% established by the environment.
-
-%% Forcing the first paragraph after an environment not to indent isn't that straightforward. I came
-%% up with the following:
-
-%% I defined a new macro \@doendeq that will redefine \everypar so that it a) removes the
-%% indentation from the first paragraph following it b) reverts to its original (empty)
-%% definition. (\@doendeq is an abridged version of LaTeX's \@doendpe which is used after
-%% paragraph-making environments.)
-
-%% To change every instance of the equation environment to remove indents after it, one could
-%% simply add \aftergroup\@doendeq to the definition of \endequation. As you are looking for a
-%% command to modify only some instances of equation, I used \csappto from the etoolbox package
-%% to locally add\aftergroup\@doendeq to \end<\@currenvir> (\@currenvir being the name of the
-%% current environment).
-
-%% I suspect that there are more elegant ways to do this.
+% allow hyphenation and justification
+\def\eanoraggedright{\ifnum\@xnumdepth=0\begin{exe}\else\begin{xlist}[iv.]\fi\ex}
+\def\ealnoraggedright{\begin{exe}\exnrfont\ex\begin{xlist}[iv.]}
-%% \newcommand*{\@doendeq}{%
-%% \everypar{{\setbox\z@\lastbox}\everypar{}}%
-%% }
-%% \newcommand*{\eqcntd}{%
-%% \csappto{end\@currenvir}{%
-%% \aftergroup\@doendeq
-%% }%
-%% }
\def\z{\ifnum\@xnumdepth=1\end{exe}\else\end{xlist}\fi}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% completely undocumented code
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-% for enforcing samepage we put stuff in a tabular environment
-\def\zs{\end{tabular}\ifnum\@xnumdepth=1\end{exe}\else\end{xlist}\fi}
-% %\def\zt{\ifnum\@xnumdepth=1\end{exe}\else\end{xlist}\fi\end{tabular}}
-% % if an example is final in a footnote
-% \def\zlast{\ifnum\@xnumdepth=1\end{exe}\else\end{xlist}\fi\vspace{-\baselineskip}}
-\def\zlast{\z\vspace{-\baselineskip}}
-\def\eafirst{\vspace{-1.5\baselineskip}\ea}
-%
-% % St. Mue. 26.02.00
-% \def\eaf#1{\begin{exe}[(iv)]\exi{(#1)}}
-% \def\eal{\begin{exe}[(\theequation)]\ex\begin{xlist}[iv.]}
-% \def\eal{\begin{exe}\ex\begin{xlist}[iv.]\raggedright} steht unten noch mal
-% \def\eafl#1{\begin{exe}[(iv)]\exi{(#1)}\begin{xlist}[iv.]}
-% \def\eaal{\begin{exe}[(\theequation)]\ex\begin{xlist}[iv.]}
\def\zl{\end{xlist}\end{exe}}
-% % if an example is final in a footnote
-% Hey, Sebastian, why did you comment this out? Please tell me, if you do such things. 22.07.2014
+\def\zs{\end{tabular}\ifnum\@xnumdepth=1\end{exe}\else\end{xlist}\fi}
\def\zllast{\end{xlist}\end{exe}\removelastskip}
-%
-%
-% %%%%%%% \lcomment for breaks in (example-)lists (leaves all counters
-% %%%%%%% as they are) (hpk)
-% \newlength{\lcommentsep}
-% \lcommentsep = 1ex
-%
-% \long\def\lcomment#1%
-% {\vspace{\lcommentsep}
-% \item[]\hspace*{-\leftmargin}%
-% \@tempskipa=\linewidth%
-% \addtolength{\@tempskipa}{\rightmargin}%
-% \addtolength{\@tempskipa}{\leftmargin}%
-% \parbox{\@tempskipa}{#1}%
-% \vspace{\lcommentsep}%
-% }
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% Picture examples
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Control vertical space for examples in footnotes
+\def\zlast{\z\vspace{-\baselineskip}}
+\def\eafirst{\vspace{-1.5\baselineskip}\ea}
%%%%%% control the alignment of exampleno. and (picture-)example
%%%%%% (by Lex Holt <lex@cogsci.ed.ac.uk>).
\def\attop#1{\leavevmode\vtop{\strut\vskip-\baselineskip\vbox{#1}}}
\def\atcenter#1{$\vcenter{#1}$}
%%%%%%
-
-% \exewidth{\exnrfont (\theequation)}}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% several examples in one line
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% %%
+%% several examples in one line %%
+%% %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\newcommand{\xbox}[2]{\noindent\parbox[t]{#1}{#2}\noindent}
+\newcommand{\nobreakbox}[1]{\xbox{\linewidth}{#1}}
+\newcommand{\xref}[1]{(\ref{#1})}
+\newcommand{\xxref}[2]{(\ref{#1}--\ref{#2})}
-%\newcommand{\nobreakbox}[1]{\xbox{\linewidth}{#1}}
+\iftoggle{cgloss}{
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% %%
+%% CGLOSS starts here %%
+%% %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\let\@gsingle=1
+\def\singlegloss{\let\@gsingle=1}
+\def\nosinglegloss{\let\@gsingle=0}
+\@ifundefined{new@fontshape}%
+ {\def\@selfnt{\ifx\@currsize\normalsize\@normalsize\else\@currsize\fi}}
+ {\def\@selfnt{\selectfont}}
+
+\def\gll% % Introduces 2-line text-and-gloss.
+ {\raggedright%
+ \bgroup %\begin{flushleft}
+ \ifx\@gsingle1%
+ \def\baselinestretch{1}\@selfnt\fi
+ \bgroup
+ \twosent
+}
+\def\glll% % Introduces 3-line text-and-gloss.
+ {\bgroup %\begin{flushleft}
+ \ifx\@gsingle1%
+ \def\baselinestretch{1}\@selfnt\fi
+ \bgroup
+ \threesent
+}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% Bars and other superscripts for projections; specifiers
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\let\prmbrs=0
-\def\primebars{\let\prmbrs=1}
-\def\obar#1{\ifmmode#1^{0}\else#1$^{0}$\fi} %% FIX
-\def\mbar#1{\ifmmode#1^{\mathrm{max}}\else#1\textsuperscript{max}\fi}
-\def\ibar#1{\ifx\prmbrs0%
- \ifmmode\overline{\mathrm{#1}}\else$\overline{\mbox{#1}}$\fi%
- \else\ifmmode#1^{'}\else#1$^{'}$\fi\fi}
-\def\iibar#1{\ifx\prmbrs0%
- \ifmmode\overline{\overline{\mathrm{#1}}}%
- \else$\overline{\overline{\mbox{#1}}}$\fi%
- \else #1P\fi}
+\def\gllll% % Introduces 4-line text-and-gloss.
+ {\bgroup %\begin{flushleft}
+ \ifx\@gsingle1%
+ \def\baselinestretch{1}\@selfnt\fi
+ \bgroup
+ \foursent
+}
+
+\def\glllll% % Introduces 5-line text-and-gloss.
+ {\bgroup %\begin{flushleft}
+ \ifx\@gsingle1%
+ \def\baselinestretch{1}\@selfnt\fi
+ \bgroup
+ \fivesent
+}
-\def\spec#1{[Spec,#1]} %Def. of "Specifier of #1"
-
+\def\gllllll% % Introduces 6-line text-and-gloss.
+ {\bgroup %\begin{flushleft}
+ \ifx\@gsingle1%
+ \def\baselinestretch{1}\@selfnt\fi
+ \bgroup
+ \sixsent
+}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% custom markup
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\ct#1{{\em #1\/}} %Citation of linguistic material with alternative style:
-%\def\ct#1{`#1'}
-\def\tx{\bf} %Introduction of technical terms with alternative style:
-%\def\tx{\em}
+\def\glllllll% % Introduces 7-line text-and-gloss.
+ {\bgroup %\begin{flushleft}
+ \ifx\@gsingle1%
+ \def\baselinestretch{1}\@selfnt\fi
+ \bgroup
+ \sevensent
+}
+
+
+\def\gllllllll% % Introduces 8-line text-and-gloss.
+ {\bgroup %\begin{flushleft}
+ \ifx\@gsingle1%
+ \def\baselinestretch{1}\@selfnt\fi
+ \bgroup
+ \eightsent
+}
-
+\newlength{\gltoffset}
+\setlength{\gltoffset}{.17\baselineskip}
+\newcommand{\nogltOffset}{\setlength{\gltoffset}{0pt}}
+\newcommand{\resetgltOffset}{\setlength{\gltoffset}{.17\baselineskip}}
+\def\glt{\ifhmode\\*[\gltoffset]\else\nobreak\vskip\gltoffset\nobreak\fi\transfont}
+
+
+% Introduces a translation
+\let\trans\glt
+
+% \def\gln{\relax}
+% % Ends the gloss environment.
+
+% The following TeX code is adapted, with permission, from:
+% gloss.tex: Macros for vertically aligning words in consecutive sentences.
+% Version: 1.0 release: 26 November 1990
+% Copyright (c) 1991 Marcel R. van der Goot (marcel@cs.caltech.edu).
+
+\newbox\lineone % boxes with words from first line
+\newbox\linetwo
+\newbox\linethree
+\newbox\linefour
+\newbox\linefive
+\newbox\linesix
+\newbox\lineseven
+\newbox\lineeight
+\newbox\wordone % a word from the first line (hbox)
+\newbox\wordtwo
+\newbox\wordthree
+\newbox\wordfour
+\newbox\wordfive
+\newbox\wordsix
+\newbox\wordseven
+\newbox\wordeight
+\newbox\gline % the constructed double line (hbox)
+\newskip\glossglue % extra glue between glossed pairs or tuples
+\glossglue = 0pt plus 2pt minus 1pt % allow stretch/shrink between words
+%\glossglue = 5pt plus 2pt minus 1pt % allow stretch/shrink between words
+\newif\ifnotdone
+
+\@ifundefined{eachwordone}{\let\eachwordone=\upshape}{\relax}
+\@ifundefined{eachwordtwo}{\let\eachwordtwo=\upshape}{\relax}
+\@ifundefined{eachwordthree}{\let\eachwordthree=\upshape}{\relax}
+\@ifundefined{eachwordfour}{\let\eachwordfour=\upshape}{\relax}
+\@ifundefined{eachwordfive}{\let\eachwordfive=\upshape}{\relax}
+\@ifundefined{eachwordsix}{\let\eachwordsix=\upshape}{\relax}
+\@ifundefined{eachwordseven}{\let\eachwordseven=\upshape}{\relax}
+\@ifundefined{eachwordeight}{\let\eachwordeight=\upshape}{\relax}
+
+\def\lastword#1#2#3% #1 = \each, #2 = line box, #3 = word box
+ {\setbox#2=\vbox{\unvbox#2%
+ \global\setbox#3=\lastbox
+ }%
+ \ifvoid#3\global\setbox#3=\hbox{#1\strut{} }\fi
+ % extra space following \strut in case #1 needs a space
+ }
+
+\def\testdone
+ {\ifdim\ht\lineone=0pt
+ \ifdim\ht\linetwo=0pt \notdonefalse % tricky space after pt
+ \else\notdonetrue
+ \fi
+ \else\notdonetrue
+ \fi
+ }
+
+\gdef\getwords(#1,#2)#3 #4\\% #1=linebox, #2=\each, #3=1st word, #4=remainder
+ {\setbox#1=\vbox{\hbox{#2\strut#3{} }% adds space, the {} is needed for CJK otherwise the space
+ % would be ignored
+ \unvbox#1%
+ }%
+ \def\more{#4}%
+ \ifx\more\empty\let\more=\donewords
+ \else\let\more=\getwords
+ \fi
+ \more(#1,#2)#4\\%
+ }
+
+\gdef\donewords(#1,#2)\\{}%
+
+\gdef\twosent#1\\ #2\\{% #1 = first line, #2 = second line
+ \getwords(\lineone,\eachwordone)#1 \\%
+ \getwords(\linetwo,\eachwordtwo)#2 \\%
+ \loop\lastword{\eachwordone}{\lineone}{\wordone}%
+ \lastword{\eachwordtwo}{\linetwo}{\wordtwo}%
+ \global\setbox\gline=\hbox{\unhbox\gline
+ \hskip\glossglue
+ \vtop{\box\wordone % vtop was vbox
+ \nointerlineskip
+ \box\wordtwo
+ }%
+ }%
+ \testdone
+ \ifnotdone
+ \repeat
+ \egroup % matches \bgroup in \gloss
+ \gl@stop}
+
+\gdef\threesent#1\\ #2\\ #3\\{% #1 = first line, #2 = second line, #3 = third
+ \getwords(\lineone,\eachwordone)#1 \\%
+ \getwords(\linetwo,\eachwordtwo)#2 \\%
+ \getwords(\linethree,\eachwordthree)#3 \\%
+ \loop\lastword{\eachwordone}{\lineone}{\wordone}%
+ \lastword{\eachwordtwo}{\linetwo}{\wordtwo}%
+ \lastword{\eachwordthree}{\linethree}{\wordthree}%
+ \global\setbox\gline=\hbox{\unhbox\gline
+ \hskip\glossglue
+ \vtop{\box\wordone % vtop was vbox
+ \nointerlineskip
+ \box\wordtwo
+ \nointerlineskip
+ \box\wordthree
+ }%
+ }%
+ \testdone
+ \ifnotdone
+ \repeat
+ \egroup % matches \bgroup in \gloss
+ \gl@stop}
+
+
+
+\gdef\foursent#1\\ #2\\ #3\\ #4\\{% #1 = first line, #2 = second line, #3 = third etc
+ \getwords(\lineone,\eachwordone)#1 \\%
+ \getwords(\linetwo,\eachwordtwo)#2 \\%
+ \getwords(\linethree,\eachwordthree)#3 \\%
+ \getwords(\linefour,\eachwordfour)#4 \\%
+ \loop\lastword{\eachwordone}{\lineone}{\wordone}%
+ \lastword{\eachwordtwo}{\linetwo}{\wordtwo}%
+ \lastword{\eachwordthree}{\linethree}{\wordthree}%
+ \lastword{\eachwordfour}{\linefour}{\wordfour}%
+ \global\setbox\gline=\hbox{\unhbox\gline
+ \hskip\glossglue
+ \vtop{\box\wordone % vtop was vbox
+ \nointerlineskip
+ \box\wordtwo
+ \nointerlineskip
+ \box\wordthree
+ \nointerlineskip
+ \box\wordfour
+ }%
+ }%
+ \testdone
+ \ifnotdone
+ \repeat
+ \egroup % matches \bgroup in \gloss
+ \gl@stop}
+
+
+
+\gdef\fivesent#1\\ #2\\ #3\\ #4\\ #5\\{% #1 = first line, #2 = second line, #3 = third etc
+ \getwords(\lineone,\eachwordone)#1 \\%
+ \getwords(\linetwo,\eachwordtwo)#2 \\%
+ \getwords(\linethree,\eachwordthree)#3 \\%
+ \getwords(\linefour,\eachwordfour)#4 \\%
+ \getwords(\linefive,\eachwordfive)#5 \\%
+ \loop\lastword{\eachwordone}{\lineone}{\wordone}%
+ \lastword{\eachwordtwo}{\linetwo}{\wordtwo}%
+ \lastword{\eachwordthree}{\linethree}{\wordthree}%
+ \lastword{\eachwordfour}{\linefour}{\wordfour}%
+ \lastword{\eachwordfive}{\linefive}{\wordfive}%
+ \global\setbox\gline=\hbox{\unhbox\gline
+ \hskip\glossglue
+ \vtop{\box\wordone % vtop was vbox
+ \nointerlineskip
+ \box\wordtwo
+ \nointerlineskip
+ \box\wordthree
+ \nointerlineskip
+ \box\wordfour
+ \nointerlineskip
+ \box\wordfive
+ }%
+ }%
+ \testdone
+ \ifnotdone
+ \repeat
+ \egroup % matches \bgroup in \gloss
+ \gl@stop}
+
+
+
+\gdef\sixsent#1\\ #2\\ #3\\ #4\\ #5\\ #6\\{% #1 = first line, #2 = second line, #3 = third etc
+ \getwords(\lineone,\eachwordone)#1 \\%
+ \getwords(\linetwo,\eachwordtwo)#2 \\%
+ \getwords(\linethree,\eachwordthree)#3 \\%
+ \getwords(\linefour,\eachwordfour)#4 \\%
+ \getwords(\linefive,\eachwordfive)#5 \\%
+ \getwords(\linesix,\eachwordsix)#6 \\%
+ \loop\lastword{\eachwordone}{\lineone}{\wordone}%
+ \lastword{\eachwordtwo}{\linetwo}{\wordtwo}%
+ \lastword{\eachwordthree}{\linethree}{\wordthree}%
+ \lastword{\eachwordfour}{\linefour}{\wordfour}%
+ \lastword{\eachwordfive}{\linefive}{\wordfive}%
+ \lastword{\eachwordsix}{\linesix}{\wordsix}%
+ \global\setbox\gline=\hbox{\unhbox\gline
+ \hskip\glossglue
+ \vtop{\box\wordone % vtop was vbox
+ \nointerlineskip
+ \box\wordtwo
+ \nointerlineskip
+ \box\wordthree
+ \nointerlineskip
+ \box\wordfour
+ \nointerlineskip
+ \box\wordfive
+ \nointerlineskip
+ \box\wordsix
+ }%
+ }%
+ \testdone
+ \ifnotdone
+ \repeat
+ \egroup % matches \bgroup in \gloss
+ \gl@stop}
+
+
+
+\gdef\sevensent#1\\ #2\\ #3\\ #4\\ #5\\ #6\\ #7\\{% #1 = first line, #2 = second line, #3 = third etc
+ \getwords(\lineone,\eachwordone)#1 \\%
+ \getwords(\linetwo,\eachwordtwo)#2 \\%
+ \getwords(\linethree,\eachwordthree)#3 \\%
+ \getwords(\linefour,\eachwordfour)#4 \\%
+ \getwords(\linefive,\eachwordfive)#5 \\%
+ \getwords(\linesix,\eachwordsix)#6 \\%
+ \getwords(\lineseven,\eachwordseven)#7 \\%
+ \loop\lastword{\eachwordone}{\lineone}{\wordone}%
+ \lastword{\eachwordtwo}{\linetwo}{\wordtwo}%
+ \lastword{\eachwordthree}{\linethree}{\wordthree}%
+ \lastword{\eachwordfour}{\linefour}{\wordfour}%
+ \lastword{\eachwordfive}{\linefive}{\wordfive}%
+ \lastword{\eachwordsix}{\linesix}{\wordsix}%
+ \lastword{\eachwordseven}{\lineseven}{\wordseven}%
+ \global\setbox\gline=\hbox{\unhbox\gline
+ \hskip\glossglue
+ \vtop{\box\wordone % vtop was vbox
+ \nointerlineskip
+ \box\wordtwo
+ \nointerlineskip
+ \box\wordthree
+ \nointerlineskip
+ \box\wordfour
+ \nointerlineskip
+ \box\wordfive
+ \nointerlineskip
+ \box\wordsix
+ \nointerlineskip
+ \box\wordseven
+ }%
+ }%
+ \testdone
+ \ifnotdone
+ \repeat
+ \egroup % matches \bgroup in \gloss
+ \gl@stop}
+
+
+
+\gdef\eightsent#1\\ #2\\ #3\\ #4\\ #5\\ #6\\ #7\\ #8\\{% #1 = first line, #2 = second line, #3 = third etc
+ \getwords(\lineone,\eachwordone)#1 \\%
+ \getwords(\linetwo,\eachwordtwo)#2 \\%
+ \getwords(\linethree,\eachwordthree)#3 \\%
+ \getwords(\linefour,\eachwordfour)#4 \\%
+ \getwords(\linefive,\eachwordfive)#5 \\%
+ \getwords(\linesix,\eachwordsix)#6 \\%
+ \getwords(\lineseven,\eachwordseven)#7 \\%
+ \getwords(\lineeight,\eachwordeight)#8 \\%
+ \loop\lastword{\eachwordone}{\lineone}{\wordone}%
+ \lastword{\eachwordtwo}{\linetwo}{\wordtwo}%
+ \lastword{\eachwordthree}{\linethree}{\wordthree}%
+ \lastword{\eachwordfour}{\linefour}{\wordfour}%
+ \lastword{\eachwordfive}{\linefive}{\wordfive}%
+ \lastword{\eachwordsix}{\linesix}{\wordsix}%
+ \lastword{\eachwordseven}{\lineseven}{\wordseven}%
+ \lastword{\eachwordeight}{\lineeight}{\wordeight}%
+ \global\setbox\gline=\hbox{\unhbox\gline
+ \hskip\glossglue
+ \vtop{\box\wordone % vtop was vbox
+ \nointerlineskip
+ \box\wordtwo
+ \nointerlineskip
+ \box\wordthree
+ \nointerlineskip
+ \box\wordfour
+ \nointerlineskip
+ \box\wordfive
+ \nointerlineskip
+ \box\wordsix
+ \nointerlineskip
+ \box\wordseven
+ \nointerlineskip
+ \box\wordeight
+ }%
+ }%
+ \testdone
+ \ifnotdone
+ \repeat
+ \egroup % matches \bgroup in \gloss
+ \gl@stop}
+
+%\def\gl@stop{{\hskip -\glossglue}\unhbox\gline\end{flushleft}}
+
+% \leavevmode puts us back in horizontal mode, so that a \\ will work
+\def\gl@stop{{\hskip -\glossglue}\unhbox\gline\leavevmode \egroup}
+}{} %end toggle cgloss
+
+\iftoggle{jambox}{
+%BeGIN Jambox
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Alexis Dimitriadis
+%
+% This is version 0.3 (informal release, Nov. 2003).
+%
+% Line up material a fixed distance from the right margin. For annotating
+% example sentences, usually with a short note in parentheses.
+% May overflow to the left or right, or line up on the next line as necessary.
+%
+% \jambox[width]{text} Align 'text' starting 'width' distance from the
+% right margin (default \the\jamwidth).
+% \jam(something) Align a note delimited by parentheses (which are
+% retained). No optional argument.
+% \jambox*{text} Set \jamwidth to the width of 'text', then align it.
+% (\jamwidth stays set for the rest of the environment).
+%
+% Notes:
+%
+% Distance from the right margin can be set to an explicit amount, or to the
+% width of some piece of text, as follows:
+%
+% \jamwidth=2in\relax Or
+% \settowidth\jamwidth {(``annotation'')}
+%
+% \jamwidth is locally scoped, so it can be set globally or inside an example
+% environment.
+%
+% BUG: Not compatible with ragged-right mode.
+%
+% Incompatibilities: Not useful with the vanilla cgloss4e.sty, which ends
+% glossed lines prematurely.
+% I do have a suitably modified file, cgloss.sty. With it you can do the
+% following:
+% \gll To kimeno. \\
+% the text \\ \jambox{(Greek)}
+% \trans `The text.'
+
+
+\newdimen\jamwidth \jamwidth=2in
+\def\jambox{\@ifnextchar[{\@jambox}
+ {\@ifnextchar*{\@jamsetbox}{\@jambox[\the\jamwidth]}}}
+
+% Set width AND display the argument.
+% The star is read and ignored; the argument #1 is boxed, used to set
+% \jamwidth, then passed to \@jambox (which also puts it in \@tempboxa!)
+%
+\def\@jamsetbox*#1{\setbox\@tempboxa\hbox{#1}\jamwidth=\wd\@tempboxa
+ \@jambox[\the\jamwidth]{\box\@tempboxa}}
+
+\def\@jambox[#1]#2{{\setbox\@tempboxa\hbox {#2}%
+ \ifdim \wd\@tempboxa<#1\relax % if label fits in the alloted space:
+ \@tempdima=#1\relax \advance\@tempdima by-\wd\@tempboxa % remaining \hspace
+ \unskip\nobreak\hfill\penalty250 % break line here if necessary
+ \hskip 1.2em minus 1.2em % used when the line extends past the margin
+ \hbox{}\nobreak\hfill\box\@tempboxa\nobreak
+ \hskip\@tempdima minus \@tempdima\hbox{}%
+ \else % the label is too wide: just right-align it
+ \hfill\penalty50\hbox{}\nobreak\hfill\box\@tempboxa
+ \fi
+ % suppress closing glue:
+ \parfillskip=0pt \finalhyphendemerits=0 \par}}
+% The penalty enables a break, taken only if the line cannot fit.
+% The \hbox{} ensures the next line does not begin with \hfill, which would
+% be discarded if initial.
+% (\vadjust inserts an empty element at the beginning of the next line, so
+% that COULD be used instead of \hbox{}).
+% Algorithm adapted from The TeXBook.
+%
+% The closing \par could be a problem if there is a \parskip...
+}{}
+\endinput
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-glyphs.sty b/Master/texmf-dist/tex/xelatex/langsci/langsci-glyphs.sty
deleted file mode 100644
index 2569c214f91..00000000000
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci-glyphs.sty
+++ /dev/null
@@ -1,28 +0,0 @@
-\newcommand{\downstep}{\textsf{ꜜ}}
-\newcommand{\↓}{\textsf{ꜜ}}
-\newcommand{\saltillo}{\textsf{ꞌ}}
-\newcommand{\Saltillo}{\textsf{Ꞌ}}
-\newcommand{\ꞌ}{\textsf{ꞌ}}
-\newcommand{\Ꞌ}{\textsf{Ꞌ}}
-
-
-\newcommand{\higha}{{$^{\text{a}}$}}
-\newcommand{\highe}{{$^{\text{e}}$}}
-\newcommand{\highE}{{$^{\text{ɛ}}$}}
-\newcommand{\highI}{{$^{\text{ɨ}}$}}
-\newcommand{\higho}{{$^{\text{o}}$}}
-\newcommand{\highO}{{$^{\text{ɔ}}$}}
-\newcommand{\highu}{{$^{\text{u}}$}}
-\newcommand{\highU}{{$^{\text{ʊ}}$}}
-
-
- \newcommand{\ᵃ}{\textsf{{\hspace{.5pt}ᵃ}}}
- \newcommand{\ᵋ}{\textsf{{\hspace{.5pt}ᵋ}}}
- \newcommand{\ᵉ}{\textsf{{\hspace{.1pt}ᵉ}}}
- \newcommand{\ᴵ}{\textsf{{\hspace{.5pt}ᴵ}}}
- \newcommand{\ᶤ}{\textsf{{\hspace{.5pt}ᶤ}}}
- \newcommand{\ᵒ}{\textsf{{\hspace{.5pt}ᵒ}}}
- \newcommand{\ᵓ}{\textsf{{\hspace{.5pt}ᵓ}}}
- \newcommand{\ᵘ}{\textsf{{\hspace{.5pt}ᵘ}}}
- \newcommand{\ᶶ}{\textsf{{\hspace{.5pt}ᶶ}}}
- \newcommand{\ꜜ}{\textsf{ꜜ\hspace*{-2pt}}}
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-lgr.sty b/Master/texmf-dist/tex/xelatex/langsci/langsci-lgr.sty
index 4827d8c4b0c..e74f4d57beb 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: 2016-01-16 16:47:43 UTC
+%% Date: 2020-03-17 13:12 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 a835d260aff..c70f7e35f7e 100644
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci-optional.sty
+++ b/Master/texmf-dist/tex/xelatex/langsci/langsci-optional.sty
@@ -1,15 +1,13 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% File: langsci-optional.sty
%% Author: Language Science Press (http://langsci-press.org)
-%% Date: Date: 2019-03-31 13:12 UTC
-%% Purpose: This file contains useful, but not essential,
+%% Date: 2016-01-16 16:47:43 UTC
+%% Purpose: This file contains useful, but not essential,
%% macros for books using langscibook.cls
%% Language: LaTeX
-%% Licence:
+%% Licence:
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
% Heiko Oberdiek
% http://tex.stackexchange.com/questions/136644/vertical-space-in-interaction-with-figure-center-environment
\newcommand{\oneline}[1]{%
@@ -55,7 +53,7 @@
\fi
\endcenter\endgroup}
-\VerbatimFootnotes
+% \VerbatimFootnotes %breaks roman numbering for examples in footnotes
% http://tex.stackexchange.com/questions/73464/inserting-rtl-text-in-verbatim-environment?rq=1
@@ -63,59 +61,6 @@
%\DefineVerbatimEnvironment{rtlverbatim}{Verbatim}{commandchars=+\[\]}
-
-\newcommand{\ispackage}[1]{\if@noftnote%
-\is{package!{\scshape #1}}%
-\else%
-\is{package!{\scshape #1}|fn{*}}%
-\fi%
-}
-
-% breaks the index
-%\usepackage{doc}
-
-
-\newcommand{\ispackageb}[1]{
-\is{package!\texttt{#1}|(}
-}
-\newcommand{\ispackagee}[1]{
-\is{package!\texttt{#1}|)}
-}
-
-\newcommand{\isoption}[1]{\if@noftnote%
-\is{option!\texttt{#1}}%
-\else%
-\is{option!\texttt{#1}|fn{*}}%
-\fi%
-}
-
-\newcommand{\iscommand}[1]{\if@noftnote%
-\index{#1@{\ttfamily $\backslash$#1}}%
-\else%
-\is{{#1@\ttfamily $\backslash$#1}|fn{*}}%
-\fi%
-}
-
-
-\newcommand\displaycmd[2]{%
- \DescribeMacro{#2}\centerline{\cmd{#1}}}
-
-% \mex considered evil, as we need explicit reference to examples in XML
-% % The following allows for a quick reference to following or preceeding examples (\mex{1}) or
-% % (\mex{0}) but also (\mex{-1})
-% % taken from covington.sty (check)
-% \newcounter{lsptempcnt}
-%
-% \newcommand{\mex}[1]{\setcounter{lsptempcnt}{\value{equation}}%
-% \addtocounter{lsptempcnt}{#1}%
-% \arabic{lsptempcnt}}%
-
-\newcommand{\fitpagewidth}[1]{
- \resizebox{\textwidth}{!}{#1}
-}
-
-
-
%add intonation bars over morphemes or words
\newcommand{\intline}[2]{\settowidth{\LSPTmp}{#2}\raisebox{#1pt}{\parbox{.1mm}{\rule{\LSPTmp}{.5pt}}}#2}
@@ -138,7 +83,7 @@
\setlength{\rotwidth}{#1}
\setlength{\rotheight}{.85\rotwidth}
\begin{rotate}{33}~ %nbsp shifts the content away from the line underneath
- \parbox{\rotwidth}{\raggedright #2}
+ \parbox{\rotwidth}{\raggedright #2}
\end{rotate}%
\rule{0pt}{\rotheight} %add zero width rule to get the right table height
}
@@ -159,17 +104,11 @@
\fi%
#3)}\nopagebreak[4]\ignorespaces}
-
+\newcommand{\fitpagewidth}[1]{
+ \resizebox{\textwidth}{!}{#1}
+}
\newcommand{\fittable}[1]{\resizebox{\textwidth}{!}{#1}}
-
-% integrate see also in multiple indexes
-\def\igobble#1 {}
-\newcommand{\langsciseealso}{\par\addvspace{.1\baselineskip}\hspace*{1.4cm}\hangindent=1.4cm\seealso}
-\newcommand{\ilsa}[2]{\il{#1@\igobble | langsciseealso{#2}}}
-\newcommand{\issa}[2]{\is{#1@\igobble | langsciseealso{#2}}}
-\newcommand{\iasa}[2]{\ia{#1@\igobble | langsciseealso{#2}}}
-
\usepackage{tabularx}
\usepackage{array}
\newenvironment{widetabular}[1][1]
@@ -177,10 +116,6 @@
{\endtabularx}
-\newcommand{\citetv}[1]{\citeauthor{#1} (\citeyear*{#1} [this volume])}
-\newcommand{\citepv}[1]{(\citealt{#1} [this volume])}
-
-
% Vowel chart tikz commands
\newcommand{\aeiou}{%
\node at (1.5,0) (a) {a};
@@ -196,7 +131,7 @@
\node at (0.25,2) (e) {e};
\node at (2.75,2) (o) {o};
\node at (0.75,1) (E) {ε};
- \node at (2.25,1) (O) {ɔ};
+ \node at (2.25,1) (O) {ɔ};
}
%no hyphenation left alingned
@@ -212,38 +147,51 @@
%no hyphenation right aligned fixed width
\newcolumntype{R}[1]{>{\raggedleft\let\newline\\\arraybackslash\hspace{0pt}}m{#1}}
-\newcolumntype{d}[1]{D{.}{.}{#1}}
-\newcommand{\xxref}[2]{(\ref{#1}--\ref{#2})}
+\newcolumntype{d}[1]{D{.}{.}{#1}}
-% Underlining in gb4e-example Environments. Usual underlining commands that span multiple words do not work, because gb4e would parse it as one word.
+% Underlining in gb4e-example Environments. Usual underlining commands that span multiple words do not work, because gb4e would parse it as one word.
% Example: \underline{My example phrase} should become \ulp{My}{~~~~~} \ulp{example}{~~~~~} \ule{phrase}
-% Note: The 2nd Argument of the \ulp command is filled in by experience - if you are not familiar with the command, you should experiment a bit. Usually, five tildes are enough, but be sure to check the outcome.
+% Note: The 2nd Argument of the \ulp command is filled in by experience - if you are not familiar with the command, you should experiment a bit. Usually, five tildes are enough, but be sure to check the outcome.
% \ule is meant to be the last word in a phrase that is underlined. Therefore, \ule does not have an extra length.
-\usepackage[normalem]{ulem}
+\usepackage[normalem]{ulem}
\usepackage{calc}
\newlength{\fulllength}
\newcommand{\ulp}[2]{%#1: stuff to underline, #2: extra length to skip the whitespace between to components
\settowidth{\LSPTmp}{#1}%
- % several boxes are need to assure that words with ascending and descending letters are underlined at the same
+ % several boxes are need to assure that words with ascending and descending letters are underlined at the same
% level, leading to the impression of a continuous stroke
- \parbox[t]{\LSPTmp}{ %restrict first box to the length of first argument
+ \parbox[t]{\LSPTmp}{%restrict first box to the length of first argument
\settowidth{\fulllength}{\parbox{\LSPTmp}{~}\parbox{#2mm}{~}} %inner box is larger than outerbox, so underlining will extend beyond length of outer box
% align parbox to bottom
% | mbox to prevent hyphenation
- \uline{\parbox[b]{\fulllength}{\mbox{#1}}}
- }
+ \uline{\parbox[b]{\fulllength}{\mbox{#1}}}%
+ }%
}
\newcommand{\ule}[1]{%#1: stuff to underline, no extra length
- \ulp{#1}{0}
+ \ulp{#1}{0}%
}
-
-
+\newlength{\fullllength}
+\newcommand{\soutp}[2]{%#1: stuff to underline, #2: extra length to skip the whitespace between to components
+ \settowidth{\LSPTmp}{#1}%
+ % several boxes are need to assure that words with ascending and descending letters are underlined at the same
+ % level, leading to the impression of a continuous stroke
+ \parbox[t]{\LSPTmp}{%restrict first box to the length of first argument
+ \settowidth{\fullllength}{\parbox{\LSPTmp}{~}\parbox{#2mm}{~}}%inner box is larger than outerbox, so underlining will extend beyond length of outer box
+ % align parbox to bottom
+ % | mbox to prevent hyphenation
+ \sout{\parbox[b]{\fullllength}{\mbox{#1}}}%
+ }%
+}
+
+\newcommand{\soute}[1]{%#1: stuff to underline, no extra length
+ \soutp{#1}{0}%
+ }
\newcommand{\longrule}{\rule{1em}{.3pt}}
-\usepackage{colortbl}
+\usepackage{colortbl}
\newcommand{\shadecell}{\cellcolor{black!20!white}}
% vertical alignment of numbered example
@@ -252,7 +200,7 @@
\parbox[t]{.8\textwidth}{
\vspace{#1}
#2
- }
+ }
\z
}
\newcommand{\exbox}[2][-.7\baselineskip]{
@@ -260,18 +208,13 @@
\parbox[t]{.8\textwidth}{
\vspace{#1}
#2
- }
+ }
}
%fix \verb error in biblatex
-\makeatletter
-\def\blx@maxline{77}
-\makeatother
-
-
-\newcommand{\twodigitexamples}{\exewidth{(23)}}
-\newcommand{\threedigitexamples}{\exewidth{(234)}}
-\newcommand{\fourdigitexamples}{\exewidth{(2345)}}
+% \makeatletter
+% \def\blx@maxline{77}
+% \makeatother
\newcommand{\rephrase}[2]{{\color{yellow!30!black}#2}\todo{replaced `#1'}}
@@ -280,34 +223,20 @@
\newenvironment{indentquote}[1]%
{\list{}{\leftmargin=#1\rightmargin=0pt}\item[]}%
{\endlist}
-
-
+
+
\newcommand{\phonrule}[3]{#1 $\to$ #2 / #3}
\newcommand{\featurebox}[1]{$\left[\begin{tabular}{>{\scshape}c}#1\end{tabular}\right]$}
-\definecolor{RED}{cmyk}{0.05,1,0.8,0}
%connect two elements with lines
\newcommand{\connect}[2]{%
\tikz[overlay,remember picture]{%
\draw[-,thick] (#1) -- (#2) node {}; %
}
-}
-
-\newcommand{\examplesroman}{
- \let\eachwordone=\upshape
- \exfont{\upshape}
-}
-\newcommand{\examplesitalics}{
- \let\eachwordone=\itshape
- \exfont{\itshape}
}
-\newenvironment{modquote}[1][6mm]% slightly less indented quote for hyphenation issues
- {\list{}{\leftmargin=#1\rightmargin=0mm}\item[]}%
- {\endlist}
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% Experimental feature for pointing out moving things. %%%%
%%%% Buggy? Write to: kopeckyf@hu-berlin.de %%%%
@@ -318,21 +247,21 @@
\edef\lsConnectTempPosition{#2}%\edef expands the argument, which means reading the current value of the counter.
{\tikz[remember picture,
anchor=base, baseline,
- inner xsep=0pt,
+ inner xsep=0pt,
inner ysep=-.5ex]\node (ConnectTempTail\lsConnectTempPosition) {\strut{}#1};}%\strut for baseline
}
\NewDocumentCommand\ConnectHead{s O{1ex} m O{\thelsConnectTempGroup}}{%read: star #1, optional argument (distance of arrow from text= std. one x-height), mand. arg. (node text), optional argument #2, the group specifier
\edef\lsConnectTempPosition{#4}%
- \stepcounter{lsConnectTempGroup}%We have a match, let's update the group counter
+ \stepcounter{lsConnectTempGroup}%We have a match, let's update the group counter
{\tikz[remember picture,
- anchor=base, baseline,
- inner xsep=0pt,
+ anchor=base, baseline,
+ inner xsep=0pt,
inner ysep=-.5ex] \node (ConnectTempHead\lsConnectTempPosition) {\strut{}#3};%
\tikz[remember picture] \draw[% we have a tail and a head, let's bring them together
\IfBooleanTF#1{{Triangle[]}-}{-{Triangle[]}},% Check if the starred version is used. The starred version is right->left, the normal version left->right
overlay] (ConnectTempTail\lsConnectTempPosition.south) -- ++(0,-#2) -| (ConnectTempHead\lsConnectTempPosition.south);
}%
-}
+}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -340,69 +269,14 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% for chapters without abstract
-\newcommand{\noabstract}{\vspace*{-2\baselineskip}}
-
-% for papers that have appendices, a replacement for \appendix.
-% Usage: \begin{paperappendix} \section{Title} ... \end{paperappendix
-% Will result in "Appendix A: Title"
-%
-\newcounter{paperappendixsection}
-\newenvironment{paperappendix}{%
- \let\oldthesection\thesection%
- \let\oldsectionformat\sectionformat%
- \setcounter{paperappendixsection}{0}%
- \def\thesection{\Alph{paperappendixsection}}%
- \def\sectionformat{\stepcounter{paperappendixsection}\appendixname\ \thesection:\enskip}%
- }{%
- \let\thesection\oldthesection%
- \let\sectionformat\oldsectionformat}
-
+\newcommand{\noabstract}{\vspace*{-2\baselineskip}}
+
%%%%%%%%%%%%%%%%%%%%
%%%% %%%%%
%%%% PLOTS %%%%%
%%%% %%%%%
%%%%%%%%%%%%%%%%%%%%
-
-% \newcommand{\barplot}[4]{%
-% \begin{tikzpicture}
-% \begin{axis}[
-% xlabel={#1},
-% ylabel={#2},
-% axis lines*=left,
-% width = \textwidth,
-% height = .3\textheight,
-% nodes near coords,
-% xtick=data,
-% x tick label style={},
-% ymin=0,
-% symbolic x coords={#3},
-% ]
-% \addplot+[ybar,lsRichGreen!80!black,fill=lsRichGreen] plot coordinates {
-% #4
-% };
-% \end{axis}
-% \end{tikzpicture}
-% }
-% \usepackage{pgfmath,pgfplotstable}
-% \newcommand{\langsciplot}[2]{%% experimental
-% \pgfplotstablegetcolsof{#1.csv}
-% \pgfmathsetmacro{\langscicsvlength}{\pgfplotsretval-1}
-% \begin{tikzpicture}[trim axis right,trim axis left]
-% \begin{axis}[
-% #2,
-% xtick=data,
-% axis lines*=left,
-% nodes near coords,
-% ymin=0,
-% width=\textwidth]
-% \foreach \i in {0,...,\langscicsvlength} {
-% \addplot[
-% /pgf/number format/read comma as period
-% ] table [x index={0},y index={\i}] {#1.csv};
-% }
-% \end{axis}
-% \end{tikzpicture}
-% }
+
\newcommand{\LSfrac}[1]{{\addfontfeature{Fractions=On}#1}}% Use the fraction glyphs shipped with Libertine. The argument is n/m, where n and m are integers
@@ -439,3 +313,23 @@
}
+% commands moved here from cgloss
+\let\prmbrs=0
+\def\primebars{\let\prmbrs=1}
+\def\obar#1{\ifmmode#1^{0}\else#1$^{0}$\fi} %% FIX
+\def\mbar#1{\ifmmode#1^{\mathrm{max}}\else#1\textsuperscript{max}\fi}
+\def\ibar#1{\ifx\prmbrs0%
+ \ifmmode\overline{\mathrm{#1}}\else$\overline{\mbox{#1}}$\fi%
+ \else\ifmmode#1^{'}\else#1$^{'}$\fi\fi}
+\def\iibar#1{\ifx\prmbrs0%
+ \ifmmode\overline{\overline{\mathrm{#1}}}%
+ \else$\overline{\overline{\mbox{#1}}}$\fi%
+ \else #1P\fi}
+
+
+\def\spec#1{[Spec,#1]} %Def. of "Specifier of #1"
+
+% Check marks and crosses
+\usepackage{pifont}
+\newcommand*{\langscicheckmark}{\ding{51}}
+\newcommand*{\langscicross}{\ding{55}}
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-series.def b/Master/texmf-dist/tex/xelatex/langsci/langsci-series.def
index fd62490e84e..60d24f88d1d 100644
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci-series.def
+++ b/Master/texmf-dist/tex/xelatex/langsci/langsci-series.def
@@ -36,124 +36,590 @@
\AtBeginDocument{
\ifx\lsSeries\algad
- \newcommand{\lsSeriesTitle}{African Language Grammars \newlineCover and Dictionaries~\lsSeriesNumber}
+ \newcommand{\lsSeriesTitle}{African Language Grammars \newlineCover and Dictionaries}
\newcommand{\lsSeriesColor}{lsLightOrange}
\fi
\ifx\lsSeries\calseries %\cal is already taken as a command
- \newcommand{\lsSeriesTitle}{Contemporary African Linguistics~\lsSeriesNumber}
+ \newcommand{\lsSeriesTitle}{Contemporary African Linguistics}
\newcommand{\lsSeriesColor}{lsMidWine}
\renewcommand{\lsISSN}{2511-7726}
+ \renewcommand{\lsSeriesText}{
+ {\large Contemporary African Linguistics}
+
+ \bigskip
+
+ Editors: Akinbiyi Akinlabi, Laura J. Downing
+
+
+ \bigskip
+
+ In this series:
+
+ \begin{enumerate}
+ \item Payne, Doris L., Sara Pacchiarotti \& Mokaya Bosire (eds.). Diversity in African languages: Selected papers from the 46th Annual Conference on African Linguistics.
+ \item Persohn, Bastian. The verb in Nyakyusa: A focus on tense, aspect and modality.
+ \item Kandybowicz, Jason, Travis Major \& Harold Torrence (eds.). African linguistics on the prairie: Selected papers from the 45th Annual Conference on African Linguistics.
+ \item Clem, Emily, Peter Jenks \& Hannah Sande (eds.). Theory and description in African Linguistics: Selected papers from the 47th Annual Conference on African Linguistics.
+ \item Lotven, Samson, Silvina Bongiovanni, Phillip Weirich, Robert Botne \& Samuel Gyasi Obeng (eds.). African linguistics across the disciplines: Selected papers from the 48th Annual Conference on African Linguistics.
+ \end{enumerate}
+ }
\fi
\ifx\lsSeries\cam
\newcommand{\lsSeriesTitle}{Contact and Multilingualism}
- \newcommand{\lsSeriesColor}{lsRed}
+ \newcommand{\lsSeriesColor}{lsRed}
\renewcommand{\lsISSN}{}
\fi
\ifx\lsSeries\cib
- \newcommand{\lsSeriesTitle}{Current Issues in Bilingualism~\lsSeriesNumber}
+ \newcommand{\lsSeriesTitle}{Current Issues in Bilingualism}
\newcommand{\lsSeriesColor}{lsLightGreen}
% \renewcommand{\lsISSN}{}
\fi
\ifx\lsSeries\cfls
- \newcommand{\lsSeriesTitle}{Conceptual Foundations of \newlineCover Language Science~\lsSeriesNumber}
+ \newcommand{\lsSeriesTitle}{Conceptual Foundations of \newlineCover Language Science}
\newcommand{\lsSeriesColor}{lsNightGreen}
\renewcommand{\lsISSN}{2363-877X}
+ \renewcommand{\lsSeriesText}{
+ {\large Conceptual Foundations of Language Science}
+
+ \bigskip
+
+ \textbf{Series editors}\\
+ Mark Dingemanse, \textit{Radboud University}\\
+ N. J. Enfield, \textit{University of Sydney}
+
+
+ \bigskip
+
+
+ \textbf{Editorial board}\\
+ Balthasar Bickel, \textit{University of Zürich},
+ Claire Bowern, \textit{Yale University},
+ Elizabeth Couper-Kuhlen, \textit{University of Helsinki},
+ William Croft, \textit{University of New Mexico},
+ Rose-Marie Déchaine, \textit{University of British Columbia},
+ William A. Foley, \textit{University of Sydney},
+ William F. Hanks, \textit{University of California at Berkeley},
+ Paul Kockelman, \textit{Yale University},
+ Keren Rice, \textit{University of Toronto},
+ Sharon Rose, \textit{University of California at San Diego},
+ Frederick J. Newmeyer, \textit{University of Washington},
+ Wendy Sandler, \textit{University of Haifa},
+ Dan Sperber, \textit{Central European University}
+
+
+ \bigskip
+
+ \begin{minipage}{\textwidth}% for undoing \raggedright and justify the following two paragraphs
+
+ No scientific work proceeds without conceptual foundations. In language science, our concepts about language determine our assumptions, direct our attention, and guide our hypotheses and our reasoning. Only with clarity about conceptual foundations can we pose coherent research questions, design critical experiments, and collect crucial data.
+ %
+ This series publishes short and accessible books that explore well-defined topics in the conceptual foundations of language science. The series provides a venue for conceptual arguments and explorations that do not require the traditional book-length treatment, yet that demand more space than a typical journal article allows.
+ \end{minipage}
+
+ \bigskip
+ \bigskip
+
+ In this series:
+
+ \begin{enumerate}
+ \item Enfield, N. J. {Natural causes of language}.
+ \item Müller, Stefan. {A lexicalist account of argument structure: Template-based phrasal LFG approaches and a lexical HPSG alternative}.
+ \item Schmidtke-Bode, Karsten, Natalia Levshina, Susanne Maria Michaelis \& Ilja A. Seržant (eds.). Explanation in typology: Diachronic sources, functional motivations and the nature of the evidence.
+ \item Morley, Rebecca L. Sound structure and sound change: A modeling approach.
+ \end{enumerate}
+
+ }
\fi
\ifx\lsSeries\classics
- \newcommand{\lsSeriesTitle}{Classics in Linguistics~\lsSeriesNumber}
+ \newcommand{\lsSeriesTitle}{Classics in Linguistics}
\newcommand{\lsSeriesColor}{black}
\renewcommand{\lsISSN}{2366-374X}
+ \renewcommand{\lsSeriesText}{
+ {\large Classics in Linguistics}
+
+ \bigskip
+
+ Chief Editors: Martin Haspelmath, Stefan Müller
+
+ \bigskip
+
+ In this series:
+
+ \begin{enumerate}
+ \item Lehmann, Christian. Thoughts on grammaticalization.
+ \item Schütze, Carson T. The empirical base of linguistics: Grammaticality judgments and linguistic methodology.
+ \item Bickerton, Derek. Roots of language.
+ \item von der Gabelentz, Georg. Die Sprachwissenschaft. Ihre Aufgaben, Methoden und bisherigen Ergebnisse.
+ \item Stefan Müller, Marga Reis \& Frank Richter (Hrsg.). Beiträge zur deutschen Grammatik: Gesammelte Schriften von Tilman N.\ Höhle.
+ \item Anderson, Stephen R.\ \& Louis de Saussure (eds.). René de Saussure and the theory of word formation.
+ \end{enumerate}
+ }
\fi
\ifx\lsSeries\cmle
- \newcommand{\lsSeriesTitle}{Computational Models of Language Evolution~\lsSeriesNumber}
+ \newcommand{\lsSeriesTitle}{Computational Models of Language Evolution}
\newcommand{\lsSeriesColor}{lsNightBlue}
\renewcommand{\lsISSN}{2364-7809}
+ \renewcommand{\lsSeriesText}{
+ {\large Computational Models of Language Evolution}
+
+ \bigskip
+
+ Editors: Luc Steels, Remi van Trijp
+
+ \bigskip
+
+ In this series:
+
+ \begin{enumerate}
+ \item Steels, Luc. The Talking Heads Experiment: Origins of words and meanings.
+ \item Vogt, Paul. How mobile robots can self-organize a vocabulary.
+ \item Bleys, Joris. Language strategies for the domain of colour.
+ \item van Trijp, Remi. The evolution of case grammar.
+ \item Spranger, Michael. The evolution of grounded spatial language.
+ \end{enumerate}
+
+ }
\fi
\ifx\lsSeries\eotms
- \newcommand{\lsSeriesTitle}{Empirically Oriented Theoretical \newlineCover Morphology and Syntax~\lsSeriesNumber}
+ \newcommand{\lsSeriesTitle}{Empirically Oriented Theoretical \newlineCover Morphology and Syntax}
\newcommand{\lsSeriesColor}{lsMidBlue}
\renewcommand{\lsISSN}{2366-3529}
+ \renewcommand{\lsSeriesText}{
+ {\large Em­pir­i­cal­ly Ori­ent­ed The­o­ret­i­cal Mor­phol­o­gy and Syn­tax}
+
+ \bigskip
+
+ Chief Editor: Stefan Müller \\
+ Consulting Editors: Berthold Crysmann, Laura Kallmeyer
+
+ \bigskip
+
+ In this series:
+
+ \begin{enumerate}
+ \item Lichte, Timm. Syntax und Valenz: Zur Modellierung kohärenter und elliptischer Strukturen mit Baumadjunktionsgrammatiken
+ \item Bîlbîie, Gabriela. Grammaire des constructions elliptiques: Une étude comparative des phrases sans verbe en roumain et en français
+ \item Bowern, Claire, Laurence Horn \& Raffaella Zanuttini (eds.). On looking into words (and beyond): Structures, Relations, Analyses
+ \item Bonami, Olivier, Gilles Boyé, Georgette Dal, Hélène Giraudo \& Fiammetta Namer. The lexeme in descriptive and theoretical morphology.
+ \item Guzmán Naranjo, Matías. Analogical classification in formal grammar.
+ \end{enumerate}
+
+ }
\fi
\ifx\lsSeries\eotmsig
- \newcommand{\lsSeriesTitle}{Implemented Grammars~\lsSeriesNumber}
+ \newcommand{\lsSeriesTitle}{Implemented Grammars}
\newcommand{\lsSeriesColor}{lsMidBlue}
\fi
\ifx\lsSeries\eurosla
- \newcommand{\lsSeriesTitle}{Eurosla Studies~\lsSeriesNumber}
+ \newcommand{\lsSeriesTitle}{Eurosla Studies}
\newcommand{\lsSeriesColor}{lsMidOrange}
- \renewcommand{\lsISSN}{2626-2665}
+ \renewcommand{\lsISSN}{2626-2665}
\fi
\ifx\lsSeries\hpls
- \newcommand{\lsSeriesTitle}{History and Philosophy of the Language Sciences~\lsSeriesNumber}
- \newcommand{\lsSeriesColor}{lsSoftGreen}
+ \newcommand{\lsSeriesTitle}{History and Philosophy of the Language Sciences}
+ \newcommand{\lsSeriesColor}{black}
+ \renewcommand{\lsISSNelectronic}{2629-172X}
+ \renewcommand{\lsISSNprint}{2629-1711}
+ \renewcommand{\lsSeriesText}{
+ {\large History and Philosophy of the Language Sciences}
+
+ \bigskip
+
+ Editor: James McElvenny
+
+
+ \bigskip
+ In this series:
+
+
+ \small
+ \begin{enumerate}
+ \item McElvenny, James (ed.). Form and formalism in linguistics.
+ \item Van Rooy, Raf. Greece’s labyrinth of language: A study in the early modern discovery of dialect diversity.
+ \end{enumerate}
+
+ }
\fi
\ifx\lsSeries\loc
- \newcommand{\lsSeriesTitle}{Languages of the Caucasus~\lsSeriesNumber}
+ \newcommand{\lsSeriesTitle}{Languages of the Caucasus}
\newcommand{\lsSeriesColor}{lsLightWine}
+ \renewcommand{\lsISSNelectronic}{2699-0156}
+ \renewcommand{\lsISSNprint}{2699-0148}
+ \renewcommand{\lsSeriesText}{
+ {\large Languages of the Caucasus}
+
+ \bigskip
+
+ Editors: Diana Forker (Universität Jena),
+ Nina Dobrushina (National Research University Higher School of Economics, Moscow),
+ Timur Maisak (Institute of Linguistics at the Russian Academy of Sciences, Moscow),
+ Oleg Belyaev (Lomonosov Moscow State University).
+
+ \bigskip
+
+ In this series:
+
+ \begin{enumerate}
+ \item Daniel, Michael, Nina Dobrushina \& Dmitry Ganenkov (eds.). The Mehweb
+ language: Essays on phonology, morphology and syntax.
+ \item Forker, Diana. A grammar of Sanzhi Dargwa.
+
+ \end{enumerate}
+ }
\fi
\ifx\lsSeries\lv
- \newcommand{\lsSeriesTitle}{Language Variation~\lsSeriesNumber}
+ \newcommand{\lsSeriesTitle}{Language Variation}
\newcommand{\lsSeriesColor}{lsDarkWine}
\renewcommand{\lsISSN}{2366-7818}
+ \renewcommand{\lsSeriesText}{
+ {\large Language Variation}
+
+ \bigskip
+
+ Editors: John Nerbonne, Dirk Geeraerts
+
+ \bigskip
+
+ In this series:
+
+ \begin{enumerate}
+ \item Côté, Marie-Hélène, Remco Knooihuizen and John Nerbonne (eds.). The future of dialects.
+ \item Schäfer, Lea. Sprachliche Imitation: Jiddisch in der deutschsprachigen Literatur (18.–20. Jahrhundert).
+ Press.
+ \item Juskan, Martin. Sound change, priming, salience: Producing and perceiving variation in Liverpool English.
+ \item Dellert, Johannes. Information-theoretic causal inference of lexical flow.
+ \end{enumerate}
+ }
\fi
\ifx\lsSeries\mi
- \newcommand{\lsSeriesTitle}{Morphological Investigations~\lsSeriesNumber}
+ \newcommand{\lsSeriesTitle}{Morphological Investigations}
\newcommand{\lsSeriesColor}{lsDarkGreenTwo}
\renewcommand{\lsISSN}{2567-742X}
+ \renewcommand{\lsSeriesText}{
+ {\large Morphological Investigations}
+
+ \bigskip
+
+ Editors: Jim Blevins, Petar Milin, Michael Ramscar
+
+ \bigskip
+
+ In this series:
+
+ \begin{enumerate}
+ \item Trips, Carola \& Jaklin Kornfilt (eds.). Further investigations into the nature of phrasal compounding
+ \item Baechler, Raffaela. Absolute Komplexität in der Nominalflexion.
+ \item Schäfer, Martin. The semantic transparency of English compound nouns.
+ \end{enumerate}
+
+ }
\fi
\ifx\lsSeries\nc
- \newcommand{\lsSeriesTitle}{Niger-Congo Comparative Studies~\lsSeriesNumber}
+ \newcommand{\lsSeriesTitle}{Niger-Congo Comparative Studies}
\newcommand{\lsSeriesColor}{lsRed}
- \renewcommand{\lsISSN}{2627-0048} %online
-% \renewcommand{\lsISSN}{2626-3513} %print
+ \renewcommand{\lsISSNelectronic}{2627-0048}
+ \renewcommand{\lsISSNprint}{2626-3513}
+ \renewcommand{\lsSeriesText}{
+ {\large Niger-Congo Comparative Studies}
+
+ \bigskip
+
+ Chief Editor: Valentin Vydrin (INALCO – LLACAN, CNRS, Paris) \\
+ Editors:
+ Larry Hyman (University of California, Berkeley),
+ Konstantin Pozdniakov (INALCO – LLACAN, CNRS, Paris),
+ Guillaume Segerer (LLACAN, CNRS, Paris),
+ John Watters (SIL International, Dallas, Texas).
+
+
+ \bigskip
+
+ In this series:
+
+ \begin{enumerate}
+ \item Watters, John R. (ed.). East Benue-Congo: Nouns, pronouns, and verbs.
+ \item Pozdniakov, Konstantin. The numeral system of Proto-Niger-Congo: A step-by-step reconstruction.
+ \end{enumerate}
+
+
+
+ }
\fi
\ifx\lsSeries\ogs
- \newcommand{\lsSeriesTitle}{Open Generative Syntax~\lsSeriesNumber}
+ \newcommand{\lsSeriesTitle}{Open Generative Syntax}
\newcommand{\lsSeriesColor}{lsDarkGreenOne}
\renewcommand{\lsISSN}{2568-7336}
+ \renewcommand{\lsSeriesText}{
+ {\large Open Generative Syntax}
+
+ \bigskip
+
+ Editors: Elena Anagnostopoulou,
+ Mark Baker,
+ Roberta D’Alessandro,
+ David Pesetsky,
+ Susi Wurmbrand
+
+
+ \bigskip
+
+ In this series:
+
+ \begin{enumerate}
+ \item Bailey, Laura R. \& Michelle Sheehan (eds.). Order and structure in syntax I: Word order and syntactic structure.
+ \item Sheehan, Michelle \& Laura R. Bailey (eds.). Order and structure in syntax II: Subjecthood and argument structure.
+ \item Bacskai-Atkari, Julia. Deletion phenomena in comparative constructions: English comparatives in a cross-linguistic perspective.
+ \item Franco, Ludovico, Mihaela Marchis Moreno \& Matthew Reeve (eds.). Agreement, case and locality in the nominal and verbal domains.
+ \item Bross, Fabian. The clausal syntax of German Sign Language: A cartographic approach.
+ \item Smith, Peter W., Johannes Mursell \& Katharina Hartmann (eds.). Agree to Agree: Agreement in the Minimalist Programme.
+ \end{enumerate}
+ }
\fi
\ifx\lsSeries\osl
- \newcommand{\lsSeriesTitle}{Open Slavic Linguistics~\lsSeriesNumber}
+ \newcommand{\lsSeriesTitle}{Open Slavic Linguistics}
\newcommand{\lsSeriesColor}{lsMidGreen}
- \renewcommand{\lsISSN}{2627-8332} % Online
- %\renewcommand{\lsISSN}{2627-8324}% (Print)
+ \renewcommand{\lsISSNelectronic}{2627-8332} % Online
+ \renewcommand{\lsISSNprint}{2627-8324}% (Print)
+ \renewcommand{\lsSeriesText}{
+ {\large Open Slavic Linguistics}
+
+ \bigskip
+
+ Editors: Berit Gehrke,
+ Denisa Lenertová,
+ Roland Meyer,
+ Radek Šimík \&
+ Luka Szucsich
+
+ \bigskip
+
+ In this series:
+
+ \begin{enumerate}
+ \item Lenertová, Denisa, Roland Meyer, Radek Šimík \& Luka Szucsich (Eds.). Advances in formal Slavic linguistics 2016.
+ \item Wiland, Bartosz. The spell-out algorithm and lexicalization patterns: Slavic verbs and complementizers.
+ \item Marušič, Franc, Petra Mišmaš \& Rok Žaucer (eds.). Advances in formal Slavic linguistics 2017.
+
+ \end{enumerate}
+
+ }
\fi
\ifx\lsSeries\pmwe
- \newcommand{\lsSeriesTitle}{Phraseology and Multiword Expressions~\lsSeriesNumber}
+ \newcommand{\lsSeriesTitle}{Phraseology and Multiword Expressions}
\newcommand{\lsSeriesColor}{lsLightBlue}
- \renewcommand{\lsISSN}{2625-3127}
+ \renewcommand{\lsISSN}{2625-3127}
+ \renewcommand{\lsSeriesText}{
+ {\large Phraseology and Multiword Expressions}
+
+ \bigskip
+
+ \textbf{Series editors}\\
+ Agata Savary (University of Tours, Blois, France),
+ Manfred Sailer (Goethe University Frankfurt a.\,M., Germany),
+ Yannick Parmentier (University of Lorraine, France),
+ Victoria Rosén (University of Bergen, Norway),
+ Mike Rosner (University of Malta, Malta).
+
+ \bigskip
+
+ In this series:
+
+ \begin{enumerate}
+ \item Manfred Sailer \& Stella Markantonatou (eds.). Multiword expressions: Insights from a multilingual perspective.
+ \item Stella Markantonatou, Carlos Ramisch, Agata Savary \& Veronika Vincze (eds.). Multiword expressions at length and in depth: Extended papers from the MWE 2017 workshop.
+ \item Yannick Parmentier \& Jakub Waszczuk (eds.). Representation and parsing of multiword expressions: Current trends.
+ \item Schulte im Walde, Sabine \& Eva Smolka (eds.). The role of constituents in multiword expressions: An interdisciplinary, cross-lingual perspective.
+
+ \end{enumerate}
+
+
+
+ }
\fi
\ifx\lsSeries\scl
- \newcommand{\lsSeriesTitle}{Studies in Caribbean Languages~\lsSeriesNumber}
+ \newcommand{\lsSeriesTitle}{Studies in Caribbean Languages}
\newcommand{\lsSeriesColor}{lsDarkOrange}
- \renewcommand{\lsISSN}{2627-1834} %online
- \renewcommand{\lsISSN}{2627-1893} %Print
+ \renewcommand{\lsISSNelectronic}{2627-1834} %online
+ \renewcommand{\lsISSNprint}{2627-1893} %Print
+ \renewcommand{\lsSeriesText}{
+ {\large Studies in Caribbean Languages}
+
+ \bigskip
+
+ Chief Editor: John R. Rickford\\
+ Managing Editor: Joseph T. Farquharson
+
+ \bigskip
+
+ In this series:
+
+ \begin{enumerate}
+ \item Irvine-Sobers, G. Alison. The acrolect in Jamaica: The architecture of phonological variation.
+ \item Forbes-Barnett, Marsha. Dual aspectual forms and event structure in Caribbean English Creoles.
+ \item Sherriah, André Ché. A tale of two dialect regions: Sranan’s 17th-century English input.
+ \item Delgado, Sally. Ship English: Sailors’ speech in the early colonial Caribbean.
+ \end{enumerate}
+
+ }
\fi
\ifx\lsSeries\sidl
- \newcommand{\lsSeriesTitle}{Studies in Diversity Linguistics~\lsSeriesNumber}
+ \newcommand{\lsSeriesTitle}{Studies in Diversity Linguistics}
\newcommand{\lsSeriesColor}{lsRichGreen}
\renewcommand{\lsISSN}{2363-5568}
+ \renewcommand{\lsSeriesText}{
+ {\large Studies in Diversity Linguistics}
+
+ \bigskip
+
+ Editor: Martin Haspelmath
+
+
+ \bigskip
+ In this series:
+
+
+
+
+
+ \begin{multicols}{2}
+ \footnotesize
+
+ \begin{enumerate}
+ \item Handschuh, Corinna. A typology of marked-S languages.
+ \item Rießler, Michael. Adjective attribution.
+ \item Klamer, Marian (ed.). The Alor-Pantar languages: History and typology.
+ \item Berghäll, Liisa. A grammar of Mauwake (Papua New Guinea).
+ \item Wilbur, Joshua. A grammar of Pite Saami.
+ \item Dahl, Östen. Grammaticalization in the North: Noun phrase morphosyntax in Scandinavian vernaculars.
+ \item Schackow, Diana. A grammar of Yakkha.
+ \item Liljegren, Henrik. A grammar of Palula.
+ \item Shimelman, Aviva. A grammar of Yauyos Quechua.
+ \item Rudin, Catherine \& Bryan James Gordon (eds.). Advances in the study of Siouan languages and linguistics.
+ \item Kluge, Angela. A grammar of Papuan Malay.
+ \item Kieviet, Paulus. A grammar of Rapa Nui.
+ \item Michaud, Alexis. Tone in Yongning Na: Lexical tones and morphotonology.
+ \item Enfield, N.\,J. (ed.). Dependencies in language: On the causal ontology of linguistic systems.
+ \item Gutman, Ariel. Attributive constructions in North-Eastern Neo-Aramaic.
+ \item Bisang, Walter \& Andrej Malchukov (eds.). Unity and diversity in grammaticalization scenarios.
+ \item Stenzel, Kristine \& Bruna Franchetto (eds.). On this and other worlds: Voices from Amazonia.
+ \item Paggio, Patrizia and Albert Gatt (eds.). The languages of Malta.
+ \item Seržant, Ilja A. \& Alena Witzlack-Makarevich (eds.). Diachrony of differential argument marking.
+ \item Hölzl, Andreas. A typology of questions in Northeast Asia and beyond: An ecological perspective.
+ \item Riesberg, Sonja, Asako Shiohara \& Atsuko Utsumi (eds.). Perspectives on information structure in Austronesian languages.
+ \item Döhler, Christian. A grammar of Komnzo.
+ \item Yakpo, Kofi. A Grammar of Pichi.
+ \item Guérin Valérie (ed.). Bridging constructions.
+ \item Aguilar-Guevara, Ana, Julia Pozas Loyo \& Violeta Vázquez-Rojas Maldonado *eds.). Definiteness across languages.
+ \item Di Garbo, Francesca, Bruno Olsson \& Bernhard Wälchli (eds.). Grammatical gender and linguistic complexity: Volume I: General issues and specific studies.
+ \item Di Garbo, Francesca, Bruno Olsson \& Bernhard Wälchli (eds.). Grammatical gender and linguistic complexity: Volume II: World-wide comparative studies.
+ \item Unterladstetter, Volker. Multi-verb constructions in Eastern Indonesia.
+ \item Edwards, Owen. Metathesis and unmetathesis in Amarasi.
+ \end{enumerate}
+ \end{multicols}
+
+ }
\fi
\ifx\lsSeries\silp
- \newcommand{\lsSeriesTitle}{Studies in Laboratory Phonology~\lsSeriesNumber}
+ \newcommand{\lsSeriesTitle}{Studies in Laboratory Phonology}
\newcommand{\lsSeriesColor}{lsLightWine}
\renewcommand{\lsISSN}{2363-5576}
+ \renewcommand{\lsSeriesText}{
+ {\raggedleft\IfFileExists{./langsci/seriesinfo/labphon-logo.pdf}{\includegraphics[width=5cm]{./langsci/seriesinfo/labphon-logo.pdf}}{LabPhon-Logo}}
+
+ \bigskip
+
+ {\large Studies in Laboratory Phonology}
+
+ \bigskip
+
+ Chief Editor: Martine Grice% (Chief Editor, University of Cologne, Germany),
+ \\
+ Editors: Doris Mücke, % (University of Cologne, Germany),
+ Taehong Cho % (Hanyang University, Seoul, South Korea)
+
+ \bigskip
+
+ In this series:
+
+ \begin{enumerate}
+ \item Cangemi, Francesco. Prosodic detail in Neapolitan Italian.
+ \item Drager, Katie. Linguistic variation, identity construction, and cognition.
+ \item Roettger, Timo B. Tonal placement in Tashlhiyt: How an intonation system accommodates to adverse phonological environments.
+ \item Mücke, Doris. Dynamische Modellierung von Artikulation und prosodischer Struktur: Eine Einführung in die Artikulatorische Phonologie.
+ \item Bergmann, Pia. Morphologisch komplexe Wörter im Deutschen: Prosodische Struktur und phonetische Realisierung.
+ \item Feldhausen, Ingo \& Fliessbach, Jan \& Maria del Mar Vanrell. Methods in prosody: A Romance language perspective.
+ \item Tilsen, Sam. Syntax with oscillators and energy levels.
+ \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.
+ \end{enumerate}
+
+ }
\fi
\ifx\lsSeries\tbls
- \newcommand{\lsSeriesTitle}{Textbooks in Language Sciences~\lsSeriesNumber}
+ \newcommand{\lsSeriesTitle}{Textbooks in Language Sciences}
\newcommand{\lsSeriesColor}{lsYellow}
\renewcommand{\lsISSN}{2364-6209}
\fi
\ifx\lsSeries\tgdi
- \newcommand{\lsSeriesTitle}{Topics at the Grammar-Discourse Interface~\lsSeriesNumber}
+ \newcommand{\lsSeriesTitle}{Topics at the Grammar-Discourse \newlineCover Interface}
\newcommand{\lsSeriesColor}{lsMidDarkBlue}
\renewcommand{\lsISSN}{2567-3335}
+ \renewcommand{\lsSeriesText}{
+ {\large Topics at the Grammar-Discourse Interface}
+
+ \bigskip
+
+ Editors: Philippa Cook (University of Göttingen),
+ Anke Holler (University of Göttingen),
+ Cathrine Fabricius-Hansen (University of Oslo)
+
+ \bigskip
+
+ In this series:
+
+ \begin{enumerate}
+ \item Song, Sanghoun. Modeling information structure in a cross-linguistic perspective.
+ \item Müller, Sonja. Distribution und Interpretation von Modalpartikel-Kombinationen.
+ \item Bueno Holle, Juan José. Information structure in Isthmus Zapotec narrative and conversation.
+ \item Parikh, Prashant. Communication and content.
+ \end{enumerate}
+
+ }
\fi
\ifx\lsSeries\tmnlp
- \newcommand{\lsSeriesTitle}{Translation and Multilingual Natural \newlineCover Language Processing~\lsSeriesNumber}
+ \newcommand{\lsSeriesTitle}{Translation and Multilingual Natural \newlineCover Language Processing}
\newcommand{\lsSeriesColor}{lsDarkBlue}
\renewcommand{\lsISSN}{2364-8899}
+ \renewcommand{\lsSeriesText}{
+ {\large Translation and Multilingual Natural Language Processing}
+
+ \bigskip
+
+ Editors: Oliver Czulo (Universität Leipzig),
+ Silvia Hansen-Schirra (Johannes Gutenberg-Universität Mainz),
+ Reinhard Rapp (Johannes Gutenberg-Universität Mainz)
+
+ \bigskip
+
+ In this series:
+
+ \begin{enumerate}
+ \item Fantinuoli, Claudio \& Federico Zanettin (eds.). New directions in corpus-based translation studies.
+ \item Hansen-Schirra, Silvia \& Sambor Grucza (eds.). Eyetracking and Applied Linguistics.
+ \item Neumann, Stella, Oliver Čulo \& Silvia Hansen-Schirra (eds.). Annotation, exploitation and evaluation of parallel corpora: TC3\,I.
+ \item Czulo, Oliver \& Silvia Hansen-Schirra (eds.). Crossroads between Contrastive Linguistics, Translation Studies and Machine Translation: TC3\,II.
+ \item Rehm, Georg, Felix Sasaki, Daniel Stein \& Andreas Witt (eds.). Language technologies for a multilingual Europe: TC3\,III.
+ \item Menzel, Katrin, Ekaterina Lapshinova-Koltunski \& Kerstin Anna Kunz (eds.). New perspectives on cohesion and coherence: Implications for translation.
+ \item Hansen-Schirra, Silvia, Oliver Czulo \& Sascha Hofmann (eds). Empirical modelling of translation and interpreting.
+ \item Svoboda, Tomáš, Łucja Biel \& Krzysztof Łoboda (eds.). Quality aspects in institutional translation.
+ \item Fox, Wendy. Can integrated titles improve the viewing experience? Investigating the impact of subtitling on the reception and enjoyment of film using eye tracking and questionnaire data.
+ \item Moran, Steven \& Michael Cysouw. The Unicode cookbook for linguists: Managing writing systems using orthography profiles.
+ \item Fantinuoli, Claudio (ed.). Interpreting and technology.
+ \item Nitzke, Jean. Problem solving activities in post-editing and translation from scratch: A multi-method study.
+ % \item LVDV
+ \end{enumerate}
+ }
\fi
\ifx\lsSeries\dummyseries
\newcommand{\lsSeriesTitle}{~}
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-textipa.sty b/Master/texmf-dist/tex/xelatex/langsci/langsci-textipa.sty
index adcedb26b2f..90e2d97d27a 100644
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci-textipa.sty
+++ b/Master/texmf-dist/tex/xelatex/langsci/langsci-textipa.sty
@@ -1,4 +1,12 @@
%Unicode versions of the TIPA \text... commands
-\newcommand{\textltailn}{ɲ}
-\newcommand{\textbardotlessj}{ɟ} \ No newline at end of file
+\renewcommand{\textltailn}{ɲ}
+\renewcommand{\textbardotlessj}{ɟ}
+\renewcommand{\textlengthmark}{ː}
+\renewcommand{\textrtaild}{ɖ}
+\renewcommand{\textopeno}{ɔ}
+\renewcommand{\textepsilon}{ɛ​}
+\renewcommand{\textschwa}{ə}
+\renewcommand{\textdoublegrave}[1]{̏#1}
+
+
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-unified.bbx b/Master/texmf-dist/tex/xelatex/langsci/langsci-unified.bbx
index ba20f39ff4a..d1de5302eef 100644
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci-unified.bbx
+++ b/Master/texmf-dist/tex/xelatex/langsci/langsci-unified.bbx
@@ -40,14 +40,14 @@
% If an @article entry contains Issuetitle and Editor information, we might
% not want to print it. The Unified Style Sheet does not offer explicit
-% guidelines on this, but they don't have any examples where either of these
-% pieces of information are actually printed. Therefore, we can offer an option
-% for the user to decide whether to print it. The default will be not to print
-% it since the Unified Style Sheet does not have examples where this information
-% is printed. The user can print it by setting `issueandeditor=true` as a package
-% option when biblatex is called.
+% guidelines on this. It is often used if an article has no page numbers,
+% but is supplied with an Article ID (some online-only journals do this).
+% But other users might not want it.
+% Therefore, we can offer an option for the user to decide whether to print it.
+% The default will be to print it. The user can desable printing by setting
+% `issueandeditor=false` as a package option when biblatex is called.
\newtoggle{issueandeditor}
-\DeclareBibliographyOption{issueandeditor}[false]{%
+\DeclareBibliographyOption{issueandeditor}[true]{%
\settoggle{issueandeditor}{#1}}
% Formatting directives for name lists
@@ -108,6 +108,43 @@
\mkbibnamefamily{#1}\isdot
\ifdefvoid{#2}{}{\revsdnamepunct\bibnamedelimd\mkbibnamegiven{#2}\isdot}%
\ifdefvoid{#4}{}{\addcomma\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Sort the bibliography, in particular pay
+% respect to the cite order
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\DeclareSortingTemplate{nycot}{%name-year-citeorder-title, based on nyt from biblatex.def
+ \sort{
+ \field{presort}
+ }
+ \sort[final]{
+ \field{sortkey}
+ }
+ \sort{
+ \field{sortname}
+ \field{author}
+ \field{editor}
+ \field{translator}
+ \field{sorttitle}
+ \field{title}
+ }
+ \sort{
+ \field{sortyear}
+ \field{year}
+ }
+ \sort{
+ \citeorder
+ }
+ \sort{
+ \field{sorttitle}
+ \field{title}
+ }
+ \sort{
+ \field{volume}
+ \literal{0}
+ }
+}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Various bibmacros used in producing the bibliography
@@ -218,6 +255,23 @@
{}%
\newunit}
+% In case that year is not given, but pubstate. This mainly occurs for titles that are forthcoming, in press, etc.
+\renewbibmacro*{addendum+pubstate}{% Thanks to https://tex.stackexchange.com/a/154367 for the idea
+ \printfield{addendum}%
+ \iffieldequalstr{labeldatesource}{pubstate}{}
+ {\newunit\newblock\printfield{pubstate}}
+}
+
+\DeclareLabeldate{%
+ \field{date}
+ \field{year}
+ \field{eventdate}
+ \field{origdate}
+ \field{urldate}
+ \field{pubstate}
+ \literal{nodate}
+}
+
% The next three bib macros are for printing the maintitle and booktitle fields
% of an @inproceedings entry with an ISSN as an article in accordance with the
% unified style sheet guidelines.
@@ -347,10 +401,10 @@
{}
{\setunit*{\addcolon\space}}%
\printlist{institution}%
- \setunit{\addspace}%
- \printfield{type}%
\setunit*{\addcomma\space}%
- \usebibmacro{date}%
+ \usebibmacro{date} %
+ \setunit{\adddot\space}%
+ \printtext[parens]{\printfield{type}}%
\newunit}
% The following is a hack to satisfy the Unified Stylesheet's decision to give the edition right after the OED as used as a sortlabel.
@@ -384,7 +438,7 @@
\DefineBibliographyStrings{english}{%
edition = {edn\adddot},
- phdthesis = {dissertation},
+ phdthesis = {Doctoral dissertation},
}
% basically everything is in sentence case, other than journals and book series (recurring titles)
@@ -679,4 +733,4 @@
\AtEveryBibitem{%
\savefield*{note}{\lsnote}%
\clearfield{note}%
-} \ No newline at end of file
+}
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-unified.cbx b/Master/texmf-dist/tex/xelatex/langsci/langsci-unified.cbx
index bc3334ab9b5..d9442377959 100644
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci-unified.cbx
+++ b/Master/texmf-dist/tex/xelatex/langsci/langsci-unified.cbx
@@ -1,8 +1,8 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% File: langscibook.cls
-%% Author: Language Science Press (http://langsci-press.org)
-%% 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
+%% Author: Language Science Press (http://langsci-press.org)
+%% Date: 2020-03-17 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
%% Copyright 2017- Language Science Press
%% Licence: This work may be distributed and/or modified under the
@@ -294,6 +294,34 @@
{}
{\usebibmacro{textcite:postnote}}
+% "This volume" citation commands
+\DeclareCiteCommand{\citetv}
+ {\usebibmacro{prenote}}
+ {\ifciteindex
+ {\indexnames{labelname}}
+ {}%
+ \printtext[bibhyperref]{\printnames{labelname}\addspace\printfield{year}}}
+ {\multicitedelim}
+ {\printtext[bibhyperref]{\usebibmacro{postnote}\addspace[this volume]}}
+
+\DeclareCiteCommand{\textcitetv}
+ {\usebibmacro{prenote}}
+ {\ifciteindex
+ {\indexnames{labelname}}
+ {}%
+ \printtext[bibhyperref]{\printnames{labelname}\addspace\bibopenparen\printfield{year}}}
+ {\multicitedelim}
+ {\printtext[bibhyperref]{\usebibmacro{postnote}\addspace[this volume]\bibcloseparen}}
+
+\DeclareCiteCommand{\parencitetv}
+ {\usebibmacro{prenote}}
+ {\ifciteindex
+ {\indexnames{labelname}}
+ {}%
+ \printtext[bibhyperref]{\bibopenparen\printnames{labelname}\addspace\printfield{year}}}
+ {\multicitedelim}
+ {\printtext[bibhyperref]{\usebibmacro{postnote}\addspace[this volume]\bibcloseparen}}
+
\DeclareMultiCiteCommand{\cites}{\cite}{\setunit{\multicitedelim}}
\DeclareMultiCiteCommand{\parencites}[\mkbibparens]{\parencite}{\setunit{\multicitedelim}}
\DeclareMultiCiteCommand{\footcites}[\mkbibfootnote]{\footcite}{\setunit{\multicitedelim}}
@@ -306,6 +334,8 @@
\let\citealt\cite
\let\citet\textcite
+\let\citep\parencite
+\let\citepv\parencitetv
\let\Citet\Textcite
\newcommand{\pgcitep}[2]{(\cite{#1}:~#2)}
\newcommand{\pgcitealt}[2]{\cite{#1}:~#2}
@@ -315,7 +345,6 @@
\newcommand{\seccitep}[2]{(\cite{#1}:~$\S$#2)}
\newcommand{\seccitet}[2]{\citeauthor{#1} (\citeyear{#1}:~$\S$#2)}
\newcommand{\secposscitet}[2]{\citeauthor{#1}'s (\citeyear{#1}:~$\S$#2)}
-\let\citep\parencite
\renewcommand*{\postnotedelim}{\addcolon\space}
\DeclareFieldFormat{postnote}{#1}
@@ -378,6 +407,3 @@
% \renewcommand{\nameyeardelim}{ }%
\endinput
-
-
-
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci_logo_nocolor.pdf b/Master/texmf-dist/tex/xelatex/langsci/langsci_logo_nocolor.pdf
deleted file mode 100644
index 2edf2afc2ca..00000000000
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci_logo_nocolor.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci_spinelogo_nocolor.pdf b/Master/texmf-dist/tex/xelatex/langsci/langsci_spinelogo_nocolor.pdf
deleted file mode 100644
index 7184c0711f7..00000000000
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci_spinelogo_nocolor.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langscibook.cls b/Master/texmf-dist/tex/xelatex/langsci/langscibook.cls
index 4bfbdd94e35..fc9a0dcd8e2 100644
--- a/Master/texmf-dist/tex/xelatex/langsci/langscibook.cls
+++ b/Master/texmf-dist/tex/xelatex/langsci/langscibook.cls
@@ -1,6 +1,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% File: langscibook.cls
%% Author: Language Science Press (http://langsci-press.org)
-%% Date: 2019-03-31 13:12 UTC
+%% Date: 2018-08-29 13:12 UTC
%% Purpose: This file defines the basic document class
%% for books published with Language Science Press.
%% Language: LaTeX
@@ -44,11 +44,11 @@
% \- Indexes
% \- Hyperref
% \- Edited volumes (Collection)
-% \- Colors
+% \- Localisation
% \_ Miscellaneous
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{langscibook}[2018/01/15 Language Science Press]
+\ProvidesClass{langscibook}[2020/02/12 Language Science Press]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Early load packages
@@ -57,20 +57,23 @@
\RequirePackage[]{silence}
\WarningsOff[hyperref]
\WarningsOff[tocstyle]
-\typeout{Warnings are disabled in langscibook.cls for hyperref and tocstyle}
+\WarningsOff[microtype]
+\WarningFilter{microtype}{Unknown slot}
+\WarningFilter{scrbook}{package incompatibility}
+\typeout{Warnings are disabled in langscibook.cls for hyperref, tocstyle, microtype and scrbook package incompatibility}
\usepackage{etoolbox}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Paths
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\newcommand{\fontpath}{}
-\newcommand{\logopath}{}
-\newcommand{\seriesinfopath}{}
-\newcommand{\localepath}{}
-\newcommand{\bibstylepath}{}
+% \newcommand{\fontpath}{}
+% \newcommand{\logopath}{}
+% \newcommand{\seriesinfopath}{}
+% \newcommand{\localepath}{}
+% \newcommand{\bibstylepath}{}
% \newcommand{\bbxpath}{}
% \newcommand{\cbxpath}{}
-\newcommand{\stylepath}{}
+% \newcommand{\stylepath}{}
% Paths can be overwritten with option "nonflat"
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -80,7 +83,10 @@
\usepackage{xspace}
\newcommand{\lsp}{Language Science Press\xspace}
\newcommand{\lsSeriesNumber}{??}
+\newcommand{\lsSeriesText}{\color{red}{No series description provided}}
\newcommand{\lsISSN}{??}
+\newcommand{\lsISSNprint}{??}
+\newcommand{\lsISSNelectronic}{??}
\newcommand{\lsISBNdigital}{000-0-000000-00-0}
\newcommand{\lsISBNhardcover}{000-0-000000-00-0}
\newcommand{\lsISBNsoftcover}{000-0-000000-00-0}
@@ -90,9 +96,8 @@
\newcommand{\lsID}{000}
\newcommand{\lsURL}{http://langsci-press.org/catalog/book/\lsID}
\newcommand{\lsSeries}{eotms}
-% \newcommand{\lsSpineBreadth}{20mm}
-\newcommand{\lsOutput}{book}
-\newcommand{\lsBookLanguage}{english}
+\newcommand{\lsOutput}{book}
+\newcommand{\lsBookLanguage}{english}
\newcommand{\lsFontsize}{11pt}
\newcommand{\lsChapterFooterSize}{\small} %footers in editedvolumes
\newcommand{\lsCopyright}{CC-BY}
@@ -115,6 +120,11 @@
\newcommand{\SpineTitle}[1]{\renewcommand{\lsSpineTitle}{#1}}
\newcommand{\SpineAuthor}[1]{\renewcommand{\lsSpineAuthor}{#1}}
+% Default commands for loaded graphics
+\newcommand{\includespinelogo}{~}
+\newcommand{\includestoragelogo}{~}
+\newcommand{\includepublisherlogo}{~}
+\newcommand{\includechapterfooterlogo}{~}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -123,23 +133,21 @@
\newif\iflsDraft \lsDraftfalse
\newif\iflsOpenReview \lsOpenReviewfalse
-\newif\iflsUndecapitalize \lsUndecapitalizefalse
+\newif\iflsResetCapitals \lsResetCapitalsfalse
\newif\iflsShowIndex \lsShowIndexfalse
\newif\iflsBiblatex \lsBiblatextrue
\newif\iflsCollection \lsCollectionfalse
\newif\iflsCollectionChapter \lsCollectionChapterfalse
\newif\iflsCollectionTOCLong \lsCollectionTOCLongfalse
\newif\iflsNewtxmath \lsNewtxmathfalse
+\newif\iflsMinimal \lsMinimalfalse
\newif\iflsCover \lsCoverfalse %output format is cover
-% \newif\iflsUscover \lsUscoverfalse
-\newif\iflsModfonts \lsModfontsfalse
\newif\iflsNoBabel \lsNoBabelfalse
\newif\iflsBabelShorthands \lsBabelShorthandsfalse
\newif\iflsMultiauthors \lsMultiauthorsfalse
\newif\iflsArseneau \lsArseneaufalse
\newif\iflsOldStyleNumbers \lsOldStyleNumbersfalse
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Option handling
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -165,30 +173,26 @@
\renewcommand{\lsSpinewidth}{#1}}
\DeclareVoidOption{smallfont}{
\renewcommand{\lsFontsize}{10pt}}
-\DeclareVoidOption{undecapitalize}{
- \lsUndecapitalizetrue }
+\DeclareVoidOption{decapbib}{
+ \lsResetCapitalstrue }
\DeclareVoidOption{draftmode}{ % 'draftmode' instead of 'draft' due to undesirable side efects
\lsDrafttrue
\overfullrule=5pt } % to indicate overfull hboxes
\DeclareVoidOption{openreview}{
\lsOpenReviewtrue%
\AtBeginDocument{\renewcommand{\lsISBNdigital}{000-0-000000-00-0}}}
-\DeclareVoidOption{nonflat}{
- \renewcommand{\fontpath}{./langsci/fonts/}
- \renewcommand{\logopath}{./langsci/graphics/}
- \renewcommand{\seriesinfopath}{./langsci/seriesinfo/}
- \renewcommand{\localepath}{./langsci/locale/}
- \renewcommand{\bibstylepath}{./langsci/}
-% \renewcommand{\bbxpath}{\bibstylepath langsci-unified/bbx/}
-% \renewcommand{\cbxpath}{\bibstylepath langsci-unified/cbx/}
- \renewcommand{\stylepath}{./langsci/styles/}
-}
+% \DeclareVoidOption{nonflat}{
+% \renewcommand{\fontpath}{./langsci/fonts/}
+% \renewcommand{\logopath}{./langsci/graphics/}
+% \renewcommand{\seriesinfopath}{./langsci/seriesinfo/}
+% \renewcommand{\localepath}{./langsci/locale/}
+% \renewcommand{\bibstylepath}{./langsci/}
+% \renewcommand{\stylepath}{./langsci/styles/}
+% }
\DeclareVoidOption{nobabel}{
\lsNoBabeltrue}
\DeclareVoidOption{babelshorthands}{
\lsBabelShorthandstrue}
-\DeclareVoidOption{modfonts}{
- \lsModfontstrue}
\DeclareVoidOption{multiauthors}{
\lsMultiauthorstrue}
\DeclareVoidOption{showindex}{
@@ -202,6 +206,8 @@
\lsNewtxmathfalse}
\DeclareVoidOption{newtxmath}{
\lsNewtxmathtrue}
+\DeclareVoidOption{minimal}{
+ \lsMinimaltrue}
\DeclareVoidOption{collection}{
\lsCollectiontrue}
\DeclareVoidOption{collectionchapter}{
@@ -215,14 +221,14 @@
\DeclareVoidOption{chinesefont}{
\newfontfamily\cn[Mapping=tex-text,Ligatures=Common,Scale=MatchUppercase]{AR PL UMing CN}
% \newcommand{\zh}[1]{{\cn #1}}
- \XeTeXlinebreaklocale 'zh'
+ \XeTeXlinebreaklocale 'zh'
\XeTeXlinebreakskip = 0pt plus 1pt
\AdditionalFontImprint{UMing}
}
\DeclareVoidOption{japanesefont}{
\newfontfamily\jpn[Mapping=tex-text,Ligatures=Common,Scale=MatchUppercase]{TakaoPGothic} %Japanese
% \newcommand{\jp}[1]{{{\jpn #1}}}
- \XeTeXlinebreaklocale 'ja'
+ \XeTeXlinebreaklocale 'ja'
\AdditionalFontImprint{TakaoPGothic}
}
% \DeclareVoidOption{koreanfont}{
@@ -259,6 +265,7 @@
numbers=noenddot, % no point after last number of chapters/sections
toc=bibliography,
index=totoc,
+ headings=optiontohead,
%chapterprefix=true,
%draft=yes,
%appendixprefix
@@ -285,7 +292,7 @@
%% standard commands
-\usepackage{\stylepath langsci-basic} % FIXME: contains important commands for the index (\isi etc.) which should be defined in the class
+\usepackage{langsci-basic}
\usepackage{todonotes}
@@ -293,7 +300,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Print on demand macros
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+\iflsMinimal\else % The minimal mode skips cover generation
% Basic cover commands, including PGF layers
\newcommand{\podsetup}{
\lsCovertrue
@@ -305,14 +312,13 @@
\renewcommand{\lastand}{ \& }%
\renewcommand{\affiliation}[1]{}
}
-
% Content creation for the spine. Including Logo, author, title, and volume number on spine.
\newcommand{\podspine}{
\renewcommand{\newlineCover}{}
\renewcommand{\and}{, }
\renewcommand{\lastand}{ \& }
- \node [above = 0mm of CoverSpine.south, anchor=base] (lspcls_spinelogo) {\color{\lsSeriesColor}\includegraphics{\logopath langsci_spinelogo_nocolor.pdf}};
+ \node [above = 0mm of CoverSpine.south, anchor=base] (lspcls_spinelogo) {\color{\lsSeriesColor}\includespinelogo};
\node [below = 0mm of CoverSpine.north, anchor=north] (lspcls_splinenumber) {\color{\lsSeriesColor}
{\parbox{.47cm}{
\centering
@@ -399,7 +405,7 @@
\else % If yes, create a node for subtitle and author
\node [ font=\fontsize{25pt}{10mm}\selectfont,
below = 8mm of lspcls_covertitle.south,
- text width=#2,
+ text width=#2,
align=left
] (lspcls_coversubtitle) {\color{#1}\lsCoverSubTitleFont{\raggedright\@subtitle\par}};
\node [
@@ -417,7 +423,7 @@
rectangle,
fill=white,
minimum size=17pt] (lspcls_square) {}; % This is the white square at the bottom left of the front cover
- \node [ above left = 10mm and 7.5mm of CoverColouredRectangleFront.south east] {\color{#1}\includegraphics{\logopath langsci_logo_nocolor.pdf}}; % Print the Language Science press Logo
+ \node [ above left = 10mm and 7.5mm of CoverColouredRectangleFront.south east] {\color{#1}\includepublisherlogo}; % Print the Language Science press Logo
\path let \p1 = (lspcls_square.north east), % Calculate the exact coordinates for the Series Title to print.
\p2 = (lspcls_covertitle.west)
in node at (\x2,\y1) (lspcls_seriesinfo) [
@@ -427,14 +433,13 @@
anchor=north west]
{\color{#1}\lsCoverSeriesFont{\lsSeriesTitle\par}};
}
-
+\fi
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Output types
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \newcommand{\lsOutputLong}{long}
\newcommand{\lsOutputBook}{book} % standard book
-\newcommand{\lsOutputInprep}{inprep} % marks manuscript as in preparation
\newcommand{\lsOutputPaper}{paper} % paper in edited volume
\newcommand{\lsOutputGuidelines}{guidelines} % guidelines
\newcommand{\lsOutputCoverBODsc}{coverbodsc} % cover with BoD measurements
@@ -445,6 +450,7 @@
%% Output types are defined with \newcommand above so they can be used with geometry.
\AtBeginDocument{
+\iflsMinimal\renewcommand{\maketitle}{You are using the minimal mode.}\else % The minimal mode skips cover generation
\ifx\lsOutput\lsOutputPaper % only if output==paper
\usepackage{chngcntr}
\counterwithout{figure}{chapter}
@@ -470,28 +476,13 @@
\lsSchmutztitel}
%%%%%%%%%%%%%%%%%%%%
\AtEndDocument{
- \lsPageStyleEmpty
- \null\newpage\thispagestyle{empty}
- %% Advertisement:
- {\lsAdvertisement}
- \null\newpage\thispagestyle{empty}
- %% Back page:
- {\lsBackPage}
- \null\newpage\thispagestyle{empty}
+ \lsPageStyleEmpty
+ \null\newpage\thispagestyle{empty} % add a final blank page
}
\fi
-\ifx\lsOutput\lsOutputInprep % only if output==inprep
- {\renewcommand{\lsCoverBlockColor}{white}
- \renewcommand{\lsCoverFontColor}{black}
- \lsCoverBlock
- \lsCoverTitleAuthor}
-\fi
-
\ifx\lsOutput\lsOutputGuidelines % only if output==guidelines
{\setcounter{page}{-1}
- \renewcommand{\lsAdvertisement}{}
- %% First titlepage:
{\lsFrontPage}
}
@@ -529,7 +520,6 @@
\fi
-% ============================
\ifx\lsOutput\lsOutputCoverCS % only if output==covercs
\podsetup
\begin{tikzpicture}[remember picture, overlay,bg/.style={outer sep=0}]
@@ -552,11 +542,8 @@
\lsInsideFont
%% Imprint:
-\ifx\lsOutput\lsOutputInprep{}
-\else{
- \ifx\lsOutput\lsOutputGuidelines{}
- \else{\lsImpressum}
- \fi}
+\ifx\lsOutput\lsOutputGuidelines{}
+\else{\lsImpressum}
\fi
%%%%%%%%%%%%%
@@ -571,7 +558,7 @@
} %% \maketitle
\fi
-
+\fi
%% for those who like the example in numbered example sentences to be typeset in italics
%% this is possible for a complete series only.
\ifx\lsSeries\sidl
@@ -600,9 +587,9 @@
% Geometry
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% For output type cover
-% \newlength{\csspine} % CS spine width algorithm, when page count is known: Total Page Number (excluding cover), usually (Total Page - 3) * 0.0572008 mm
-% \newlength{\bodspine} % BoD spine width algorithm located at http://www.bod.de/hilfe/coverberechnung.html (German only, please contact LangSci for help)
+% For output type cover
+% CS spine width algorithm, when page count is known: Total Page Number (excluding cover), usually (Total Page - 3) * 0.0572008 mm
+% BoD spine width algorithm located at http://www.bod.de/hilfe/coverberechnung.html (German only, please contact LangSci for help)
\newlength{\bleed}
\newlength{\seitenbreite}
\newlength{\seitenhoehe}
@@ -669,14 +656,6 @@
]{geometry}
\fi
-\usepackage[
- absolute % for absolute positioning in titlepage
- %,showboxes
- ]{textpos}
-\setlength{\TPHorizModule}{1mm}
-\setlength{\TPVertModule}{\TPHorizModule}
-\textblockorigin{0mm}{0mm}
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Fonts
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -688,146 +667,127 @@
\usepackage{amssymb} % has to be loaded before other stuff
\usepackage{amsmath} % has to be loaded before mathspec/unicode-math
-\iflsNewtxmath\else
-%% There is a known problem in the interplay between \binom, unicode-math, and OTF
-%% https://tex.stackexchange.com/questions/269980/wrong-parentheses-size-in-binom-with-xelatex-and-unicode-math-in-displaystyle
-\ifx\Umathcode\@undefined\else
-
-\DeclareRobustCommand{\genfrac}[6]{%
- \def\@tempa{#1#2}%
- \edef\@tempb{\@nx\@genfrac\@mathstyle{#4}%
- % just \over or \above never withdelims versions
- \ifx @#3@\@@over\else\@@above\fi
- }%
- \ifx\@tempa\@empty \else
- \bgroup % so mathord not mathinner
- \left\ifx\relax#1\relax.\else#1\fi % assumes . is null delimiter
- % otherwise add specified delimiter
- \kern-\nulldelimiterspace % fractions add extra nulldelimiter space
- \fi
- \@tempb{#3}{\mathstrut{#5}}{\mathstrut{#6}}%
- \ifx\@tempa\@empty \else
- \kern-\nulldelimiterspace
- \right\ifx\relax#2\relax.\else#2\fi
- \egroup
- \fi
-}
-\fi
-%% Provides \setmathfont
-\usepackage{unicode-math}
-\fi
-
-\iflsNewtxmath
-%% Deprecated:
-\PassOptionsToPackage{no-math}{fontspec} % must appear before metalogo or any fontspec stuff; deactivates fontspec's math settings, which is necessary to let newtxmath do the job
-\fi
-
-\usepackage{metalogo}\newcommand{\xelatex}{\XeLaTeX\xspace}
-\usepackage{dejavu}
-\usepackage{libertine}
+\iflsMinimal\else % The minimal mode skips font loading
+ \iflsNewtxmath\else
+ %% There is a known problem in the interplay between \binom, unicode-math, and OTF
+ %% https://tex.stackexchange.com/questions/269980/wrong-parentheses-size-in-binom-with-xelatex-and-unicode-math-in-displaystyle
+ \ifx\Umathcode\@undefined\else
+
+ \DeclareRobustCommand{\genfrac}[6]{%
+ \def\@tempa{#1#2}%
+ \edef\@tempb{\@nx\@genfrac\@mathstyle{#4}%
+ % just \over or \above never withdelims versions
+ \ifx @#3@\@@over\else\@@above\fi
+ }%
+ \ifx\@tempa\@empty \else
+ \bgroup % so mathord not mathinner
+ \left\ifx\relax#1\relax.\else#1\fi % assumes . is null delimiter
+ % otherwise add specified delimiter
+ \kern-\nulldelimiterspace % fractions add extra nulldelimiter space
+ \fi
+ \@tempb{#3}{\mathstrut{#5}}{\mathstrut{#6}}%
+ \ifx\@tempa\@empty \else
+ \kern-\nulldelimiterspace
+ \right\ifx\relax#2\relax.\else#2\fi
+ \egroup
+ \fi
+ }
+ \fi
+ %% Provides \setmathfont
+ \usepackage{unicode-math}
+ \fi
-\setmonofont[
- Ligatures={TeX},Scale=MatchLowercase,
- BoldFont = DejaVuSansMono-Bold.ttf ,
- SlantedFont = DejaVuSansMono-Oblique.ttf ,
- BoldSlantedFont = DejaVuSansMono-BoldOblique.ttf
- ]{DejaVuSansMono.ttf}
+ \iflsNewtxmath
+ %% Deprecated:
+ \PassOptionsToPackage{no-math}{fontspec} % must appear before metalogo or any fontspec stuff; deactivates fontspec's math settings, which is necessary to let newtxmath do the job
+ \fi
-\iflsNewtxmath\else
-\setmathfont[AutoFakeBold]{libertinusmath-regular.otf}
-\fi
+ \usepackage{metalogo}\newcommand{\xelatex}{\XeLaTeX\xspace}
+
+ \setmonofont[
+ % Ligatures={TeX},% not supported by ttf
+ Scale=MatchLowercase,
+ BoldFont = DejaVuSansMono-Bold.ttf ,
+ SlantedFont = DejaVuSansMono-Oblique.ttf ,
+ BoldSlantedFont = DejaVuSansMono-BoldOblique.ttf
+ ]{DejaVuSansMono.ttf}
+
+ \setsansfont[
+ %Ligatures={TeX,Common},% not supported by ttf
+ Scale=MatchLowercase,
+% Path=\fontpath,
+ BoldFont = Arimo-Bold.ttf,
+ ItalicFont = Arimo-Italic.ttf,
+ BoldItalicFont = Arimo-BoldItalic.ttf
+ ]{Arimo-Regular.ttf}
+
+ \iflsNewtxmath\else
+ \setmathfont[AutoFakeBold
+% ,Path=\fontpath
+ ]{LibertinusMath-Regular.otf}
+ \setmathfont[range={cal},StylisticSet=1%,Path=\fontpath
+ ]{XITSMath-Regular.otf}
+ \setmathfont[range={bfcal},StylisticSet=1%,Path=\fontpath
+ ]{XITSMath-Bold.otf}
+ \fi
-\iflsModfonts% use Langsci fonts
- \iflsOldStyleNumbers
- \defaultfontfeatures[LinLibertine_RZ_B.otf,LinLibertine_RI_B.otf,LinLibertine_RZI_B.otf,LinLibertine_R_B.otf]{SmallCapsFeatures={Numbers=OldStyle}}
- \fi
- \setsansfont[
- %Ligatures={TeX,Common}, % not supported by ttf
- Scale=MatchLowercase,
- Path=\fontpath,
- BoldFont = Arimo-Bold_B.ttf ,
- ItalicFont = Arimo-Italic_B.ttf ,
- BoldItalicFont = Arimo-BoldItalic_B.ttf
- ]{Arimo_B.ttf}
-
- \setmainfont[
- Ligatures={TeX,Common},
- Path=\fontpath,
- PunctuationSpace=0,
- Numbers={Proportional},
- BoldFont = LinLibertine_RZ_B.otf ,
- ItalicFont = LinLibertine_RI_B.otf ,
- BoldItalicFont = LinLibertine_RZI_B.otf,
- BoldSlantedFont = LinLibertine_RZ_B.otf,
- SlantedFont = LinLibertine_R_B.otf,
- SlantedFeatures = {FakeSlant=0.25},
- BoldSlantedFeatures = {FakeSlant=0.25},
- SmallCapsFeatures = {FakeSlant=0},
- ]{LinLibertine_R_B.otf}
-\else % use standard fonts
- \iflsOldStyleNumbers
- \defaultfontfeatures[LinLibertine_RZ.otf,LinLibertine_RI.otf,LinLibertine_RZI.otf,LinLibertine_R.otf]{SmallCapsFeatures={Numbers=OldStyle}}
- \fi
- \setsansfont[
- %Ligatures={TeX,Common}, % not supported by ttf
- Scale=MatchLowercase,
- Path=\fontpath,
- BoldFont = Arimo-Bold.ttf ,
- ItalicFont = Arimo-Italic.ttf ,
- BoldItalicFont = Arimo-BoldItalic.ttf
- ]{Arimo-Regular.ttf}
-
- \setmainfont[
- Ligatures={TeX,Common},
- Path=\fontpath,
- PunctuationSpace=0,
- Numbers={Proportional},
- BoldFont = LinLibertine_RZ.otf ,
- ItalicFont = LinLibertine_RI.otf ,
- BoldItalicFont = LinLibertine_RZI.otf,
- BoldSlantedFont = LinLibertine_RZ.otf,
- SlantedFont = LinLibertine_R.otf,
- SlantedFeatures = {FakeSlant=0.25},
- BoldSlantedFeatures = {FakeSlant=0.25},
- SmallCapsFeatures = {FakeSlant=0},
- ]{LinLibertine_R.otf}
-\fi
+ \iflsOldStyleNumbers
+ \defaultfontfeatures[LibertinusSerif-Semibold.otf,LibertinusSerif-Italic.otf,LibertinusSerif-SemiboldItalic.otf,LibertinusSerif-Regular.otf]{SmallCapsFeatures={Numbers=OldStyle}}
+ \fi
-%% Deprecated:
-\iflsNewtxmath % some users have problems when installing newtxmath
- \usepackage[libertine]{newtxmath}
-
- %% following http://tex.stackexchange.com/questions/297328/xelatex-does-not-load-newtxmath-with-linuxlibertine-sometimes
- %% due to a bug in XeTeX. This also seems to fix an issue with \url in footnotes.
- %% Unfortunately, this is NOT extensively tested!
- \usepackage{xpatch}
- \xpretocmd{\textsuperscript}
- {{\sbox0{$\textstyle x$}}}
- {}{}
- \AtBeginDocument{%
- \DeclareSymbolFont{operators}{\encodingdefault}{\familydefault}{m}{n}%
- \SetSymbolFont{operators}{bold}{\encodingdefault}{\familydefault}{b}{n}%
- }
-\fi
+ \setmainfont[
+ Ligatures={TeX,Common},
+% Path=\fontpath,
+ PunctuationSpace=0,
+ Numbers={Proportional},
+ BoldFont = LibertinusSerif-Semibold.otf,
+ ItalicFont = LibertinusSerif-Italic.otf,
+ BoldItalicFont = LibertinusSerif-SemiboldItalic.otf,
+ BoldSlantedFont = LibertinusSerif-Semibold.otf,
+ SlantedFont = LibertinusSerif-Regular.otf,
+ SlantedFeatures = {FakeSlant=0.25},
+ BoldSlantedFeatures = {FakeSlant=0.25},
+ SmallCapsFeatures = {FakeSlant=0},
+ ]{LibertinusSerif-Regular.otf}
+
+ %% Deprecated:
+ \iflsNewtxmath % some users have problems when installing newtxmath
+ \usepackage[libertine]{newtxmath}
+ %% following http://tex.stackexchange.com/questions/297328/xelatex-does-not-load-newtxmath-with-linuxlibertine-sometimes
+ %% due to a bug in XeTeX. This also seems to fix an issue with \url in footnotes.
+ %% Unfortunately, this is NOT extensively tested!
+ \usepackage{xpatch}
+ \xpretocmd{\textsuperscript}
+ {{\sbox0{$\textstyle x$}}}
+ {}{}
+ \AtBeginDocument{%
+ \DeclareSymbolFont{operators}{\encodingdefault}{\familydefault}{m}{n}%
+ \SetSymbolFont{operators}{bold}{\encodingdefault}{\familydefault}{b}{n}%
+ }
+ \fi
-\let\oldtabular\tabular % number in tabulars
-\let\endoldtabular\endtabular
-\renewenvironment{tabular}{\normalfont\addfontfeatures{Numbers=Lining}\selectfont\oldtabular}{\endoldtabular}
-
-\frenchspacing %see https://en.wikipedia.org/wiki/Sentence_spacing#Typography
-\usepackage[final]{microtype}
-
-\newcommand{\lsCoverTitleFont}[1]{\sffamily\addfontfeatures{Scale=MatchUppercase}\fontsize{52pt}{17.25mm}\selectfont #1}
-\newcommand{\lsCoverSubTitleFont}{\sffamily\addfontfeatures{Scale=MatchUppercase}\fontsize{25pt}{10mm}\selectfont}
-\newcommand{\lsCoverAuthorFont}{\fontsize{25pt}{12.5mm}\selectfont}
-\newcommand{\lsCoverSeriesFont}{\sffamily\fontsize{17pt}{7.5mm}\selectfont} % fontsize?
-\newcommand{\lsCoverSeriesHistoryFont}{\sffamily\fontsize{10pt}{5mm}\selectfont}
-\newcommand{\lsInsideFont}{} % obsolete, see \setmainfont
-\newcommand{\lsDedicationFont}{\fontsize{15pt}{10mm}\selectfont}
-\newcommand{\lsBackTitleFont}{\sffamily\addfontfeatures{Scale=MatchUppercase}\fontsize{25pt}{10mm}\selectfont}
-\newcommand{\lsBackBodyFont}{\lsInsideFont}
-\newcommand{\lsSpineAuthorFont}{\bfseries\fontsize{16pt}{14pt}\selectfont}
-\newcommand{\lsSpineTitleFont}{\sffamily\bfseries\fontsize{18pt}{14pt}\selectfont}
+ \let\oldtabular\tabular % number in tabulars
+ \let\endoldtabular\endtabular
+ \renewenvironment{tabular}{\normalfont\addfontfeatures{Numbers=Lining}\selectfont\oldtabular}{\endoldtabular}
+
+ \frenchspacing %see https://en.wikipedia.org/wiki/Sentence_spacing#Typography
+ \usepackage[final]{microtype}
+
+ \newcommand{\lsCoverTitleFontSize}{52pt}
+ \newcommand{\lsCoverTitleFontBaselineskip}{17.25mm}
+ \newcommand{\lsCoverTitleSizes}[2]{\renewcommand{\lsCoverTitleFontSize}{#1}\renewcommand{\lsCoverTitleFontBaselineskip}{#2}}
+ \newcommand{\lsCoverTitleFont}[1]{\sffamily\addfontfeatures{Scale=MatchUppercase}\fontsize{\lsCoverTitleFontSize}{17.25mm}\selectfont #1}
+ \newcommand{\lsCoverSubTitleFont}{\sffamily\addfontfeatures{Scale=MatchUppercase}\fontsize{25pt}{10mm}\selectfont}
+ \newcommand{\lsCoverAuthorFont}{\fontsize{25pt}{12.5mm}\selectfont}
+ \newcommand{\lsCoverSeriesFont}{\sffamily\fontsize{17pt}{7.5mm}\selectfont} % fontsize?
+ \newcommand{\lsCoverSeriesHistoryFont}{\sffamily\fontsize{10pt}{5mm}\selectfont}
+ \newcommand{\lsInsideFont}{} % obsolete, see \setmainfont
+ \newcommand{\lsDedicationFont}{\fontsize{15pt}{10mm}\selectfont}
+ \newcommand{\lsBackTitleFont}{\sffamily\addfontfeatures{Scale=MatchUppercase}\fontsize{25pt}{10mm}\selectfont}
+ \newcommand{\lsBackBodyFont}{\lsInsideFont}
+ \newcommand{\lsSpineAuthorFont}{\bfseries\fontsize{16pt}{14pt}\selectfont}
+ \newcommand{\lsSpineTitleFont}{\sffamily\bfseries\fontsize{18pt}{14pt}\selectfont}
+\fi % end minimal mode switch from line ~677
\setkomafont{sectioning}{\normalcolor\bfseries}
@@ -836,10 +796,73 @@
% Colors
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
\usepackage{xcolor}
-\input{\seriesinfopath langsci-series.def} % \lsSeriesColor, \lsSeriesTitle, \lsISSN and colors are defined here
+
+\definecolor{lsLightBlue}{cmyk}{0.6,0.05,0.05,0}
+\definecolor{lsMidBlue}{cmyk}{0.75,0.15,0,0}
+\definecolor{lsMidDarkBlue}{cmyk}{0.9,0.4,0.05,0}
+\definecolor{lsDarkBlue}{cmyk}{0.9,0.5,0.15,0.3}
+\definecolor{lsNightBlue}{cmyk}{1,0.47,0.22,0.68}
+
+\definecolor{lsYellow}{cmyk}{0,0.25,1,0}
+\definecolor{lsLightOrange}{cmyk}{0,0.50,1,0}
+\definecolor{lsMidOrange}{cmyk}{0,0.64,1,0}
+\definecolor{lsDarkOrange}{cmyk}{0,0.78,1,0}
+\definecolor{lsRed}{cmyk}{0.05,1,0.8,0}
+
+\definecolor{lsLightWine}{cmyk}{0.3,1,0.6,0}
+\definecolor{lsMidWine}{cmyk}{0.54,1,0.65,0.1}
+\definecolor{lsDarkWine}{cmyk}{0.58,1,0.70,0.35}
+\definecolor{lsSoftGreen}{cmyk}{0.32,0.02,0.72,0}
+\definecolor{lsLightGreen}{cmyk}{0.4,0,1,0}
+
+\definecolor{lsMidGreen}{cmyk}{0.55,0,0.9,0.1}
+\definecolor{lsRichGreen}{cmyk}{0.6,0,0.9,0.35}
+\definecolor{lsDarkGreenOne}{cmyk}{0.85,0.02,0.95,0.38}
+\definecolor{lsDarkGreenTwo}{cmyk}{0.85,0.05,1,0.5}
+\definecolor{lsNightGreen}{cmyk}{0.88,0.15,1,0.66}
+
+\definecolor{lsLightGray}{cmyk}{0,0,0,0.17}
+\definecolor{lsGuidelinesGray}{cmyk}{0,0.04,0,0.45}
+
+\definecolor{lsDOIGray}{cmyk}{0,0,0,0.45}
+\definecolor{RED}{cmyk}{0.05,1,0.8,0}
+
+\definecolor{langscicol1}{cmyk}{0.6,0.05,0.05,0}
+\definecolor{langscicol2}{cmyk}{0.75,0.15,0,0}
+\definecolor{langscicol3}{cmyk}{0.9,0.4,0.05,0}
+\definecolor{langscicol4}{cmyk}{0.9,0.5,0.15,0.3}
+\definecolor{langscicol5}{cmyk}{1,0.47,0.22,0.68}
+\definecolor{langscicol6}{cmyk}{0,0.25,1,0}
+\definecolor{langscicol7}{cmyk}{0,0.50,1,0}
+\definecolor{langscicol8}{cmyk}{0,0.64,1,0}
+\definecolor{langscicol9}{cmyk}{0,0.78,1,0}
+\definecolor{langscicol10}{cmyk}{0.05,1,0.8,0}
+\definecolor{langscicol11}{cmyk}{0.3,1,0.6,0}
+\definecolor{langscicol12}{cmyk}{0.54,1,0.65,0.1}
+\definecolor{langscicol13}{cmyk}{0.58,1,0.70,0.35}
+\definecolor{langscicol14}{cmyk}{0.32,0.02,0.72,0}
+\definecolor{langscicol15}{cmyk}{0.4,0,1,0}
+\definecolor{langscicol16}{cmyk}{0.55,0,0.9,0.1}
+\definecolor{langscicol17}{cmyk}{0.6,0,0.9,0.35}
+\definecolor{langscicol18}{cmyk}{0.85,0.02,0.95,0.38}
+\definecolor{langscicol19}{cmyk}{0.85,0.05,1,0.5}
+\definecolor{langscicol20}{cmyk}{0.88,0.15,1,0.66}
+% \newcommand{\lsptable}[2]{
+% \resizebox{#1}{!}{
+% \begin{tabularx}{\textwidth}{XXXXXXXXXXXXXXXXXXXX}
+% \cellcolor{langscicol1}&\cellcolor{langscicol2}&\cellcolor{langscicol3}&\cellcolor{langscicol4}&\cellcolor{langscicol5}&\cellcolor{langscicol6}&\cellcolor{langscicol7}&\cellcolor{langscicol8}&\cellcolor{langscicol9}&\cellcolor{langscicol10}&\cellcolor{langscicol11}&\cellcolor{langscicol12}&\cellcolor{langscicol13}&\cellcolor{langscicol14}&\cellcolor{langscicol15}&\cellcolor{langscicol16}&\cellcolor{langscicol17}&\cellcolor{langscicol18}&\cellcolor{langscicol19}&\cellcolor{langscicol20}
+% \rule{0pt}{#2}
+% \end{tabularx}
+% }
+% }
+
+
+\input{langsci-series.def}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Cover
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -863,94 +886,13 @@
\else
\fi
-\newcommand{\lsCoverBlock}{
- \begin{textblock}{155}(7.6,7.5)
- \color{\lsCoverBlockColor}
- \raggedright\rule{155mm}{225mm}
- \end{textblock}
- \iflsDraft
- \begin{textblock}{155}(30,80)
- \color{lsLightGray}
- \rotatebox{40}{
- \begin{tabular}{c}
- \scalebox{10}{DRAFT}\\
- of \today, \currenttime
- \end{tabular}}
- \end{textblock}
- \fi
- \iflsOpenReview
- \iflsDraft
- \ClassError{langsci/langscibook}{Open review mode not compatible with draft mode. Please disable one of them}{}
- \fi
- \begin{textblock}{170}(-20,75)
- \rotatebox{30}{
- \colorbox{red}{
- \parbox[c][15ex][c]{220mm}{\centering\lsCoverTitleFont\color{white}Open Review\\[-0.1ex]}
- }
- }
- \end{textblock}
- \fi
-% \iflsUndecapitalize
-% \begin{textblock}{170}(-20,75)
-% \rotatebox{30}{
-% \colorbox{red}{
-% \parbox[c][15ex][c]{220mm}{\centering\lsCoverTitleFont\color{white}Undecapitalized\\[-0.1ex]}
-% % \begin{tabular}{c}
-% % ~\\
-% % \scalebox{6}{\color{red}Open Review}\\[-0.5ex]
-% % ~%version of \today, \currenttime
-% % \end{tabular}
-% }
-% }
-% \end{textblock}
-% \fi
-
- }
-
-\newcommand{\lsCoverTitleAuthor}{
- \renewcommand{\and}{\\}
- \renewcommand{\lastand}{\\}
- \renewcommand{\newlineCover}{\\}
- \renewcommand{\newlineSpine}{}
- \lsCoverBlock
-
- \begin{textblock}{140}(15,17.5)
- \color{\lsCoverFontColor}
- \raggedright
- {\lsCoverTitleFont{\@title\\}}
-
- \ifx\@subtitle\empty
- \else \vspace{8mm} {\lsCoverSubTitleFont \@subtitle\\}
- \fi
-
- \vspace{11.2mm} % 20mm - 25pt
-
- \raggedright
- {\lsCoverAuthorFont
- \lsEditorPrefix\@author\\}
- \end{textblock}}
-
-\newcommand{\lsCoverSeries}{
- \begin{textblock}{95}(7.4,209)
- \color{white}
- \raggedright\rule{3.6mm}{3.5mm}
- \color{\lsCoverFontColor}
- \hspace{3mm}\parbox[t]{85mm}{\raggedright\lsCoverSeriesFont
- \lsSeriesTitle\\}
- \end{textblock}}
-
-\newcommand{\lsCoverLogo}{
- \begin{textblock}{33}(124.6,205)
- \raggedright\IfFileExists{\logopath langsci_logo_nocolor.pdf}{\includegraphics{\logopath langsci_logo_nocolor.pdf}}{langsci logo}
- \end{textblock}}
-
- \pgfdeclarelayer{lspcls_bg} % Create a background layer that serves as the canvas for the coloured rectangles.
- \pgfsetlayers{lspcls_bg,main} % Order the background layer behind the main layer of TikZ.
+\pgfdeclarelayer{lspcls_bg} % Create a background layer that serves as the canvas for the coloured rectangles.
+\pgfsetlayers{lspcls_bg,main} % Order the background layer behind the main layer of TikZ.
\newcommand{\lsFrontPage}{% Front page
\ifcsname tikz@library@external@loaded\endcsname\tikzexternaldisable\fi
\pgfdeclarelayer{lspcls_bg} % Create a background layer that serves as the canvas for the coloured rectangles.
- \pgfsetlayers{lspcls_bg,main} % Order the background layer behind the main layer of TikZ.
+ \pgfsetlayers{lspcls_bg,main} % Order the background layer behind the main layer of TikZ.
\thispagestyle{empty}
\renewcommand{\and}{, }%
\renewcommand{\lastand}{ \& }%
@@ -968,7 +910,7 @@
\podcoverbottomtext
\iflsDraft \node [rotate=45,align=center,scale=3,color=white,text opacity=.75] at (current page.center) {\lsCoverTitleFont Draft\\of \today, \currenttime}; \fi
\iflsOpenReview \node [rotate=45,align=center,scale=1.5,color=white,text opacity=.75] at (current page.center) {\lsCoverTitleFont Open Review\\Version of \today, \currenttime}; \fi
-% \iflsUndecapitalize \node [rotate=45,scale=1.5,color=white,text opacity=.75] at (current page.center) {\lsCoverTitleFont Undecapitalized}; \fi
+% \iflsUndecapitalize \node [rotate=45,scale=1.5,color=white,text opacity=.75] at (current page.center) {\lsCoverTitleFont Undecapitalized}; \fi
\end{tikzpicture}
\ifcsname tikz@library@external@loaded\endcsname\tikzexternalenable\fi
}
@@ -976,7 +918,7 @@
\newcommand{\lsSchmutztitel}{% Schmutztitel
\ifcsname tikz@library@external@loaded\endcsname\tikzexternaldisable\fi
\pgfdeclarelayer{lspcls_bg} % Create a background layer that serves as the canvas for the coloured rectangles.
- \pgfsetlayers{lspcls_bg,main} % Order the background layer behind the main layer of TikZ.
+ \pgfsetlayers{lspcls_bg,main} % Order the background layer behind the main layer of TikZ.
\thispagestyle{empty}
\renewcommand{\and}{, }%
\renewcommand{\lastand}{ \& }%
@@ -991,15 +933,15 @@
] (CoverColouredRectangleFront) {};
\end{pgfonlayer}
\podfrontcovertoptext[\lsSeriesColor]{140mm}{51pt}
- \node [ above left = 10mm and 7.5mm of CoverColouredRectangleFront.south east] {\color{\lsSeriesColor}\includegraphics{\logopath langsci_logo_nocolor.pdf}}; % Print the Language Science press Logo
+ \node [ above left = 10mm and 7.5mm of CoverColouredRectangleFront.south east] {\color{\lsSeriesColor}\includepublisherlogo}; % Print the Language Science press Logo
\end{tikzpicture}
\ifcsname tikz@library@external@loaded\endcsname\tikzexternalenable\fi
}
%\usepackage{pdfpages}
-\newcommand{\lsAdvertisement}{%
- \include{\logopath langsci-advertisement}
-}
+% \newcommand{\lsAdvertisement}{%
+% \include{\logopath langsci-advertisement}
+% }
\newcommand{\lsBackPage}{%
\ifcsname tikz@library@external@loaded\endcsname\tikzexternaldisable\fi
@@ -1033,13 +975,18 @@
\color{black}
\raggedright\lsCoverSeriesHistoryFont
-\IfFileExists{\seriesinfopath \lsSeries-info.tex}{\input{\seriesinfopath\lsSeries-info}}{
- Series information: \seriesinfopath \lsSeries-info.tex not found!}
+% \IfFileExists{./\lsSeries-info.tex}{\input{./\lsSeries-info}}{
+% Series information: \lsSeries-info.tex not found!}
+{\lsSeriesText}
+\IfStrEq{\lsISSNprint}{??} % \IfStrEq from xstring
+ {}
+ {\vfill\hfill ISSN (print): \lsISSNprint\\
+ \hfill ISSN (electronic): \lsISSNelectronic\\}
\IfStrEq{\lsISSN}{??} % \IfStrEq from xstring
{}
- {\vfill\hfill ISSN: \lsISSN}
-}
+ {\vfill\hfill ISSN: \lsISSN}
+}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Imprint
@@ -1079,7 +1026,7 @@
\newcommand{\BookDOI}[1]{\renewcommand{\lsBookDOI}{#1}}
-%invert names of first author for citation on impressum page
+%invert names of first author for citation on impressum page
\newcommand{\lsFirstAuthorFullName}{}%temporary, will be overwritten
\newcommand{\lsFirstAuthorFirstName}{}%temporary, will be overwritten
@@ -1091,33 +1038,35 @@
\AtBeginDocument{
\makeatletter
-\let\theauthor\@author
+\let\theauthor\@author
\makeatother
+\ifdefempty{\lsFirstAuthorFirstName}{% Check if the \lsFirstAuthorFirstName is given in localmetadata.tex (or somewhere else).
\renewcommand{\and}{NONLASTAND} %expand for easier checking. Might need to be undone later on
\renewcommand{\lastand}{LASTAND} %expand for easier checking
\IfSubStr{\theauthor}{NONLASTAND}{%2+authors
\renewcommand{\lsFirstAuthorFullName}{\StrBefore{\theauthor}{\and }}
- \renewcommand{\lsFirstAuthorFirstName}{\StrBefore{\theauthor}{ }}
+ \renewcommand{\lsFirstAuthorFirstName}{\StrBefore{\theauthor}{ }}
\renewcommand{\lsFirstAuthorLastName}{\StrBetween{\theauthor}{ }{\and }}
- \renewcommand{\lsNonFirstAuthorsString}{\and\StrBehind{\theauthor}{\and }}
+ \renewcommand{\lsNonFirstAuthorsString}{\and\StrBehind{\theauthor}{\and }}
}{%else
\IfSubStr{\theauthor}{LASTAND}{%less than two authors, more than one
\renewcommand{\lsFirstAuthorFullName}{\StrBefore{\theauthor}{\lastand }}
\renewcommand{\lsFirstAuthorFirstName}{\StrBefore{\theauthor}{ }}
\renewcommand{\lsFirstAuthorLastName}{\StrBetween{\theauthor}{ }{\lastand }}
- \renewcommand{\lsNonFirstAuthorsString}{\lastand\StrBehind{\theauthor}{\lastand }}
+ \renewcommand{\lsNonFirstAuthorsString}{\lastand\StrBehind{\theauthor}{\lastand }}
}{%else exactly one author
\renewcommand{\lsFirstAuthorFirstName}{\StrBefore{\theauthor}{ }}
\renewcommand{\lsFirstAuthorLastName}{\StrBehind{\theauthor}{ }}
}
- }
+ }
+ }{}
}
-
-\newcommand{\lsImpressionCitationAuthor}{
+
+\newcommand{\lsImpressionCitationAuthor}{
\lsFirstAuthorLastName, \lsFirstAuthorFirstName \lsNonFirstAuthorsString}
-
+
\newcommand{\lsImpressumCitationText}{
\onlyAuthor
\renewcommand{\newlineCover}{}
@@ -1129,6 +1078,18 @@
Berlin: Language Science Press.
}
\newcommand{\lsImpressumExtra}{}%for legal notes required for revised theses ("... in fulfillment of ... ")
+
+\newcommand{\publisherstreetaddress}{%
+Language Science Press\\
+Xhain\\
+Grünberger Str. 16\\
+10243 Berlin, Germany}
+\newcommand{\publisherurl}{\href{http://langsci-press.org}{langsci-press.org}}
+\newcommand{\storageinstitution}{FU Berlin}
+\newcommand{\githubtext}{Source code available from \href{https://www.github.com/langsci/\lsID}{www.github.com/langsci/\lsID}}
+\newcommand{\paperhivetext}{Collaborative~reading:~\href{https://paperhive.org/documents/remote?type=langsci&id=\lsID}{paperhive.org/documents/remote?type=langsci\&id=\lsID}}
+
+
\newcommand{\lsImpressum}{
\thispagestyle{empty}
\raggedright
@@ -1145,15 +1106,15 @@ This title can be downloaded at:\\
\newcommand{\ccby}{CC-BY}
\ifx\lsCopyright\ccby
Published under the Creative Commons Attribution 4.0 Licence (CC BY 4.0):
-http://creativecommons.org/licenses/by/4.0/ \includegraphics[height=.75em]{\logopath ccby.eps}
+http://creativecommons.org/licenses/by/4.0/ \includegraphics[height=.75em]{ccby.pdf}
\else
Published under the Creative Commons Attribution-NoDerivatives 4.0 Licence (CC BY-ND 4.0):
-http://creativecommons.org/licenses/by-nd/4.0/ \includegraphics[height=.75em]{\logopath ccbynd.eps}
+http://creativecommons.org/licenses/by-nd/4.0/ \includegraphics[height=.75em]{ccbynd.pdf}
\fi
{\lsImpressumExtra}
-\ifx\lsSeries\sidl
+\ifx\lsSeries\sidl
Indexed in EBSCO\smallskip
\fi
@@ -1182,16 +1143,21 @@ ISBN: &
}
\end{tabular}
-\IfStrEq{\lsISSN}{??} % \IfStrEq from xstring
+\IfStrEq{\lsISSNprint}{??} % \IfStrEq from xstring
+ {}
+ {ISSN (print): \lsISSNprint\\
+ ISSN (electronic): \lsISSNelectronic\\}
+\IfStrEq{\lsISSN}{??}
{}
{ISSN: \lsISSN}
-\IfStrEq{\lsBookDOI}{??} % \IfStrEq from xstring
+
+\IfStrEq{\lsBookDOI}{??}
{{\color{red} no DOI}}
{\doi{\lsBookDOI}}\\
-\IfStrEq{\lsID}{000}{\color{red} ID not assigned!}{%
-Source code available from \href{https://www.github.com/langsci/\lsID}{www.github.com/langsci/\lsID} \\
-Collaborative~reading:~\href{https://paperhive.org/documents/remote?type=langsci&id=\lsID}{paperhive.org/documents/remote?type=langsci\&id=\lsID}
+\IfStrEq{\lsID}{000}{\color{red} ID not assigned!}{%
+\githubtext\\
+\paperhivetext
}%
\bigskip
@@ -1217,21 +1183,19 @@ Proofreading:
Open reviewing:
\@openreviewer \\
\fi
-Fonts: Linux Libertine, Libertinus Math, Arimo, DejaVu Sans Mono\lsAdditionalFontsImprint\\
+Fonts: Libertinus, Arimo, DejaVu Sans Mono\lsAdditionalFontsImprint\\
Typesetting software: \XeLaTeX
\bigskip
-Language Science Press\\
-Unter den Linden 6\\
-10099 Berlin, Germany\\
-\href{http://langsci-press.org}{langsci-press.org}
+\publisherstreetaddress\\
+\publisherurl
\vfill
-Storage and cataloguing done by FU Berlin \\[3ex]
+Storage and cataloguing done by \storageinstitution\\[3ex]
-\IfFileExists{\logopath storagelogo.pdf}{\includegraphics[width=5cm]{\logopath storagelogo.pdf}}{\logotext} \\[3ex]
+\includestoragelogo\\[3ex]
% \vfill
@@ -1328,11 +1292,11 @@ Storage and cataloguing done by FU Berlin \\[3ex]
% Footnotes
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ifxetex
+\ifxetex\iflsMinimal\else
\addtokomafont{footnote}{\addfontfeatures{Numbers=Lining}} % numbers in footnotes
%\addtokomafont{footnotelabel}{\addfontfeatures{Numbers=Lining}} % numbers in footnote labels
%\addtokomafont{footnotereference}{\addfontfeatures{Numbers=Lining}} % numbers in footnote references
-\fi
+\fi\fi
\raggedbottom
\deffootnote[1.5em]{1.5em}{\normalparindent}{\textsuperscript{\thefootnotemark}} % putting a space after footnotemark has undesirable side effects with footnotes that start with an empty line; instead use \xspace in the footnote definition below
@@ -1352,6 +1316,9 @@ Storage and cataloguing done by FU Berlin \\[3ex]
\ifx\footnote\nextToken\textsuperscript{,}\fi}
+\let\oldfootnotemark\footnotemark
+\renewcommand{\footnotemark}{\upshape\oldfootnotemark}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Quotes
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1370,12 +1337,17 @@ Storage and cataloguing done by FU Berlin \\[3ex]
\item\relax}
{\endlist}
+\newenvironment{modquote}[1][6mm]% slightly less indented quote for hyphenation issues
+ {\list{}{\leftmargin=#1\rightmargin=0mm}\item[]}%
+ {\endlist}
+
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
% Language-specific settings
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Must apear before biblatex and hyperref.
@@ -1415,9 +1387,10 @@ Storage and cataloguing done by FU Berlin \\[3ex]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\usepackage[
- natbib=true,
- style=\bibstylepath langsci-unified,
- citestyle=\bibstylepath langsci-unified,
+ natbib=true,
+ style=langsci-unified,
+ citestyle=langsci-unified,
+ datamodel=langsci, % add authauthor and autheditor as possible fields to bibtex entries
useprefix = true, %sort von, van, de where they should appear
%refsection=chapter,
maxbibnames=99,
@@ -1428,14 +1401,15 @@ Storage and cataloguing done by FU Berlin \\[3ex]
doi=false,
url=false,
eprint=false,
- autolang=hyphen,
- useprefix=true,
+ autolang=hyphen,
+ \iflsResetCapitals
+ language=english,
+ \fi
backend=\lsBiblatexBackend,
indexing=cite,
\iflsCollection\else
- toc=bib, % make bibliography appear in toc
- \fi
- datamodel=\bibstylepath langsci % add authauthor and autheditor as possible fields to bibtex entries
+ toc=bib, % make bibliography appear in toc
+ \fi
]{biblatex}
% If the user provided a shortauthor in the bibtex entry, we use the authentic author (as with the
@@ -1513,7 +1487,7 @@ Storage and cataloguing done by FU Berlin \\[3ex]
\widowpenalty\@M
}
{}{}
-
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Floats
@@ -1582,6 +1556,23 @@ width=.8\textwidth
}
+% for papers that have appendices, a replacement for \appendix.
+% Usage: \begin{paperappendix} \section{Title} ... \end{paperappendix
+% Will result in "Appendix A: Title"
+%
+\newcounter{paperappendixsection}
+\newenvironment{paperappendix}{%
+ \let\oldthesection\thesection%
+ \let\oldsectionformat\sectionformat%
+ \setcounter{paperappendixsection}{0}%
+ \def\thesection{\Alph{paperappendixsection}}%
+ \def\sectionformat{\stepcounter{paperappendixsection}\appendixname\ \thesection:\enskip}%
+ }{%
+ \let\thesection\oldthesection%
+ \let\sectionformat\oldsectionformat}
+
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Indexes
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1618,57 +1609,6 @@ width=.8\textwidth
\fi
}
-\newcommand{\lsIndexTitle}{Index}
-\newcommand{\lsLanguageIndexTitle}{Language index} % This can be changed according to the language.
-\newcommand{\lsSubjectIndexTitle}{Subject index}
-\newcommand{\lsNameIndexTitle}{Name index}
-\newcommand{\lsPrefaceTitle}{Preface}
-\newcommand{\lsAcknowledgementTitle}{Acknowledgments}
-\newcommand{\lsAbbreviationsTitle}{Abbreviations}
-\newcommand{\lsReferencesTitle}{references} % This aligns with \defbibheading
-\IfFileExists{{\localepath langsci-hyphenation-universal}}{\input{\localepath langsci-hyphenation-universal}}{}
-
-\ifx\lsBookLanguage\lsBookLanguageFrench
-\renewcommand{\lsIndexTitle}{Index}
-\renewcommand{\lsNameIndexTitle}{Index des auteurs cités}
-\renewcommand{\lsSubjectIndexTitle}{Index des termes}
-\renewcommand{\lsLanguageIndexTitle}{Index des langues}
-\renewcommand{\lsPrefaceTitle}{Préface}
-\renewcommand{\lsAcknowledgementTitle}{Remerciements}
-\renewcommand{\lsAbbreviationsTitle}{Liste des abréviations utilisées dans les gloses des exemples}
-\renewcommand{\lsReferencesTitle}{french}
- \iflsNoBabel
- \else
- \renewcommand\frenchfigurename{Figure}
- \renewcommand\frenchtablename{Table}
- \fi
-\IfFileExists{{\localepath langsci-hyphenation-fr}}{\input{\localepath langsci-hyphenation-fr}}{}
-\fi
-
-\ifx\lsBookLanguage\lsBookLanguageGerman
-\renewcommand{\lsIndexTitle}{Register}
-\renewcommand{\lsNameIndexTitle}{Autorenregister}
-\renewcommand{\lsSubjectIndexTitle}{Sachregister}
-\renewcommand{\lsLanguageIndexTitle}{Sprachregister}
-\renewcommand{\lsPrefaceTitle}{Vorwort}
-\renewcommand{\lsAcknowledgementTitle}{Danksagung}
-\renewcommand{\lsAbbreviationsTitle}{Abkürzungsverzeichnis}
-\renewcommand{\lsReferencesTitle}{german}
-\IfFileExists{{\localepath langsci-hyphenation-de}}{\input{\localepath langsci-hyphenation-de}}{}
-\fi
-
-\ifx\lsBookLanguage\lsBookLanguagePortuguese
-\renewcommand{\lsIndexTitle}{Índices}
-\renewcommand{\lsNameIndexTitle}{Índice remissivo de autores citados}
-\renewcommand{\lsSubjectIndexTitle}{Índice remissivo temático}
-\renewcommand{\lsLanguageIndexTitle}{Índice remissivo de línguas}
-\renewcommand{\lsPrefaceTitle}{Prefácio}
-\renewcommand{\lsAcknowledgementTitle}{Agradecimentos}
-\renewcommand{\lsAbbreviationsTitle}{\colorbox{red}{Translation info for Abbv missing}}
-\renewcommand{\lsReferencesTitle}{portugese}
-\IfFileExists{{\localepath langsci-hyphenation-pt}}{\input{\localepath langsci-hyphenation-pt}}{}
-\fi
-
% \AtBeginDocument{% FK 16-Jan-19: It is unclear why this was set. It conflicts with TikZ externalisation.
\makeindex
\newindex{lan}{ldx}{lnd}{\lsLanguageIndexTitle}
@@ -1731,6 +1671,10 @@ width=.8\textwidth
\newif\ifshowindex \showindexfalse
\usepackage{authorindex}
+\providecommand{\isi}[1]{\is{#1}#1}
+\providecommand{\iai}[1]{\ia{#1}#1}
+\providecommand{\ili}[1]{\il{#1}#1}
+
\iflsShowIndex % shows index commands in text
\RequirePackage{soul}
% \RequirePackage[noadjust]{marginnote}
@@ -1746,6 +1690,22 @@ width=.8\textwidth
\renewcommand{\ia}[1]{{\tikzstyle{notestyleraw} += [text width=1.5cm]\todo[color=pink,size=\scriptsize]{\tiny#1}\iaold{#1}}}
\fi
+% integrate see also in multiple indexes
+\def\igobble#1 {}
+\newcommand{\langsciseealso}{\par\addvspace{.1\baselineskip}\hspace*{1.4cm}\hangindent=1.4cm\seealso}
+\newcommand{\ilsa}[2]{\il{#1@\igobble | langsciseealso{#2}}}
+\newcommand{\issa}[2]{\is{#1@\igobble | langsciseealso{#2}}}
+\newcommand{\iasa}[2]{\ia{#1{}@\igobble | langsciseealso{#2}}}
+
+
+\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
+}{%if optional argument present
+\ia{#1@#1}% add optional argument to index
+}%
+#3}%output last name in text
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Hyperref
@@ -1795,6 +1755,13 @@ width=.8\textwidth
\renewcommand{\Hfootnoteautorefname}{Footnote}%
\fi
+\providecommand{\sectref}[1]{§\ref{#1}}
+\providecommand{\chapref}[1]{Chapter~\ref{#1}}
+\providecommand{\partref}[1]{Part~\ref{#1}}
+\providecommand{\tabref}[1]{Table~\ref{#1}}
+\providecommand{\figref}[1]{Figure~\ref{#1}}
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Collection (edited volume):
@@ -1834,7 +1801,7 @@ width=.8\textwidth
\edef\lsCollectionTitle{\@title\ifx\@subtitle\empty\else{: \@subtitle}\fi} % \edef immediately expands \@title
\edef\lsCollectionEditor{\@author}
\addbibresource{collection_tmp.bib}
- \if@partsw\AfterEndDocument{\typeout{langscibook Warning: You are in includeonly mode.}\typeout{The bibliographical information for the chapters in this volume have not been updated}}\else% Check for \includeonly mode
+ \if@partsw\AfterEndDocument{\typeout{langscibook Warning: You are in includeonly mode.}\typeout{The bibliographical information for the chapters in this volume have not been updated}}\else% Check for \includeonly mode
\newwrite\tempfile % open temporary bib file
\immediate\openout\tempfile=collection_tmp.bib
\fi
@@ -1940,13 +1907,12 @@ width=.8\textwidth
\protect\numberline{\thechapter}\fi
\@title\ \newline{\normalfont\@author}}} % space between \@title and \newline is needed for bookmarks
+\newcommand{\localizedchaptestring}{Chapter}
\newcommand{\lsCollectionPaperTitle}{{%
\renewcommand{\newlineTOC}{}
\renewcommand{\newlineCover}{\\}
-% \\[-1\baselineskip]
-% \vspace*{-2\baselineskip}
\renewcommand{\chapterheadstartvskip}{}
- {\LARGE \noindent \hspace*{-.7cm} Chapter \thechapter}\\ %there must be a better way to undo this length than a hard value
+ {\LARGE \noindent \hspace*{-.7cm} \localizedchaptestring~\thechapter}\\ %there must be a better way to undo this length than a hard value
\bigskip
\@title}}
@@ -1987,11 +1953,11 @@ width=.8\textwidth
\renewcommand{\newlineCover}{\\[0.5ex]}
\AuthorAffiliation\Large\@author}}
-\newcommand{\lsCollectionPaperCitation}{\scalebox{1.2}{
- \includegraphics{\logopath langsci_spinelogo_nocolor.pdf}}%
+\newcommand{\lsCollectionPaperCitation}{\scalebox{1.2}{%
+ \includechapterfooterlogo}%
% \hspace{0.8em}%
\hfill%
- \parbox[b]{.87\textwidth}{\linespread{0.8}\lsChapterFooterSize\normalfont\lsCollectionPaperCitationText \includegraphics[height=.75em]{\logopath ccby.eps}}}
+ \parbox[b]{.87\textwidth}{\linespread{0.8}\lsChapterFooterSize\normalfont\lsCollectionPaperCitationText \includegraphics[height=.75em]{ccby.pdf}}}
\ifx\lsOutput\lsOutputPaper % only if output==paper
\renewcommand{\lsCollectionPaperCitation}{Change with \string\papernote}
\fi
@@ -2034,7 +2000,14 @@ width=.8\textwidth
\rohead{\lsCollectionPaperHeaderTitle}
}
+\providecommand\shorttitlerunninghead[1]{\rohead{\thechapter\hspace{.5em} #1}}
+\providecommand{\markuptitle}[2]{
+ \title{\texorpdfstring{#1}{#2}}
+ \shorttitlerunninghead{#2}
+ \renewcommand{\lsChapterFooterSize}{\scriptsize}
+ \renewcommand{\lsCollectionPaperFooterTitle}{Add\noexpand\texttt{\textbackslash renewcommand\{\textbackslash lsCollectionPaperFooterTitle\}\{A new theory of \textbackslash noexpand\textbackslash textit\{This\} and \textbackslash noexpand\textbackslash textit\{that\}\}} to preamble}
+}
%writeout page numbers for separation of chapters
@@ -2049,69 +2022,85 @@ width=.8\textwidth
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Color definitions:
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Localisation
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\definecolor{lsLightBlue}{cmyk}{0.6,0.05,0.05,0}
-\definecolor{lsMidBlue}{cmyk}{0.75,0.15,0,0}
-\definecolor{lsMidDarkBlue}{cmyk}{0.9,0.4,0.05,0}
-\definecolor{lsDarkBlue}{cmyk}{0.9,0.5,0.15,0.3}
-\definecolor{lsNightBlue}{cmyk}{1,0.47,0.22,0.68}
-\definecolor{lsYellow}{cmyk}{0,0.25,1,0}
-\definecolor{lsLightOrange}{cmyk}{0,0.50,1,0}
-\definecolor{lsMidOrange}{cmyk}{0,0.64,1,0}
-\definecolor{lsDarkOrange}{cmyk}{0,0.78,1,0}
-\definecolor{lsRed}{cmyk}{0.05,1,0.8,0}
-\definecolor{lsLightWine}{cmyk}{0.3,1,0.6,0}
-\definecolor{lsMidWine}{cmyk}{0.54,1,0.65,0.1}
-\definecolor{lsDarkWine}{cmyk}{0.58,1,0.70,0.35}
-\definecolor{lsSoftGreen}{cmyk}{0.32,0.02,0.72,0}
-\definecolor{lsLightGreen}{cmyk}{0.4,0,1,0}
-\definecolor{lsMidGreen}{cmyk}{0.55,0,0.9,0.1}
-\definecolor{lsRichGreen}{cmyk}{0.6,0,0.9,0.35}
-\definecolor{lsDarkGreenOne}{cmyk}{0.85,0.02,0.95,0.38}
-\definecolor{lsDarkGreenTwo}{cmyk}{0.85,0.05,1,0.5}
-\definecolor{lsNightGreen}{cmyk}{0.88,0.15,1,0.66}
+\ifx\lsBookLanguage\lsBookLanguageFrench
+ \renewcommand{\chapref}[1]{Chapitre~\ref{#1}}
+ \renewcommand{\partref}[1]{Partie~\ref{#1}}
+ \renewcommand{\tabref}[1]{Tableau~\ref{#1}}
+ \renewcommand{\figref}[1]{Figure~\ref{#1}}
+\fi
-\definecolor{lsLightGray}{cmyk}{0,0,0,0.17}
-\definecolor{lsGuidelinesGray}{cmyk}{0,0.04,0,0.45}
+\ifx\lsBookLanguage\lsBookLanguageGerman
+ \renewcommand{\chapref}[1]{Kapitel~\ref{#1}}
+ \renewcommand{\partref}[1]{Teil~\ref{#1}}
+ \renewcommand{\tabref}[1]{Tabelle~\ref{#1}}
+ \renewcommand{\figref}[1]{Abbildung~\ref{#1}}
+\fi
-\definecolor{lsDOIGray}{cmyk}{0,0,0,0.45}
+\ifx\lsBookLanguage\lsBookLanguagePortuguese
+ \renewcommand{\chapref}[1]{Capítulo~\ref{#1}}
+ \renewcommand{\partref}[1]{Parte~\ref{#1}}
+ \renewcommand{\tabref}[1]{Tabela~\ref{#1}}
+ \renewcommand{\figref}[1]{Figura~\ref{#1}}
+\fi
-\definecolor{langscicol1}{cmyk}{0.6,0.05,0.05,0}
-\definecolor{langscicol2}{cmyk}{0.75,0.15,0,0}
-\definecolor{langscicol3}{cmyk}{0.9,0.4,0.05,0}
-\definecolor{langscicol4}{cmyk}{0.9,0.5,0.15,0.3}
-\definecolor{langscicol5}{cmyk}{1,0.47,0.22,0.68}
-\definecolor{langscicol6}{cmyk}{0,0.25,1,0}
-\definecolor{langscicol7}{cmyk}{0,0.50,1,0}
-\definecolor{langscicol8}{cmyk}{0,0.64,1,0}
-\definecolor{langscicol9}{cmyk}{0,0.78,1,0}
-\definecolor{langscicol10}{cmyk}{0.05,1,0.8,0}
-\definecolor{langscicol11}{cmyk}{0.3,1,0.6,0}
-\definecolor{langscicol12}{cmyk}{0.54,1,0.65,0.1}
-\definecolor{langscicol13}{cmyk}{0.58,1,0.70,0.35}
-\definecolor{langscicol14}{cmyk}{0.32,0.02,0.72,0}
-\definecolor{langscicol15}{cmyk}{0.4,0,1,0}
-\definecolor{langscicol16}{cmyk}{0.55,0,0.9,0.1}
-\definecolor{langscicol17}{cmyk}{0.6,0,0.9,0.35}
-\definecolor{langscicol18}{cmyk}{0.85,0.02,0.95,0.38}
-\definecolor{langscicol19}{cmyk}{0.85,0.05,1,0.5}
-\definecolor{langscicol20}{cmyk}{0.88,0.15,1,0.66}
+\newcommand{\lsIndexTitle}{Index}
+\newcommand{\lsLanguageIndexTitle}{Language index} % This can be changed according to the language.
+\newcommand{\lsSubjectIndexTitle}{Subject index}
+\newcommand{\lsNameIndexTitle}{Name index}
+\newcommand{\lsPrefaceTitle}{Preface}
+\newcommand{\lsAcknowledgementTitle}{Acknowledgments}
+\newcommand{\lsAbbreviationsTitle}{Abbreviations}
+\newcommand{\lsReferencesTitle}{references} % This aligns with \defbibheading
+% \IfFileExists{{\localepath langsci-hyphenation-universal}}{\input{\localepath langsci-hyphenation-universal}}{}
+\ifx\lsBookLanguage\lsBookLanguageFrench
+\renewcommand{\lsIndexTitle}{Index}
+\renewcommand{\lsNameIndexTitle}{Index des auteurs cités}
+\renewcommand{\lsSubjectIndexTitle}{Index des termes}
+\renewcommand{\lsLanguageIndexTitle}{Index des langues}
+\renewcommand{\lsPrefaceTitle}{Préface}
+\renewcommand{\lsAcknowledgementTitle}{Remerciements}
+\renewcommand{\lsAbbreviationsTitle}{Liste des abréviations utilisées dans les gloses des exemples}
+\renewcommand{\lsReferencesTitle}{french}
+ \iflsNoBabel
+ \else
+ \renewcommand\frenchfigurename{Figure}
+ \renewcommand\frenchtablename{Table}
+ \fi
+% \IfFileExists{{\localepath langsci-hyphenation-fr}}{\input{\localepath langsci-hyphenation-fr}}{}
+\fi
+
+\ifx\lsBookLanguage\lsBookLanguageGerman
+\renewcommand{\lsIndexTitle}{Register}
+\renewcommand{\lsNameIndexTitle}{Autorenregister}
+\renewcommand{\lsSubjectIndexTitle}{Sachregister}
+\renewcommand{\lsLanguageIndexTitle}{Sprachregister}
+\renewcommand{\lsPrefaceTitle}{Vorwort}
+\renewcommand{\lsAcknowledgementTitle}{Danksagung}
+\renewcommand{\lsAbbreviationsTitle}{Abkürzungsverzeichnis}
+\renewcommand{\lsReferencesTitle}{german}
+% \IfFileExists{{\localepath langsci-hyphenation-de}}{\input{\localepath langsci-hyphenation-de}}{}
+\fi
+
+\ifx\lsBookLanguage\lsBookLanguagePortuguese
+\renewcommand{\lsIndexTitle}{Índices}
+\renewcommand{\lsNameIndexTitle}{Índice remissivo de autores citados}
+\renewcommand{\lsSubjectIndexTitle}{Índice remissivo temático}
+\renewcommand{\lsLanguageIndexTitle}{Índice remissivo de línguas}
+\renewcommand{\lsPrefaceTitle}{Prefácio}
+\renewcommand{\lsAcknowledgementTitle}{Agradecimentos}
+\renewcommand{\lsAbbreviationsTitle}{\colorbox{red}{Translation info for Abbv missing}}
+\renewcommand{\lsReferencesTitle}{portugese}
+% \IfFileExists{{\localepath langsci-hyphenation-pt}}{\input{\localepath langsci-hyphenation-pt}}{}
+\fi
-% \newcommand{\lsptable}[2]{
-% \resizebox{#1}{!}{
-% \begin{tabularx}{\textwidth}{XXXXXXXXXXXXXXXXXXXX}
-% \cellcolor{langscicol1}&\cellcolor{langscicol2}&\cellcolor{langscicol3}&\cellcolor{langscicol4}&\cellcolor{langscicol5}&\cellcolor{langscicol6}&\cellcolor{langscicol7}&\cellcolor{langscicol8}&\cellcolor{langscicol9}&\cellcolor{langscicol10}&\cellcolor{langscicol11}&\cellcolor{langscicol12}&\cellcolor{langscicol13}&\cellcolor{langscicol14}&\cellcolor{langscicol15}&\cellcolor{langscicol16}&\cellcolor{langscicol17}&\cellcolor{langscicol18}&\cellcolor{langscicol19}&\cellcolor{langscicol20}
-% \rule{0pt}{#2}
-% \end{tabularx}
-% }
-% }
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Miscellaneous