summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/xelatex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-04-02 21:02:58 +0000
committerKarl Berry <karl@freefriends.org>2019-04-02 21:02:58 +0000
commitd66cfca1b1989bbf980473ff42a40a821a16d5aa (patch)
treec48efb984986ac40bbe81aedd211b1d46b3faefe /Master/texmf-dist/tex/xelatex
parentd7b2b4344970bfcf3f51d54b4753251f9e21471e (diff)
langsci (2apr19)
git-svn-id: svn://tug.org/texlive/trunk@50706 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/xelatex')
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/biblatex-langsci-unified-undecap.bbx564
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/langsci-advertisement.tex5
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/langsci-avm.sty53
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/langsci-basic.sty11
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/langsci-colors.def61
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/langsci-jambox.sty93
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/langsci-linguex.sty2
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/langsci-optional.sty176
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/langsci-series.def101
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/langsci-tbls.sty17
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/langsci-textipa.sty4
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/langsci-tikz.sty25
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/langsci-unified.bbx (renamed from Master/texmf-dist/tex/xelatex/langsci/biblatex-langsci-unified.bbx)31
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/langsci-unified.cbx (renamed from Master/texmf-dist/tex/xelatex/langsci/langsci-authoryear-comp.cbx)33
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/langscibook-logo.pdfbin10258 -> 0 bytes
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/langscibook.cls482
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/tbls-filter.pdf91
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/tbls-plus.pdf114
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/tbls-refresh.pdf103
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/tbls-report.pdf117
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/tbls-test.pdf108
-rw-r--r--Master/texmf-dist/tex/xelatex/langsci/tbls-tree.pdf131
22 files changed, 1280 insertions, 1042 deletions
diff --git a/Master/texmf-dist/tex/xelatex/langsci/biblatex-langsci-unified-undecap.bbx b/Master/texmf-dist/tex/xelatex/langsci/biblatex-langsci-unified-undecap.bbx
deleted file mode 100644
index 36aa97e7552..00000000000
--- a/Master/texmf-dist/tex/xelatex/langsci/biblatex-langsci-unified-undecap.bbx
+++ /dev/null
@@ -1,564 +0,0 @@
-% Modified by LSP, Thu Jul 31 22:36:02 CEST 2014
-% Modified further, Mo Sep 26 12:29:00 CEST 2016
-\ProvidesFile{sp-biblatex.bbx}
-
-% NB: The Unified Style Sheet wants abbreviated "ed(s)", "edn". But using the abbreviate option also abbreviates the names of months. But then dateabbrev=false restores the long names of months
-% biblatex has a "useprefix" option, which makes "von" count for alphabetization; the Unified Stylesheet does not want that, so it is important that this option be disabled (even if an author tries to set it to true)
-
-\ExecuteBibliographyOptions{sorting=nyt,abbreviate,dateabbrev=false,useprefix=false}
-
-% biblatex by default calls biblatex.def, we add to this authoryear.bbx, which in turn loads standard.bbx. So, sp-biblatex.bbx is built on top of those styles; once authoryear.bbx is loaded, we tell it not to put in dashes for repeated authors (in accordance with the Unified Stylesheet)
-
-\RequireBibliographyStyle{authoryear}
-\ExecuteBibliographyOptions{dashed=false}
-
-% Formatting directives for name lists
-% ------------------------------------------------------------------
-%
-% In biblatex.def, there are name formats defined: first-last, last-first, last-first/first-last. They could be simplified (we don't need provisions for using initials only, since the Unified Style doesn't do that), but since biblatex.def is loaded automatically, there's no point. The name formats call bibmacros that figure out how to order the internal of name components. These are re-defined here to make sure that "von" is treated as part of the last name (it still doesn't count for sorting -- which is controlled by the \useprefix package option)
-% name:last is used to produce citation labels
-% name:last-first is used to produce the first author's name listing in the alphabetical bibliography
-
-% Also moved the Jr part to after the first name and inserted another comma, because the Unified Stylesheet disagrees with standard.bbx: it wants "Jr." not to be treated as part of the last name.
-
-% The macros here get 4 arguments passed to them. They are: #1 last name, #2 first name, #3 von, #4 Jr.
-
-\renewbibmacro*{name:last}[4]{%
- \usebibmacro{name:delim}{#3#1}%
- \usebibmacro{name:hook}{#3#1}%
- \ifblank{#3}
- {}
- {\ifcapital
- {\mkbibnameprefix{\MakeCapital{#3}}\isdot}
- {\mkbibnameprefix{#3}\isdot}%
- \ifpunctmark{'}{}{\bibnamedelimc}}%
- \mkbibnamelast{#1}}%
-
-\renewbibmacro*{name:last-first}[4]{%
- \usebibmacro{name:delim}{#3#1}%
- \usebibmacro{name:hook}{#3#1}%
- \ifblank{#3}{}{%
- \mkbibnameprefix{#3}\isdot%
- \ifpunctmark{'}{}{\bibnamedelimc}}%
- \mkbibnamelast{#1}\isdot
- \ifblank{#2}{}{\addcomma\bibnamedelimd\mkbibnamefirst{#2}\isdot}%
- \ifblank{#4}{}{\addcomma\bibnamedelimd\mkbibnameaffix{#4}\isdot}}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Various bibmacros used in producing the bibliography
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\renewbibmacro*{date+extrayear}{%
- \iffieldundef{labelyear}
- {}
- {\printtext{\printdatelabel}}{\printfield{extrayear}}
- }% Took out the parentheses around the year
-
-\renewbibmacro*{author}{%
- \ifboolexpr{
- test \ifuseauthor
- and
- not test {\ifnameundef{author}}
- }
- {\usebibmacro{bbx:dashcheck}
- {\bibnamedash}
- {\usebibmacro{bbx:savehash}%
- \printnames{author}%
- \iffieldundef{authortype}
- {\newunit}% period instead of space
- {\setunit{\addcomma\space}}}%
- \iffieldundef{authortype}
- {}
- {\usebibmacro{authorstrg}%
- \newunit}}% period instead of space
- {\global\undef\bbx@lasthash
- \usebibmacro{labeltitle}%
- \newunit}% period instead of space
- \usebibmacro{date+extrayear}}
-
-\renewbibmacro*{editor}{%
- \usebibmacro{bbx:editor}{editorstrg}}
-\renewbibmacro*{editor+others}{%
- \usebibmacro{bbx:editor}{editor+othersstrg}}
-\renewbibmacro*{bbx:editor}[1]{%
- \ifboolexpr{
- test \ifuseeditor
- and
- not test {\ifnameundef{editor}}
- }
- {\usebibmacro{bbx:dashcheck}
- {\bibnamedash}
- {\printnames{editor}%
- \setunit{\addspace}%
- \usebibmacro{bbx:savehash}}%
- \printtext[parens]{\usebibmacro{#1}}%
- \clearname{editor}%
- \newunit}% period instead of space
- {\global\undef\bbx@lasthash
- \usebibmacro{labeltitle}%
- \newunit}% period instead of space
- \usebibmacro{date+extrayear}}
-
-\renewbibmacro*{translator}{%
- \usebibmacro{bbx:translator}{translatorstrg}}
-\renewbibmacro*{translator+others}{%
- \usebibmacro{bbx:translator}{translator+othersstrg}}
-\renewbibmacro*{bbx:translator}[1]{%
- \ifboolexpr{
- test \ifusetranslator
- and
- not test {\ifnameundef{translator}}
- }
- {\usebibmacro{bbx:dashcheck}
- ts {\bibnamedash}
- {\printnames{translator}%
- \setunit{\addcomma\space}%
- \usebibmacro{bbx:savehash}}%
- \usebibmacro{translator+othersstrg}%
- \clearname{translator}%
- \newunit}% period instead of space
- {\global\undef\bbx@lasthash
- \usebibmacro{labeltitle}%
- \newunit}% period instead of space
- \usebibmacro{date+extrayear}}
-
-\renewbibmacro*{journal}{%
- \iffieldundef{journaltitle}
- {}
- {\printtext{%
- \printfield{journaltitle}%
- \setunit{\subtitlepunct}%
- \printfield{journalsubtitle}}}}
-
-\renewbibmacro*{volume+number+eid}{%
- \printfield{volume}%
-% \setunit*{\adddot}%
- \printfield[parens]{number}% parentheses instead of dot before issue number
- \setunit{\addcomma\space}%
- \printfield{eid}}
-
-% Because of the weird format "3 May, 2007" specified in the Unified Stylesheet for URL access dates, we need a special way to format the urldate
-
-\newcommand{\mkbibdateunified}[3]{% Year-Month-Day as input --> xx Month, Year
- \iffieldundef{#3}
- {}
- {\stripzeros{\thefield{#3}}%
- \nobreakspace}%
- \iffieldundef{#2}
- {\iffieldundef{#1}%
- {}%
- {\stripzeros{\thefield{#1}}}}%
- {\mkbibmonth{\thefield{#2}}%
- \iffieldundef{#1}%
- {}%
- {\iffieldundef{#3}%
- {}%
- {,}%
- \space\stripzeros{\thefield{#1}}}%
- }%
- }%
-
-\renewbibmacro*{url+urldate}{%
- \printfield{url}%
- \iffieldundef{urlyear}%
- {}%
- {\setunit*{\addspace}%
- \printtext[parens]{\mkbibdateunified{urlyear}{urlmonth}{urlday}}}%
- }
-
-\renewbibmacro*{series+number}{%
- \iffieldundef{series}
- {}
- {\printtext[parens]{%
- \printfield{series}%
- \setunit*{\addspace}%
- \printfield{number}}%
- }}
-
-\renewbibmacro*{byeditor+others}{%
- \ifnameundef{editor}
- {}
- {\printnames[byeditor]{editor}%
- \setunit{\addspace}%
- \printtext[parens]{\usebibmacro{editor+othersstrg}}% putting (ed.) or (eds.) after editors of books
- \clearname{editor}%
- \newunit}%
- \usebibmacro{byeditorx}%
- \usebibmacro{bytranslator+others}}
-
-\renewbibmacro*{chapter+pages}{%
- \iffieldundef{chapter}%
- {}%
- {\printfield{chapter}%
- \setunit{\addcomma\space}}%
- \printfield{pages}%
- \newunit}
-
-\renewbibmacro*{note+pages}{%
- \iffieldundef{note}%
- {}%
- {\printfield{note}%
- \setunit{\addcomma\space}}%
- \printfield{pages}%
- \newunit}
-
-\newbibmacro*{institution+location+type+date}{%
- \printlist{location}%
- \iflistundef{institution}
- {}
- {\setunit*{\addcolon\space}}%
- \printlist{institution}%
- \setunit{\addspace}%
- \printfield{type}%
- \setunit*{\addcomma\space}%
- \usebibmacro{date}%
- \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.
-
-\renewbibmacro*{labeltitle}{%
- \iffieldundef{label}
- {\iffieldundef{shorttitle}
- {\printfield{title}%
- \setunit{\addcomma\space}% Here it comes, preparing for the edition
- \printfield{edition}% Here's the edition
- \clearfield{title}%
- \clearfield{edition}}% Clearing the edition field, so it's not printed again below
- {\printfield[title]{shorttitle}}}
- {\printfield{label}}}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Punctuation & formatting
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-% This gets rid of the Oxford comma in name lists and uses the ampersand rather than "and":
-
-\renewcommand*{\finalnamedelim}{\addspace\&\addspace}
-\renewcommand*{\finallistdelim}{\addspace\&\addspace}
-
-% no colon after "In" in incollection entries (overriding biblatex.def):
-
-\renewcommand{\intitlepunct}{\addspace}
-
-\renewcommand{\subtitlepunct}{\addcolon\space}
-\renewcommand*{\bibpagespunct}{\newunitpunct} % No comma before pages, just the usual new unit period
-
-\DefineBibliographyStrings{english}{%
- edition = {edn\adddot},
-}
-
-% basically everything is in sentence case, other than journals and book series (recurring titles)
-% \DeclareFieldFormat[article,periodical,book,thesis,incollection,unpublished,inproceedings]{titlecase}{\MakeSentenceCase*{#1}}%
-
-% No quotes around titles
-\DeclareFieldFormat[article,periodical,inbook,incollection,inproceedings,patent,thesis,unpublished]{title}{#1}
-
-% Just like book titles, thesis titles are in italics
-\DeclareFieldFormat[thesis]{title}{\mkbibemph{#1}}
-
-\DeclareFieldFormat{pages}{#1} % no pp. prefix, took \mkpageprefix out [kvf]
-\DeclareFieldFormat{doi}{\doi{#1}}
-\DeclareFieldFormat{url}{\url{#1}}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% The bibliography drivers, specifying the formats of each type of entry in the bibliography
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%% First, the entry types used in the Unified Test Bibliography. Could rely on standard.bbx for all others as a fallback.
-
-% For the article type, the only departure from standard.bbx is that
-% we don't use a literal "In: " before the journal title; other formatting
-% departures are done in the format specs and bibmacros
-
-\DeclareBibliographyDriver{article}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author/translator+others}%
- \setunit{\labelnamepunct}\newblock
- \usebibmacro{title}%
- \newunit
- \printlist{language}%
- \newunit\newblock
- \usebibmacro{byauthor}%
- \newunit\newblock
- \usebibmacro{bytranslator+others}%
- \newunit\newblock
- \printfield{version}%
- \newunit\newblock
-% \usebibmacro{in:}% We don't use "In: " before journal titles
- \usebibmacro{journal+issuetitle}%
- \newunit
- \usebibmacro{byeditor+others}%
- \newunit\newblock% \newblock ensures period before pages
- \usebibmacro{note+pages}%
- \newunit\newblock
- \iftoggle{bbx:isbn}
- {\printfield{issn}}
- {}%
- \newunit\newblock
- \usebibmacro{doi+eprint+url}%
- \newunit\newblock
- \usebibmacro{addendum+pubstate}%
- \setunit{\bibpagerefpunct}\newblock
- \usebibmacro{pageref}%
- \newunit\newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
- \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{periodical}{%
-\usebibmacro{bibindex}%
-\usebibmacro{begentry}%
-\usebibmacro{author/editor+others/translator+others}%
-\setunit{\labelnamepunct}\newblock
-\usebibmacro{title}%
-\newunit
-\printlist{language}%
-\newunit\newblock
-\usebibmacro{byauthor}%
-\newunit\newblock
-\usebibmacro{bytranslator+others}%
-\newunit\newblock
-\printfield{version}%
-\newunit\newblock
-% \usebibmacro{in:}% We don't use "In: " before journal titles
-\usebibmacro{journal+issuetitle}%
-\newunit
-\usebibmacro{byeditor+others}%
-\newunit\newblock% \newblock ensures period before pages
-\usebibmacro{note+pages}%
-\newunit\newblock
-\iftoggle{bbx:isbn}
-{\printfield{issn}}
-{}%
-\newunit\newblock
-\usebibmacro{doi+eprint+url}%
-\newunit\newblock
-\usebibmacro{addendum+pubstate}%
-\setunit{\bibpagerefpunct}\newblock
-\usebibmacro{pageref}%
-\newunit\newblock
-\iftoggle{bbx:related}
-{\usebibmacro{related:init}%
-\usebibmacro{related}}
-{}%
-\usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{book}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author/editor+others/translator+others}%
- \setunit{\labelnamepunct}\newblock
- \usebibmacro{maintitle+title}%
- \newunit
- \printlist{language}%
- \newunit\newblock
- \usebibmacro{byauthor}%
- \newunit\newblock
- \usebibmacro{byeditor+others}%
- \newunit\newblock
- \printfield{edition}%
- \newunit
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
- \newunit
- \printfield{volumes}%
- \setunit{\addspace}% crucial difference from standard.bbx: space and then (Series + number)
- \usebibmacro{series+number}%
- \newunit\newblock
- \printfield{note}%
- \newunit\newblock
- \usebibmacro{publisher+location+date}%
- % \newunit\newblock commented by LSP
- % \usebibmacro{chapter+pages}%
- % \newunit
- % \printfield{pagetotal}%
- \newunit\newblock
- \iftoggle{bbx:isbn}
- {\printfield{isbn}}
- {}%
- \newunit\newblock
- \usebibmacro{doi+eprint+url}%
- \newunit\newblock
- \usebibmacro{addendum+pubstate}%
- \setunit{\bibpagerefpunct}\newblock
- \usebibmacro{pageref}%
- \newunit\newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
- \usebibmacro{finentry}}
-
- \DeclareBibliographyDriver{incollection}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author/translator+others}%
- \setunit{\labelnamepunct}\newblock
- \usebibmacro{title}%
- \newunit
- \printlist{language}%
- \newunit\newblock
- \usebibmacro{byauthor}%
- \newunit\newblock
- \usebibmacro{in:}%
- \ifnameundef{editor}
- {\setunit{\addspace}}
- {\usebibmacro{byeditor+others}\setunit{\addcomma\space}}
- \usebibmacro{maintitle+booktitle}%
- \setunit{\addcomma\space}
- \printfield{edition}%
- \setunit{\addcomma\space}
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
- \setunit{\addcomma\space}
- \printfield{volumes}%
- \setunit{\addspace}%
- \usebibmacro{series+number}%
- \setunit{\addcomma\space}
- \usebibmacro{chapter+pages}%
- \newunit\newblock
- \printfield{note}%
- \newunit\newblock
- \usebibmacro{publisher+location+date}%
- \newunit\newblock
- \iftoggle{bbx:isbn}
- {\printfield{isbn}}
- {}%
- \newunit\newblock
- \usebibmacro{doi+eprint+url}%
- \newunit\newblock
- \usebibmacro{addendum+pubstate}%
- \setunit{\bibpagerefpunct}\newblock
- \usebibmacro{pageref}%
- \newunit\newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
- \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{inproceedings}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author/translator+others}%
- \setunit{\labelnamepunct}\newblock
- \usebibmacro{title}%
- \newunit
- \printlist{language}%
- \newunit\newblock
- \usebibmacro{byauthor}%
- \newunit\newblock
- \usebibmacro{in:}%
- \ifnameundef{editor}
- {\setunit{\addspace}}
- {\usebibmacro{byeditor+others}\setunit{\addcomma\space}}
- \usebibmacro{maintitle+booktitle}%
- \setunit{\addcomma\space}
- \printfield{edition}%
- \setunit{\addcomma\space}
- \iffieldundef{maintitle}
- {\printfield{volume}%
- \printfield{part}}
- {}%
- \setunit{\addcomma\space}
- \printfield{volumes}%
- \setunit{\addspace}%
- \usebibmacro{series+number}%
- \setunit{\addcomma\space}
- \usebibmacro{chapter+pages}%
- \newunit\newblock
- \printfield{note}%
- \newunit\newblock
- \printlist{organization}%
- \newunit
- \usebibmacro{publisher+location+date}%
- \newunit\newblock
- \iftoggle{bbx:isbn}
- {\printfield{isbn}}
- {}%
- \newunit\newblock
- \usebibmacro{doi+eprint+url}%
- \newunit\newblock
- \usebibmacro{addendum+pubstate}%
- \setunit{\bibpagerefpunct}\newblock
- \usebibmacro{pageref}%
- \newunit\newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
- \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{thesis}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author}%
- \setunit{\labelnamepunct}\newblock
- \usebibmacro{title}%
- \newunit
- \printlist{language}%
- \newunit\newblock
- \usebibmacro{byauthor}%
- \newunit\newblock
- \printfield{note}%
- \newunit\newblock
- \usebibmacro{institution+location+type+date}%
- \newunit\newblock
- \usebibmacro{chapter+pages}%
- \newunit
- \printfield{pagetotal}%
- \newunit\newblock
- \iftoggle{bbx:isbn}
- {\printfield{isbn}}
- {}%
- \newunit\newblock
- \usebibmacro{doi+eprint+url}%
- \newunit\newblock
- \usebibmacro{addendum+pubstate}%
- \setunit{\bibpagerefpunct}\newblock
- \usebibmacro{pageref}%
- \newunit\newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
- \usebibmacro{finentry}}
-
-\DeclareBibliographyDriver{unpublished}{%
- \usebibmacro{bibindex}%
- \usebibmacro{begentry}%
- \usebibmacro{author}%
- \setunit{\labelnamepunct}\newblock
- \usebibmacro{title}%
- \newunit
- \printlist{language}%
- \newunit\newblock
- \usebibmacro{byauthor}%
- \newunit\newblock
- \printfield{howpublished}%
- \newunit\newblock
- \printfield{note}%
- \newunit\newblock
- \usebibmacro{location+date}%
- \newunit\newblock
- \iftoggle{bbx:url}
- {\usebibmacro{url+urldate}}
- {}%
- \newunit\newblock
- \usebibmacro{addendum+pubstate}%
- \setunit{\bibpagerefpunct}\newblock
- \usebibmacro{pageref}%
- \newunit\newblock
- \iftoggle{bbx:related}
- {\usebibmacro{related:init}%
- \usebibmacro{related}}
- {}%
- \usebibmacro{finentry}}
-
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-advertisement.tex b/Master/texmf-dist/tex/xelatex/langsci/langsci-advertisement.tex
index d1adca90a34..2d7d02e87ba 100644
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci-advertisement.tex
+++ b/Master/texmf-dist/tex/xelatex/langsci/langsci-advertisement.tex
@@ -1,7 +1,7 @@
\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
@@ -13,4 +13,5 @@
\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} \ No newline at end of file
+\end{tikzpicture}%
+\ifcsname tikz@library@external@loaded\endcsname\tikzexternalenable\fi
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-avm.sty b/Master/texmf-dist/tex/xelatex/langsci/langsci-avm.sty
index 03e57511cfe..367b7333e24 100644
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci-avm.sty
+++ b/Master/texmf-dist/tex/xelatex/langsci/langsci-avm.sty
@@ -1,10 +1,12 @@
%% avm.sty - a style file for attribute-value matrices
%% Copyright 1992, 1993, 2006, 2013 Christopher Manning (manning@cs.stanford.edu)
+%% Copyright 2018 Language Science Press (felix.kopecky@langsci-press.org)
%
-% v 1.00 mar 29, 1992
-% v 1.01 dec 6, 1993
-% v 1.02 jan 5, 2006
-% v 1.03 dec 8, 2013
+% v 1.00 mar 29, 1992
+% v 1.01 dec 6, 1993
+% v 1.02 jan 5, 2006
+% v 1.03 dec 8, 2013
+% v 1.03l feb 16, 2018
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -17,6 +19,7 @@
% This work has the LPPL maintenance status `maintained'.
%
% The Current Maintainer of this work is Christopher Manning.
+% The Maintainer for Language Science Press additions is Felix Kopecky.
%
% This work consists of the files avm.sty, avm-doc.tex, avm-test.tex.
@@ -53,12 +56,34 @@
\def\avmvskip#1{\def\avmjvskip{#1}}
\def\avmjvskip{0.385ex}%was .3875
+%% Additions by Language Science Press
+\RequirePackage{tikz}
+\usetikzlibrary{calc}
+\def\LangsciAvmStretchfactor{15}
+
+\newcommand{\LangsciAvmLeftDelim}[2]% #1 = height, #2 = depth
+{\tikz[baseline]{\coordinate (middle) at ($(-.\LangsciAvmStretchfactor,-#2)!0.5!(-.\LangsciAvmStretchfactor,#1)$);\draw[thick] (0,-#2) -- (middle) -- (0,#1);}\:}
+
+\newcommand{\LangsciAvmRightDelim}[2]% #1 = height, #2 = depth
+{\:\tikz[baseline]{\coordinate (middle) at ($(.\LangsciAvmStretchfactor,-#2)!0.5!(.\LangsciAvmStretchfactor,#1)$);\draw[thick] (0,-#2) -- (middle) -- (0,#1);}}
+
+\newlength{\LangsciAvmAngleBoxHeight}
+\newlength{\LangsciAvmAngleBoxDepth}
+\newsavebox{\LangsciAvmAngleBox}
+
+\newcommand{\LangsciAvmAngle}[1]% #1 = text to be enclosed
+{\savebox{\LangsciAvmAngleBox}{#1}% get size of box
+ \settoheight{\LangsciAvmAngleBoxHeight}{\usebox{\LangsciAvmAngleBox}}%
+ \settodepth{\LangsciAvmAngleBoxDepth}{\usebox{\LangsciAvmAngleBox}}%
+ \LangsciAvmLeftDelim{\LangsciAvmAngleBoxHeight}{\LangsciAvmAngleBoxDepth}%
+ \,\usebox{\LangsciAvmAngleBox}\,%
+ \LangsciAvmRightDelim{\LangsciAvmAngleBoxHeight}{\LangsciAvmAngleBoxDepth}}
\def\avmjprolog#1{$\mskip-\thinmuskip
\left#1\hskip\avmjbskip\vcenter\bgroup\vskip\avmjvskip
- \ialign\bgroup\avmjfont
- \strut ##\unskip\hfil
- &&\hskip\avmjhskip\avmjvalfont ##\unskip\hfil\cr}
+ \ialign\bgroup\bgroup\normalfont\avmjfont
+ \strut ##\egroup\unskip\hfil
+ &&\hskip\avmjhskip\bgroup\normalfont\avmjvalfont ##\egroup\unskip\hfil\cr}
\def\avmjpostlog#1{\crcr\egroup\vskip\avmjvskip\egroup
\hskip\avmjbskip\right#1\mskip-\thinmuskip$\ignorespaces}
@@ -74,8 +99,9 @@
\def){\avmjpostlog\rparen}%
\def<{\avmjprolog\langle}%
\def>{\avmjpostlog\rangle}%
+\def\+{$\oplus\,$}
\ifavmsorted
-\def[##1{\setbox\avmboxthree=\hbox{\avmjsortfont##1\/}\setbox2=\hbox
+\def[##1{\setbox\avmboxthree=\hbox{\bgroup\normalfont\avmjsortfont##1\egroup}\setbox2=\hbox
\bgroup\avmjprolog\lbrack}%
\def]{\avmjpostlog\rbrack\egroup\avmjsort}%
\else\ifavmlabeled
@@ -100,13 +126,14 @@
\long\def\avm{\begingroup
\ifavmactive\specialavm
\else
-\def\({\avmjprolog(}%
+\def\({\avmjprolog(}%
+\def\+{$\oplus\,$}
\def\){\avmjpostlog)}%
\def\<{\avmjprolog\langle}%
\def\>{\avmjpostlog\rangle}%
%
\ifavmsorted
-\def\[##1{\setbox\avmboxthree=\hbox{\avmjsortfont##1\/}\setbox
+\def\[##1{\setbox\avmboxthree=\hbox{\bgroup\normalfont\avmjsortfont##1\egroup}\setbox
2=\hbox\bgroup\avmjprolog[}%
\def\]{\avmjpostlog]\egroup\avmjsort}%
\else\ifavmlabeled
@@ -137,7 +164,7 @@
\else \lower\dimen2\llap{\box\avmboxthree}\box2%
\fi\fi\fi}%
\long\def\sort##1##2{\setbox2=\hbox{##2}\setbox
- \avmboxthree=\hbox{\avmjsortfont##1\/}\dimen2=\ht2%
+ \avmboxthree=\hbox{\bgroup\normalfont\avmjsortfont##1\egroup}\dimen2=\ht2%
\advance\dimen2 by -.25\baselineskip
\ifavmtopleft \raise\dimen2\box\avmboxthree\box2%
\else\ifavmtopright \box2\raise\dimen2\box\avmboxthree%
@@ -145,8 +172,8 @@
\else \lower\dimen2\box\avmboxthree\box2%
\fi\fi\fi}%
\long\def\osort##1##2{\setbox2=\hbox{##2}\setbox
- \avmboxthree=\hbox{\avmjsortfont ##1\/}\avmjsort}%
-\def\asort##1{\avmspan{\avmjsortfont ##1}\\}%
+ \avmboxthree=\hbox{\bgroup\normalfont\avmjsortfont ##1\egroup}\avmjsort}%
+\def\asort##1{\avmspan{\bgroup\normalfont\avmjsortfont ##1\egroup}\\}%
\def\avml{\avmjprolog.}%
\def\avmr{\avmjpostlog.}%
\def\avmb##1{\node{##1}{\lbrack\;\rbrack}}%
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-basic.sty b/Master/texmf-dist/tex/xelatex/langsci/langsci-basic.sty
index c8165b4710f..ffd4bf87fcf 100644
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci-basic.sty
+++ b/Master/texmf-dist/tex/xelatex/langsci/langsci-basic.sty
@@ -1,7 +1,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% File: langsci-basic.sty
%% Author: Language Science Press (http://langsci-press.org)
-%% Date: 2016-01-16 16:47:43 UTC
+%% Date: Date: 2019-03-31 13:12 UTC
%% Purpose: This file contains essential macros and is included
%% into langscibook.cls
%% Language: LaTeX
@@ -78,3 +78,12 @@
\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}
+}
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-colors.def b/Master/texmf-dist/tex/xelatex/langsci/langsci-colors.def
index 0374b95128b..c043a57229f 100644
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci-colors.def
+++ b/Master/texmf-dist/tex/xelatex/langsci/langsci-colors.def
@@ -1,60 +1 @@
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% Color definitions:
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\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{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}
-}
-}
+% moved to langscibook.cls \ No newline at end of file
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-jambox.sty b/Master/texmf-dist/tex/xelatex/langsci/langsci-jambox.sty
deleted file mode 100644
index ccf65af5762..00000000000
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci-jambox.sty
+++ /dev/null
@@ -1,93 +0,0 @@
-%%%%%%%%%%%%%%%%%% JAMBOX: RIGHT-COLUMN ANNOTATIONS %%%%%%%%%%%%%%%%
-%
-% 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]}}}
-
-% Quickie invocation: The argument is delimited by the parentheses (no width
-% argument allowed). I redefine it in my documents to add formatting.
-% Syntax: \jam(Some note)
-%
-\def\jam(#1){\jambox{(#1)}}
-
-% 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}}
-
-%% Version 1: old & stupid
-%% \def\@jambox[#1]#2{\hfill\hbox to #1 {#2\hfil}}
-
-% Version 2:
-% Always takes up \jamwidth space, even if it means breaking the line. But it
-% works on ragged-right mode, too.
-% \def\@jambox[#1]#2{\setbox\@tempboxa\hbox {#2\hfil}%
-% \ifdim \wd\@tempboxa<#1\relax \wd\@tempboxa=#1\relax\fi
-% \hskip 0.5em plus 1fill
-% \penalty 100\vadjust{}\nobreak\hfill\box\@tempboxa\par}
-% The penalty enables a break. \vadjust inserts an empty element
-% at the beginning of the next line, protecting \hfill from being discarded.
-
-% Version 3:
-% This seems to cover everything! But unfortunately, it won't work in
-% ragged-right mode-- the line is broken BEFORE the last word, to make enough
-% space...
-\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...
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-linguex.sty b/Master/texmf-dist/tex/xelatex/langsci/langsci-linguex.sty
index 1cb2509f91f..ebab548c0b3 100644
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci-linguex.sty
+++ b/Master/texmf-dist/tex/xelatex/langsci/langsci-linguex.sty
@@ -60,7 +60,7 @@
\newcommand{\theFnExRBr}{)}%added in version 4.0
\renewcommand{\theExNo}{\theExLBr\arabic{ExNo}\theExRBr}%modified in version 4.0
\renewcommand{\theFnExNo}{\theFnExLBr\roman{FnExNo}\theFnExRBr}%removed in version 4.0
-\newcommand{\firstrefdash}{-}
+\newcommand{\firstrefdash}{}
\newcommand{\secondrefdash}{-}
\newcommand{\SubExLBr}{}
\newcommand{\SubExRBr}{.}
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-optional.sty b/Master/texmf-dist/tex/xelatex/langsci/langsci-optional.sty
index 369b9f5292a..a835d260aff 100644
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci-optional.sty
+++ b/Master/texmf-dist/tex/xelatex/langsci/langsci-optional.sty
@@ -1,7 +1,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% File: langsci-optional.sty
%% Author: Language Science Press (http://langsci-press.org)
-%% Date: 2016-01-16 16:47:43 UTC
+%% Date: Date: 2019-03-31 13:12 UTC
%% Purpose: This file contains useful, but not essential,
%% macros for books using langscibook.cls
%% Language: LaTeX
@@ -152,6 +152,13 @@
\fi%
#3)}\nopagebreak[4]\ignorespaces}
+\newcommand{\langinfoverb}[3]{{\upshape #1~(% langinfo without index marker
+\ifx\\#2\\%
+\else%
+#2;
+\fi%
+#3)}\nopagebreak[4]\ignorespaces}
+
\newcommand{\fittable}[1]{\resizebox{\textwidth}{!}{#1}}
@@ -195,7 +202,7 @@
%no hyphenation left alingned
\newcolumntype{Q}{>{\raggedright\arraybackslash}X}
%no hyphenation right aligned
-\newcolumntype{S}{>{\raggedleft\arraybackslash}X}
+\newcolumntype{Y}{>{\raggedleft\arraybackslash}X}
%no hyphenation centered
\newcolumntype{C}{>{\centering\arraybackslash}X}
%no hyphenation fixed width
@@ -266,8 +273,6 @@
\newcommand{\threedigitexamples}{\exewidth{(234)}}
\newcommand{\fourdigitexamples}{\exewidth{(2345)}}
-\newcommand{\noabstract}{\vspace*{-2\baselineskip}} %for chapters without abstract
-
\newcommand{\rephrase}[2]{{\color{yellow!30!black}#2}\todo{replaced `#1'}}
\newcommand{\missref}[2][]{\todo[#1]{missing reference #2}}
@@ -303,49 +308,134 @@
{\list{}{\leftmargin=#1\rightmargin=0mm}\item[]}%
{\endlist}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% Experimental feature for pointing out moving things. %%%%
+%%%% Buggy? Write to: kopeckyf@hu-berlin.de %%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\usetikzlibrary{arrows,arrows.meta}
+\newcounter{lsConnectTempGroup}
+\NewDocumentCommand\ConnectTail{m O{\thelsConnectTempGroup}}{%read: mandatory arg #1, optional argument #2 with the current group counter as its default value.
+ \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 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
+ {\tikz[remember picture,
+ 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);
+ }%
+}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% Extras for use in (some) edited volumes %%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% 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}
+
%%%%%%%%%%%%%%%%%%%%
%%%% %%%%%
%%%% 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
+
+
+% Provide a raised tie bar for diphthongs and affricates with ascenders
+\newcommand{\hitie}[2]{%
+\mbox{#1}%
+\raisebox{.5mm}{%
+͡%
+}%
+\mbox{#2}%
+}
+
-\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}
+\newcommand{\hitier}[3][.7]{%
+\mbox{#2}%
+\hspace*{#1mm}%
+\raisebox{.5mm}{%
+͡%
+}%
+\hspace*{-#1mm}%
+\mbox{#3}%
}
-\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}
-} \ No newline at end of file
+
+
+\newcommand{\hitiel}[3][.7]{%
+\mbox{#2}%
+\hspace*{-#1mm}%
+\raisebox{.5mm}{%
+͡%
+}%
+\hspace*{#1mm}%
+\mbox{#3}%
+}
+
+
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-series.def b/Master/texmf-dist/tex/xelatex/langsci/langsci-series.def
index d1d1599b423..fd62490e84e 100644
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci-series.def
+++ b/Master/texmf-dist/tex/xelatex/langsci/langsci-series.def
@@ -4,23 +4,32 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\input{\seriesinfopath langsci-colors.def} % color definitions
+\newcommand{\algad}{algad}
\newcommand{\calseries}{calseries}
+\newcommand{\cam}{cam}
+\newcommand{\cib}{cib}
+\newcommand{\cfls}{cfls} %Conceptual Foundation of the Language Sciences
+\newcommand{\classics}{classics}
+\newcommand{\cmle}{cmle} %Computational Models of Language Evolution
\newcommand{\eotms}{eotms}
\newcommand{\eotmsig}{eotmsig}
\newcommand{\eurosla}{eurosla}
-\newcommand{\sidl}{sidl}
-\newcommand{\algad}{algad}
-\newcommand{\tmnlp}{tmnlp}
+\newcommand{\hpls}{hpls}
+\newcommand{\loc}{loc}
+\newcommand{\lv}{lv} %Language Variation
+\newcommand{\mi}{mi}
\newcommand{\nc}{nc} %Niger Congo
-\newcommand{\tbls}{tbls} %Textbooks in Language Sciences
+\newcommand{\ogs}{ogs} %Open Generative Syntax
+\newcommand{\osl}{osl} %Open Slavic Linguistics
+\newcommand{\pmwe}{pmwe} %Phraseology and Multi-Word Expressions
+\newcommand{\scl}{scl}
+\newcommand{\sidl}{sidl}
\newcommand{\silp}{silp} %Studies in Laboratory Phonology
-\newcommand{\tdgi}{tdgi} %Topics at the Discourse Grammar Interface
-\newcommand{\cmle}{cmle} %Computational Models of Language Evolution
-\newcommand{\cfls}{cfls} %Conceptual Foundation of the Language Sciences
-\newcommand{\lv}{lv} %Language Variation
-\newcommand{\classics}{classics}
+\newcommand{\tbls}{tbls} %Textbooks in Language Sciences
+\newcommand{\tgdi}{tgdi} %Topics at the Grammar-Discourse Interface
+\newcommand{\tmnlp}{tmnlp}
+
\newcommand{\dummyseries}{dummyseries}
\newcommand{\guidelines}{guidelines}
\newcommand{\lsSeriesFontColor}{white}
@@ -35,12 +44,23 @@
\newcommand{\lsSeriesColor}{lsMidWine}
\renewcommand{\lsISSN}{2511-7726}
\fi
+\ifx\lsSeries\cam
+ \newcommand{\lsSeriesTitle}{Contact and Multilingualism}
+ \newcommand{\lsSeriesColor}{lsRed}
+ \renewcommand{\lsISSN}{}
+\fi
+
+\ifx\lsSeries\cib
+ \newcommand{\lsSeriesTitle}{Current Issues in Bilingualism~\lsSeriesNumber}
+ \newcommand{\lsSeriesColor}{lsLightGreen}
+% \renewcommand{\lsISSN}{}
+\fi
\ifx\lsSeries\cfls
\newcommand{\lsSeriesTitle}{Conceptual Foundations of \newlineCover Language Science~\lsSeriesNumber}
\newcommand{\lsSeriesColor}{lsNightGreen}
\renewcommand{\lsISSN}{2363-877X}
\fi
-\ifx\lsSeries\classics
+\ifx\lsSeries\classics
\newcommand{\lsSeriesTitle}{Classics in Linguistics~\lsSeriesNumber}
\newcommand{\lsSeriesColor}{black}
\renewcommand{\lsISSN}{2366-374X}
@@ -61,24 +81,54 @@
\fi
\ifx\lsSeries\eurosla
\newcommand{\lsSeriesTitle}{Eurosla Studies~\lsSeriesNumber}
- \newcommand{\lsSeriesColor}{lsMidOrange}
+ \newcommand{\lsSeriesColor}{lsMidOrange}
+ \renewcommand{\lsISSN}{2626-2665}
+\fi
+\ifx\lsSeries\hpls
+ \newcommand{\lsSeriesTitle}{History and Philosophy of the Language Sciences~\lsSeriesNumber}
+ \newcommand{\lsSeriesColor}{lsSoftGreen}
+\fi
+\ifx\lsSeries\loc
+ \newcommand{\lsSeriesTitle}{Languages of the Caucasus~\lsSeriesNumber}
+ \newcommand{\lsSeriesColor}{lsLightWine}
\fi
\ifx\lsSeries\lv
- \newcommand{\lsSeriesTitle}{Language Variation~\lsSeriesNumber}
- \newcommand{\lsSeriesColor}{lsDarkWine}
- \renewcommand{\lsISSN}{2366-7818}
+ \newcommand{\lsSeriesTitle}{Language Variation~\lsSeriesNumber}
+ \newcommand{\lsSeriesColor}{lsDarkWine}
+ \renewcommand{\lsISSN}{2366-7818}
+\fi
+\ifx\lsSeries\mi
+ \newcommand{\lsSeriesTitle}{Morphological Investigations~\lsSeriesNumber}
+ \newcommand{\lsSeriesColor}{lsDarkGreenTwo}
+ \renewcommand{\lsISSN}{2567-742X}
\fi
\ifx\lsSeries\nc
- \newcommand{\lsSeriesTitle}{Monographs on Comparative Niger-Congo~\lsSeriesNumber}
- \newcommand{\lsSeriesColor}{lsRed}
+ \newcommand{\lsSeriesTitle}{Niger-Congo Comparative Studies~\lsSeriesNumber}
+ \newcommand{\lsSeriesColor}{lsRed}
+ \renewcommand{\lsISSN}{2627-0048} %online
+% \renewcommand{\lsISSN}{2626-3513} %print
\fi
\ifx\lsSeries\ogs
\newcommand{\lsSeriesTitle}{Open Generative Syntax~\lsSeriesNumber}
- \newcommand{\lsSeriesColor}{lsDarkGreenOne}
+ \newcommand{\lsSeriesColor}{lsDarkGreenOne}
+ \renewcommand{\lsISSN}{2568-7336}
+\fi
+\ifx\lsSeries\osl
+ \newcommand{\lsSeriesTitle}{Open Slavic Linguistics~\lsSeriesNumber}
+ \newcommand{\lsSeriesColor}{lsMidGreen}
+ \renewcommand{\lsISSN}{2627-8332} % Online
+ %\renewcommand{\lsISSN}{2627-8324}% (Print)
+\fi
+\ifx\lsSeries\pmwe
+ \newcommand{\lsSeriesTitle}{Phraseology and Multiword Expressions~\lsSeriesNumber}
+ \newcommand{\lsSeriesColor}{lsLightBlue}
+ \renewcommand{\lsISSN}{2625-3127}
\fi
\ifx\lsSeries\scl
\newcommand{\lsSeriesTitle}{Studies in Caribbean Languages~\lsSeriesNumber}
\newcommand{\lsSeriesColor}{lsDarkOrange}
+ \renewcommand{\lsISSN}{2627-1834} %online
+ \renewcommand{\lsISSN}{2627-1893} %Print
\fi
\ifx\lsSeries\sidl
\newcommand{\lsSeriesTitle}{Studies in Diversity Linguistics~\lsSeriesNumber}
@@ -89,21 +139,22 @@
\newcommand{\lsSeriesTitle}{Studies in Laboratory Phonology~\lsSeriesNumber}
\newcommand{\lsSeriesColor}{lsLightWine}
\renewcommand{\lsISSN}{2363-5576}
-\fi
+\fi
\ifx\lsSeries\tbls
\newcommand{\lsSeriesTitle}{Textbooks in Language Sciences~\lsSeriesNumber}
\newcommand{\lsSeriesColor}{lsYellow}
- \renewcommand{\lsISSN}{2364-6209}
-\fi
-\ifx\lsSeries\tdgi
- \newcommand{\lsSeriesTitle}{Topics at the Discourse Grammar Interface~\lsSeriesNumber}
+ \renewcommand{\lsISSN}{2364-6209}
+\fi
+\ifx\lsSeries\tgdi
+ \newcommand{\lsSeriesTitle}{Topics at the Grammar-Discourse Interface~\lsSeriesNumber}
\newcommand{\lsSeriesColor}{lsMidDarkBlue}
+ \renewcommand{\lsISSN}{2567-3335}
\fi
\ifx\lsSeries\tmnlp
\newcommand{\lsSeriesTitle}{Translation and Multilingual Natural \newlineCover Language Processing~\lsSeriesNumber}
\newcommand{\lsSeriesColor}{lsDarkBlue}
\renewcommand{\lsISSN}{2364-8899}
-\fi
+\fi
\ifx\lsSeries\dummyseries
\newcommand{\lsSeriesTitle}{~}
\newcommand{\lsSeriesColor}{lsNightGreen}
@@ -113,4 +164,4 @@
\newcommand{\lsSeriesColor}{lsGuidelinesGray}
\renewcommand{\lsCoverFontColor}{black}
\fi
-}
+}
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-tbls.sty b/Master/texmf-dist/tex/xelatex/langsci/langsci-tbls.sty
index 3a902ff0bcb..32548438403 100644
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci-tbls.sty
+++ b/Master/texmf-dist/tex/xelatex/langsci/langsci-tbls.sty
@@ -3,6 +3,11 @@
\usepackage[framemethod=tikz]{mdframed}
\mdfsetup{skipabove=2\baselineskip,skipbelow=2\baselineskip,frametitlefont=\sffamily\bfseries\Large, needspace=4\baselineskip, splittopskip=1.5\baselineskip}
\mdfsetup{apptotikzsetting={\tikzset{mdfbackground/.append style={draw=none}}}}
+\AtEndPreamble{% Check if the external library from tikz has been loaded in the preamble. If so, skip externalising for all mdframed boxes.
+ \ifcsname tikz@library@external@loaded\endcsname
+ \mdfsetup{settings={\tikzexternaldisable},endcode={\tikzexternalenable}}
+ \fi
+}
\newcommand{\langscisymbol}{book}
\newlength{\trennlinie}
\setlength{\trennlinie}{.8mm}
@@ -15,8 +20,8 @@
middlelinewidth=1.5pt,linecolor=\tblslinecolour,outerlinewidth=5mm,
innerleftmargin=5mm, innerrightmargin=5mm, innerbottommargin=5mm, innertopmargin=0,
frametitleaboveskip=15mm, frametitlebelowskip=10mm,frametitlerule=false, repeatframetitle=false,
- firstextra={\node[xshift=5mm,right,draw=\tblslinecolour, line width=1.5pt,rectangle, minimum size=10mm, fill=white] at (P-|O) {\color{\tblslinecolour}\includegraphics[width=10mm]{tbls-\langscisymbol.pdf}};}, % if environment is on multiple pages, print this on the first page.
- singleextra={\node[xshift=5mm,right,draw=\tblslinecolour, line width=1.5pt,rectangle, minimum size=10mm, fill=white] at (P-|O) {\color{\tblslinecolour}\includegraphics[width=10mm]{tbls-\langscisymbol.pdf}};} % if env. does not span multiple pages, print the same.
+ firstextra={\node[xshift=5mm,right,draw=\tblslinecolour, line width=1.5pt,rectangle, minimum size=10mm, fill=white] at (P-|O) {\color{\tblslinecolour}\includegraphics[width=10mm]{langsci/graphics/tbls-\langscisymbol.pdf}};}, % if environment is on multiple pages, print this on the first page.
+ singleextra={\node[xshift=5mm,right,draw=\tblslinecolour, line width=1.5pt,rectangle, minimum size=10mm, fill=white] at (P-|O) {\color{\tblslinecolour}\includegraphics[width=10mm]{langsci/graphics/tbls-\langscisymbol.pdf}};} % if env. does not span multiple pages, print the same.
}
\mdfdefinestyle{greyexercise}{%
@@ -27,9 +32,9 @@
backgroundcolor=\tblsboxcolor,
innerleftmargin=5mm, innerrightmargin=5mm, innerbottommargin=5mm, innertopmargin=5mm,
frametitleaboveskip=15mm, frametitlebelowskip=5mm,frametitlerule=false, repeatframetitle=false,
- firstextra={\node[xshift=5mm,right,draw=\tblsboxcolor, line width=1.5pt,rectangle, minimum size=10mm, fill=white] at (P-|O) {\color{\tblsboxcolor}\includegraphics[width=10mm]{tbls-\langscisymbol.pdf}
+ firstextra={\node[xshift=5mm,right,draw=\tblsboxcolor, line width=1.5pt,rectangle, minimum size=10mm, fill=white] at (P-|O) {\color{\tblsboxcolor}\includegraphics[width=10mm]{langsci/graphics/tbls-\langscisymbol.pdf}
};},
- singleextra={\node[xshift=5mm,right,draw=\tblsboxcolor, line width=1.5pt,rectangle, minimum size=10mm, fill=white] at (P-|O) {\color{\tblsboxcolor}\includegraphics[width=10mm]{tbls-\langscisymbol.pdf}
+ singleextra={\node[xshift=5mm,right,draw=\tblsboxcolor, line width=1.5pt,rectangle, minimum size=10mm, fill=white] at (P-|O) {\color{\tblsboxcolor}\includegraphics[width=10mm]{langsci/graphics/tbls-\langscisymbol.pdf}
};}
}
@@ -106,7 +111,7 @@
%add logo if requested
\ifthenelse{\equal{#1}{}}{\bigskip}{
\begin{flushleft}
- \hspace*{3.5mm} \raisebox{0mm}[0mm][0mm]{\color{white}\includegraphics[width=10mm]{#1.eps}}
+ \hspace*{3.5mm} \raisebox{0mm}[0mm][0mm]{\color{white}\includegraphics[width=10mm]{langsci/graphics/#1.eps}}
\end{flushleft}}
%add header
\boxheader{#3}
@@ -184,7 +189,7 @@
\begin{figure}
\begin{flushleft}
\hspace*{3.5mm}
- \raisebox{-10mm}[0mm][0mm]{\ifthenelse{\equal{#1}{}}{}{\includegraphics[width=10mm]{#1.eps}}} \\
+ \raisebox{-10mm}[0mm][0mm]{\ifthenelse{\equal{#1}{}}{}{\includegraphics[width=10mm]{langsci/graphics/#1.eps}}} \\
\end{flushleft}
\color{lsYellow}\framebox[\textwidth]{%
\color{black}
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-textipa.sty b/Master/texmf-dist/tex/xelatex/langsci/langsci-textipa.sty
new file mode 100644
index 00000000000..adcedb26b2f
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/langsci/langsci-textipa.sty
@@ -0,0 +1,4 @@
+%Unicode versions of the TIPA \text... commands
+
+\newcommand{\textltailn}{ɲ}
+\newcommand{\textbardotlessj}{ɟ} \ No newline at end of file
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-tikz.sty b/Master/texmf-dist/tex/xelatex/langsci/langsci-tikz.sty
new file mode 100644
index 00000000000..96bcd052110
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/langsci/langsci-tikz.sty
@@ -0,0 +1,25 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% Experimental feature for pointing out moving things. %%%%
+%%%% Buggy? Write to: kopeckyf@hu-berlin.de %%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\usetikzlibrary{arrows,arrows.meta}
+\newcounter{lsConnectTempGroup}
+\NewDocumentCommand\ConnectTail{m O{\thelsConnectTempGroup}}{%read: mandatory arg #1, optional argument #2 with the current group counter as its default value.
+ \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 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
+ {\tikz[remember picture,
+ 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);
+ }%
+} \ No newline at end of file
diff --git a/Master/texmf-dist/tex/xelatex/langsci/biblatex-langsci-unified.bbx b/Master/texmf-dist/tex/xelatex/langsci/langsci-unified.bbx
index 2ff2f4c8006..ba20f39ff4a 100644
--- a/Master/texmf-dist/tex/xelatex/langsci/biblatex-langsci-unified.bbx
+++ b/Master/texmf-dist/tex/xelatex/langsci/langsci-unified.bbx
@@ -1,3 +1,21 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 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
+%% Language: LaTeX
+%% Copyright 2017- Language Science Press
+%% Licence: This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%% This work has the LPPL maintenance status `maintained'.
+%%% The Current Maintainer of this work is Sebastian Nordhoff.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
\ProvidesFile{biblatex-sp-unified.bbx}
% NB: The Unified Style Sheet wants abbreviated "ed(s)", "edn". But using the abbreviate option also abbreviates the names of months. But then dateabbrev=false restores the long names of months
@@ -488,6 +506,9 @@
\DeclareBibliographyAlias{incollection}{inproceedings}
+
+% \DeclareBibliographyAlias{techreport}{standard}
+
% Given the guidelines in the unified style sheet, we should print conference
% proceedings and working papers as @article's just in case the publication has
% an ISSN. So, rather than have users handle this in the database by changing the
@@ -649,3 +670,13 @@
\usebibmacro{related}}
{}%
\usebibmacro{finentry}}
+
+%% changes of bibliography style (bbx)
+\DeclareFieldFormat{postnote}{#1}% display pages without page prefix (p., pp.)
+\DeclareBibliographyAlias{inbook}{incollection}% see https://github.com/semprag/biblatex-sp-unified/issues/35
+\DeclareFieldFormat[techreport,report,misc]{titlecase}{\MakeSentenceCase*{#1}}% techreport/report and misc are not genuinely supported by biblatex-sp-unified
+%% The note field should appear at end of an entry just before the DOI, other than with the used bibliography style. It is therefore first removed, then again restored and included together with the DOI.
+\AtEveryBibitem{%
+ \savefield*{note}{\lsnote}%
+ \clearfield{note}%
+} \ No newline at end of file
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langsci-authoryear-comp.cbx b/Master/texmf-dist/tex/xelatex/langsci/langsci-unified.cbx
index 4844de94ed7..bc3334ab9b5 100644
--- a/Master/texmf-dist/tex/xelatex/langsci/langsci-authoryear-comp.cbx
+++ b/Master/texmf-dist/tex/xelatex/langsci/langsci-unified.cbx
@@ -1,3 +1,21 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 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
+%% Language: LaTeX
+%% Copyright 2017- Language Science Press
+%% Licence: This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%% This work has the LPPL maintenance status `maintained'.
+%%% The Current Maintainer of this work is Sebastian Nordhoff.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
\ProvidesFile{sp-authoryear-comp.cbx}
% For backward compatibility: choose labeldate or labeldateparts depending on the biblatex version
@@ -192,9 +210,7 @@
\newbibmacro*{cite:labelyear+extrayear}{%
\iffieldundef{labelyear}
{}
- {\printtext[bibhyperref]{%
- \printfield{labelyear}%
- \printfield{extrayear}}}}
+ {\printtext[bibhyperref]{\printlabeldateextra}}}
\newbibmacro*{cite:extrayear}{%
\iffieldundef{extrayear}
@@ -355,4 +371,13 @@
\renewcommand*{\multicitedelim}{\addcomma\space}
- \endinput
+%% changes of citestyle (cbx) (FIXME: documentation missing)
+\renewcommand{\postnotedelim}{: }%
+\renewcommand{\multicitedelim}{\addsemicolon\space}%
+\renewcommand{\compcitedelim}{\multicitedelim}
+% \renewcommand{\nameyeardelim}{ }%
+
+\endinput
+
+
+
diff --git a/Master/texmf-dist/tex/xelatex/langsci/langscibook-logo.pdf b/Master/texmf-dist/tex/xelatex/langsci/langscibook-logo.pdf
deleted file mode 100644
index fa30f59cc4f..00000000000
--- a/Master/texmf-dist/tex/xelatex/langsci/langscibook-logo.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 587fc1fb0d9..4bfbdd94e35 100644
--- a/Master/texmf-dist/tex/xelatex/langsci/langscibook.cls
+++ b/Master/texmf-dist/tex/xelatex/langsci/langscibook.cls
@@ -1,7 +1,6 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% File: langscibook.cls
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% File: langscibook.cls
%% Author: Language Science Press (http://langsci-press.org)
-%% Date: Fri Apr 27 2018
+%% Date: 2019-03-31 13:12 UTC
%% Purpose: This file defines the basic document class
%% for books published with Language Science Press.
%% Language: LaTeX
@@ -13,16 +12,11 @@
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-%%
-%% This work has the LPPL maintenance status `maintained'.
-%%
-%% The Current Maintainer of this work is Sebastian Nordhoff.
-%%
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
+%%% This work has the LPPL maintenance status `maintained'.
+%%% The Current Maintainer of this work is Sebastian Nordhoff.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Structure of this file:
+% \- Early load packages
% \- Paths
% \- Default values of variables
% \- Definition of conditionals
@@ -50,31 +44,37 @@
% \- Indexes
% \- Hyperref
% \- Edited volumes (Collection)
+% \- Colors
% \_ Miscellaneous
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{langscibook}[2018/01/15 Language Science Press]
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Early load packages
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\RequirePackage[]{silence}
+\WarningsOff[hyperref]
+\WarningsOff[tocstyle]
+\typeout{Warnings are disabled in langscibook.cls for hyperref and tocstyle}
+\usepackage{etoolbox}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
% Paths
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\newcommand{\fontpath}{}
\newcommand{\logopath}{}
\newcommand{\seriesinfopath}{}
\newcommand{\localepath}{}
-\newcommand{\bstpath}{}
-\newcommand{\bbxpath}{}
-\newcommand{\cbxpath}{}
+\newcommand{\bibstylepath}{}
+% \newcommand{\bbxpath}{}
+% \newcommand{\cbxpath}{}
\newcommand{\stylepath}{}
% Paths can be overwritten with option "nonflat"
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
% Default values
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\usepackage{xspace}
@@ -91,8 +91,8 @@
\newcommand{\lsURL}{http://langsci-press.org/catalog/book/\lsID}
\newcommand{\lsSeries}{eotms}
% \newcommand{\lsSpineBreadth}{20mm}
-\newcommand{\lsOutput}{book} %"short" makes no sense if "long" is deprecated
-\newcommand{\lsBookLanguage}{english} %"short" makes no sense if "long" is deprecated
+\newcommand{\lsOutput}{book}
+\newcommand{\lsBookLanguage}{english}
\newcommand{\lsFontsize}{11pt}
\newcommand{\lsChapterFooterSize}{\small} %footers in editedvolumes
\newcommand{\lsCopyright}{CC-BY}
@@ -118,9 +118,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
% Conditionals
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\newif\iflsDraft \lsDraftfalse
@@ -133,17 +131,17 @@
\newif\iflsCollectionTOCLong \lsCollectionTOCLongfalse
\newif\iflsNewtxmath \lsNewtxmathfalse
\newif\iflsCover \lsCoverfalse %output format is cover
-\newif\iflsUscover \lsUscoverfalse
+% \newif\iflsUscover \lsUscoverfalse
\newif\iflsModfonts \lsModfontsfalse
\newif\iflsNoBabel \lsNoBabelfalse
\newif\iflsBabelShorthands \lsBabelShorthandsfalse
\newif\iflsMultiauthors \lsMultiauthorsfalse
+\newif\iflsArseneau \lsArseneaufalse
+\newif\iflsOldStyleNumbers \lsOldStyleNumbersfalse
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
% Option handling
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\RequirePackage{kvoptions} % for key-value options
@@ -180,11 +178,9 @@
\renewcommand{\logopath}{./langsci/graphics/}
\renewcommand{\seriesinfopath}{./langsci/seriesinfo/}
\renewcommand{\localepath}{./langsci/locale/}
- \renewcommand{\bstpath}{./langsci/bst/}
- \renewcommand{\bbxpath}{\bstpath biblatex-langsci-unified/bbx/}
- % \renewcommand{\bbxpath}{\bstpath}
- \renewcommand{\cbxpath}{\bstpath biblatex-langsci-unified/cbx/}
- % \renewcommand{\cbxpath}{\bstpath}
+ \renewcommand{\bibstylepath}{./langsci/}
+% \renewcommand{\bbxpath}{\bibstylepath langsci-unified/bbx/}
+% \renewcommand{\cbxpath}{\bibstylepath langsci-unified/cbx/}
\renewcommand{\stylepath}{./langsci/styles/}
}
\DeclareVoidOption{nobabel}{
@@ -214,6 +210,8 @@
\DeclareVoidOption{collectiontoclong}{
\lsCollectiontrue%
\lsCollectionTOCLongtrue}
+\DeclareVoidOption{arseneau}{\lsArseneautrue}
+\DeclareVoidOption{oldstylenumbers}{\lsOldStyleNumberstrue}
\DeclareVoidOption{chinesefont}{
\newfontfamily\cn[Mapping=tex-text,Ligatures=Common,Scale=MatchUppercase]{AR PL UMing CN}
% \newcommand{\zh}[1]{{\cn #1}}
@@ -246,13 +244,12 @@
% \newcommand{\textsyriac}[1]{{\syriacfont #1}}
\AdditionalFontImprint{Estrangelo Edessa}
}
+
\ProcessKeyvalOptions{langscibook}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
% Class
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -268,9 +265,7 @@
]{scrbook}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
% Packages
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\usepackage{morewrites} %more helper files to write to
@@ -291,16 +286,12 @@
%% standard commands
\usepackage{\stylepath langsci-basic} % FIXME: contains important commands for the index (\isi etc.) which should be defined in the class
-%% useful commands for glossings:
-% \usepackage{\stylepath langsci-lgr} #FIXME this should probably be replaced by \usepackage{leipzig}
\usepackage{todonotes}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
% Print on demand macros
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Basic cover commands, including PGF layers
@@ -314,8 +305,7 @@
\renewcommand{\lastand}{ \& }%
\renewcommand{\affiliation}[1]{}
}
-
-% \usepackage[outline]{contour}
+
% Content creation for the spine. Including Logo, author, title, and volume number on spine.
\newcommand{\podspine}{
@@ -323,14 +313,6 @@
\renewcommand{\and}{, }
\renewcommand{\lastand}{ \& }
\node [above = 0mm of CoverSpine.south, anchor=base] (lspcls_spinelogo) {\color{\lsSeriesColor}\includegraphics{\logopath langsci_spinelogo_nocolor.pdf}};
-% add number on spine
-% inside logo
-% \node [below = -7mm of lspcls_spinelogo] (lspcls_splinenumber) { \hspace*{4mm}{\parbox{.37cm}{\centering \contour{\lsSeriesColor}{\color{white}\sffamily \large \lsSeriesNumber }}}};
-% bottom centered
-% \node [below = -1mm of lspcls_spinelogo] (lspcls_splinenumber) {\color{\lsSeriesColor} \hspace*{4mm}{\parbox{.37cm}{\centering\sffamily \large \lsSeriesNumber }}};
-% bottom leftaligned
-% \node [below = -1mm of lspcls_spinelogo] (lspcls_splinenumber) {\color{\lsSeriesColor} \hspace*{4mm}{\parbox{.37cm}{\sffamily \large \lsSeriesNumber }}};
-%
\node [below = 0mm of CoverSpine.north, anchor=north] (lspcls_splinenumber) {\color{\lsSeriesColor}
{\parbox{.47cm}{
\centering
@@ -447,9 +429,7 @@
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
% Output types
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \newcommand{\lsOutputLong}{long}
@@ -465,7 +445,7 @@
%% Output types are defined with \newcommand above so they can be used with geometry.
\AtBeginDocument{
-\ifx\lsOutput\lsOutputPaper % only if output=paper
+\ifx\lsOutput\lsOutputPaper % only if output==paper
\usepackage{chngcntr}
\counterwithout{figure}{chapter}
\counterwithout{table}{chapter}
@@ -474,7 +454,7 @@
\renewcommand{\maketitle}{
\begin{titlepage}
\thispagestyle{empty}
-\ifx\lsOutput\lsOutputBook % only if output=book
+\ifx\lsOutput\lsOutputBook % only if output==book
\setcounter{page}{-1}
%% First titlepage:
{\lsFrontPage}
@@ -501,14 +481,14 @@
}
\fi
-\ifx\lsOutput\lsOutputInprep % only if output=inprep
+\ifx\lsOutput\lsOutputInprep % only if output==inprep
{\renewcommand{\lsCoverBlockColor}{white}
\renewcommand{\lsCoverFontColor}{black}
\lsCoverBlock
\lsCoverTitleAuthor}
\fi
-\ifx\lsOutput\lsOutputGuidelines % only if output=guidelines
+\ifx\lsOutput\lsOutputGuidelines % only if output==guidelines
{\setcounter{page}{-1}
\renewcommand{\lsAdvertisement}{}
%% First titlepage:
@@ -517,7 +497,7 @@
\fi
-\ifx\lsOutput\lsOutputCoverBODhc % only if output=cover
+\ifx\lsOutput\lsOutputCoverBODhc % only if output==cover
\podsetup
\begin{tikzpicture}[remember picture, overlay,bg/.style={outer sep=0}]
\podgeometry{24.2mm}{23.1cm}{15.5cm}
@@ -533,7 +513,7 @@
\fi
-\ifx\lsOutput\lsOutputCoverBODsc % only if output=cover
+\ifx\lsOutput\lsOutputCoverBODsc % only if output==cover
\podsetup
\begin{tikzpicture}[remember picture, overlay,bg/.style={outer sep=0}]
\podgeometry{13.75mm}{23.1cm}{15.5cm}
@@ -550,14 +530,14 @@
% ============================
-\ifx\lsOutput\lsOutputCoverCS % only if output=covercs
+\ifx\lsOutput\lsOutputCoverCS % only if output==covercs
\podsetup
\begin{tikzpicture}[remember picture, overlay,bg/.style={outer sep=0}]
\podgeometry{10.675mm}{22.5cm}{15.5cm}
\podspine
\podfrontcovertoptext{140mm}{52pt} % Due to different cover sizes, the text size was adjusted so that the difference in line breaks would be minimal between hard and softcover books.
\podcoverbottomtext
- \iflsUscover\newcommand{\lsISBNcover}{\lsISBNsoftcoverus}\else\newcommand{\lsISBNcover}{\lsISBNsoftcover}\fi
+% \iflsUscover\newcommand{\lsISBNcover}{\lsISBNsoftcoverus}\else\newcommand{\lsISBNcover}{\lsISBNsoftcover}\fi
\podbackcover{140mm}
\end{tikzpicture}
%exit the document right here
@@ -604,7 +584,7 @@
\fi
\ifx\lsSeries\pmwe
- \renewcommand{\eachwordone}{\itshape}
+ \renewcommand{\eachwordone}{\normalfont}
\fi
\ifx\lsSeries\nc
@@ -617,15 +597,12 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
% Geometry
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% For output type cover
-% \usepackage{catchfilebetweentags}
-\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
+% \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)
\newlength{\bleed}
\newlength{\seitenbreite}
\newlength{\seitenhoehe}
@@ -701,9 +678,7 @@
\textblockorigin{0mm}{0mm}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
% Fonts
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\usepackage{ifxetex}
@@ -763,6 +738,9 @@
\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,
@@ -784,10 +762,13 @@
SlantedFont = LinLibertine_R_B.otf,
SlantedFeatures = {FakeSlant=0.25},
BoldSlantedFeatures = {FakeSlant=0.25},
- SmallCapsFeatures = {FakeSlant=0,Numbers=OldStyle},
+ SmallCapsFeatures = {FakeSlant=0},
]{LinLibertine_R_B.otf}
\else % use standard fonts
- \setsansfont[
+ \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,
@@ -808,9 +789,8 @@
SlantedFont = LinLibertine_R.otf,
SlantedFeatures = {FakeSlant=0.25},
BoldSlantedFeatures = {FakeSlant=0.25},
- SmallCapsFeatures = {FakeSlant=0,Numbers=OldStyle},
+ SmallCapsFeatures = {FakeSlant=0},
]{LinLibertine_R.otf}
-
\fi
%% Deprecated:
@@ -853,9 +833,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
% Colors
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\usepackage{xcolor}
@@ -863,9 +841,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
% Cover
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\usepackage{pst-barcode} % for generating bar codes
@@ -909,30 +885,25 @@
\begin{textblock}{170}(-20,75)
\rotatebox{30}{
\colorbox{red}{
- \parbox[c][15ex][c]{220mm}{\centering\lsCoverTitleFont\color{white}Open Review\\[-0.1ex]}
- % \begin{tabular}{c}
- % ~\\
- % \scalebox{6}{\color{red}Open Review}\\[-0.5ex]
- % ~%version of \today, \currenttime
- % \end{tabular}
- }
- }
- \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}
+ \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
}
@@ -976,13 +947,10 @@
\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
- \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.
-% % \lsCoverBlock
-% % \lsCoverTitleAuthor
-% % \lsCoverSeries
-% % \lsCoverLogo
+\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.
\thispagestyle{empty}
\renewcommand{\and}{, }%
\renewcommand{\lastand}{ \& }%
@@ -1000,16 +968,15 @@
\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
}
\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.
-% % \lsCoverBlock
-% % \lsCoverTitleAuthor
-% % \lsCoverLogo
+ \pgfsetlayers{lspcls_bg,main} % Order the background layer behind the main layer of TikZ.
\thispagestyle{empty}
\renewcommand{\and}{, }%
\renewcommand{\lastand}{ \& }%
@@ -1026,36 +993,16 @@
\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
\end{tikzpicture}
+\ifcsname tikz@library@external@loaded\endcsname\tikzexternalenable\fi
}
%\usepackage{pdfpages}
-\newcommand{\lsAdvertisement}{
+\newcommand{\lsAdvertisement}{%
\include{\logopath langsci-advertisement}
}
-\newcommand{\lsBackPage}{ % Back page
-% % \lsCoverBlock
-% %
-% % \begin{textblock}{140}(15,24) % 30mm-6mm
-% % \color{white}
-% % {\raggedright
-% % \lsBackTitleFont
-% % \lsBackTitle \\ \null}
-% %
-% % \lsBackBodyFont
-% %
-% % \noindent
-% % \lsBackBody
-% % \end{textblock}
-% %
-% % \begin{textblock}{40}(105,200)
-% % \lsBackBodyFont\sffamily
-% % \colorbox{white}{%
-% % \begin{pspicture}(0,0)(4.1,1in)
-% % \psbarcode[transx=0.4,transy=0.3]{\lsISBNdigital}{includetext height=0.7}{isbn}
-% % \end{pspicture}
-% % }%
-% % \end{textblock}
+\newcommand{\lsBackPage}{%
+ \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.
\pagestyle{empty}
@@ -1074,13 +1021,12 @@
\end{pgfonlayer}
\podbackcover{137mm}
\end{tikzpicture}
+ \ifcsname tikz@library@external@loaded\endcsname\tikzexternalenable\fi
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
% Series history
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\newcommand{\lsSeriesHistory}{
@@ -1092,15 +1038,11 @@
\IfStrEq{\lsISSN}{??} % \IfStrEq from xstring
{}
- {\vfill\hfill ISSN: \lsISSN}
-
-}
-
+ {\vfill\hfill ISSN: \lsISSN}
+}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
% Imprint
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% for imprint:
@@ -1136,17 +1078,57 @@
\newcommand{\SeriesNumber}[1]{\renewcommand{\lsSeriesNumber}{#1}}
\newcommand{\BookDOI}[1]{\renewcommand{\lsBookDOI}{#1}}
+
+%invert names of first author for citation on impressum page
+
+\newcommand{\lsFirstAuthorFullName}{}%temporary, will be overwritten
+\newcommand{\lsFirstAuthorFirstName}{}%temporary, will be overwritten
+\newcommand{\lsFirstAuthorLastName}{}%temporary, will be overwritten
+\newcommand{\lsFirstAuthorString}{\lsFirstAuthorLastName, \lsFirstAuthorFirstName} %can be customized in localmetadata.tex
+\newcommand{\lsNonFirstAuthorsString}{} %default, will be overwritten iff more than one author
+% \newcommand{\lsImpressionCitationAuthor}{\lsFirstAuthorString \lsNonFirstAuthorsString}
+
+
+\AtBeginDocument{
+\makeatletter
+\let\theauthor\@author
+\makeatother
+\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{\lsFirstAuthorLastName}{\StrBetween{\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 }}
+ }{%else exactly one author
+ \renewcommand{\lsFirstAuthorFirstName}{\StrBefore{\theauthor}{ }}
+ \renewcommand{\lsFirstAuthorLastName}{\StrBehind{\theauthor}{ }}
+ }
+ }
+}
+
+
+\newcommand{\lsImpressionCitationAuthor}{
+\lsFirstAuthorLastName, \lsFirstAuthorFirstName \lsNonFirstAuthorsString}
+
\newcommand{\lsImpressumCitationText}{
\onlyAuthor
\renewcommand{\newlineCover}{}
\renewcommand{\newlineSpine}{}
- {\@author}\if\lsEditorSuffix\empty\else\ \lsEditorSuffix\fi. %
+ {\lsImpressionCitationAuthor}\if\lsEditorSuffix\empty\else\ \lsEditorSuffix\fi. %
{\lsYear}. %
\textit{\@title}\if\@subtitle\empty\else: \textit{\@subtitle}\fi\ %
(\lsSeriesTitle). %
Berlin: Language Science Press.
}
-
+\newcommand{\lsImpressumExtra}{}%for legal notes required for revised theses ("... in fulfillment of ... ")
\newcommand{\lsImpressum}{
\thispagestyle{empty}
\raggedright
@@ -1163,12 +1145,20 @@ 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/
+http://creativecommons.org/licenses/by/4.0/ \includegraphics[height=.75em]{\logopath ccby.eps}
\else
Published under the Creative Commons Attribution-NoDerivatives 4.0 Licence (CC BY-ND 4.0):
-http://creativecommons.org/licenses/by-nd/4.0/
+http://creativecommons.org/licenses/by-nd/4.0/ \includegraphics[height=.75em]{\logopath ccbynd.eps}
\fi
+{\lsImpressumExtra}
+
+\ifx\lsSeries\sidl
+Indexed in EBSCO\smallskip
+\fi
+
+
+
\begin{tabular}{@{}l@{~}l}
ISBN: &
\IfStrEq{\lsISBNdigital}{000-0-000000-00-0}{%no digital ISBN, issue warning
@@ -1199,9 +1189,10 @@ ISBN: &
\IfStrEq{\lsBookDOI}{??} % \IfStrEq from xstring
{{\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}
-
+}%
\bigskip
Cover and concept of design:
@@ -1254,9 +1245,7 @@ Storage and cataloguing done by FU Berlin \\[3ex]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
% Dedication
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\newcommand{\lsDedication}{\thispagestyle{empty}
@@ -1270,9 +1259,7 @@ Storage and cataloguing done by FU Berlin \\[3ex]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
% Header and footer
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\usepackage{datetime}
@@ -1301,9 +1288,7 @@ Storage and cataloguing done by FU Berlin \\[3ex]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
% Sectioning
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\setcounter{secnumdepth}{4}
@@ -1323,9 +1308,7 @@ Storage and cataloguing done by FU Berlin \\[3ex]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
% Epigrams
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\epigram#1{\gdef\@epigram{#1}} % needs to be defined this way to check emptiness
@@ -1342,9 +1325,7 @@ Storage and cataloguing done by FU Berlin \\[3ex]
\setlength{\afterepigraphskip}{0\baselineskip}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
% Footnotes
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifxetex
@@ -1372,9 +1353,7 @@ Storage and cataloguing done by FU Berlin \\[3ex]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
% Quotes
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% quotes are indented at one side only.
@@ -1385,8 +1364,7 @@ Storage and cataloguing done by FU Berlin \\[3ex]
%% quotations are indented at one side only
%% there is no indentation at the beginning of the quote
\renewenvironment{quotation}
-{\list{}{\listparindent 1.5em%
-%\itemindent \listparindent
+{\list{}{\listparindent 1.5em%\itemindent \listparindent
%\rightmargin \leftmargin
\parsep \z@ \@plus\p@}%
\item\relax}
@@ -1412,18 +1390,18 @@ Storage and cataloguing done by FU Berlin \\[3ex]
\else
\iflsBabelShorthands
\ifx\lsBookLanguage\lsBookLanguageEnglish
- \usepackage[german,\lsBookLanguage]{babel}
+ \usepackage[ngerman,\lsBookLanguage]{babel}
\addto\extrasenglish{\languageshorthands{german}\useshorthands{"}}
\fi
\ifx\lsBookLanguage\lsBookLanguageFrench
- \usepackage[german,\lsBookLanguage]{babel}
+ \usepackage[ngerman,\lsBookLanguage]{babel}
\addto\extrasfrench{\languageshorthands{german}\useshorthands{"}}
\fi
\ifx\lsBookLanguage\lsBookLanguageGerman
- \usepackage[german]{babel}
+ \usepackage[ngerman]{babel}% ngerman provides better hyphenation than german.
\fi
\ifx\lsBookLanguage\lsBookLanguagePortuguese
- \usepackage[german,\lsBookLanguage]{babel}
+ \usepackage[ngerman,\lsBookLanguage]{babel}
\addto\extrasportuges{\languageshorthands{german}\useshorthands{"}}
\fi
\else
@@ -1433,20 +1411,13 @@ Storage and cataloguing done by FU Berlin \\[3ex]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
% Citations
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\usepackage[
- natbib=true,
- % \iflsUndecapitalize
- % style=\bstpath biblatex-langsci-unified-undecap,
- % \else
- % style=\bstpath biblatex-langsci-unified,
- % \fi
- style=\bbxpath biblatex-langsci-unified,
- citestyle=\cbxpath langsci-authoryear-comp,
+ natbib=true,
+ style=\bibstylepath langsci-unified,
+ citestyle=\bibstylepath langsci-unified,
useprefix = true, %sort von, van, de where they should appear
%refsection=chapter,
maxbibnames=99,
@@ -1464,7 +1435,7 @@ Storage and cataloguing done by FU Berlin \\[3ex]
\iflsCollection\else
toc=bib, % make bibliography appear in toc
\fi
- datamodel=\bstpath langsci % add authauthor and autheditor as possible fields to bibtex entries
+ datamodel=\bibstylepath langsci % add authauthor and autheditor as possible fields to bibtex entries
]{biblatex}
% If the user provided a shortauthor in the bibtex entry, we use the authentic author (as with the
@@ -1490,21 +1461,8 @@ Storage and cataloguing done by FU Berlin \\[3ex]
{}}
-%% changes of citestyle (cbx) (FIXME: documentation missing)
-\renewcommand{\postnotedelim}{: }%
-\renewcommand{\multicitedelim}{\addsemicolon\space}%
-\renewcommand{\compcitedelim}{\multicitedelim}
-% \renewcommand{\nameyeardelim}{ }%
-
-%% changes of bibliography style (bbx)
-\DeclareFieldFormat{postnote}{#1}% display pages without page prefix (p., pp.)
-\DeclareBibliographyAlias{inbook}{incollection}% see https://github.com/semprag/biblatex-sp-unified/issues/35
-\DeclareFieldFormat[techreport,report,misc]{titlecase}{\MakeSentenceCase*{#1}}% techreport/report and misc are not genuinely supported by biblatex-sp-unified
-%% The note field should appear at end of an entry just before the DOI, other than with the used bibliography style. It is therefore first removed, then again restored and included together with the DOI.
-\AtEveryBibitem{%
- \savefield*{note}{\lsnote}%
- \clearfield{note}%
-}
+
+
%% DOIs are handled after hyperref.
\defbibheading{references}{\chapter{References}\sloppy}
\defbibheading{french}{\chapter{Références bibliographiques}\sloppy}
@@ -1549,24 +1507,16 @@ Storage and cataloguing done by FU Berlin \\[3ex]
%% penalties against widows and orphans in bibliography
%% http://tex.stackexchange.com/questions/297705/atbeginenvironment-does-not-work-with-natbib/297721#297721
-\usepackage{etoolbox}
\apptocmd{\thebibliography}{%
\clubpenalty\@M
\@clubpenalty\clubpenalty
\widowpenalty\@M
}
{}{}
-
-% % temporary workaround to fix wrong wrapping for \verb in bibtex
-% \makeatletter
-% \def\blx@maxline{77}
-% \makeatother
-
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
% Floats
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\usepackage{floatrow} % For adjusting the position of the caption (default is below).
@@ -1613,9 +1563,7 @@ width=.8\textwidth
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
% Appendices
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\appto\appendix{%
@@ -1635,13 +1583,10 @@ width=.8\textwidth
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
% Indexes
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\usepackage{index}
-%% Wie im Stylefile, aber ohne \MakeUppercase
+\usepackage{index} %% Wie im Stylefile, aber ohne \MakeUppercase
\renewenvironment{theindex}{%
\edef\indexname{\the\@nameuse{idxtitle@\@indextype}}%
\if@twocolumn
@@ -1657,9 +1602,7 @@ width=.8\textwidth
\index@prologue
\bigskip
\fi
- ]%
-% \@mkboth{\MakeUppercase\indexname}%
-% {\MakeUppercase\indexname}%
+ ]% \@mkboth{\MakeUppercase\indexname}% {\MakeUppercase\indexname}%
\@mkboth{\indexname}%
{\indexname}%
\thispagestyle{plain}%
@@ -1694,6 +1637,11 @@ width=.8\textwidth
\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
@@ -1721,20 +1669,19 @@ width=.8\textwidth
\IfFileExists{{\localepath langsci-hyphenation-pt}}{\input{\localepath langsci-hyphenation-pt}}{}
\fi
-\AtBeginDocument{
+% \AtBeginDocument{% FK 16-Jan-19: It is unclear why this was set. It conflicts with TikZ externalisation.
\makeindex
\newindex{lan}{ldx}{lnd}{\lsLanguageIndexTitle}
\newindex{sbj}{sdx}{snd}{\lsSubjectIndexTitle}
\renewindex{default}{adx}{and}{\lsNameIndexTitle} %biblatex can only deal with the default index
% \newindex{wrd}{wdx}{wnd}{Expression index}
% \newindex{rwrd}{rdx}{rnd}{Reverse expression index}
-}
+% }
\indexproofstyle{\setlength{\overfullrule}{0pt}\raggedright\footnotesize}
%% \index inside footnote
-\def\infn#1#2{%
-% \hyperpage{#2}n#1% 99n2
+\def\infn#1#2{% \hyperpage{#2}n#1% 99n2
% \hyperpage{#2}*% 99*
\hyperpage{#2}\textsuperscript{#1}% 99²
}%
@@ -1791,8 +1738,8 @@ width=.8\textwidth
\let\isold\is
\let\ilold\il
\let\iaold\ia
- \renewcommand{\isi}[1]{\sethlcolor{green}\hl{#1}\isold{#1}}
- \renewcommand{\is}[1]{{\tikzstyle{notestyleraw} += [text width=1.5cm]\todo[color=green,size=\scriptsize]{\tiny#1}\isold{#1}}}
+ \renewcommand{\isi}[1]{\sethlcolor{lsSoftGreen}\hl{#1}\isold{#1}}
+ \renewcommand{\is}[1]{{\tikzstyle{notestyleraw} += [text width=1.5cm]\todo[color=lsSoftGreen,size=\scriptsize]{\tiny#1}\isold{#1}}}
\renewcommand{\ili}[1]{\sethlcolor{yellow}\hl{#1}\ilold{#1}}
\renewcommand{\il}[1]{{\tikzstyle{notestyleraw} += [text width=1.5cm]\todo[color=yellow,size=\scriptsize]{\tiny#1}\ilold{#1}}}
\renewcommand{\iai}[1]{\sethlcolor{pink}\hl{#1}\iaold{#1}}
@@ -1801,9 +1748,7 @@ width=.8\textwidth
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
% Hyperref
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\usepackage[
@@ -1833,7 +1778,7 @@ width=.8\textwidth
\iffieldundef{url}{}{ \url{\thefield{url}}\iffieldundef{urlday}{}{, accessed \thefield{urlyear}-\thefield{urlmonth}-\thefield{urlday}}.}
\restorefield{note}{\lsnote}
\iffieldundef{note}{}{\addspace{\thefield{note}\addperiod}}
- \iffieldundef{doi}{}{ {\color{lsGuidelinesGray}\doi{\thefield{doi}}}}
+ \iffieldundef{doi}{}{ {\color{lsDOIGray}\doi{\thefield{doi}}}}
}
%\DeclareFieldFormat{doi}{{\color{lsGuidelinesGray}\doi{#1}}}
\fi
@@ -1852,9 +1797,7 @@ width=.8\textwidth
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
% Collection (edited volume):
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% for papers of collections:
@@ -1891,10 +1834,13 @@ 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
\newwrite\tempfile % open temporary bib file
\immediate\openout\tempfile=collection_tmp.bib
+ \fi
}
-\AtEndDocument{\immediate\closeout\tempfile}% close temporary bib file
+% Only touch the \tempfile if we are NOT in \includeonly mode, prevent flushing of the file
+\AtEndDocument{\if@partsw\else\immediate\closeout\tempfile\fi}% close temporary bib file
%% customize \tableofcontents
\renewcommand{\@dotsep}{2.5} % space between dots
@@ -1938,12 +1884,13 @@ width=.8\textwidth
{\thefield{entrytype}}}
{\multicitedelim}
{\usebibmacro{postnote}}
- \renewcommand{\lsCollectionPaperCitationText}{\fullciteFooter{#1}}
+ \renewcommand{\lsCollectionPaperCitationText}{\fullciteFooter{#1footer}}
\include{#1}%
- \addtocounter{page}{-1}
- \edef\lsCollectionPaperLastPage{\thepage} % \lsCollectionPaperFirstPage is defined in \lsPaper
- \addtocounter{page}{1}
+ \if@partsw\relax\else% This switch controls whether the included chapter is in the range of \includeonly. It's from source2e.
+ \addtocounter{page}{-1}
+ \edef\lsCollectionPaperLastPage{\thepage} % \lsCollectionPaperFirstPage is defined in \lsPaper
+ \addtocounter{page}{1}
%%% for citation in footer
%% preprocessing of author/editor names
@@ -1958,8 +1905,9 @@ width=.8\textwidth
%% write bib entry to file
%% FIXME: the publisher field needs a final period, since this is not provided by \fullciteFooter together with DOIs.
- \immediate\write\tempfile{@incollection{#1,author={\authorTemp},title={{\lsCollectionPaperFooterTitle}},booktitle={{\lsCollectionTitle}},editor={\editorTemp},publisher={Language Science Press.},Address={Berlin},year={\,\lsYear},pages={\lsCollectionPaperFirstPage --\lsCollectionPaperLastPage},doi={\lsChapterDOI},options={skipbib=true,skiplab=true}}}
-
+ \immediate\write\tempfile{@incollection{#1,author={\authorTemp},title={{\lsCollectionPaperFooterTitle}},booktitle={{\lsCollectionTitle}},editor={\editorTemp},publisher={Language Science Press.},Address={Berlin},year={\lsYear},pages={\lsCollectionPaperFirstPage --\lsCollectionPaperLastPage},doi={\lsChapterDOI},keywords={withinvolume}}}
+ \immediate\write\tempfile{@incollection{#1footer,author={\authorTemp},title={{\lsCollectionPaperFooterTitle}},booktitle={{\lsCollectionTitle}},editor={\editorTemp},publisher={Language Science Press.},Address={Berlin},year={\lsYear},pages={\lsCollectionPaperFirstPage --\lsCollectionPaperLastPage},doi={\lsChapterDOI},options={dataonly=true}}}
+ \fi% If the paper is not within \includeonly, don't do anything.
\end{refsection}
\end{collectionpaper}}
\fi
@@ -2043,8 +1991,8 @@ width=.8\textwidth
\includegraphics{\logopath langsci_spinelogo_nocolor.pdf}}%
% \hspace{0.8em}%
\hfill%
- \parbox[b]{.87\textwidth}{\linespread{0.8}\lsChapterFooterSize\normalfont\lsCollectionPaperCitationText}}
-\ifx\lsOutput\lsOutputPaper % only if output=paper
+ \parbox[b]{.87\textwidth}{\linespread{0.8}\lsChapterFooterSize\normalfont\lsCollectionPaperCitationText \includegraphics[height=.75em]{\logopath ccby.eps}}}
+\ifx\lsOutput\lsOutputPaper % only if output==paper
\renewcommand{\lsCollectionPaperCitation}{Change with \string\papernote}
\fi
@@ -2087,22 +2035,86 @@ width=.8\textwidth
}
+
+
%writeout page numbers for separation of chapters
% \usepackage{newfile}
% \newoutputstream{pages}
% \openoutputfile{\jobname.pgs}{pages}
% \newcommand{\writechapterpages}{\addtostream{pages}{\thepage}}
-%
% \AtEndDocument{
% \closeoutputstream{pages}
% }
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Color definitions:
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\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{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}
+% }
+% }
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
% Miscellaneous
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\usepackage[figuresright]{rotating}
@@ -2122,4 +2134,14 @@ width=.8\textwidth
%% {}* Can the boy who run fast can jump high?
%% \zl
+\iflsArseneau% Donald Arseneau's automatic handling of page breaking from comp.text.tex: https://groups.google.com/d/topic/comp.text.tex/3eehwzortPg/discussion
+% With the optimisations from the memoir class. The memoir class has relative instead of absolute values.
+\def\sloppybottom{%
+ \def\@textbottom{\vskip \z@ \@plus.0001fil \@minus .95\topskip}%
+ \topskip=1\topskip \@plus 0.625\topskip \@minus .95\topskip%
+ \def\@texttop{\vskip \z@ \@plus -0.625\topskip \@minus -0.95\topskip}%
+}
+\sloppybottom
+\fi
+
\endinput
diff --git a/Master/texmf-dist/tex/xelatex/langsci/tbls-filter.pdf b/Master/texmf-dist/tex/xelatex/langsci/tbls-filter.pdf
new file mode 100644
index 00000000000..399346ed615
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/langsci/tbls-filter.pdf
@@ -0,0 +1,91 @@
+%PDF-1.4
+%쏢
+5 0 obj
+<</Length 6 0 R>>
+stream
+q 0.1 0 0 0.1 0 0 cm
+/R7 gs
+% g
+% 0 240 240 re f
+% g
+100 60 40 20 re
+30 160 180 20 re
+60 110 120 20 re
+60 110 m
+f
+Q
+endstream
+endobj
+6 0 obj
+116
+endobj
+4 0 obj
+<</Type/Page/MediaBox [0 0 24 24]
+/Parent 3 0 R
+/Resources<</ProcSet[/PDF]
+/ExtGState 8 0 R
+>>
+/Contents 5 0 R
+>>
+endobj
+3 0 obj
+<< /Type /Pages /Kids [
+4 0 R
+] /Count 1
+>>
+endobj
+1 0 obj
+<</Type /Catalog /Pages 3 0 R
+/Metadata 9 0 R
+>>
+endobj
+7 0 obj
+<</Type/ExtGState
+/OPM 1>>endobj
+8 0 obj
+<</R7
+7 0 R>>
+endobj
+9 0 obj
+<</Type/Metadata
+/Subtype/XML/Length 1344>>stream
+<?xpacket begin='' id='W5M0MpCehiHzreSzNTczkc9d'?>
+<?adobe-xap-filters esc="CRLF"?>
+<x:xmpmeta xmlns:x='adobe:ns:meta/' x:xmptk='XMP toolkit 2.9.1-13, framework 1.6'>
+<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:iX='http://ns.adobe.com/iX/1.0/'>
+<rdf:Description rdf:about='uuid:cee20fd5-de11-11f3-0000-1530e969d095' xmlns:pdf='http://ns.adobe.com/pdf/1.3/' pdf:Producer='GPL Ghostscript 9.22'/>
+<rdf:Description rdf:about='uuid:cee20fd5-de11-11f3-0000-1530e969d095' xmlns:xmp='http://ns.adobe.com/xap/1.0/'><xmp:ModifyDate>2018-08-22T12:22:23+02:00</xmp:ModifyDate>
+<xmp:CreateDate>2018-08-22T12:22:23+02:00</xmp:CreateDate>
+<xmp:CreatorTool>UnknownApplication</xmp:CreatorTool></rdf:Description>
+<rdf:Description rdf:about='uuid:cee20fd5-de11-11f3-0000-1530e969d095' xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='uuid:cee20fd5-de11-11f3-0000-1530e969d095'/>
+<rdf:Description rdf:about='uuid:cee20fd5-de11-11f3-0000-1530e969d095' xmlns:dc='http://purl.org/dc/elements/1.1/' dc:format='application/pdf'><dc:title><rdf:Alt><rdf:li xml:lang='x-default'>Untitled</rdf:li></rdf:Alt></dc:title></rdf:Description>
+</rdf:RDF>
+</x:xmpmeta>
+
+
+<?xpacket end='w'?>
+endstream
+endobj
+2 0 obj
+<</Producer(GPL Ghostscript 9.22)
+/CreationDate(D:20180822122223+02'00')
+/ModDate(D:20180822122223+02'00')>>endobj
+xref
+0 10
+0000000000 65535 f
+0000000388 00000 n
+0000001942 00000 n
+0000000329 00000 n
+0000000200 00000 n
+0000000015 00000 n
+0000000181 00000 n
+0000000452 00000 n
+0000000493 00000 n
+0000000522 00000 n
+trailer
+<< /Size 10 /Root 1 0 R /Info 2 0 R
+/ID [<90D4493E115BA5DD9E69EFA090D98DBD><90D4493E115BA5DD9E69EFA090D98DBD>]
+>>
+startxref
+2065
+%%EOF
diff --git a/Master/texmf-dist/tex/xelatex/langsci/tbls-plus.pdf b/Master/texmf-dist/tex/xelatex/langsci/tbls-plus.pdf
new file mode 100644
index 00000000000..c22fe8c814e
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/langsci/tbls-plus.pdf
@@ -0,0 +1,114 @@
+%PDF-1.4
+%쏢
+5 0 obj
+<</Length 6 0 R>>
+stream
+q 0.1 0 0 0.1 0 0 cm
+/R7 gs
+% g
+% 0 240 239.73 re
+f
+% g
+130 170 m
+110 170 l
+110 130 l
+70 130 l
+70 110 l
+110 110 l
+110 70 l
+130 70 l
+130 110 l
+170 110 l
+170 130 l
+130 130 l
+h
+120 220 m
+64.8789 220 20 175.121 20 120 c
+20 64.8789 64.8789 20 120 20 c
+175.121 20 220 64.8789 220 120 c
+220 175.121 175.121 220 120 220 c
+h
+120 40 m
+75.8984 40 40 75.8984 40 120 c
+40 164.102 75.8984 200 120 200 c
+164.102 200 200 164.102 200 120 c
+200 75.8984 164.102 40 120 40 c
+h
+120 40 m
+f
+Q
+endstream
+endobj
+6 0 obj
+470
+endobj
+4 0 obj
+<</Type/Page/MediaBox [0 0 24 24]
+/Parent 3 0 R
+/Resources<</ProcSet[/PDF]
+/ExtGState 8 0 R
+>>
+/Contents 5 0 R
+>>
+endobj
+3 0 obj
+<< /Type /Pages /Kids [
+4 0 R
+] /Count 1
+>>
+endobj
+1 0 obj
+<</Type /Catalog /Pages 3 0 R
+/Metadata 9 0 R
+>>
+endobj
+7 0 obj
+<</Type/ExtGState
+/OPM 1>>endobj
+8 0 obj
+<</R7
+7 0 R>>
+endobj
+9 0 obj
+<</Type/Metadata
+/Subtype/XML/Length 1344>>stream
+<?xpacket begin='' id='W5M0MpCehiHzreSzNTczkc9d'?>
+<?adobe-xap-filters esc="CRLF"?>
+<x:xmpmeta xmlns:x='adobe:ns:meta/' x:xmptk='XMP toolkit 2.9.1-13, framework 1.6'>
+<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:iX='http://ns.adobe.com/iX/1.0/'>
+<rdf:Description rdf:about='uuid:80cd0c54-de11-11f3-0000-ca7119f977de' xmlns:pdf='http://ns.adobe.com/pdf/1.3/' pdf:Producer='GPL Ghostscript 9.22'/>
+<rdf:Description rdf:about='uuid:80cd0c54-de11-11f3-0000-ca7119f977de' xmlns:xmp='http://ns.adobe.com/xap/1.0/'><xmp:ModifyDate>2018-08-22T12:20:12+02:00</xmp:ModifyDate>
+<xmp:CreateDate>2018-08-22T12:20:12+02:00</xmp:CreateDate>
+<xmp:CreatorTool>UnknownApplication</xmp:CreatorTool></rdf:Description>
+<rdf:Description rdf:about='uuid:80cd0c54-de11-11f3-0000-ca7119f977de' xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='uuid:80cd0c54-de11-11f3-0000-ca7119f977de'/>
+<rdf:Description rdf:about='uuid:80cd0c54-de11-11f3-0000-ca7119f977de' xmlns:dc='http://purl.org/dc/elements/1.1/' dc:format='application/pdf'><dc:title><rdf:Alt><rdf:li xml:lang='x-default'>Untitled</rdf:li></rdf:Alt></dc:title></rdf:Description>
+</rdf:RDF>
+</x:xmpmeta>
+
+
+<?xpacket end='w'?>
+endstream
+endobj
+2 0 obj
+<</Producer(GPL Ghostscript 9.22)
+/CreationDate(D:20180822122012+02'00')
+/ModDate(D:20180822122012+02'00')>>endobj
+xref
+0 10
+0000000000 65535 f
+0000000742 00000 n
+0000002296 00000 n
+0000000683 00000 n
+0000000554 00000 n
+0000000015 00000 n
+0000000535 00000 n
+0000000806 00000 n
+0000000847 00000 n
+0000000876 00000 n
+trailer
+<< /Size 10 /Root 1 0 R /Info 2 0 R
+/ID [<2106EE0723CBAEADC0359583D39E1DB5><2106EE0723CBAEADC0359583D39E1DB5>]
+>>
+startxref
+2419
+%%EOF
diff --git a/Master/texmf-dist/tex/xelatex/langsci/tbls-refresh.pdf b/Master/texmf-dist/tex/xelatex/langsci/tbls-refresh.pdf
new file mode 100644
index 00000000000..d2d36dbbbf6
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/langsci/tbls-refresh.pdf
@@ -0,0 +1,103 @@
+%PDF-1.4
+%쏢
+5 0 obj
+<</Length 6 0 R>>
+stream
+q 0.1 0 0 0.1 0 0 cm
+/R7 gs
+% g
+% 0.898438 239.648 240 re
+f
+% g
+176.48 176.48 m
+161.988 191.02 142.109 200 120 200 c
+75.7813 200 40.1211 164.219 40.1211 120 c
+40.1211 75.7813 75.7813 40 120 40 c
+157.301 40 188.398 65.5117 197.301 100 c
+176.48 100 l
+168.281 76.7188 146.09 60 120 60 c
+86.9102 60 60 86.9102 60 120 c
+60 153.09 86.9102 180 120 180 c
+136.602 180 151.41 173.09 162.191 162.191 c
+130 130 l
+200 130 l
+200 200 l
+h
+176.48 176.48 m
+f
+Q
+endstream
+endobj
+6 0 obj
+443
+endobj
+4 0 obj
+<</Type/Page/MediaBox [0 0 24 24]
+/Parent 3 0 R
+/Resources<</ProcSet[/PDF]
+/ExtGState 8 0 R
+>>
+/Contents 5 0 R
+>>
+endobj
+3 0 obj
+<< /Type /Pages /Kids [
+4 0 R
+] /Count 1
+>>
+endobj
+1 0 obj
+<</Type /Catalog /Pages 3 0 R
+/Metadata 9 0 R
+>>
+endobj
+7 0 obj
+<</Type/ExtGState
+/OPM 1>>endobj
+8 0 obj
+<</R7
+7 0 R>>
+endobj
+9 0 obj
+<</Type/Metadata
+/Subtype/XML/Length 1344>>stream
+<?xpacket begin='' id='W5M0MpCehiHzreSzNTczkc9d'?>
+<?adobe-xap-filters esc="CRLF"?>
+<x:xmpmeta xmlns:x='adobe:ns:meta/' x:xmptk='XMP toolkit 2.9.1-13, framework 1.6'>
+<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:iX='http://ns.adobe.com/iX/1.0/'>
+<rdf:Description rdf:about='uuid:51b69ad3-de11-11f3-0000-42bf8145e49f' xmlns:pdf='http://ns.adobe.com/pdf/1.3/' pdf:Producer='GPL Ghostscript 9.22'/>
+<rdf:Description rdf:about='uuid:51b69ad3-de11-11f3-0000-42bf8145e49f' xmlns:xmp='http://ns.adobe.com/xap/1.0/'><xmp:ModifyDate>2018-08-22T12:18:53+02:00</xmp:ModifyDate>
+<xmp:CreateDate>2018-08-22T12:18:53+02:00</xmp:CreateDate>
+<xmp:CreatorTool>UnknownApplication</xmp:CreatorTool></rdf:Description>
+<rdf:Description rdf:about='uuid:51b69ad3-de11-11f3-0000-42bf8145e49f' xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='uuid:51b69ad3-de11-11f3-0000-42bf8145e49f'/>
+<rdf:Description rdf:about='uuid:51b69ad3-de11-11f3-0000-42bf8145e49f' xmlns:dc='http://purl.org/dc/elements/1.1/' dc:format='application/pdf'><dc:title><rdf:Alt><rdf:li xml:lang='x-default'>Untitled</rdf:li></rdf:Alt></dc:title></rdf:Description>
+</rdf:RDF>
+</x:xmpmeta>
+
+
+<?xpacket end='w'?>
+endstream
+endobj
+2 0 obj
+<</Producer(GPL Ghostscript 9.22)
+/CreationDate(D:20180822121853+02'00')
+/ModDate(D:20180822121853+02'00')>>endobj
+xref
+0 10
+0000000000 65535 f
+0000000715 00000 n
+0000002269 00000 n
+0000000656 00000 n
+0000000527 00000 n
+0000000015 00000 n
+0000000508 00000 n
+0000000779 00000 n
+0000000820 00000 n
+0000000849 00000 n
+trailer
+<< /Size 10 /Root 1 0 R /Info 2 0 R
+/ID [<B7F64D9F6C9270590BECE38D283B1B71><B7F64D9F6C9270590BECE38D283B1B71>]
+>>
+startxref
+2392
+%%EOF
diff --git a/Master/texmf-dist/tex/xelatex/langsci/tbls-report.pdf b/Master/texmf-dist/tex/xelatex/langsci/tbls-report.pdf
new file mode 100644
index 00000000000..ebf933d2aae
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/langsci/tbls-report.pdf
@@ -0,0 +1,117 @@
+%PDF-1.4
+%쏢
+5 0 obj
+<</Length 6 0 R>>
+stream
+q 0.1 0 0 0.1 0 0 cm
+/R7 gs
+% g
+% 1.60156 239.301 240 re
+f
+% g
+157.301 210 m
+82.6992 210 l
+30 157.301 l
+30 82.6992 l
+82.6992 30 l
+157.301 30 l
+210 82.6992 l
+210 157.301 l
+h
+190 91.0195 m
+148.98 50 l
+91.0195 50 l
+50 91.0195 l
+50 148.98 l
+91.0195 190 l
+148.98 190 l
+190 148.98 l
+h
+190 91.0195 m
+f
+120 90 m
+114.488 90 110 85.5117 110 80 c
+110 74.4883 114.488 70 120 70 c
+125.512 70 130 74.4883 130 80 c
+130 85.5117 125.512 90 120 90 c
+h
+120 90 m
+f*
+110 100 20 70 re
+f*
+Q
+endstream
+endobj
+6 0 obj
+468
+endobj
+4 0 obj
+<</Type/Page/MediaBox [0 0 24 24]
+/Parent 3 0 R
+/Resources<</ProcSet[/PDF]
+/ExtGState 8 0 R
+>>
+/Contents 5 0 R
+>>
+endobj
+3 0 obj
+<< /Type /Pages /Kids [
+4 0 R
+] /Count 1
+>>
+endobj
+1 0 obj
+<</Type /Catalog /Pages 3 0 R
+/Metadata 9 0 R
+>>
+endobj
+7 0 obj
+<</Type/ExtGState
+/OPM 1>>endobj
+8 0 obj
+<</R7
+7 0 R>>
+endobj
+9 0 obj
+<</Type/Metadata
+/Subtype/XML/Length 1344>>stream
+<?xpacket begin='' id='W5M0MpCehiHzreSzNTczkc9d'?>
+<?adobe-xap-filters esc="CRLF"?>
+<x:xmpmeta xmlns:x='adobe:ns:meta/' x:xmptk='XMP toolkit 2.9.1-13, framework 1.6'>
+<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:iX='http://ns.adobe.com/iX/1.0/'>
+<rdf:Description rdf:about='uuid:187e2ad2-de11-11f3-0000-e6e74bcaa580' xmlns:pdf='http://ns.adobe.com/pdf/1.3/' pdf:Producer='GPL Ghostscript 9.22'/>
+<rdf:Description rdf:about='uuid:187e2ad2-de11-11f3-0000-e6e74bcaa580' xmlns:xmp='http://ns.adobe.com/xap/1.0/'><xmp:ModifyDate>2018-08-22T12:17:17+02:00</xmp:ModifyDate>
+<xmp:CreateDate>2018-08-22T12:17:17+02:00</xmp:CreateDate>
+<xmp:CreatorTool>UnknownApplication</xmp:CreatorTool></rdf:Description>
+<rdf:Description rdf:about='uuid:187e2ad2-de11-11f3-0000-e6e74bcaa580' xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='uuid:187e2ad2-de11-11f3-0000-e6e74bcaa580'/>
+<rdf:Description rdf:about='uuid:187e2ad2-de11-11f3-0000-e6e74bcaa580' xmlns:dc='http://purl.org/dc/elements/1.1/' dc:format='application/pdf'><dc:title><rdf:Alt><rdf:li xml:lang='x-default'>Untitled</rdf:li></rdf:Alt></dc:title></rdf:Description>
+</rdf:RDF>
+</x:xmpmeta>
+
+
+<?xpacket end='w'?>
+endstream
+endobj
+2 0 obj
+<</Producer(GPL Ghostscript 9.22)
+/CreationDate(D:20180822121717+02'00')
+/ModDate(D:20180822121717+02'00')>>endobj
+xref
+0 10
+0000000000 65535 f
+0000000740 00000 n
+0000002294 00000 n
+0000000681 00000 n
+0000000552 00000 n
+0000000015 00000 n
+0000000533 00000 n
+0000000804 00000 n
+0000000845 00000 n
+0000000874 00000 n
+trailer
+<< /Size 10 /Root 1 0 R /Info 2 0 R
+/ID [<56D823169E2B6A3D6FD878C48A0EEDEC><56D823169E2B6A3D6FD878C48A0EEDEC>]
+>>
+startxref
+2417
+%%EOF
diff --git a/Master/texmf-dist/tex/xelatex/langsci/tbls-test.pdf b/Master/texmf-dist/tex/xelatex/langsci/tbls-test.pdf
new file mode 100644
index 00000000000..74634953d7e
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/langsci/tbls-test.pdf
@@ -0,0 +1,108 @@
+%PDF-1.4
+%쏢
+5 0 obj
+<</Length 6 0 R>>
+stream
+q 0.1 0 0 0.1 0 0 cm
+/R7 gs
+% g
+% 0 239.73 239.73 re
+f
+% g
+165.898 164.219 m
+100 98.2813 l
+64.1016 134.102 l
+50 120 l
+100 70 l
+180 150 l
+h
+120 220 m
+64.8008 220 20 175.199 20 120 c
+20 64.8008 64.8008 20 120 20 c
+175.199 20 220 64.8008 220 120 c
+220 175.199 175.199 220 120 220 c
+h
+120 40 m
+75.7813 40 40 75.7813 40 120 c
+40 164.219 75.7813 200 120 200 c
+164.219 200 200 164.219 200 120 c
+200 75.7813 164.219 40 120 40 c
+h
+120 40 m
+f
+Q
+endstream
+endobj
+6 0 obj
+435
+endobj
+4 0 obj
+<</Type/Page/MediaBox [0 0 24 24]
+/Parent 3 0 R
+/Resources<</ProcSet[/PDF]
+/ExtGState 8 0 R
+>>
+/Contents 5 0 R
+>>
+endobj
+3 0 obj
+<< /Type /Pages /Kids [
+4 0 R
+] /Count 1
+>>
+endobj
+1 0 obj
+<</Type /Catalog /Pages 3 0 R
+/Metadata 9 0 R
+>>
+endobj
+7 0 obj
+<</Type/ExtGState
+/OPM 1>>endobj
+8 0 obj
+<</R7
+7 0 R>>
+endobj
+9 0 obj
+<</Type/Metadata
+/Subtype/XML/Length 1344>>stream
+<?xpacket begin='' id='W5M0MpCehiHzreSzNTczkc9d'?>
+<?adobe-xap-filters esc="CRLF"?>
+<x:xmpmeta xmlns:x='adobe:ns:meta/' x:xmptk='XMP toolkit 2.9.1-13, framework 1.6'>
+<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:iX='http://ns.adobe.com/iX/1.0/'>
+<rdf:Description rdf:about='uuid:dbb233d1-de10-11f3-0000-43af12e764cd' xmlns:pdf='http://ns.adobe.com/pdf/1.3/' pdf:Producer='GPL Ghostscript 9.22'/>
+<rdf:Description rdf:about='uuid:dbb233d1-de10-11f3-0000-43af12e764cd' xmlns:xmp='http://ns.adobe.com/xap/1.0/'><xmp:ModifyDate>2018-08-22T12:15:35+02:00</xmp:ModifyDate>
+<xmp:CreateDate>2018-08-22T12:15:35+02:00</xmp:CreateDate>
+<xmp:CreatorTool>UnknownApplication</xmp:CreatorTool></rdf:Description>
+<rdf:Description rdf:about='uuid:dbb233d1-de10-11f3-0000-43af12e764cd' xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='uuid:dbb233d1-de10-11f3-0000-43af12e764cd'/>
+<rdf:Description rdf:about='uuid:dbb233d1-de10-11f3-0000-43af12e764cd' xmlns:dc='http://purl.org/dc/elements/1.1/' dc:format='application/pdf'><dc:title><rdf:Alt><rdf:li xml:lang='x-default'>Untitled</rdf:li></rdf:Alt></dc:title></rdf:Description>
+</rdf:RDF>
+</x:xmpmeta>
+
+
+<?xpacket end='w'?>
+endstream
+endobj
+2 0 obj
+<</Producer(GPL Ghostscript 9.22)
+/CreationDate(D:20180822121535+02'00')
+/ModDate(D:20180822121535+02'00')>>endobj
+xref
+0 10
+0000000000 65535 f
+0000000707 00000 n
+0000002261 00000 n
+0000000648 00000 n
+0000000519 00000 n
+0000000015 00000 n
+0000000500 00000 n
+0000000771 00000 n
+0000000812 00000 n
+0000000841 00000 n
+trailer
+<< /Size 10 /Root 1 0 R /Info 2 0 R
+/ID [<DFA15DD59BAB3502B4091F992BBE1665><DFA15DD59BAB3502B4091F992BBE1665>]
+>>
+startxref
+2384
+%%EOF
diff --git a/Master/texmf-dist/tex/xelatex/langsci/tbls-tree.pdf b/Master/texmf-dist/tex/xelatex/langsci/tbls-tree.pdf
new file mode 100644
index 00000000000..6e690fb501b
--- /dev/null
+++ b/Master/texmf-dist/tex/xelatex/langsci/tbls-tree.pdf
@@ -0,0 +1,131 @@
+%PDF-1.4
+%쏢
+5 0 obj
+<</Length 6 0 R>>
+stream
+q 0.1 0 0 0.1 0 0 cm
+/R7 gs
+% g
+% 0.898438 240 240 re
+f
+% g
+134.059 117.969 m
+133.672 119.488 133.441 121.051 133.441 122.699 c
+133.441 124.34 133.629 125.898 134.059 127.379 c
+94.1016 169.02 l
+92.6992 168.59 91.1289 168.398 89.5703 168.398 c
+87.9688 168.398 86.4102 168.59 85 169.02 c
+45 127.379 l
+45.4297 125.898 45.6211 124.34 45.6211 122.699 c
+45.6211 112.66 37.7305 104.449 28.0508 104.449 c
+18.3984 104.449 10.4688 112.66 10.4688 122.699 c
+10.4688 132.77 18.3984 140.98 28.0508 140.98 c
+29.6484 140.98 31.1289 140.781 32.5391 140.352 c
+72.6211 181.91 l
+72.1484 183.398 71.9883 185.039 71.9883 186.68 c
+71.9883 196.719 79.8789 204.961 89.5703 204.961 c
+99.2188 204.961 107.148 196.719 107.148 186.68 c
+107.148 185.039 106.949 183.398 106.52 181.91 c
+106.48 181.879 l
+146.559 140.352 l
+147.969 140.781 149.449 140.98 151.02 140.98 c
+160.699 140.98 168.59 132.77 168.59 122.699 c
+168.59 121.02 168.398 119.379 167.969 117.852 c
+208.012 76.2891 l
+209.41 76.7617 210.898 76.9492 212.5 76.9492 c
+222.148 76.9492 230.078 68.7109 230.078 58.6719 c
+230.078 48.6289 222.148 40.3906 212.5 40.3906 c
+202.809 40.3906 194.922 48.6289 194.922 58.6719 c
+194.922 60.3086 195.078 61.8789 195.512 63.3203 c
+155.551 105 l
+155.469 104.961 155.43 105 155.43 105.039 c
+154.02 104.648 152.539 104.41 151.02 104.41 c
+149.488 104.41 147.969 104.648 146.559 105.039 c
+146.559 105 146.52 104.961 146.449 105 c
+106.48 63.3203 l
+106.91 61.8789 107.07 60.3086 107.07 58.6719 c
+107.07 48.6289 99.1797 40.3906 89.4883 40.3906 c
+79.8398 40.3906 71.9492 48.6289 71.9492 58.6719 c
+71.9492 68.7109 79.8398 76.9492 89.4883 76.9492 c
+91.0898 76.9492 92.5781 76.7617 93.9805 76.2891 c
+134.059 117.891 l
+134.059 117.93 134.059 117.93 134.059 117.969 c
+h
+134.059 117.969 m
+f
+Q
+endstream
+endobj
+6 0 obj
+1741
+endobj
+4 0 obj
+<</Type/Page/MediaBox [0 0 24 24]
+/Parent 3 0 R
+/Resources<</ProcSet[/PDF]
+/ExtGState 8 0 R
+>>
+/Contents 5 0 R
+>>
+endobj
+3 0 obj
+<< /Type /Pages /Kids [
+4 0 R
+] /Count 1
+>>
+endobj
+1 0 obj
+<</Type /Catalog /Pages 3 0 R
+/Metadata 9 0 R
+>>
+endobj
+7 0 obj
+<</Type/ExtGState
+/OPM 1>>endobj
+8 0 obj
+<</R7
+7 0 R>>
+endobj
+9 0 obj
+<</Type/Metadata
+/Subtype/XML/Length 1344>>stream
+<?xpacket begin='' id='W5M0MpCehiHzreSzNTczkc9d'?>
+<?adobe-xap-filters esc="CRLF"?>
+<x:xmpmeta xmlns:x='adobe:ns:meta/' x:xmptk='XMP toolkit 2.9.1-13, framework 1.6'>
+<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:iX='http://ns.adobe.com/iX/1.0/'>
+<rdf:Description rdf:about='uuid:6a7280cf-de10-11f3-0000-73a7a6c34153' xmlns:pdf='http://ns.adobe.com/pdf/1.3/' pdf:Producer='GPL Ghostscript 9.22'/>
+<rdf:Description rdf:about='uuid:6a7280cf-de10-11f3-0000-73a7a6c34153' xmlns:xmp='http://ns.adobe.com/xap/1.0/'><xmp:ModifyDate>2018-08-22T12:12:25+02:00</xmp:ModifyDate>
+<xmp:CreateDate>2018-08-22T12:12:25+02:00</xmp:CreateDate>
+<xmp:CreatorTool>UnknownApplication</xmp:CreatorTool></rdf:Description>
+<rdf:Description rdf:about='uuid:6a7280cf-de10-11f3-0000-73a7a6c34153' xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='uuid:6a7280cf-de10-11f3-0000-73a7a6c34153'/>
+<rdf:Description rdf:about='uuid:6a7280cf-de10-11f3-0000-73a7a6c34153' xmlns:dc='http://purl.org/dc/elements/1.1/' dc:format='application/pdf'><dc:title><rdf:Alt><rdf:li xml:lang='x-default'>Untitled</rdf:li></rdf:Alt></dc:title></rdf:Description>
+</rdf:RDF>
+</x:xmpmeta>
+
+
+<?xpacket end='w'?>
+endstream
+endobj
+2 0 obj
+<</Producer(GPL Ghostscript 9.22)
+/CreationDate(D:20180822121225+02'00')
+/ModDate(D:20180822121225+02'00')>>endobj
+xref
+0 10
+0000000000 65535 f
+0000002014 00000 n
+0000003568 00000 n
+0000001955 00000 n
+0000001826 00000 n
+0000000015 00000 n
+0000001806 00000 n
+0000002078 00000 n
+0000002119 00000 n
+0000002148 00000 n
+trailer
+<< /Size 10 /Root 1 0 R /Info 2 0 R
+/ID [<9F4814B9971D7810C499CFBC2650784E><9F4814B9971D7810C499CFBC2650784E>]
+>>
+startxref
+3691
+%%EOF