texlive[47487] Master/texmf-dist: langsci (27apr18)
commits+karl at tug.org
commits+karl at tug.org
Mon Apr 30 00:35:32 CEST 2018
Revision: 47487
http://tug.org/svn/texlive?view=revision&revision=47487
Author: karl
Date: 2018-04-30 00:35:31 +0200 (Mon, 30 Apr 2018)
Log Message:
-----------
langsci (27apr18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/xelatex/langsci/README.md
trunk/Master/texmf-dist/doc/xelatex/langsci/documentation/langsci-doc.pdf
trunk/Master/texmf-dist/doc/xelatex/langsci/documentation/langsci-doc.tex
trunk/Master/texmf-dist/doc/xelatex/langsci/examples/samplemonograph.tex
trunk/Master/texmf-dist/doc/xelatex/langsci/examples/samplepaper.tex
trunk/Master/texmf-dist/doc/xelatex/langsci/examples/samplevolume.tex
trunk/Master/texmf-dist/doc/xelatex/langsci/localbibliography.bib
trunk/Master/texmf-dist/tex/xelatex/langsci/biblatex-langsci-unified.bbx
trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-authoryear-comp.cbx
trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-basic.sty
trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-bidi.sty
trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-cgloss.sty
trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-forest-setup.sty
trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-gb4e.sty
trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-glyphs.sty
trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-linguex.sty
trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-optional.sty
trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-subparts.sty
trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-tbls.sty
trunk/Master/texmf-dist/tex/xelatex/langsci/langscibook.cls
Added Paths:
-----------
trunk/Master/texmf-dist/doc/xelatex/langsci/didyoulikethisbook.tex
trunk/Master/texmf-dist/doc/xelatex/langsci/examples/langsci-test.bib
trunk/Master/texmf-dist/doc/xelatex/langsci/storagelogo.pdf
trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-avm.sty
trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-hyphenation-de.tex
trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-hyphenation-fr.tex
trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-hyphenation-pt.tex
trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-hyphenation-universal.tex
trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-jambox.sty
trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-lgr.sty
trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-tobi.sty
trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-alarm.pdf
trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-book.pdf
trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-bulb.pdf
trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-bulbon.pdf
trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-code.pdf
trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-explore.pdf
trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-glass.pdf
trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-glass2.pdf
trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-law.pdf
trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-more.pdf
trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-pencil.pdf
trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-people.pdf
trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-r.pdf
trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-receipt.pdf
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/xelatex/langsci/avm.sty
trunk/Master/texmf-dist/doc/xelatex/langsci/jambox.sty
trunk/Master/texmf-dist/doc/xelatex/langsci/main.tex
Modified: trunk/Master/texmf-dist/doc/xelatex/langsci/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/xelatex/langsci/README.md 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/doc/xelatex/langsci/README.md 2018-04-29 22:35:31 UTC (rev 47487)
@@ -1,7 +1,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Project: langsci
%% Author: Language Science Press (http://langsci-press.org)
-%% Date: 2017-09-25 11:11:11 UTC
+%% Date: 2018-04-27 11:11:11 UTC
%% Purpose: publishing boks with Language Science Press.
%% Languages: LaTeX, tikz, eps
%% Copyright 2012- Language Science Press
@@ -19,19 +19,20 @@
%%
%% This work consists of the files
%% - langscibook.cls: class file
-%% - series.def: metadata for series
-%% - colors.def: colors used by the series
+%% - langsci-series.def: metadata for series
+%% - langsci-colors.def: colors used by the series
%% - langsci-basic.sty for commands required by the standard template
%% - bib style definitions langsci-unified.bst, biblatex-langsci-unified.bbx, langsci-authoryear-comp.cbx, biblatex-langsci-unified-undecap.bbx
%% - files for the logos used in the textbook series Textbooks in Language Sciences: tbls-book.eps tbls-bulb.eps tbls-glass.eps tbls-law.eps
-%% - the file logo.pdf as a dummy, to be replaced with a file for the hosting institution
+%% - the file storagelogo.pdf as a dummy, to be replaced with a file for the hosting institution
%% - a file advertisement.tex added to the very last page in tikz
%% - langsci-optional.sty: additional useful commands
%% - langsci-gb4e.sty and langsci-cgloss.sty: typeset linguistic examples
%% - langsci-forest-setup.sty: definitions for linguistic trees
%% - langsci-bidi.sty: bidirectional text
-%% - langsci-tbls.sty: macros for the textbook series Textbooks in Language Sciencesjambox.sty
+%% - langsci-tbls.sty: macros for the textbook series Textbooks in Language Sciences
%% - langsci-glyphs.sty: some workarounds for Libertine font limitations
+%% - langsci-lgr.sty: shortcuts for the Leipzig Glossing Rules
%% - langsci-linguex.sty: a version of linguex which does not break gb4e
%% - langsci-subparts.sty: adds an additional sectioning level between part and chapter
%%
Deleted: trunk/Master/texmf-dist/doc/xelatex/langsci/avm.sty
===================================================================
--- trunk/Master/texmf-dist/doc/xelatex/langsci/avm.sty 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/doc/xelatex/langsci/avm.sty 2018-04-29 22:35:31 UTC (rev 47487)
@@ -1,184 +0,0 @@
-%% avm.sty - a style file for attribute-value matrices
-%% Copyright 1992, 1993, 2006, 2013 Christopher Manning (manning at cs.stanford.edu)
-%
-% v 1.00 mar 29, 1992
-% v 1.01 dec 6, 1993
-% v 1.02 jan 5, 2006
-% v 1.03 dec 8, 2013
-%
-% 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 Christopher Manning.
-%
-% This work consists of the files avm.sty, avm-doc.tex, avm-test.tex.
-
-\newif\ifavmactive\newif\ifavmsorted\newif\ifavmlabeled
-\newif\ifavmcenter\newif\ifavmbottom
-\newif\ifavmbottomright\newif\ifavmtopleft\newif\ifavmtopright
-
-\newdimen\avmdimen
-\newbox\avmboxone\newbox\avmboxthree
-
-\def\avmoptions#1{\avmactivefalse\avmsortedfalse\avmlabeledfalse
- \avmcenterfalse\avmbottomfalse
- \avmbottomrightfalse\avmtopleftfalse\avmtoprightfalse
- \def\more{#1}\ifx\more\empty\else\avmjoptions#1,\@nil\fi}
-\def\avmjoptions#1,#2\@nil{\def\more{#2}\csname avm#1true\endcsname
- \ifx\more\empty\else\avmjoptions#2\@nil\fi}
-
-
-\def\avmfont#1{\def\avmjfont{#1}}
-\def\avmjfont{}
-
-\def\avmvalfont#1{\def\avmjvalfont{#1}}
-\def\avmjvalfont{}
-
-\def\avmsortfont#1{\def\avmjsortfont{#1}}
-\def\avmjsortfont{}
-
-\def\avmhskip#1{\def\avmjhskip{#1}}
-\def\avmjhskip{1em}
-
-\def\avmbskip#1{\def\avmjbskip{#1}}
-\def\avmjbskip{0em}
-
-\def\avmvskip#1{\def\avmjvskip{#1}}
-\def\avmjvskip{0.385ex}%was .3875
-
-
-\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}
-\def\avmjpostlog#1{\crcr\egroup\vskip\avmjvskip\egroup
- \hskip\avmjbskip\right#1\mskip-\thinmuskip$\ignorespaces}
-
-
-\def\avmjcatcode{\let\lparen=(\let\rparen=)\catcode`\[=13\catcode`\]=13
- \catcode`\<=13\catcode`\@=13\catcode`\(=13\catcode`\)=13
- \catcode`\>=13\catcode`\|=13}
-
-{\avmjcatcode % new group: redefine above catcodes as active
-
-\gdef\specialavm{\avmjcatcode
-\def({\avmjprolog\lparen}%
-\def){\avmjpostlog\rparen}%
-\def<{\avmjprolog\langle}%
-\def>{\avmjpostlog\rangle}%
-\ifavmsorted
-\def[##1{\setbox\avmboxthree=\hbox{\avmjsortfont##1\/}\setbox2=\hbox
- \bgroup\avmjprolog\lbrack}%
-\def]{\avmjpostlog\rbrack\egroup\avmjsort}%
-\else\ifavmlabeled
-\def[##1{\def\more{##1}\setbox2=\hbox\bgroup\avmjprolog[}%
-\def]{\avmjpostlog]\egroup\node{\more}{\box2}}%
-\else
-\def[{\avmjprolog\lbrack}%
-\def]{\avmjpostlog\rbrack}%
-\fi\fi
-%
-\def\<{$\langle$}\def\>{$\rangle$}%
-\def\({\lparen}
-\def\){\rparen}%
-\def\[{\lbrack}
-\def\]{\rbrack}%
-\def|{$\,\vert\,$}%
-\def@##1{\avmbox{##1}}%
-} % end defn of \specialavm
-} % restore active catcodes
-
-
-\long\def\avm{\begingroup
-\ifavmactive\specialavm
-\else
-\def\({\avmjprolog(}%
-\def\){\avmjpostlog)}%
-\def\<{\avmjprolog\langle}%
-\def\>{\avmjpostlog\rangle}%
-%
-\ifavmsorted
-\def\[##1{\setbox\avmboxthree=\hbox{\avmjsortfont##1\/}\setbox
- 2=\hbox\bgroup\avmjprolog[}%
-\def\]{\avmjpostlog]\egroup\avmjsort}%
-\else\ifavmlabeled
-\def\[##1{\def\more{##1}\setbox2=\hbox\bgroup\avmjprolog[}%
-\def\]{\avmjpostlog]\egroup\node{\more}{\box2}}%
-\else
-\def\[{\avmjprolog[}%
-\def\]{\avmjpostlog]}%
-\fi\fi
-%
-\def\|{$\,\vert\,$}%
-\def\@##1{\avmbox{##1}}%
-\fi % end not active
-%
-\ifx\LaTeX\undefined\def\\{\cr}% running under TeX
-\else \ifx\@tabularcr\relax
-\def\\{\@arraycr}% fix for the Mainz array package
-\else
-\def\\{\@tabularcr}% Leverage off LaTeX's \\*[dimen] options
-\fi
-\fi
-\def\!{\node}%
-\long\def\avmjsort{\dimen2=\ht2\advance\dimen2 by -.25\baselineskip
- \global\dimen\avmdimen=\wd\avmboxthree
- \ifavmtopleft \raise\dimen2\llap{\box\avmboxthree}\box2%
- \else\ifavmtopright \box2\raise\dimen2\box\avmboxthree
- \else\ifavmbottomright \box2\lower\dimen2\box\avmboxthree
- \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%
- \advance\dimen2 by -.25\baselineskip
- \ifavmtopleft \raise\dimen2\box\avmboxthree\box2%
- \else\ifavmtopright \box2\raise\dimen2\box\avmboxthree%
- \else\ifavmbottomright \box2\lower\dimen2\box\avmboxthree%
- \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}\\}%
-\def\avml{\avmjprolog.}%
-\def\avmr{\avmjpostlog.}%
-\def\avmb##1{\node{##1}{\lbrack\;\rbrack}}%
-\def\avmd##1{\node{##1}{---}}%
-\def\q##1{\ifx ##1\{$\lbrace$\else
- \ifx ##1\}$\rbrace$\else
- \ifx ##1<$\langle$\else
- \ifx ##1>$\rangle$\fi \fi \fi \fi}%
-\def\{{\avmjprolog\lbrace}%
-\def\}{\avmjpostlog\rbrace}%
-\def\;{\hskip\avmjhskip}%
-\def\avmspan##1{\multispan2\strut ##1\expandafter\hfil}%
-\avmjfont
-\openup\avmjvskip
-\setbox\avmboxone=\hbox\bgroup\ignorespaces
-} % end defn of \avm
-
-
-\def\endavm{\egroup\ifvmode\leavevmode\fi % this if is useful!
- \ifavmsorted\null\hskip\dimen\avmdimen\fi
- \ifavmcenter
- \box\avmboxone
- \else \ifavmbottom
- \lower.575\baselineskip\hbox{\vbox{\box\avmboxone\null}}%
- \else
-% the next bit is ripped off from Emma's \evnup in lingmacros.sty
- \dimen2=\ht\avmboxone\advance\dimen2 by -.725\baselineskip
- \lower\dimen2\box\avmboxone
-\fi \fi \endgroup}
-
-
-% based on TeXbook exercise 21.3
-\def\avmbox#1{\setbox2=\hbox{$\scriptstyle #1$}\lower.2ex\vbox{\hrule
- \hbox{\vrule\kern1.25pt
- \vbox{\kern1.25pt\box2\kern1.25pt}\kern1.25pt\vrule}\hrule}}
Added: trunk/Master/texmf-dist/doc/xelatex/langsci/didyoulikethisbook.tex
===================================================================
--- trunk/Master/texmf-dist/doc/xelatex/langsci/didyoulikethisbook.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/xelatex/langsci/didyoulikethisbook.tex 2018-04-29 22:35:31 UTC (rev 47487)
@@ -0,0 +1,16 @@
+\thispagestyle{empty}
+\pgfdeclarelayer{lspadvert_bg} % Please make sure to never use lspadvert_... PGF layers in any document
+\pgfsetlayers{lspadvert_bg,main}
+
+\begin{tikzpicture}[remember picture, overlay,bg/.style={outer sep=0}]
+ \begin{pgfonlayer}{lspadvert_bg} % background layer
+ \node at (current page.center) [bg, fill=lsGuidelinesGray, minimum height=22cm, minimum width=15cm] (lspadvert_bg1) {}; % Die können wir noch dynamisch bestimmen
+ \end{pgfonlayer}
+ \node [execute at begin node={}, font=\fontsize{52pt}{16.75mm}\selectfont, below right = 10mm and 7.5mm of lspadvert_bg1.north west, text width=13.7cm, align=left] (lspadvert_covertitle) {\color{black}\lsCoverTitleFont{Did you like this book?\par}}; % x = 15mm - 7.5mm ; y = 17.5mm - 7.5mm
+
+ \node [font=\fontsize{25pt}{10mm}\selectfont,below = 8mm of lspadvert_covertitle.south, text width=137mm] (lspadvert_coversubtitle) {\color{black} \lsCoverSubTitleFont \nohyphens{This book was brought to you for free}\par};
+
+ \node (lspadvert_logo) [above left = 10mm and 7.5mm of lspadvert_bg1.south east] {\color{black}\includegraphics{\logopath langsci_logo_nocolor.pdf}};
+ \node [above right = 48.8mm and -.1mm of lspadvert_bg1.south west, rectangle, fill=white, minimum size=17pt] (lspadvert_square) {};
+ \path let \p1 = (lspadvert_square.north east), \p2 = (lspadvert_covertitle.west) in node at (\x2,\y1) (lspadvert_seriesinfo) [font=\fontsize{17pt}{7.5mm}\selectfont, right, align=flush left, text width=90mm, anchor=north west] {\color{black}\lsCoverSeriesFont{\nohyphens{Please help us in providing free access to linguistic research worldwide. Visit \url{http://www.langsci-press.org/donate} to provide financial support or register as a community proofreader or typesetter \mbox{at \url{http://www.langsci-press.org/register}.}}\par}};
+\end{tikzpicture}
\ No newline at end of file
Property changes on: trunk/Master/texmf-dist/doc/xelatex/langsci/didyoulikethisbook.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/xelatex/langsci/documentation/langsci-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/xelatex/langsci/documentation/langsci-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/xelatex/langsci/documentation/langsci-doc.tex 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/doc/xelatex/langsci/documentation/langsci-doc.tex 2018-04-29 22:35:31 UTC (rev 47487)
@@ -83,10 +83,10 @@
\end{itemize}
\section{Colors and series definitions}
-The metadata for Language Science Press book series are stored in the file \texttt{series.def}. This file loads the file \texttt{colors.def} to set the colors for the cover and title font. Both files should be safe to use for all books of well-established series. For new series, the ISSN field of \texttt{series.def} might have to be updated.
+The metadata for Language Science Press book series are stored in the file \texttt{langsci-series.def}. This file loads the file \texttt{langsci-colors.def} to set the colors for the cover and title font. Both files should be safe to use for all books of well-established series. For new series, the ISSN field of \texttt{langsci-series.def} might have to be updated.
\chapter{Creating a book}
-The easiest way to start a book is to download the skeletons from \url{http://langsci-press.org/templatesAndTools}. Sample documents for monographs, edited volumes and chapters in edited volumes are provided in the folder \texttt{samples/} as well.
+The easiest way to start a book is to download the skeletons from \url{http://langsci-press.org/templatesAndTools}. Sample documents for monographs, edited volumes and chapters in edited volumes are provided in the folder \texttt{examples/} as well.
\section{Creating a monograph}
Load the class. Make sure the following metadata values are set with the metadata commands listed in \sectref{sec:metadatacommands}:
@@ -94,16 +94,16 @@
\begin{itemize}
\item author
\item title
+\end{itemize}
+
+Provide the following additional information if necessary:
+\begin{itemize}
\item series
\item series number
\item all ISBNs
\item BookDOI
- \item URL
+ \item ID
\item blurb (back body)
-\end{itemize}
-
-Provide the following additional information if necessary:
-\begin{itemize}
\item subtitle
\item backtitle
\item spine title
@@ -113,6 +113,7 @@
\item list of typesetters
\item list of illustrators
\item license other than CC-BY
+ \item list of additional fonts
\end{itemize}
@@ -147,8 +148,8 @@
% \option{noindex}
% remove index}
% {false
-\option{biblatex}{Use Bib\LaTeX}{true}
-\option{bibtex}{Use Bibtex}{false}
+% \option{biblatex}{Use Bib\LaTeX}{true}
+% \option{bibtex}{Use Bibtex}{false}
\option{collection}{Make the book an edited volume}{false}
\option{collectionchapter}{Add numeric chapter prefix to each contribution.}{false}
\option{collectiontoclong}{More detailed table of content in edited volumes}{false}
@@ -161,7 +162,7 @@
\option{nonflat}{Use elaborate directory structure. If set to true, fonts, packages etc will be loaded from subfolders. If set to false, they will be loaded from the working directory}{false}
\option{showindex}{Show indexed terms in margin}{false}
\option{smallfont}{Use a smaller font for books above 500 pages}{false}
-\option{undecapitalize}{Do not decapitalize titles in the list of references}{false}
+% \option{undecapitalize}{Do not decapitalize titles in the list of references}{false}
\section{String options}
\option{output}{Different output formats}{book}
@@ -170,38 +171,19 @@
\item \texttt{inprep}: Mark manuscript as in preparation
\item \texttt{paper}: Contribution to edited volume
\item \texttt{guidelines}: Choose color grey; condense frontmatter
-\item \texttt{coverbodsc}: Create a two-page wide cover (back-spine-front) for use with BoD hardcover books
+\item \texttt{coverbodhc}: Create a two-page wide cover (back-spine-front) for use with BoD hardcover books
\item \texttt{coverbodsc}: Create a two-page wide cover (back-spine-front) for use with BoD softcover books
\item \texttt{covercreatespace}: Create a two-page wide cover (back-spine-front) for use with CreateSpace
-\item \texttt{spinewidth}{The width of the spine (for cover creation)}
\end{itemize}
+
+\option{spinewidth}{The width of the spine (for cover creation)}{20mm}
+\option{booklanguage}{Load babel for the specified language and change the custom headers for list of references and indexes}{english}
\option{copyright}{The license chosen}{"CC-BY"}
-\option{biblatexbackend}{The backend of BibLaTeX}{"bibtex"}
-Alternative: \texttt{biber}
-% \backmatter
-% \phantomsection%this allows hyperlink in ToC to work
-% \printbibliography[heading=references]
-% \cleardoublepage
-% \phantomsection
-% \addcontentsline{toc}{chapter}{Index}
-% \addcontentsline{toc}{section}{Name index}
-% \ohead{Name index}
-% \printindex
-% \cleardoublepage
-% \phantomsection
-% \addcontentsline{toc}{section}{Language index}
-% \ohead{Language index}
-% \printindex[lan]
-% \cleardoublepage
-% \phantomsection
-% \addcontentsline{toc}{section}{Subject index}
-% \ohead{Subject index}
-% \printindex[sbj]
-% \ohead{}
+% \option{biblatexbackend}{The backend of BibLaTeX}{"biber"}
+% Alternative: \texttt{biber}
+
-
-
\section{Metadata commands}\label{sec:metadatacommands}
The following commands are used to indicated metadata.
@@ -219,7 +201,7 @@
\option{$\backslash$SeriesNumber}{Position of the book in its series}{??}
\option{$\backslash$URL}{The URL where this title can be downloaded}{http://langsci-press.org/catalog}
-
+
\section{Overrides}
The following commands allow to override further default settings:
@@ -245,6 +227,7 @@
\option{$\backslash$lsSpineAuthorFont}{Font for the author on the spine}{$\backslash$fontsize\{16pt\}\{14pt\}$\backslash$selectfont}
\option{$\backslash$lsSpineTitleFont}{Font for the title on the spine}{$\backslash$sffamily$\backslash$fontsize\{18pt\}\{14pt\}$\backslash$selectfont}
\option{$\backslash$lsSubjectIndexTitle}{The title of the subject index. Change this for non-English works}{Subject index}
+\option{$\backslash$lsYear}{$\backslash$the$\backslash$year}
\section{Additions}
\option{$\backslash$lsAdditionalFontsImprint}{Add additional fonts to the list of fonts in the colophon}{\textrm{void}}
Added: trunk/Master/texmf-dist/doc/xelatex/langsci/examples/langsci-test.bib
===================================================================
--- trunk/Master/texmf-dist/doc/xelatex/langsci/examples/langsci-test.bib (rev 0)
+++ trunk/Master/texmf-dist/doc/xelatex/langsci/examples/langsci-test.bib 2018-04-29 22:35:31 UTC (rev 47487)
@@ -0,0 +1,7 @@
+ at BOOK{Chomsky1957,
+ author = {Noam Chomsky},
+ year = {1957},
+ title = {Syntactic structures},
+ address = {The Hague},
+ publisher = {Mouton}
+}
Property changes on: trunk/Master/texmf-dist/doc/xelatex/langsci/examples/langsci-test.bib
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/xelatex/langsci/examples/samplemonograph.tex
===================================================================
--- trunk/Master/texmf-dist/doc/xelatex/langsci/examples/samplemonograph.tex 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/doc/xelatex/langsci/examples/samplemonograph.tex 2018-04-29 22:35:31 UTC (rev 47487)
@@ -15,7 +15,7 @@
\proofreader{John Doe}
\BackBody{What everyone should know about monographs: it's here}
-\bibliography{localbibliography}
+\bibliography{langsci-test}
\begin{document}
\maketitle
\frontmatter
@@ -28,11 +28,12 @@
\chapter{Introduction}
This is the introduction.
\chapter{New research}
-This is the main argument.
+This is the main argument \citep{Chomsky1957}.
\chapter{Conclusion}
This is the conclusion.
\backmatter
+\sloppy
\phantomsection%this allows hyperlink in ToC to work
\printbibliography[heading=references]
\cleardoublepage
Modified: trunk/Master/texmf-dist/doc/xelatex/langsci/examples/samplepaper.tex
===================================================================
--- trunk/Master/texmf-dist/doc/xelatex/langsci/examples/samplepaper.tex 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/doc/xelatex/langsci/examples/samplepaper.tex 2018-04-29 22:35:31 UTC (rev 47487)
@@ -1,19 +1,14 @@
\documentclass[output=paper]{langscibook}
\title{Introduction}
\author{%
- Chap ter Author\affiliation{University of Eden}
- \and
- Noam Chimpsky\affiliation{University of Pluto}
- \lastand
+ Chap ter Author\affiliation{University of Eden}\and
+ Noam Chimpsky\affiliation{University of Pluto}\lastand
Jane Wilson\affiliation{National Institute for Language}
}
-% \chapterDOI{} %will be filled in at production
-
-% \epigram{}
-
\abstract{
Abstract goes here
}
+% \bibliography{langsci-test}
\begin{document}
@@ -29,7 +24,7 @@
\begin{table}
\caption{Frequencies of word classes}
\label{tab:1:frequencies}
- \begin{tabular}{lllll}
+ \begin{tabular}{lrrrr}
\lsptoprule
& nouns & verbs & adjectives & adverbs\\
\midrule
Modified: trunk/Master/texmf-dist/doc/xelatex/langsci/examples/samplevolume.tex
===================================================================
--- trunk/Master/texmf-dist/doc/xelatex/langsci/examples/samplevolume.tex 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/doc/xelatex/langsci/examples/samplevolume.tex 2018-04-29 22:35:31 UTC (rev 47487)
@@ -13,18 +13,15 @@
\renewcommand{\lsISBNhardcover}{000-0-000000-00-0}
\renewcommand{\lsISBNsoftcover}{000-0-000000-00-0}
% \BookDOI{}%ask coordinator for DOI
-\renewcommand{\lsURL}{http://langsci-press.org/catalog/book/000}
+\renewcommand{\lsID}{000}
\dedication{For Mom and Dad}
\typesetter{Jane Doe}
\proofreader{John Doe}
\BackBody{What everyone should know about edited volumes: it's here}
+
-
-\setlength{\csspine}{25.0559784mm}
-\setlength{\bodspine}{20mm}
-
-\bibliography{localbibliography}
+\bibliography{langsci-test}
\begin{document}
\maketitle
\frontmatter
Deleted: trunk/Master/texmf-dist/doc/xelatex/langsci/jambox.sty
===================================================================
--- trunk/Master/texmf-dist/doc/xelatex/langsci/jambox.sty 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/doc/xelatex/langsci/jambox.sty 2018-04-29 22:35:31 UTC (rev 47487)
@@ -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...
Modified: trunk/Master/texmf-dist/doc/xelatex/langsci/localbibliography.bib
===================================================================
--- trunk/Master/texmf-dist/doc/xelatex/langsci/localbibliography.bib 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/doc/xelatex/langsci/localbibliography.bib 2018-04-29 22:35:31 UTC (rev 47487)
@@ -2,7 +2,7 @@
@BOOK{Comrie1981,
author = {Bernard Comrie},
year = {1981},
- title = {Language Universals and Spanish Linguistic Typology},
+ title = {Language Universals and Linguistic Typology},
address = {Oxford},
publisher = {Basil Blackwell}
}
Deleted: trunk/Master/texmf-dist/doc/xelatex/langsci/main.tex
===================================================================
--- trunk/Master/texmf-dist/doc/xelatex/langsci/main.tex 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/doc/xelatex/langsci/main.tex 2018-04-29 22:35:31 UTC (rev 47487)
@@ -1,57 +0,0 @@
-\documentclass{langscibook}
-\author{Jane Doe}
-\title{New findings in linguistics}
-\subtitle{What everyone should know}
-% \renewcommand{\lsSeries}{silp}
-% \renewcommand{\lsSeriesNumber}{99}
-% \BackTitle{}
-% \BackBody{}
-% \dedication{}
-% \typesetter{}
-% \proofreader{}
-% \renewcommand{\lsISBNdigital}{000-0-000000-00-0}
-% \renewcommand{\lsISBNhardcover}{000-0-000000-00-0}
-% \renewcommand{\lsISBNsoftcover}{000-0-000000-00-0}
-% \renewcommand{\lsISBNsoftcoverus}{000-0-000000-00-0}
-% \BookDOI{}
-% \renewcommand{\lsURL}{http://langsci-press.org/catalog/book/000}
-
-\bibliography{localbibliography}
-\begin{document}
-\maketitle
-
-\frontmatter
-\currentpdfbookmark{Contents}{name} % adds a PDF bookmark
-\tableofcontents
-% \include{chapters/preface}
-% \include{chapters/acknowledgments}
-% \include{chapters/abbreviations}
-
-\mainmatter
-\chapter{Introduction}
-
-
-
-
-
-\backmatter
-\phantomsection%this allows hyperlink in ToC to work
-\printbibliography[heading=references]
-\cleardoublepage
-\phantomsection
-\addcontentsline{toc}{chapter}{Index}
-\addcontentsline{toc}{section}{Name index}
-\ohead{Name index}
-\printindex
-\cleardoublepage
-\phantomsection
-\addcontentsline{toc}{section}{Language index}
-\ohead{Language index}
-\printindex[lan]
-\cleardoublepage
-\phantomsection
-\addcontentsline{toc}{section}{Subject index}
-\ohead{Subject index}
-\printindex[sbj]
-\ohead{}
-\end{document}
\ No newline at end of file
Added: trunk/Master/texmf-dist/doc/xelatex/langsci/storagelogo.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/xelatex/langsci/storagelogo.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/xelatex/langsci/storagelogo.pdf 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/doc/xelatex/langsci/storagelogo.pdf 2018-04-29 22:35:31 UTC (rev 47487)
Property changes on: trunk/Master/texmf-dist/doc/xelatex/langsci/storagelogo.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/xelatex/langsci/biblatex-langsci-unified.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/biblatex-langsci-unified.bbx 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/biblatex-langsci-unified.bbx 2018-04-29 22:35:31 UTC (rev 47487)
@@ -1,17 +1,37 @@
-% 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}
+\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
% 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)
+% For backward compatibility: choose labeldate or labeldateparts depending on the biblatex version
+\@ifpackagelater{biblatex}{2016/09/09}
+{%
+ \ExecuteBibliographyOptions{labeldateparts} % as of biblatex 3.5 (2016/09/10)
+}
+{%
+ \ExecuteBibliographyOptions{labeldate}
+ \def\printlabeldateextra{\printdateextralabel}
+}%
+
\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}
+\ExecuteBibliographyOptions{dashed=false,isbn=false,eprint=false}
+% If an @article entry contains Issuetitle and Editor information, we might
+% not want to print it. The Unified Style Sheet does not offer explicit
+% guidelines on this, but they don't have any examples where either of these
+% pieces of information are actually printed. Therefore, we can offer an option
+% for the user to decide whether to print it. The default will be not to print
+% it since the Unified Style Sheet does not have examples where this information
+% is printed. The user can print it by setting `issueandeditor=true` as a package
+% option when biblatex is called.
+\newtoggle{issueandeditor}
+\DeclareBibliographyOption{issueandeditor}[false]{%
+ \settoggle{issueandeditor}{#1}}
+
% Formatting directives for name lists
% ------------------------------------------------------------------
%
@@ -23,7 +43,11 @@
% 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]{%
+% In biblatex v3.3 and onwards, the name formatting has changed in a big way. See for example: http://tex.stackexchange.com/questions/299036/biblatex-3-3-name-formatting, https://github.com/plk/biblatex/issues/372, and http://www.texdev.net/2016/03/13/biblatex-a-new-syntax-for-declarenameformat/. The name formats in biblatex.def are not called first-last etc. anymore but given-family etc. And while there are safeguard legacy aliases (\DeclareNameAlias{first-last}{given-family}, for example), the new formats then use macros like \usebibmacro{name:family-given}, which of course our old redefinitions didn't adjust. So, for newer biblatex, we need to do new versions of \renewbibmacro{name:...}.
+
+%% Redefinitions of name:last and name:last-first for old biblatex
+
+\renewbibmacro*{name:last}[4]{%
\usebibmacro{name:delim}{#3#1}%
\usebibmacro{name:hook}{#3#1}%
\ifblank{#3}
@@ -33,17 +57,40 @@
{\mkbibnameprefix{#3}\isdot}%
\ifpunctmark{'}{}{\bibnamedelimc}}%
\mkbibnamelast{#1}}%
-
-\renewbibmacro*{name:last-first}[4]{%
+
+\renewbibmacro*{name:last-first}[4]{%
\usebibmacro{name:delim}{#3#1}%
\usebibmacro{name:hook}{#3#1}%
\ifblank{#3}{}{%
- \mkbibnameprefix{#3}\isdot%
+ \mkbibnameprefix{#3}\isdot%
\ifpunctmark{'}{}{\bibnamedelimc}}%
\mkbibnamelast{#1}\isdot
\ifblank{#2}{}{\addcomma\bibnamedelimd\mkbibnamefirst{#2}\isdot}%
\ifblank{#4}{}{\addcomma\bibnamedelimd\mkbibnameaffix{#4}\isdot}}
+%% Redefinitions of name:family and name:family-given for new biblatex
+
+\renewbibmacro*{name:family}[4]{%
+ \usebibmacro{name:delim}{#3#1}%
+ \usebibmacro{name:hook}{#3#1}%
+ \ifdefvoid{#3}
+ {}
+ {\ifcapital
+ {\mkbibnameprefix{\MakeCapital{#3}}\isdot}
+ {\mkbibnameprefix{#3}\isdot}%
+ \ifprefchar{}{\bibnamedelimc}}%
+ \mkbibnamefamily{#1}\isdot}%
+
+\renewbibmacro*{name:family-given}[4]{%
+ \usebibmacro{name:delim}{#3#1}%
+ \usebibmacro{name:hook}{#3#1}%
+ \ifdefvoid{#3}{}{%
+ \mkbibnameprefix{#3}\isdot
+ \ifprefchar{}{\bibnamedelimc}}%
+ \mkbibnamefamily{#1}\isdot
+ \ifdefvoid{#2}{}{\revsdnamepunct\bibnamedelimd\mkbibnamegiven{#2}\isdot}%
+ \ifdefvoid{#4}{}{\addcomma\bibnamedelimd\mkbibnamesuffix{#4}\isdot}}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Various bibmacros used in producing the bibliography
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -51,8 +98,7 @@
\renewbibmacro*{date+extrayear}{%
\iffieldundef{labelyear}
{}
- {\printtext{\printdatelabel}}{\printfield{extrayear}}
- }% Took out the parentheses around the year
+ {\printtext{\printlabeldateextra}}}% Took out the parentheses around the year
\renewbibmacro*{author}{%
\ifboolexpr{
@@ -110,7 +156,7 @@
not test {\ifnameundef{translator}}
}
{\usebibmacro{bbx:dashcheck}
- ts {\bibnamedash}
+ {\bibnamedash}
{\printnames{translator}%
\setunit{\addcomma\space}%
\usebibmacro{bbx:savehash}}%
@@ -130,6 +176,72 @@
\setunit{\subtitlepunct}%
\printfield{journalsubtitle}}}}
+\newbibmacro*{journal+issuetitle+editor}{%
+ \usebibmacro{journal}%
+ \setunit*{\addspace}%
+ \iffieldundef{series}
+ {}
+ {\newunit
+ \printfield{series}%
+ \setunit{\addspace}}%
+ \usebibmacro{volume+number+eid}%
+ \iftoggle{issueandeditor}
+ {\setunit{\addspace}%
+ \usebibmacro{issue+date}%
+ \setunit{\addcolon\space}%
+ \usebibmacro{issue}
+ % The following three lines were originally not included inside of
+ % the journal+issuetitle bibmacro. They have been moved inside of
+ % this macro in order to allow them to be controlled by the toggle
+ % `issuetitle` that is defined at the top of this style file.
+ \newunit
+ \usebibmacro{byeditor+others}%
+ \newunit}
+ {}%
+ \newunit}
+
+% The next three bib macros are for printing the maintitle and booktitle fields
+% of an @inproceedings entry with an ISSN as an article in accordance with the
+% unified style sheet guidelines.
+% 1. maintitle
+\newbibmacro*{unified:proc-as-article:maintitle}{%
+ \ifboolexpr{
+ test {\iffieldundef{maintitle}}
+ and
+ test {\iffieldundef{mainsubtitle}}
+ }
+ {}
+ {\printtext{%
+ \printfield[maintitle]{maintitle}%
+ \setunit{\subtitlepunct}%
+ \printfield[maintitle]{mainsubtitle}}%
+ \newunit}%
+ \printfield{maintitleaddon}}
+
+% 2. booktitle
+\newbibmacro*{unified:proc-as-article:booktitle}{%
+ \ifboolexpr{
+ test {\iffieldundef{booktitle}}
+ and
+ test {\iffieldundef{booksubtitle}}
+ }
+ {}
+ {\printtext{%
+ \printfield[booktitle]{booktitle}%
+ \setunit{\subtitlepunct}%
+ \printfield[booktitle]{booksubtitle}}%
+ \newunit}%
+ \printfield{booktitleaddon}}
+
+% 3. maintitle+booktitle
+\newbibmacro*{unified:proc-as-article:maintitle+booktitle}{%
+ \iffieldundef{maintitle}
+ {}
+ {\usebibmacro{unified:proc-as-article:maintitle}%
+ \newunit\newblock}
+ \usebibmacro{unified:proc-as-article:booktitle}%
+ \setunit{\addspace}}
+
\renewbibmacro*{volume+number+eid}{%
\printfield{volume}%
% \setunit*{\adddot}%
@@ -137,8 +249,17 @@
\setunit{\addcomma\space}%
\printfield{eid}}
+% This is for printing the volume field of a proceedings with an ISSN as an article
+% in accordance with the unified style sheet guidelines. It depends on the declared
+% field format below.
+\newbibmacro*{unified:proc-as-article:volume+number+eid}{%
+ \printfield[volume:unified:proc-as-article]{volume}%
+ \printfield[parens]{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}
{}
@@ -156,13 +277,13 @@
{,}%
\space\stripzeros{\thefield{#1}}}%
}%
- }%
+ }%
\renewbibmacro*{url+urldate}{%
\printfield{url}%
\iffieldundef{urlyear}%
- {}%
- {\setunit*{\addspace}%
+ {}%
+ {\setunit*{\addspace}%
\printtext[parens]{\mkbibdateunified{urlyear}{urlmonth}{urlday}}}%
}
@@ -233,12 +354,12 @@
% 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}
+\renewcommand*{\finalnamedelim}{\addspace\&\addspace}
+\renewcommand*{\finallistdelim}{\addspace\&\addspace}
% no colon after "In" in incollection entries (overriding biblatex.def):
-\renewcommand{\intitlepunct}{\addspace}
+\renewcommand{\intitlepunct}{\addspace}
\renewcommand{\subtitlepunct}{\addcolon\space}
\renewcommand*{\bibpagespunct}{\newunitpunct} % No comma before pages, just the usual new unit period
@@ -245,21 +366,29 @@
\DefineBibliographyStrings{english}{%
edition = {edn\adddot},
+ phdthesis = {dissertation},
}
% 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}}%
+\DeclareFieldFormat[article,book,collection,incollection,inproceedings,thesis,unpublished]{titlecase}{\MakeSentenceCase*{#1}}%
% No quotes around titles
-\DeclareFieldFormat[article,periodical,inbook,incollection,inproceedings,patent,thesis,unpublished]{title}{#1}
+\DeclareFieldFormat[article,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{doi}{%
+ \ifhyperref
+ {\href{https://doi.org/#1}{\nolinkurl{https://doi.org/#1}}}
+ {\nolinkurl{https://doi.org/#1}}}
\DeclareFieldFormat{url}{\url{#1}}
+% This is for printing the volume field of a proceedings with an ISSN as an article
+% in accordance with the unified style sheet guidelines
+\DeclareFieldFormat{volume:unified:proc-as-article}{#1}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% The bibliography drivers, specifying the formats of each type of entry in the bibliography
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -266,7 +395,7 @@
%%% 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
+% 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
@@ -285,11 +414,9 @@
\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{in:}% We don't use "In: " before journal titles
+ \usebibmacro{journal+issuetitle+editor}%
+ \newblock% \newblock ensures period before pages
\usebibmacro{note+pages}%
\newunit\newblock
\iftoggle{bbx:isbn}
@@ -308,44 +435,6 @@
{}%
\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}%
@@ -373,61 +462,11 @@
\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}%
+ \usebibmacro{chapter+pages}%
\newunit
- \printlist{language}%
+ \printfield{pagetotal}%
\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}}
{}%
@@ -444,58 +483,107 @@
{}%
\usebibmacro{finentry}}
+% Aliased to ensure no period between the title and the series.
+\DeclareBibliographyAlias{collection}{book}
+
+\DeclareBibliographyAlias{incollection}{inproceedings}
+
+% 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
+% entry type, we can implement this by checking if the inproceedings entry has an
+% ISSN. If the field is undefined, the driver will do what driver did for
+% @inproceedings entries as of 512f11657199a6044f7663da454f3eac338bdbd5
+% except that \printlist{organization} and \newunit have been removed.
+% On the other hand, if the ISSN field is not undefined, then we will do largely
+% the exact same thing that we do in the @article driver, except that we use the
+% two macros \usebibmacro{unified:proc-as-article:maintitle+booktitle} and
+% \usebibmacro{unified:proc-as-article:volume+number+eid} instead of
+% \usebibmacro{journal+issuetitle} and except that \usebibmacro{byeditor+others}
+% has been removed so as to ensure that the editors are not listed even if they
+% are present in the database.
\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}}
- {}%
+ \iffieldundef{issn}
+ {\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{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{unified:proc-as-article:maintitle+booktitle}%
+ \usebibmacro{unified:proc-as-article:volume+number+eid}
+ \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{thesis}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
@@ -561,4 +649,3 @@
\usebibmacro{related}}
{}%
\usebibmacro{finentry}}
-
Modified: trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-authoryear-comp.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-authoryear-comp.cbx 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-authoryear-comp.cbx 2018-04-29 22:35:31 UTC (rev 47487)
@@ -1,6 +1,16 @@
\ProvidesFile{sp-authoryear-comp.cbx}
-\ExecuteBibliographyOptions{uniquename,uniquelist,autocite=inline}
+% For backward compatibility: choose labeldate or labeldateparts depending on the biblatex version
+\@ifpackagelater{biblatex}{2016/09/09}
+{%
+ \ExecuteBibliographyOptions{labeldateparts} % as of biblatex 3.5 (2016/09/10)
+}
+{%
+ \ExecuteBibliographyOptions{labeldate}
+}%
+
+\ExecuteBibliographyOptions{uniquename=minfull,uniquelist=minyear,autocite=inline}
+
% disabled sortcites option, since it was sorting by name, instead of
% year, and we often want to keep citations in the order chosen by the
% author
@@ -14,12 +24,21 @@
{\iffieldundef{prenote}
{}
{\global\undef\cbx at lasthash
- \global\undef\cbx at lastyear}}}
+ \global\undef\cbx at lastyear}}}
\newbibmacro*{cite:reinit}{%
\global\undef\cbx at lasthash
\global\undef\cbx at lastyear}
+\newbibmacro*{labelyearrepeat}{%
+ \ifthenelse{\iffieldequals{labelyear}{\cbx at lastyear}\AND
+ \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
+ {\setunit{\addcomma}%
+ \usebibmacro{cite:extrayear}}
+ {\setunit{\compcitedelim}%
+ \usebibmacro{cite:labelyear+extrayear}%
+ \savefield{labelyear}{\cbx at lastyear}}}
+
\newbibmacro*{cite}{% Based on cite bib macro from authoryear-comp.cbx
\iffieldundef{shorthand}
{\ifthenelse{\ifnameundef{labelname}\OR\iffieldundef{labelyear}}
@@ -30,13 +49,7 @@
\usebibmacro{cite:labelyear+extrayear}}%
\usebibmacro{cite:reinit}}
{\iffieldequals{namehash}{\cbx at lasthash}
- {\ifthenelse{\iffieldequals{labelyear}{\cbx at lastyear}\AND
- \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
- {\setunit{\addcomma}%
- \usebibmacro{cite:extrayear}}
- {\setunit{\compcitedelim}%
- \usebibmacro{cite:labelyear+extrayear}%
- \savefield{labelyear}{\cbx at lastyear}}}
+ {\usebibmacro{labelyearrepeat}}
{\printtext[bibhyperref]{% Include labelname in hyperlink
\DeclareFieldAlias{bibhyperref}{default}% Prevent nested hyperlinks
\printnames{labelname}%
@@ -54,13 +67,7 @@
{\usebibmacro{cite:label}%
\usebibmacro{cite:reinit}}
{\iffieldequals{namehash}{\cbx at lasthash}
- {\ifthenelse{\iffieldequals{labelyear}{\cbx at lastyear}\AND
- \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
- {\setunit{\addcomma}%
- \usebibmacro{cite:extrayear}}
- {\setunit{\compcitedelim}%
- \usebibmacro{cite:labelyear+extrayear}%
- \savefield{labelyear}{\cbx at lastyear}}}
+ {\usebibmacro{labelyearrepeat}}
{\usebibmacro{cite:labelyear+extrayear}%
\savefield{namehash}{\cbx at lasthash}%
\savefield{labelyear}{\cbx at lastyear}}}}
@@ -68,16 +75,10 @@
\usebibmacro{cite:reinit}}%
\setunit{\multicitedelim}}
-\renewbibmacro*{textcite}{% Based on textcite bib macro from authoryear-comp.cbx
+\newbibmacro*{textcite}{% Based on textcite bib macro from authoryear-comp.cbx
\iffieldequals{namehash}{\cbx at lasthash}
{\iffieldundef{shorthand}
- {\ifthenelse{\iffieldequals{labelyear}{\cbx at lastyear}\AND
- \(\value{multicitecount}=0\OR\iffieldundef{postnote}\)}
- {\setunit{\addcomma}%
- \usebibmacro{cite:extrayear}}
- {\setunit{\compcitedelim}%
- \usebibmacro{cite:labelyear+extrayear}%
- \savefield{labelyear}{\cbx at lastyear}}}
+ {\usebibmacro{labelyearrepeat}}
{\setunit{\compcitedelim}%
\usebibmacro{cite:shorthand}%
\global\undef\cbx at lastyear}}
@@ -127,6 +128,59 @@
{}%
\multicitedelim}}
+\newbibmacro*{posscite}{% Based on textcite bib macro above
+ \iffieldequals{namehash}{\cbx at lasthash}
+ {\iffieldundef{shorthand}
+ {\usebibmacro{labelyearrepeat}}
+ {\setunit{\compcitedelim}%
+ \usebibmacro{cite:shorthand}%
+ \global\undef\cbx at lastyear}}
+ {\ifnameundef{labelname}
+ {\printtext[bibhyperref]{% Include labelname in hyperlink
+ \DeclareFieldAlias{bibhyperref}{default}% Prevent nested hyperlinks
+ \iffieldundef{shorthand}
+ {\usebibmacro{cite:label}%
+ \setunit{%
+ \global\booltrue{cbx:parens}%
+ \addspace\bibopenparen}%
+ \ifnumequal{\value{citecount}}{1}
+ {\usebibmacro{prenote}}
+ {}%
+ \usebibmacro{cite:labelyear+extrayear}}
+ {\usebibmacro{cite:shorthand}}%
+ \ifthenelse{\iffieldundef{postnote}\AND
+ \(\value{multicitetotal}=0\AND\value{citetotal}=1\)}
+ {\bibcloseparen% Include closing parenthesis in hyperlink
+ \global\boolfalse{cbx:parens}}
+ {}}}
+ {\printtext[bibhyperref]{% Include labelname in hyperlink
+ \DeclareFieldAlias{bibhyperref}{default}% Prevent nested hyperlinks
+ \printnames{labelname}'s%
+ \setunit{%
+ \global\booltrue{cbx:parens}%
+ \addspace\bibopenparen}%
+ \ifnumequal{\value{citecount}}{1}
+ {\usebibmacro{prenote}}
+ {}%
+ \iffieldundef{shorthand}
+ {\iffieldundef{labelyear}
+ {\usebibmacro{cite:label}}
+ {\usebibmacro{cite:labelyear+extrayear}}%
+ \savefield{labelyear}{\cbx at lastyear}}
+ {\usebibmacro{cite:shorthand}%
+ \global\undef\cbx at lastyear}%
+ \ifthenelse{\iffieldundef{postnote}\AND
+ \(\value{multicitetotal}=0\AND\value{citetotal}=1\)}
+ {\bibcloseparen% Include closing parenthesis in hyperlink
+ \global\boolfalse{cbx:parens}}
+ {}}%
+ \savefield{namehash}{\cbx at lasthash}}}%
+ \setunit{%
+ \ifbool{cbx:parens}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
+ {}%
+ \multicitedelim}}
+
\newbibmacro*{cite:shorthand}{%
\printtext[bibhyperref]{\printfield{shorthand}}}
@@ -153,12 +207,12 @@
{\setunit{}%
\printtext{%
\ifbool{cbx:parens}
- {\bibcloseparen\global\boolfalse{cbx:parens}}
- {}}}
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
+ {}}}
{\setunit{%
\ifbool{cbx:parens}
- {\bibcloseparen\global\boolfalse{cbx:parens}}
- {}%
+ {\bibcloseparen\global\boolfalse{cbx:parens}}
+ {}%
\multicitedelim}}}
\DeclareCiteCommand{\cite}
@@ -232,7 +286,7 @@
{\setunit{\multicitedelim}}
\DeclareMultiCiteCommand{\textcites}{\textcite}{}
-\renewcommand*{\nameyeardelim}{\addspace}
+\renewcommand*{\nameyeardelim}{\addspace}
\let\citealt\cite
\let\citet\textcite
@@ -241,8 +295,16 @@
\newcommand{\pgcitealt}[2]{\cite{#1}:~#2}
\newcommand{\pgcitet}[2]{\citeauthor{#1} (\citeyear{#1}:~#2)}
\newcommand{\pgposscitet}[2]{\citeauthor{#1}'s (\citeyear{#1}:~#2)}
+\newcommand{\seccitealt}[2]{\cite{#1}:~$\S$#2}
+\newcommand{\seccitep}[2]{(\cite{#1}:~$\S$#2)}
+\newcommand{\seccitet}[2]{\citeauthor{#1} (\citeyear{#1}:~$\S$#2)}
+\newcommand{\secposscitet}[2]{\citeauthor{#1}'s (\citeyear{#1}:~$\S$#2)}
\let\citep\parencite
+\renewcommand*{\postnotedelim}{\addcolon\space}
+\DeclareFieldFormat{postnote}{#1}
+\DeclareFieldFormat{multipostnote}{#1}
+
\DeclareCiteCommand{\citeauthor}
{\boolfalse{citetracker}%
\boolfalse{pagetracker}%
@@ -258,22 +320,29 @@
{\boolfalse{citetracker}%
\boolfalse{pagetracker}%
\usebibmacro{prenote}}
- {\printfield[bibhyperref]{year}}
+ {\printtext[bibhyperref]{\iffieldundef{year}{\printfield{labelyear}}{\printfield{year}}\printfield{extrayear}}}
{\multicitedelim}
{\usebibmacro{postnote}}
-
+
\DeclareCiteCommand{\citeyearpar}[\mkbibparens]
{\boolfalse{citetracker}%
\boolfalse{pagetracker}%
\usebibmacro{prenote}}
- {\printfield[bibhyperref]{year}}
+ {\printtext[bibhyperref]{\iffieldundef{year}{\printfield{labelyear}}{\printfield{year}}\printfield{extrayear}}}
{\multicitedelim}
{\usebibmacro{postnote}}
\DeclareCiteCommand{\posscitet}
+ {\usebibmacro{cite:init}}
+ {\usebibmacro{citeindex}%
+ \usebibmacro{posscite}}
+ {}
+ {\usebibmacro{textcite:postnote}}
+
+\DeclareCiteCommand{\posscitealt}
{\boolfalse{citetracker}%
\boolfalse{pagetracker}}
- {\printtext[bibhyperref]{\printnames{labelname}'s \printfield[parens]{year}}}
+ {\printtext[bibhyperref]{\printnames{labelname}'s \iffieldundef{year}{\printfield{labelyear}}{\printfield{year}}\printfield{extrayear}}}
{}
{}
@@ -283,7 +352,7 @@
{\printtext[bibhyperref]{\printnames{labelname}'s}}
{}
{}
-
+
\renewcommand*{\multicitedelim}{\addcomma\space}
\endinput
Added: trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-avm.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-avm.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-avm.sty 2018-04-29 22:35:31 UTC (rev 47487)
@@ -0,0 +1,184 @@
+%% avm.sty - a style file for attribute-value matrices
+%% Copyright 1992, 1993, 2006, 2013 Christopher Manning (manning at cs.stanford.edu)
+%
+% v 1.00 mar 29, 1992
+% v 1.01 dec 6, 1993
+% v 1.02 jan 5, 2006
+% v 1.03 dec 8, 2013
+%
+% 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 Christopher Manning.
+%
+% This work consists of the files avm.sty, avm-doc.tex, avm-test.tex.
+
+\newif\ifavmactive\newif\ifavmsorted\newif\ifavmlabeled
+\newif\ifavmcenter\newif\ifavmbottom
+\newif\ifavmbottomright\newif\ifavmtopleft\newif\ifavmtopright
+
+\newdimen\avmdimen
+\newbox\avmboxone\newbox\avmboxthree
+
+\def\avmoptions#1{\avmactivefalse\avmsortedfalse\avmlabeledfalse
+ \avmcenterfalse\avmbottomfalse
+ \avmbottomrightfalse\avmtopleftfalse\avmtoprightfalse
+ \def\more{#1}\ifx\more\empty\else\avmjoptions#1,\@nil\fi}
+\def\avmjoptions#1,#2\@nil{\def\more{#2}\csname avm#1true\endcsname
+ \ifx\more\empty\else\avmjoptions#2\@nil\fi}
+
+
+\def\avmfont#1{\def\avmjfont{#1}}
+\def\avmjfont{}
+
+\def\avmvalfont#1{\def\avmjvalfont{#1}}
+\def\avmjvalfont{}
+
+\def\avmsortfont#1{\def\avmjsortfont{#1}}
+\def\avmjsortfont{}
+
+\def\avmhskip#1{\def\avmjhskip{#1}}
+\def\avmjhskip{1em}
+
+\def\avmbskip#1{\def\avmjbskip{#1}}
+\def\avmjbskip{0em}
+
+\def\avmvskip#1{\def\avmjvskip{#1}}
+\def\avmjvskip{0.385ex}%was .3875
+
+
+\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}
+\def\avmjpostlog#1{\crcr\egroup\vskip\avmjvskip\egroup
+ \hskip\avmjbskip\right#1\mskip-\thinmuskip$\ignorespaces}
+
+
+\def\avmjcatcode{\let\lparen=(\let\rparen=)\catcode`\[=13\catcode`\]=13
+ \catcode`\<=13\catcode`\@=13\catcode`\(=13\catcode`\)=13
+ \catcode`\>=13\catcode`\|=13}
+
+{\avmjcatcode % new group: redefine above catcodes as active
+
+\gdef\specialavm{\avmjcatcode
+\def({\avmjprolog\lparen}%
+\def){\avmjpostlog\rparen}%
+\def<{\avmjprolog\langle}%
+\def>{\avmjpostlog\rangle}%
+\ifavmsorted
+\def[##1{\setbox\avmboxthree=\hbox{\avmjsortfont##1\/}\setbox2=\hbox
+ \bgroup\avmjprolog\lbrack}%
+\def]{\avmjpostlog\rbrack\egroup\avmjsort}%
+\else\ifavmlabeled
+\def[##1{\def\more{##1}\setbox2=\hbox\bgroup\avmjprolog[}%
+\def]{\avmjpostlog]\egroup\node{\more}{\box2}}%
+\else
+\def[{\avmjprolog\lbrack}%
+\def]{\avmjpostlog\rbrack}%
+\fi\fi
+%
+\def\<{$\langle$}\def\>{$\rangle$}%
+\def\({\lparen}
+\def\){\rparen}%
+\def\[{\lbrack}
+\def\]{\rbrack}%
+\def|{$\,\vert\,$}%
+\def@##1{\avmbox{##1}}%
+} % end defn of \specialavm
+} % restore active catcodes
+
+
+\long\def\avm{\begingroup
+\ifavmactive\specialavm
+\else
+\def\({\avmjprolog(}%
+\def\){\avmjpostlog)}%
+\def\<{\avmjprolog\langle}%
+\def\>{\avmjpostlog\rangle}%
+%
+\ifavmsorted
+\def\[##1{\setbox\avmboxthree=\hbox{\avmjsortfont##1\/}\setbox
+ 2=\hbox\bgroup\avmjprolog[}%
+\def\]{\avmjpostlog]\egroup\avmjsort}%
+\else\ifavmlabeled
+\def\[##1{\def\more{##1}\setbox2=\hbox\bgroup\avmjprolog[}%
+\def\]{\avmjpostlog]\egroup\node{\more}{\box2}}%
+\else
+\def\[{\avmjprolog[}%
+\def\]{\avmjpostlog]}%
+\fi\fi
+%
+\def\|{$\,\vert\,$}%
+\def\@##1{\avmbox{##1}}%
+\fi % end not active
+%
+\ifx\LaTeX\undefined\def\\{\cr}% running under TeX
+\else \ifx\@tabularcr\relax
+\def\\{\@arraycr}% fix for the Mainz array package
+\else
+\def\\{\@tabularcr}% Leverage off LaTeX's \\*[dimen] options
+\fi
+\fi
+\def\!{\node}%
+\long\def\avmjsort{\dimen2=\ht2\advance\dimen2 by -.25\baselineskip
+ \global\dimen\avmdimen=\wd\avmboxthree
+ \ifavmtopleft \raise\dimen2\llap{\box\avmboxthree}\box2%
+ \else\ifavmtopright \box2\raise\dimen2\box\avmboxthree
+ \else\ifavmbottomright \box2\lower\dimen2\box\avmboxthree
+ \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%
+ \advance\dimen2 by -.25\baselineskip
+ \ifavmtopleft \raise\dimen2\box\avmboxthree\box2%
+ \else\ifavmtopright \box2\raise\dimen2\box\avmboxthree%
+ \else\ifavmbottomright \box2\lower\dimen2\box\avmboxthree%
+ \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}\\}%
+\def\avml{\avmjprolog.}%
+\def\avmr{\avmjpostlog.}%
+\def\avmb##1{\node{##1}{\lbrack\;\rbrack}}%
+\def\avmd##1{\node{##1}{---}}%
+\def\q##1{\ifx ##1\{$\lbrace$\else
+ \ifx ##1\}$\rbrace$\else
+ \ifx ##1<$\langle$\else
+ \ifx ##1>$\rangle$\fi \fi \fi \fi}%
+\def\{{\avmjprolog\lbrace}%
+\def\}{\avmjpostlog\rbrace}%
+\def\;{\hskip\avmjhskip}%
+\def\avmspan##1{\multispan2\strut ##1\expandafter\hfil}%
+\avmjfont
+\openup\avmjvskip
+\setbox\avmboxone=\hbox\bgroup\ignorespaces
+} % end defn of \avm
+
+
+\def\endavm{\egroup\ifvmode\leavevmode\fi % this if is useful!
+ \ifavmsorted\null\hskip\dimen\avmdimen\fi
+ \ifavmcenter
+ \box\avmboxone
+ \else \ifavmbottom
+ \lower.575\baselineskip\hbox{\vbox{\box\avmboxone\null}}%
+ \else
+% the next bit is ripped off from Emma's \evnup in lingmacros.sty
+ \dimen2=\ht\avmboxone\advance\dimen2 by -.725\baselineskip
+ \lower\dimen2\box\avmboxone
+\fi \fi \endgroup}
+
+
+% based on TeXbook exercise 21.3
+\def\avmbox#1{\setbox2=\hbox{$\scriptstyle #1$}\lower.2ex\vbox{\hrule
+ \hbox{\vrule\kern1.25pt
+ \vbox{\kern1.25pt\box2\kern1.25pt}\kern1.25pt\vrule}\hrule}}
Property changes on: trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-avm.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-basic.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-basic.sty 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-basic.sty 2018-04-29 22:35:31 UTC (rev 47487)
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% File: langsci-basic.sty
%% Author: Language Science Press (http://langsci-press.org)
-%% Date: 2016-01-16 16:47:43 UTC
-%% Purpose: This file contains essential macros and is included
+%% Date: 2016-01-16 16:47:43 UTC
+%% Purpose: This file contains essential macros and is included
%% into langscibook.cls
%% Language: LaTeX
-%% Licence:
+%% Licence:
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\newcommand{\sectref}[1]{§\ref{#1}}
@@ -14,8 +14,30 @@
\newcommand{\tabref}[1]{Table~\ref{#1}}
\newcommand{\figref}[1]{Figure~\ref{#1}}
+
+\ifx\lsBookLanguage\lsBookLanguageFrench
+ \newcommand{\chapref}[1]{Chapitre~\ref{#1}}
+ \newcommand{\partref}[1]{Partie~\ref{#1}}
+ \newcommand{\tabref}[1]{Tableau~\ref{#1}}
+ \newcommand{\figref}[1]{Figure~\ref{#1}}
+\fi
+
+\ifx\lsBookLanguage\lsBookLanguageGerman
+ \newcommand{\chapref}[1]{Kapitel~\ref{#1}}
+ \newcommand{\partref}[1]{Teil~\ref{#1}}
+ \newcommand{\tabref}[1]{Tabelle~\ref{#1}}
+ \newcommand{\figref}[1]{Abbildung~\ref{#1}}
+\fi
+
+\ifx\lsBookLanguage\lsBookLanguagePortuguese
+ \newcommand{\chapref}[1]{Capítulo~\ref{#1}}
+ \newcommand{\partref}[1]{Parte~\ref{#1}}
+ \newcommand{\tabref}[1]{Tabela~\ref{#1}}
+ \newcommand{\figref}[1]{Figura~\ref{#1}}
+\fi
+
\newcommand{\lsptoprule}{\midrule\toprule}
-\newcommand{\lspbottomrule}{\bottomrule\midrule}
+\newcommand{\lspbottomrule}{\bottomrule\midrule}
\newcommand{\REF}[1]{(\ref{#1})}
@@ -30,11 +52,12 @@
\newcommand{\db}{\hspaceThis{[}} %dummy space for [ in IMT line
\newcommand{\rmfnm}{{\upshape\footnotemark}} %romanfootnotemark
-\newcommand{\citegen}[2][]{\citeauthor{#2}'s (\citeyear[#1]{#2})}
+\newcommand{\citegen}[2][]{\citeauthor{#2}'s (\citeyear*[#1]{#2})}
+\newcommand{\citeapo}[2][]{\citeauthor{#2}' (\citeyear*[#1]{#2})}
\newcommand{\protectedex}[1]{
\noindent
-\parbox{\textwidth}{
+\parbox{\textwidth}{
#1}
}
@@ -42,7 +65,7 @@
\enlargethispage{#1\baselineskip}
}
-\newcommand\shorttitlerunninghead[1]{\rohead{\thechapter\hspace{.5em} #1}}
+\newcommand\shorttitlerunninghead[1]{\rohead{\thechapter\hspace{.5em} #1}}
% old font commands
\renewcommand{\it}{\itshape}
@@ -51,4 +74,7 @@
\renewcommand{\rm}{\upshape}
% vertical space to structure tables
-\newcommand{\tablevspace}{\\[-.5em]}
\ No newline at end of file
+\newcommand{\tablevspace}{\\[-.5em]}
+
+\let\oldfootnotemark\footnotemark
+\renewcommand{\footnotemark}{\upshape\oldfootnotemark}
Modified: trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-bidi.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-bidi.sty 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-bidi.sty 2018-04-29 22:35:31 UTC (rev 47487)
@@ -1,10 +1,10 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% File: langsci-bidi.sty
%% Author: Language Science Press (http://langsci-press.org)
-%% Date: 2016-01-16 16:47:43 UTC
+%% Date: 2016-01-16 16:47:43 UTC
%% Purpose: This file contains stuff for typesetting bidirectional texts.
%% Language: LaTeX
-%% Licence:
+%% Licence:
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% shamelessly borrowed from the bidi package
Modified: trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-cgloss.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-cgloss.sty 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-cgloss.sty 2018-04-29 22:35:31 UTC (rev 47487)
@@ -1,17 +1,17 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% File: langsci-cgloss.sty
%% Author: Language Science Press (http://langsci-press.org)
-%% Date: 2016-01-16 16:47:43 UTC
+%% Date: 2016-01-16 16:47:43 UTC
%% Purpose: This file contains an adpated version of the cgloss
%% package for glossing linguistic examples.
%% Language: LaTeX
-%% Licence:
+%% Licence:
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% -*- LaTeX -*-
% Modified version of cgloss4e.sty. Hacked and renamed cgloss.sty
-% by Alexis Dimitriadis (alexis at babel.ling.upenn.edu)
+% by Alexis Dimitriadis (alexis at babel.ling.upenn.edu)
% Following borrows from Covington's style files inspired by Midnight by M.
% de Groot, adapted to be used with gb4e.sty: examples beginning with \ex can
@@ -26,13 +26,13 @@
% \\)---hpk
%
-% Changes by Alexis Dimitriadis
+% Changes by Alexis Dimitriadis
%
% Removed flushleft environment and initial vskip to make macros usable
% on the same line with earlier and/or later text, e.g.,
% \item Q: \gll ... \\
% ... \\ \hfill (Greek)
-% \trans Q: `...'
+% \trans Q: `...'
% Note: Text following the gloss will appear on line one of the example;
% To get a line break, insert one manually with \\ or use \trans or \glt.
% (\gln does not end the line, since it was already the
@@ -41,7 +41,7 @@
% Modified \glt to keep translation on the same page as the text.
% BUGS: does not work very gracefully with double spacing (struts are not
-% automatically inserted after the \vboxes used by the macros).
+% automatically inserted after the \vboxes used by the macros).
% In double space mode without \nosinglegloss, when a translation
% is not given, the next line of text is single-spaced from the glossed text.
% With \nosinglegloss, the translation is set too close to the bottom line.
@@ -225,7 +225,8 @@
}
\gdef\getwords(#1,#2)#3 #4\\% #1=linebox, #2=\each, #3=1st word, #4=remainder
- {\setbox#1=\vbox{\hbox{#2\strut#3 }% adds space
+ {\setbox#1=\vbox{\hbox{#2\strut#3{} }% adds space, the {} is needed for CJK otherwise the space
+ % would be ignored
\unvbox#1%
}%
\def\more{#4}%
@@ -278,7 +279,7 @@
\gl at stop}
-
+
\gdef\foursent#1\\ #2\\ #3\\ #4\\{% #1 = first line, #2 = second line, #3 = third
\getwords(\lineone,\eachwordone)#1 \\%
\getwords(\linetwo,\eachwordtwo)#2 \\%
@@ -306,7 +307,7 @@
\gl at stop}
-
+
\gdef\fivesent#1\\ #2\\ #3\\ #4\\ #5\\{% #1 = first line, #2 = second line, #3 = third
\getwords(\lineone,\eachwordone)#1 \\%
\getwords(\linetwo,\eachwordtwo)#2 \\%
@@ -338,7 +339,7 @@
\gl at stop}
-
+
\gdef\sixsent#1\\ #2\\ #3\\ #4\\ #5\\ #6\\{% #1 = first line, #2 = second line, #3 = third
\getwords(\lineone,\eachwordone)#1 \\%
\getwords(\linetwo,\eachwordtwo)#2 \\%
@@ -374,7 +375,7 @@
\gl at stop}
-
+
\gdef\sevensent#1\\ #2\\ #3\\ #4\\ #5\\ #6\\ #7\\{% #1 = first line, #2 = second line, #3 = third
\getwords(\lineone,\eachwordone)#1 \\%
\getwords(\linetwo,\eachwordtwo)#2 \\%
@@ -414,7 +415,7 @@
\gl at stop}
-
+
\gdef\eightsent#1\\ #2\\ #3\\ #4\\ #5\\ #6\\ #7\\ #8\\{% #1 = first line, #2 = second line, #3 = third
\getwords(\lineone,\eachwordone)#1 \\%
\getwords(\linetwo,\eachwordtwo)#2 \\%
@@ -462,4 +463,4 @@
% \leavevmode puts us back in horizontal mode, so that a \\ will work
\def\gl at stop{{\hskip -\glossglue}\unhbox\gline\leavevmode \egroup}
-\endinput
\ No newline at end of file
+\endinput
Modified: trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-forest-setup.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-forest-setup.sty 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-forest-setup.sty 2018-04-29 22:35:31 UTC (rev 47487)
@@ -1,11 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% File: langsci-forest-setup.sty
%% Author: Language Science Press (http://langsci-press.org)
-%% Date: 2016-01-16 16:47:43 UTC
-%% Purpose: This file contains optional styles and settings for the
+%% Date: 2016-01-16 16:47:43 UTC
+%% Purpose: This file contains optional styles and settings for the
%% forest package. This version is for 2.0.
%% Language: LaTeX
-%% Licence:
+%% Licence:
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -13,10 +13,12 @@
% a workaround is to use a different pgf driver.
% See email from Akira Kakuto to Stefan Müller 15.01.2016
+% Do we need this for 2017?
+% We seem to be better off without it 31.10.2017
%deceive the driver
-\def\pdftexversion{140}
+%\def\pdftexversion{140}
%use the old driver for dvipdfm
-\def\pgfsysdriver{pgfsys-dvipdfm.def}
+%\def\pgfsysdriver{pgfsys-dvipdfm.def}
% http://en.wikibooks.org/wiki/LaTeX/Linguistics#Syntactic_trees
\usepackage{tikz-dependency}
@@ -31,8 +33,8 @@
% does not work with forest v1.05 did not check later versions
-\usepackage[external]{forest}
-\tikzset{external/up to date check=simple}
+\usepackage[external,linguistics]{forest}
+\tikzset{external/up to date check=simple}
% for texlive: -shell-escape, for miktex -enable-write18
% All externalized graphics go go the \externaldirectory
%\tikzexternalize[prefix=external-figures/,shell escape=-shell-escape]
@@ -39,23 +41,18 @@
\tikzset{external/system call={xelatex \tikzexternalcheckshellescape -halt-on-error -interaction=batchmode -jobname "\image" "\texsource"}}
%\usepackage{morewrites}
-%\usepackage{forest}
-% for forest version2
-\useforestlibrary{linguistics}
-\forestapplylibrarydefaults{linguistics}
-
% specification for all trees, "default preamble" appends to existing specification.
% The version with apostrophe replaces it.
\forestset{default preamble'={
- for tree={align=center,parent anchor=south, child anchor=north,base=bottom},
+ for tree={align=center,parent anchor=south, child anchor=north,anchor=north,base=bottom},
before drawing tree={
sort by=y,
for min={tree}{baseline}
}
- }}
+ }}
\forestset{
@@ -81,7 +78,7 @@
% http://www.texample.net/tikz/examples/borrowers-and-lenders/
-\usetikzlibrary{arrows} %,positioning}
+\usetikzlibrary{arrows} %,positioning}
\tikzset{
%Define standard arrow tip
>=stealth'}
@@ -89,7 +86,7 @@
%% \forestset{
-%% sn edges/.style={for tree={parent anchor=south, child anchor=north,align=center,base=bottom,where n children=0{tier=word}{}}},
+%% sn edges/.style={for tree={parent anchor=south, child anchor=north,align=center,base=bottom,where n children=0{tier=word}{}}},
%% background tree/.style={for tree={text opacity=0.2,draw opacity=0.2,edge={draw opacity=0.2}}}
%% }
@@ -103,14 +100,15 @@
l sep=0,inner xsep=0,
append translation/.expanded/.wrap pgfmath arg={\gettranslation{##1}}{content},
content/.expanded/.wrap pgfmath arg={\gettext{##1}}{content},
- },
+ },
append translation/.style={
if={strequal("#1","")}{}{
append={[#1,no edge,inner xsep=0,inner ysep=0,outer ysep=0,
+ tier=gloss,
l=\baselineskip + 0.2ex,
]}
}
- }
+ }
}
\def\gettext#1{\gettextA#1;;\endget}
@@ -124,7 +122,9 @@
% to do: make this style default and change all other figures explicitely as is described here:
% http://tex.stackexchange.com/questions/167983/getting-rid-of-a-default-where-specification
\forestset{
-sm edges/.style={for tree={parent anchor=south, child anchor=north,base=bottom},
+sm edges/.style={for tree={parent anchor=south, child anchor=north,base=top}, % changed base=bottom
+ % to top since we have NP and AVM nodes and the NP has to start
+ % right away at the same hight as the AVM St. Mü. 18.10.2017
where n children=0{tier=word,delay=with translation}{} %,delay=with translation
},
sm edges without translation/.style={for tree={parent anchor=south, child anchor=north,base=bottom},
@@ -196,7 +196,7 @@
%
% TAG
% http://tex.stackexchange.com/questions/207459/getting-old-school-trees-with-forest
-% fit -> fit=band causes all nodes to have nothing below them
+% fit -> fit=band causes all nodes to have nothing below them
tag/.style={for tree={parent anchor=south, child anchor=north,align=center,base=top,fit=rectangle},
where n children=0{delay=with translation}{},
% the following breaks the alignments in sets
@@ -207,7 +207,7 @@
no word baseline/.style={for tree={parent anchor=south, child anchor=north,align=center,base=top},
where n children=0{delay=with translation}{}},
%
-% a style that creates an arrow pointing to the substitution node from a tree top node encoded as daughter
+% a style that creates an arrow pointing to the substitution node from a tree top node encoded as daughter
substitution/.style={edge={<-,dashed},l+=\baselineskip},
%
%
@@ -238,5 +238,3 @@
delay={where content={}{shape=coordinate,for siblings={anchor=north}}{}}
}
}
-
-
Modified: trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-gb4e.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-gb4e.sty 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-gb4e.sty 2018-04-29 22:35:31 UTC (rev 47487)
@@ -8,7 +8,7 @@
%% Licence:
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ProvidesPackage{langsci/styles/langsci-gb4e}[2000/09/05]
+\ProvidesPackage{langsci-gb4e}[2000/09/05]
\def\gbVersion{4e}
%%%%%%%%%%%%%%%%%%%%%%%%
@@ -65,8 +65,8 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\input{\stylepath langsci-cgloss.sty}
-\input{\stylepath jambox.sty}
+\usepackage{langsci-cgloss}
+% \input{jambox.sty}
\@ifundefined{new at fontshape}{\def\reset at font{}\let\mathrm\rm\let\mathit\mit}{}
@@ -103,16 +103,6 @@
% new user command for specifying translations:
%\newcommand{\mytrans}[1]{{\trans`#1'}\vskip.6\baselineskip}
-% make examples in footnotes smaller:
-\let\beforeExFootnote\footnote
-\renewcommand{\footnote}[1]{\begingroup%
-\let\exfont\fnexfont%
-\let\glossfont\fnglossfont%
-\let\transfont\fntransfont%
-\let\exnrfont\fnexnrfont%
-%\renewcommand{\@@xsi}{\let\@xsi\roman}% set example numbering to roman
-\beforeExFootnote{#1}%
-\endgroup}
\renewcommand{\eachwordone}{\exfont}
@@ -137,25 +127,21 @@
\newif\if at xrec\@xrecfalse
\@definecounter{fnx}
-%%%% adapted from latex.tex to get examples in footnotes right
-%% \long\def\@footnotetext#1{%
-%% \@noftnotefalse\setcounter{fnx}{0}%
-%% \insert\footins{\reset at font\footnotesize
-%% \interlinepenalty\interfootnotelinepenalty
-%% \splittopskip\footnotesep
-%% \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
-%% \hsize\columnwidth \@parboxrestore
-%% \edef\@currentlabel{\csname p at footnote\endcsname\@thefnmark}\@makefntext
-%% {\rule{\z@}{\footnotesep}\ignorespaces
-%% #1\strut}}\@noftnotetrue}
-% same effect but more compact
+% set a flag that we are in footnotes now and change the size of example fonts
\let\oldFootnotetext\@footnotetext
\renewcommand\@footnotetext[1]{%
\@noftnotefalse\setcounter{fnx}{0}%
- \oldFootnotetext{#1}\@noftnotetrue}
+\begingroup%
+\let\exfont\fnexfont%
+\let\glossfont\fnglossfont%
+\let\transfont\fntransfont%
+\let\exnrfont\fnexnrfont%
+ \oldFootnotetext{#1}%
+\endgroup%
+\@noftnotetrue}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -251,7 +237,7 @@
\def\exe{%
%\ifnum\value{equation}>9 \exewidth{(23)}\else\fi% inserted by LSP, for large example numbers
- \ifnum\value{equation}>99 \exewidth{(235)}\else\fi% inserted by LSP, for large example numbers
+ \ifnum\value{equation}>98 \exewidth{(235)}\else\fi% inserted by LSP, for large example numbers
\@ifnextchar [{\@exe}{\@exe[\@exwidth]}}
\def\@exe[#1]{\ifnum \@xnumdepth >0%
\if at xrec\@exrecwarn\fi%
Modified: trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-glyphs.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-glyphs.sty 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-glyphs.sty 2018-04-29 22:35:31 UTC (rev 47487)
@@ -1,11 +1,11 @@
-\newcommand{\downstep}{\textsf{↓}}
-\newcommand{\↓}{\textsf{↓}}
+\newcommand{\downstep}{\textsf{ꜜ}}
+\newcommand{\↓}{\textsf{ꜜ}}
\newcommand{\saltillo}{\textsf{ꞌ}}
\newcommand{\Saltillo}{\textsf{Ꞌ}}
\newcommand{\ꞌ}{\textsf{ꞌ}}
\newcommand{\Ꞌ}{\textsf{Ꞌ}}
-
+
\newcommand{\higha}{{$^{\text{a}}$}}
\newcommand{\highe}{{$^{\text{e}}$}}
\newcommand{\highE}{{$^{\text{ɛ}}$}}
@@ -15,15 +15,14 @@
\newcommand{\highu}{{$^{\text{u}}$}}
\newcommand{\highU}{{$^{\text{ʊ}}$}}
-
+
\newcommand{\ᵃ}{\textsf{{\hspace{.5pt}ᵃ}}}
- \newcommand{\ᵋ}{\textsf{{\hspace{.5pt}ᵋ}}}
- \newcommand{\ᵉ}{\textsf{{\hspace{.1pt}ᵉ}}}
+ \newcommand{\ᵋ}{\textsf{{\hspace{.5pt}ᵋ}}}
+ \newcommand{\ᵉ}{\textsf{{\hspace{.1pt}ᵉ}}}
\newcommand{\ᴵ}{\textsf{{\hspace{.5pt}ᴵ}}}
- \newcommand{\ᶤ}{\textsf{{\hspace{.5pt}ᶤ}}}
+ \newcommand{\ᶤ}{\textsf{{\hspace{.5pt}ᶤ}}}
\newcommand{\ᵒ}{\textsf{{\hspace{.5pt}ᵒ}}}
\newcommand{\ᵓ}{\textsf{{\hspace{.5pt}ᵓ}}}
\newcommand{\ᵘ}{\textsf{{\hspace{.5pt}ᵘ}}}
\newcommand{\ᶶ}{\textsf{{\hspace{.5pt}ᶶ}}}
\newcommand{\ꜜ}{\textsf{ꜜ\hspace*{-2pt}}}
-
\ No newline at end of file
Added: trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-hyphenation-de.tex
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-hyphenation-de.tex (rev 0)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-hyphenation-de.tex 2018-04-29 22:35:31 UTC (rev 47487)
@@ -0,0 +1,637 @@
+\hyphenation{%
+Aar-au
+ab-ge-kürzt
+ab-ge-lei-tet
+Ab-lei-ten
+ab-zu-lei-ten
+a-dä-qua-ter
+A-djek-tiv-fle-xi-on
+Ad-res-sa-ten
+Adri-ano
+affri-ca-te
+affri-ca-tes
+Ak-ku-sa-tiv
+A-le-man-ni-schen
+all-ge-mein-ste
+Alt-hoch-deutsch
+Alt-hoch-deut-sche
+Alt-hoch-deut-schen
+A-na-lo-gi-en
+A-na-ly-se
+a-na-ly-siert
+an-ge-nom-men
+an-nä-hernd
+An-satz
+an-setzt
+An-tje
+an-zu-füh-ren
+Ar-bei-ten
+Ar-ti-ku-la-tion
+Auf-tre-ten
+auf-wach-sen
+auf-weist
+Aus-blei-chung
+aus-ei-nan-der-ge-hal-ten
+aus-fal-len
+aus-führ-lich
+aus-führ-li-che
+Aus-gleich
+Aus-gleichs-me-cha-nis-men
+Aus-gleichs-ten-denz
+Aus-gleichs-ten-den-zen
+aus-lau-ten-de
+aus-schließ-lich
+Aus-schnitt
+Bän-de
+ba-sie-end
+Be-deu-tungs-as-pekt
+Be-deu-tungs-as-pekt-en
+be-dingt
+be-ding-te
+Bei-spiel
+Bei-spie-le
+bei-spiels-wei-se
+bei-spiels-wei-se
+Be-lebt-heit
+Be-lebt-heits-hie-rar-chie
+be-nö-tigt
+be-ob-ach-ten
+be-ob-ach-tet
+Be-ob-ach-tung
+Be-reich
+Be-rei-che
+Be-reichs
+be-reits
+Be-rich-ti-gun-gen
+bern-deut-sches
+be-schäf-tigt
+Be-schrän-kung
+Be-schränk-ung-en
+be-schreibt
+Be-schrei-bung
+be-schrie-ben
+bes-ser
+be-steht
+be-stimmt
+be-stimm-te
+be-stimm-ten
+be-stimm-ter
+Be-tont-heit
+be-trach-tet
+be-tref-fend
+Be-völ-ke-rungs-dich-te
+Be-völ-ke-rungs-grö-ße
+be-zie-hen
+be-züg-lich
+Blö-cke
+Blö-cken
+Bo-den-see-a-le-man-nisch
+bräuch-te
+bün-dig
+Cha-rak-te-ri-sti-ka
+Cha-rak-te-ris-ti-ka
+Char-les
+com-ple-ments
+con-straint
+da-für
+Dam-mel
+da-ran
+da-von
+da-zu
+de-fi-nie-ren
+de-fi-niert
+De-mon-stra-tiv-pro-no-men
+De-mon-stra-tiv-pro-no-mens
+des-sen
+des-we-gen
+De-ter-mi-nie-rer
+De-ter-mi-nie-rer-ka-te-go-rie-en
+De-ter-mi-nie-rern
+deut-sche
+deut-schen
+di-a-chron
+di-a-chrone
+di-a-chro-ner
+Di-a-lekt-grup-pe
+die-nen
+dient
+die-sel-be
+die-sem
+die-sen
+die-ser
+Die-wald
+Diph-thon-gie-rung
+Dis-kurs-kon-text
+Dis-kurs-teil-neh-mer
+Dis-kurs-teil-neh-mers
+Dis-kurs-ver-lauf
+Dis-kurs-ver-läu-fe
+Di-stinkt-heit
+durch-aus
+Durch-schnitt-li-che
+durch-schnitt-li-chen
+Durch-schnitts-wer-te
+durch-zu-füh-ren
+Dy-na-mi-ken
+dy-na-mi-sche
+Ei-gen-schaf-ten
+ei-nem
+ei-ner
+ein-fa-cher
+ein-ge-gan-gen
+ein-ge-stie-gen
+ein-ge-teilt
+ein-heit-li-ches
+Ein-tei-lung
+E-le-men-te
+E-li-sa-beth-tal
+el-säs-si-scher
+ent-hält
+ent-spre-chen
+ent-we-der
+ent-wi-ckeln
+er-klä-ren
+er-klärt
+Er-klär-ung
+er-mög-li-chen
+er-rei-chen
+er-scheint
+ers-ten
+Ers-tens
+er-wei-tert
+Eu-ro-pe
+e-ven-tu-el-le
+exem-pla-risch
+Fak-to-ren
+fal-len
+feh-len-de
+fest-hal-ten
+fin-det
+Fin-kel
+Fle-xi-on
+Fle-xi-ons-ka-te-go-ri-en
+Fle-xi-ons-klas-se
+Fle-xi-ons-klas-sen
+Fle-xi-ons-mor-pho-lo-gie
+Fle-xi-ons-pa-ra-dig-ma
+Fle-xi-ons-suf-fix
+Fle-xi-ons-sys-stem
+Fol-ge
+folg-lich
+Folg-lich
+folgt
+Frank-reichs
+fran-zö-sisch
+fran-zö-si-schen
+Frei-burg
+Fri-bourg
+früh-neu-hoch-deut-sche
+fünf-tens
+Funk-ti-ons-glei-chung
+Gebiet
+Ge-brauchs-un-ter-schied
+ge-folgt
+ge-fragt
+ge-ge-ben
+Ge-gen-teil
+ge-gen-über
+ge-gen-ü-ber-ge-stellt
+ge-glie-dert
+ge-hö-ren
+ge-macht
+Ge-mein-de
+ge-mein-sa-men
+ge-meint
+ge-nannt
+ge-nann-ten
+ge-nau-er
+ge-ne-ra-ti-ven
+ge-ne-rell
+Ge-ni-tiv
+Ge-ni-tivs
+Ge-nus
+Ge-nus-syn-kre-tis-men
+ge-o-gra-fisch
+ge-o-gra-fi-sche
+ge-prüft
+ge-ra-de
+ge-rings-te
+ger-ma-ni-schen
+Ge-samt-kom-ple-xi-tät
+Ge-schlecht
+ge-spei-chert
+Ge-sprächs-part-ner
+Ge-sprächs-part-ners
+Ge-sprächs-teil-neh-mer
+ge-spro-chen
+ge-spro-che-nen
+ge-wor-fen
+ge-zählt
+ge-zeigt
+gleich
+glei-cher
+Gleich-zei-tig
+gram-ma-ti-ka-li-sier-ten
+Gram-ma-ti-ka-li-sie-rung
+Grenz-wert
+gro-ße
+grund-sätz-lich
+grund-sätz-li-che
+Gruy-ter
+Gur-mels
+ha-ben
+han-delt
+Haupt-ar-gu-ment
+Hebrä-isch
+Hebrä-ische
+Hebrä-ischen
+He-ran-ge-hens-wei-sen
+her-zu-lei-ten
+he-te-ro-ge-nen
+hier
+hie-rar-chi-schen
+hier-hin
+hie-si-gen
+hin-ge-wie-sen
+his-to-risch
+his-to-rische
+Hoch-a-le-man-nisch
+hoch-ale-man-ni-sche
+Hoch-ale-man-ni-sche
+Hoch-a-le-man-ni-schen
+hoch-deut-sche
+Höchst-a-le-man-nisch
+höchst-a-le-man-ni-sche
+höchst-ale-man-ni-schen
+Höchst-ale-man-ni-schen
+hö-he-re
+hö-he-rem
+hö-he-ren
+hö-he-rer
+Ho-mo-ge-ni-tät
+Hö-rer
+Hot-zen-kö-cher-le
+Hu-zen-bach
+Iko-ni-zi-tät
+in-for-ma-ti-ons-the-o-re-ti-sches
+in-for-mel-le
+In-no-va-ti-ons-ra-te
+In-no-va-ti-vi-tät
+ins-be-son-de-re
+in-te-res-sant
+in-te-res-san-ter-wei-se
+In-te-res-ses
+in-te-res-sier-ten
+In-ter-ro-ga-tiv-pro-no-men
+In-ter-ro-ga-tiv-pro-no-mens
+i-so-liert
+i-so-lier-te
+i-so-lier-ten
+Jahr-hun-dert
+je-der
+je-ner
+je-weils
+Jid-disch
+Jid-disch-en
+Jung-gram-ma-ti-kern
+Kai-ser-stuhl
+Ka-pi-tel
+Ka-pi-teln
+Ka-pi-tels
+Karl-Ham-pus
+Ka-sus-mar-kie-rung
+Ka-te-go-rie
+Ka-te-go-ri-en
+Ka-te-go-ri-sie-rung
+kei-nem
+Kir-chen-sla-vi-schen
+klein-ste
+ko-diert
+kom-ple-xer
+Kom-ple-xi-fi-zie-rung
+Kom-ple-xi-tät
+Kom-ple-xi-täts-aus-gleich
+Kom-pri-mie-rung
+kon-kre-ten
+kon-kre-ter
+kon-kur-rie-ren
+kon-kur-riert
+konn-te
+Kon-sti-tu-en-ten-struk-tur
+kons-ti-tu-tio-nel-ler
+Kon-tak-te
+Kon-takt-spra-chen
+ko-o-pe-ra-ti-ven
+kor-pus-ba-sier-te
+Kürsch-ner
+lang-sa-mer
+Laut-qua-li-tät
+leicht
+Letz-te-re
+Le-xems
+Lexi-kon
+lie-gen
+lin-gu-is-ti-schen
+Li-te-ra-tur-hebrä-isch-en
+Mann-heim
+mar-kiert
+Mar-kie-rung
+Mas-ku-lin
+ma-xi-mal
+Me-cha-nis-men
+meh-re-ren
+Mehr-spra-chig-keit
+mesch-li-chen
+Mess-me-tho-de
+Mess-me-tho-den
+Me-tho-de
+Me-tho-den
+Mi-ni-ma-lis-mus
+mit-ei-nan-der
+Mit-tel-hoch-deutsch
+Mit-tel-hoch-deut-sche
+Mit-tel-hoch-deut-schen
+Mit-tel-sil-ben-zen-tra-li-sier-ung
+Mo-bi-li-tät
+Mo-dell
+mo-del-liert
+mo-der-nen
+Mo-di-fi-ka-ti-on
+Mo-du-le
+mög-li-che
+mög-li-chen
+mög-li-cher
+mög-lichst
+Mo-ment
+Mon-go-lisch
+Mo-no-fle-xi-on
+mor-pho-lo-gisch
+mor-pho-lo-gi-sche
+mor-pho-lo-gi-schen
+mor-pho-syn-tak-ti-sche
+mor-pho-syn-tak-ti-schen
+mo-vier-ten
+mul-ti-lin-gu-a-len
+Mund-art
+münd-lich
+müs-sen
+nach-ge-wie-sen
+na-sa-lier-ten
+ne-ben
+Ne-ben-sil-be
+Ne-ben-sil-ben-schwä-chung
+Netz-werk
+Netz-wer-ken
+Neu-e-run-gen
+Neu-trum
+Nie-der-a-le-man-nisch
+nie-der-a-le-man-ni-schen
+nie-dri-ge-ren
+Nie-mey-er
+No-mi-nal-fle-xi-on
+No-mi-nal-phra-se
+No-mi-na-tiv
+o-ben
+Ober-fläch-en-ab-fol-ge
+O-ber-rhein-a-le-man-nisch
+o-ber-rhein-a-le-man-ni-sche
+O-ber-rhein-a-le-man-ni-schen
+öko-no-mi-scher
+on-to-lo-gi-sche
+O-pa-zi-tät
+o-pe-ra-ti-o-na-li-siert
+Ope-ra-ti-o-na-li-sie-rung
+or-ga-ni-siert
+or-na-men-ta-le
+Ost-jid-disch-en
+Pa-ra-dig-ma
+Pa-ra-dig-men
+Par-ti-zip
+Pe-ri-phra-sen
+pe-ri-phras-ti-scher
+Per-so-nal-pro-no-men
+Pe-tri-feld
+Phä-no-me-ne
+phi-lo-so-phi-schen
+pho-no-lo-gisch
+pho-no-lo-gi-sche
+pho-no-lo-gi-schen
+plä-diert
+Po-si-tions-mög-lich-keit
+Po-si-tions-mög-lich-keit-en
+pos-se-si-ven
+Pos-ses-siv-pro-no-men
+Pos-ses-siv-pro-no-mens
+prag-ma-ti-sch-en
+prak-ti-schen
+prä-sen-tiert
+prä-zi-se
+Pri-mär
+Pri-mär-
+Pri-mär-um-laut
+prin-zi-pi-el-len
+Pro-zes-se
+Qua-li-tät
+Qua-li-täts-un-ter-schie-de
+re-a-li-sie-ren-de
+re-a-li-sie-rung
+Re-a-li-sie-rungs-re-geln
+Rechts-att-ri-bu-te
+Re-dun-dan-zen
+re-gel-mä-ßi-gen
+Re-geln
+re-la-ti-ver
+Rhein-ebe-ne
+Rot-weil
+Schlach-ter
+schließ-lich
+Schwä-bisch
+schwä-bi-sche
+Schwä-bi-sche
+schwä-bi-schen
+schwa-che
+Schwarz-wald
+Schwei-zer
+Schwer-punkt
+Se-kun-där-um-laut
+Sen-se-be-zirk
+Se-quen-zier-ungs-be-schrän-kung-en
+Se-ria-li-sier-ungs-be-schrän-kung-en
+Sim-pli-fi-zie-rung
+so-wie
+so-wohl
+so-zio-lin-gu-is-ti-schen
+Spen-cer
+Spe-zi-al-fäl-le
+spe-zi-fisch-sten
+spe-zi-fi-ziert
+Spra-che
+Spra-chen
+Sprach-ge-mein-schaft
+Sprach-ge-mein-schaf-ten
+Sprach-ge-schich-te
+Sprach-imi-ta-tio-nen
+Sprach-in-sel
+Sprach-kon-takts
+Sprach-wan-del
+Sprach-wissenschaftlers
+sprach-wis-sen-schaft-li-cher
+Sprech-akt-opera-tor
+Sprech-akt-opera-tor-en
+Sprech-er-be-kennt-nis
+Stamm-for-men
+Stamm-mo-di-fi-ka-ti-on
+Stan-dar-di-sie-rungs-pro-zess
+Standard-Ost-jid-disch
+Stan-dard-spra-che
+stär-ker
+steht
+stel-len
+stell-ver-tre-tend
+Step-pe
+steu-ert
+struk-tu-rel-le
+struk-tu-rel-ler
+Stutt-gar-ter
+Sub-stan-tiv
+Sub-stan-tiv-
+sued-oes-tli-chen
+Sum-me
+Süß-kram
+Syn-kre-tis-men
+Syn-kre-tis-mus
+Syn-kre-tis-mus-paa-res
+syn-tak-ti-schen
+syn-tak-ti-scher
+syn-te-thi-schen
+Sys-tem
+sy-ste-ma-tisch
+sys-te-ma-ti-sche
+sys-te-ma-ti-schem
+Sys-te-ma-ti-sie-rungs-ar-beit
+Szcze-pa-niak
+Ta-bel-le
+Ta-bel-len
+täg-li-chen
+Ta-xo-no-mie
+ta-xo-no-mi-sche
+Teil-a-na-ly-sen
+Teil-dis-zi-pli-nen
+the-o-re-ti-sche
+The-o-rie-bil-dung
+trenn-te
+Ü-ber-gang
+ü-ber-neh-men-den
+Ü-ber-set-zung
+Ü-ber-spe-zi-fi-ka-ti-on
+um-lau-ten
+un-ab-hän-gig
+un-be-stimm-te
+un-be-stimm-ten
+un-ga-ri-schen
+un-ge-fähr
+U-ni-fi-ka-tion
+Un-ter-ka-pi-teln
+un-ter-schie-den
+un-ter-schied-li-che
+un-ter-schied-li-chem
+un-ter-schied-li-chen
+un-ter-schied-li-cher
+Un-ter-spe-zi-fi-ka-tion
+Un-ter-stüt-zung
+un-ter-such-ten
+Un-ter-su-chungs-ge-biet
+Ur-in-do-ger-ma-ni-sche
+Ut-rum
+Va-ri-a-ti-on
+Ver-all-ge-mei-ner-ung
+ver-an-schau-licht
+Verb-cluster
+Ver-bin-dung-en
+Verb-kette
+Verb-ketten
+Verb-kom-plex
+Verb-partikel
+Verb-par-ti-kel
+Verb-partikeln
+Verb-par-ti-keln
+Verb-phra-se
+Verb-zweit-stel-lung
+Ver-deut-li-chung
+ver-ein-fach-te
+Ver-gleich
+Ver-gleich-bar-keit
+Ver-glei-che
+Ver-gleichs
+ver-gleichs-wei-se
+Ver-laufs-mus-ter
+ver-letzt
+ver-or-ten
+ver-schie-de-ne
+ver-schie-de-nen
+ver-schie-den-en
+ver-schie-de-ner
+ver-stan-den
+Ver-tei-lung
+ver-tre-te
+Ver-tre-ters
+ver-wand-te
+Ver-wen-dungs-un-ter-schied
+Ver-wen-dungs-un-ter-schiede
+ver-wer-fen
+Ver-zer-ren
+Vis-per-ter-mi-nen
+VO-Grund-wort-stel-lung
+vo-ka-lisch
+voll-stän-di-ges
+von-ei-nan-der
+Vor-be-rei-tung
+vor-ge-stellt
+vor-han-den
+vor-kom-men
+vor-kommt
+Vor-schlä-ge
+wahr-neh-mungs-psy-cho-lo-gi-scher
+wei-sen
+wei-ten
+wei-ter
+Wei-te-ren
+wel-che
+wel-chen
+we-ni-ger
+we-sent-lich
+we-sent-lich-en
+wes-halb
+west-jid-disch
+West-jid-disch-Projekt
+West-mittel-deutsch
+wich-tig
+wie-der-ho-len
+Will-kop
+wis-sen-schafts-ge-schicht-li-chen
+wo-durch
+Wohl-ge-formt-heit
+Wort-ar-ten
+Wör-ter
+wur-de
+wür-de
+Wur-zel
+Wur-zel-al-ter-na-ti-o-nen
+Wur-zeln
+Zel-len
+Zu-falls-prin-zip
+zu-ge-wie-sen
+Zu-ge-zo-ge-nen
+zugrunde-lie-gen-de
+zu-rück-er-o-bert
+zu-sam-men-fal-len
+Zu-sam-men-ge-fasst
+zu-sam-men-ge-nom-men
+Zu-sam-men-hang
+zu-sätz-lich
+Zu-schrei-bung
+Zu-stand
+zu-tref-fen
+zwei-tens
+zwi-schen
+}
\ No newline at end of file
Property changes on: trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-hyphenation-de.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-hyphenation-fr.tex
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-hyphenation-fr.tex (rev 0)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-hyphenation-fr.tex 2018-04-29 22:35:31 UTC (rev 47487)
@@ -0,0 +1,51 @@
+\hyphenation{%
+ac-cep-ta-ble
+affri-ca-te
+affri-ca-tes
+a-na-lyse
+ap-pa-rais-sent %check the hyphenation
+au-xi-liaire
+clus-ter
+clus-ters
+com-pa-ra-tive
+com-pa-ra-tives
+com-ple-ments
+con-si-dé-ré
+cons-truc-tion
+cons-truc-tions
+con-texte
+con-textes
+con-tras-tif
+con-ven-tion-nelles
+deu-xième %check the hyphenation
+E-di-tu-ra
+en-tre-tien-nent
+en-vi-sa-gé
+é-ven-tua-li-té
+e-xem-ple
+e-xem-ples
+Fien-go
+Gar-dent
+Han-ka-mer
+in-fi-ni-tif
+in-ter-pré-ta-tion
+in-ter-ro-ga-ti-ves
+Ka-ze-nin
+Ken-ne-dy
+ma-té-riel
+moin-dre
+par-ti-cu-lier
+per-met-tant
+prin-tre
+pseu-do-cons-ti-tuants
+pseu-do-gap-ping
+quel-ques
+re-cons-truc-tion
+ren-tre-ra
+Schlan-gen
+sous-ca-té-go-ri-sa-tion
+su-bor-don-nants
+suf-fi-sam-ment
+sui-vant
+syn-ta-xique
+}
\ No newline at end of file
Property changes on: trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-hyphenation-fr.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-hyphenation-pt.tex
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-hyphenation-pt.tex (rev 0)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-hyphenation-pt.tex 2018-04-29 22:35:31 UTC (rev 47487)
@@ -0,0 +1,2 @@
+\hyphenation{%
+}
\ No newline at end of file
Property changes on: trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-hyphenation-pt.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-hyphenation-universal.tex
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-hyphenation-universal.tex (rev 0)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-hyphenation-universal.tex 2018-04-29 22:35:31 UTC (rev 47487)
@@ -0,0 +1,3 @@
+\hyphenation{%
+Choms-ky
+}
\ No newline at end of file
Property changes on: trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-hyphenation-universal.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-jambox.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-jambox.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-jambox.sty 2018-04-29 22:35:31 UTC (rev 47487)
@@ -0,0 +1,93 @@
+%%%%%%%%%%%%%%%%%% 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...
Property changes on: trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-jambox.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-lgr.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-lgr.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-lgr.sty 2018-04-29 22:35:31 UTC (rev 47487)
@@ -0,0 +1,88 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% File: langsci-lgr.sty
+%% Author: Language Science Press (http://langsci-press.org)
+%% Date: 2016-01-16 16:47:43 UTC
+%% Purpose: This file contains shortcuts for the Leipzig Glossing
+%% Rules.
+%% Language: LaTeX
+%% Licence:
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\newcommand{\ABL}{\textsc{abl}{}\xspace} %ablative
+\newcommand{\ABS}{\textsc{abs}{}\xspace} %absolutive
+\newcommand{\ACC}{\textsc{acc}{}\xspace} %accusative
+\newcommand{\ADJ}{\textsc{adj}{}\xspace} %adjective
+\newcommand{\ADV}{\textsc{adv}{}\xspace} %adverb(ial)
+\newcommand{\AGR}{\textsc{agr}{}\xspace} %agreement
+\newcommand{\ALL}{\textsc{all}{}\xspace} %allative
+\newcommand{\ANTIP}{\textsc{antip}{}\xspace} %antipassive
+\newcommand{\APPL}{\textsc{appl}{}\xspace} %applicative
+\newcommand{\ART}{\textsc{art}{}\xspace} %article
+\newcommand{\AUX}{\textsc{aux}{}\xspace} %auxiliary
+\newcommand{\BEN}{\textsc{ben}{}\xspace} %benefactive
+\newcommand{\CAUS}{\textsc{caus}{}\xspace} %causative
+\newcommand{\CLF}{\textsc{clf}{}\xspace} %classifier
+\newcommand{\COM}{\textsc{com}{}\xspace} %comitative
+\newcommand{\COMP}{\textsc{comp}{}\xspace} %complementizer
+\newcommand{\COMPL}{\textsc{compl}{}\xspace} %completive
+\newcommand{\COND}{\textsc{cond}{}\xspace} %conditional
+\newcommand{\COP}{\textsc{cop}{}\xspace} %copula
+\newcommand{\CVB}{\textsc{cvb}{}\xspace} %converb
+\newcommand{\DAT}{\textsc{dat}{}\xspace} %dative
+\newcommand{\DECL}{\textsc{decl}{}\xspace} %declarative
+\newcommand{\DEM}{\textsc{dem}{}\xspace} %demonstrative
+\newcommand{\DEF}{\textsc{det}{}\xspace}
+\newcommand{\DET}{\textsc{def}{}\xspace}
+\newcommand{\DIST}{\textsc{dist}{}\xspace} %distal
+\newcommand{\DISTR}{\textsc{distr}{}\xspace} %distributive
+\newcommand{\DU}{\textsc{du}{}\xspace} %dual
+\newcommand{\DUR}{\textsc{dur}{}\xspace} %durative
+\newcommand{\ERG}{\textsc{erg}{}\xspace} %ergative
+\newcommand{\EXCL}{\textsc{excl}{}\xspace} %exclusive
+\newcommand{\F}{\textsc{f}{}\xspace}
+\newcommand{\FOC}{\textsc{foc}{}\xspace} %focus
+\newcommand{\FUT}{\textsc{fut}{}\xspace} %future
+\newcommand{\GEN}{\textsc{gen}{}\xspace} %genitive
+\newcommand{\IMP}{\textsc{imp}{}\xspace} %imperative
+\newcommand{\INCL}{\textsc{incl}{}\xspace} %inclusive
+\newcommand{\IND}{\textsc{ind}{}\xspace} %indicative
+\newcommand{\INDF}{\textsc{indf}{}\xspace} %indefinite
+\newcommand{\INS}{\textsc{ins}{}\xspace} %instrumental
+\newcommand{\INTR}{\textsc{intr}{}\xspace} %intransitive
+\newcommand{\IPFV}{\textsc{ipfv}{}\xspace} %imperfective
+\newcommand{\IRR}{\textsc{irr}{}\xspace} %irrealis
+\newcommand{\LOC}{\textsc{loc}{}\xspace} %locative
+% \renewcommand{\M}{\textsc{m}{}\xspace} % use at own risk
+\newcommand{\N}{\textsc{n}{}\xspace}
+\newcommand{\NEG}{\textsc{neg}{}\xspace}
+\newcommand{\NMLZ}{\textsc{nmlz}{}\xspace} %nominalizer/nominalization
+\newcommand{\NOM}{\textsc{nom}{}\xspace} %nominative
+\newcommand{\OBJ}{\textsc{obj}{}\xspace} %object
+\newcommand{\OBL}{\textsc{obl}{}\xspace} %oblique
+% \renewcommand{\P}{\textsc{p}{}\xspace} %%originally pilcrow, use at own risk
+\newcommand{\PASS}{\textsc{pass}{}\xspace} %passive
+\newcommand{\PFV}{\textsc{pfv}{}\xspace} %perfective
+\newcommand{\PL}{\textsc{pl}{}\xspace} %plural
+\newcommand{\POSS}{\textsc{poss}{}\xspace} %possessive
+\newcommand{\PRED}{\textsc{pred}{}\xspace} %predicative
+\newcommand{\PRF}{\textsc{prf}{}\xspace} %perfect
+\newcommand{\PRS}{\textsc{prs}{}\xspace} %present
+\newcommand{\PROG}{\textsc{prog}{}\xspace} %progressive
+\newcommand{\PROH}{\textsc{proh}{}\xspace} %prohibitive
+\newcommand{\PROX}{\textsc{prox}{}\xspace} %proximal/proximate
+\newcommand{\PST}{\textsc{pst}{}\xspace} %past
+\newcommand{\PTCP}{\textsc{ptcp}{}\xspace} %participle
+\newcommand{\PURP}{\textsc{purp}{}\xspace} %purposive
+\newcommand{\Q}{\textsc{q}{}\xspace}
+\newcommand{\QUOT}{\textsc{quot}{}\xspace} %quotative
+\newcommand{\RECP}{\textsc{recp}{}\xspace} %reciprocal
+\newcommand{\REFL}{\textsc{refl}{}\xspace} %reflexive
+\newcommand{\REL}{\textsc{rel}{}\xspace} %relative
+\newcommand{\RES}{\textsc{res}{}\xspace} %resultative
+% \renewcommand{\S}{\textsc{s}{}\xspace} %originally § , use at own risk
+\newcommand{\SBJ}{\textsc{sbj}{}\xspace} %subject
+\newcommand{\SBJV}{\textsc{sbjv}{}\xspace} %subjunctive
+\newcommand{\SG}{\textsc{sg}{}\xspace} %singular
+\newcommand{\TOP}{\textsc{top}{}\xspace}
+\newcommand{\TR}{\textsc{tr}{}\xspace} %transitive
+\newcommand{\VOC}{\textsc{voc}{}\xspace} %vocative
Property changes on: trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-lgr.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-linguex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-linguex.sty 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-linguex.sty 2018-04-29 22:35:31 UTC (rev 47487)
@@ -3,26 +3,26 @@
%% of the LaTeX Project Public License Distributed from CTAN
%% archives in directory macros/latex/base/lppl.txt; either
%% version 1 of the License, or any later version.
-%% linguex.sty version 3.3, revised 2000/12/22, compatability with
+%% linguex.sty version 3.3, revised 2000/12/22, compatability with
%% lucida fonts: Defaults defined \AtBeginDocument
-%% linguex.sty version 3.4, revised 2001/04/30, corrected vspacing for
-%% \ex. embedded in \a.
-%% linguex.sty version 3.5, revised 2002/01/26, corrected hspacing for
+%% linguex.sty version 3.4, revised 2001/04/30, corrected vspacing for
+%% \ex. embedded in \a.
+%% linguex.sty version 3.5, revised 2002/01/26, corrected hspacing for
%% \alignSubEx
-%% linguex.sty version 3.6, revised 2008/03/20, \lessthanten,
-%% \lessthanhundred, and \lessthanthousand redefined due to problems
+%% linguex.sty version 3.6, revised 2008/03/20, \lessthanten,
+%% \lessthanhundred, and \lessthanthousand redefined due to problems
%% with kerning in fonts
-%% linguex.sty version 3.7, revised 2008/06/30, \lessthanten,
-%% \lessthanhundred, and \lessthanthousand redefined due to problems
+%% linguex.sty version 3.7, revised 2008/06/30, \lessthanten,
+%% \lessthanhundred, and \lessthanthousand redefined due to problems
%% with kerning in fonts
%% linguex.sty version 3.7a, revised 2009/09/02, replaced hard-coded
%% example format with \theExNo
-%% linguex.sty version 4.0 replaces hard-coded brackets with
+%% linguex.sty version 4.0 replaces hard-coded brackets with
%% predefined commands
-%% linguex.sty version 4.1 replaces \refstepcounter by \stepcounter
+%% linguex.sty version 4.1 replaces \refstepcounter by \stepcounter
%% for internal counters
-%% linguex.sty version 4.2 replaces \rm by \textrm in definition of
-%% \stripoffbr; undoes the change in version 4.0 from .66\baselineskip to
+%% linguex.sty version 4.2 replaces \rm by \textrm in definition of
+%% \stripoffbr; undoes the change in version 4.0 from .66\baselineskip to
%% \Extopsep; renews definition of \label AtBeginDocument
%% linguex.sty version 4.3 removes code that caused problems with beamer; adds
%% a \ProvidesPackage line to keep track of versions better
@@ -38,7 +38,7 @@
\ProvidesPackage{langsci-linguex}[2017/02/14 adapted to work in the LangSci class]
\RequirePackage{xspace,cgloss4e}
%%%%%%%%%%%%%%%%%%% FOOTNOTES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% to let \ex. know whether or not it is in a footnote
+% to let \ex. know whether or not it is in a footnote
\newif\if at noftnote\@noftnotetrue
\let\predefinedfootnotetext=\@footnotetext
\long\def\@footnotetext#1{\@noftnotefalse\predefinedfootnotetext{#1}%
@@ -69,7 +69,7 @@
\newcommand{\Exarabic}{\arabic}%added in version 4.0
\newcommand{\Exalph}{\alph}%added in version 4.0
\newcommand{\Exroman}{\roman}%added in version 4.0
-% Modification in version 4.0: hard wired brackets replaced by
+% Modification in version 4.0: hard wired brackets replaced by
% commands defined above:
\renewcommand{\theSubExNo}{\hbox{\if at noftnote\theExLBr\Exarabic{ExNo}\firstrefdash
\Exalph{SubExNo}\theExRBr\else
@@ -114,7 +114,7 @@
\newcommand{\minimalwidth}[1]{\settowidth{\digitwidth}{#1}%added-3.7
\ifdim\digitwidth<\mindigitwidth\mindigitwidth\digitwidth\fi}%added-3.7
%
-%%%%%%%%%%%%%%%%%%% DEFINITION OF \Lsciex. %%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%% DEFINITION OF \Lsciex. %%%%%%%%%%%%%%%%%%%%%%%%%%
\newif\ifembedded
\newif\ifExWarning
\newcounter{ExDepth}
@@ -123,7 +123,7 @@
\begin{list}{}{\leftmargin\z@%
\labelwidth\z@\labelsep\z@\partopsep\z@\topsep\Extopsep}%
\item{}#1%
- \stepcounter{ExDepth}\ExEnd}%refstepcounter replaced
+ \stepcounter{ExDepth}\ExEnd}%refstepcounter replaced
\def\Lsciex.#1\par{%
\ifnum\theExDepth>0 \setcounter{TempExDepth}{\theExDepth}%
\setcounter{ExDepth}{0}
@@ -131,15 +131,15 @@
\ifembedded\else
\ifdim\lastskip=.66\baselineskip\vspace{\Exredux}\fi
\fi
- \stepcounter{ExDepth}%%refstepcounter replaced
+ \stepcounter{ExDepth}%%refstepcounter replaced
\my at ifnextchar[{\OptArgEx}{\ifindex\expandafter\lookforwords\fi
\NormalEx\testforgramm}%
#1%
\addtocounter{ExDepth}{\theTempExDepth}\setcounter{TempExDepth}{0}%
\embeddedfalse\global\ExWarningfalse\ExEnd}
-\newcommand{\NormalEx}{\ifExWarning
- \PackageWarning{linguex}{Check example numbering (screwed up?),
- check number of empty lines at end of examples.
+\newcommand{\NormalEx}{\ifExWarning
+ \PackageWarning{linguex}{Check example numbering (screwed up?),
+ check number of empty lines at end of examples.
Detected}\fi\ExWarningtrue
\if at noftnote\refstepcounter{ExNo}%
\Exformat[\ExLBr\Exarabic{ExNo}\ExRBr]%
@@ -177,21 +177,21 @@
\minimalwidth{9}%
\settowidth{\lessthanthousand}{\ExLBr\hbox to \philarge{}\ExRBr}%modified-3.7,4.0
\ifdim\currentlabel<\lessthanthousand\leftmargin\Exlabelsep
- \ifdim\lessthanthousand<\Exlabelwidth\Exlabelwidth\Exlabelsep%
- \settowidth{\lessthanten}{\ExLBr\hbox
+ \ifdim\lessthanthousand<\Exlabelwidth\Exlabelwidth\Exlabelsep%
+ \settowidth{\lessthanten}{\ExLBr\hbox
to \philsmall{}\ExRBr}%modified-3.7
- \settowidth{\lessthanhundred}{\ExLBr\hbox to
+ \settowidth{\lessthanhundred}{\ExLBr\hbox to
\philmiddle{}\ExRBr}%modified-3.7
\ifdim\currentlabel<\lessthanten\leftmargin\lessthanten%
\else
\ifdim\currentlabel<\lessthanhundred\leftmargin\lessthanhundred%
- \else
+ \else
\ifdim\currentlabel<\lessthanthousand\leftmargin\lessthanthousand%
\fi\fi\fi\fi
\else
\Exlabelwidth\z@
\fi%
- \@Exleftmargin\Exlabelwidth
+ \@Exleftmargin\Exlabelwidth
\labelwidth\leftmargin
\ifembedded\relax\else
\addtolength{\Exlabelwidth}{\Exindent}
@@ -209,7 +209,7 @@
}%
\ifindex\firstwordtrue\fi\item{}}
%
-%%%%%%%% the `[' of OPTIONAL ARGUMENTS must immediately follow \Lsciex. %%%%%%
+%%%%%%%% the `[' of OPTIONAL ARGUMENTS must immediately follow \Lsciex. %%%%%%
%%%% redefinition of \@ifnextchar that does NOT ignore spaces %%%%%%%%%%%
\def\my at ifnextchar#1#2#3{\let\reserved at d=#1%
\def\reserved at a{#2}\def\reserved at b{#3}%
@@ -253,13 +253,13 @@
\def\a.{\ifindex\firstwordtrue\fi
\ifnum\theExDepth=0 \unembeddedtrue
\trivex.\fi
- \stepcounter{ExDepth}%refstepcounter replaced
- \begin{list}{\makebox[\labelwidth][l]{%
+ \stepcounter{ExDepth}%refstepcounter replaced
+ \begin{list}{\makebox[\labelwidth][l]{%
\ifnum\theExDepth=1 \SubExLBr\Exalph{ABC}\SubExRBr%
\else
\ifnum\theExDepth=2 %
\ifdim\currentlabel<\lessthanthousand%
- \ifalignSubEx
+ \ifalignSubEx
\llap{\hbox to \alignSubExnegindent{\ifunembedded%
\SubExLBr\Exalph{SubExNo}\SubExRBr
\else\SubExlabel\fi\hss}}%
@@ -269,18 +269,18 @@
\else\SubExlabel\fi\fi
\else
\ifnum\theExDepth=3 %
- \if at noftnote%\ifunembedded\mbox{$\bullet$!}\else
+ \if at noftnote%\ifunembedded\mbox{$\bullet$!}\else
\SubSubExLBr\Exroman{SubSubExNo}\SubSubExRBr
%\fi
\else\Exarabic{SubSubExNo}\SubSubExRBr\fi
\fi\fi\fi}}%
- {\labelsep\z@
- \ifnum\theExDepth=2\topsep .3\Extopsep\else\topsep 0pt\fi
+ {\labelsep\z@
+ \ifnum\theExDepth=2\topsep .3\Extopsep\else\topsep 0pt\fi
\parsep\z@\itemsep\z@
\ifnum\theExDepth=1 %
\usecounter{ABC}%
\settowidth{\currentlabel}{\ExLBr\Exarabic{ExNo}\ExRBr}%
- \listdecl%
+ \listdecl%
\else
\ifnum\theExDepth=2 %
\usecounter{SubExNo}%
@@ -300,12 +300,12 @@
%%%%%%%%%%%%%%%%% ITEMS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\newExitem[#1]{\ifnum\theExDepth=2 %
\ifdim\currentlabel<\lessthanthousand%
- \ifalignSubEx
+ \ifalignSubEx
\item[\llap{\hbox to \alignSubExnegindent{#1\hfill}}]%
\else
- \item[#1\hfill]\fi
+ \item[#1\hfill]\fi
\else\item[#1\hfill]%
- \fi
+ \fi
\else\item[#1\hfill]%
\fi\testforgramm}
\let\oldb=\b
@@ -327,11 +327,11 @@
\def\Lsciexi.#1\par{\indextrue\Lsciex.#1 | blabla | \indexfalse\par}
\def\ai.#1 \par{\indextrue
\a.#1 | blabla |
- \par
+ \par
\indexfalse}
\def\finish|#1|{\ExEnd}
\newcommand{\testGrAndBr}{\GTest{}{\printGramm\checkforbr}}
-\def\doaword#1 {%
+\def\doaword#1 {%
\iffirstword\firstwordfalse\expandafter\testGrAndBr\fi%
#1
\ifgloss\expandafter\checkforbrorstar\else
@@ -359,7 +359,7 @@
\unvbox#1}%
\def\more{#4}%
\ifx\more\empty\let\more=\donewords
- \else\let\more=\getwords
+ \else\let\more=\getwords
\fi
\more(#1,#2)#4\\%
}
@@ -367,7 +367,7 @@
\global\glossfalse%
\ifindex\expandafter\lookforwords\fi {} }
%%%
-\newcommand{\newgll}{\glosstrue\GTest{\gll}{\gll\printGramm}}
+\newcommand{\newgll}{\glosstrue\GTest{\gll}{\gll\printGramm}}
\def\exg.{\my at ifnextchar[{\newglossex}{\Lsciex.\newgll}}
\def\newglossex[#1]{\Lsciex.[#1]\newgll}
\def\ag.{\my at ifnextchar[{\newglossa}{\a.\newgll}}
@@ -395,10 +395,10 @@
\newcounter{tmpaEx}
\newif\ifNoFnRef
\newcommand{\Next}{\if at noftnote\NoFnReftrue\else\NoFnReffalse\fi
- \copyExNo\stepcounter{tmpaEx}\printExNo}%refstepcounter replaced
+ \copyExNo\stepcounter{tmpaEx}\printExNo}%refstepcounter replaced
\newcommand{\NNext}{\if at noftnote\NoFnReftrue\else\NoFnReffalse\fi
\copyExNo\addtocounter{tmpaEx}{2}\printExNo}
-\newcommand{\TextNext}{\NoFnReftrue\copyExNo\stepcounter{tmpaEx}\printExNo}%refstepcounter replaced
+\newcommand{\TextNext}{\NoFnReftrue\copyExNo\stepcounter{tmpaEx}\printExNo}%refstepcounter replaced
\newcommand{\Last}{\if at noftnote\NoFnReftrue\else
\ifnum\Exarabic{FnExNo}=0 \NoFnReftrue\else\NoFnReffalse\fi
\fi
@@ -424,18 +424,18 @@
\else\theFnExRBr\fi}}%hard wired bracket changed to \theExBr in version 4.0
\newcommand{\printExNo}{\@ifnextchar[{\complexExNo}{%
\if at noftnote\theExLBr\else\theFnExLBr\fi\thetmpaEx%
- \if at noftnote\theExRBr\else\theFnExRBr\fi\xspace}}%hard
+ \if at noftnote\theExRBr\else\theFnExRBr\fi\xspace}}%hard
%wired bracket changed to \theExBr in version 4.0
%%%%%%%%%%%%%%%%%%%%%%%%%%% compatibility with beamer class %%%%%%%%%%%%%%%%%%%%%%%%%%
% This code has now been commented out in v 4.2 since it now causes problems with beamer
% The original problem it solved was probably a beamer issue, not a linguex issue.
% Users with old versions of beamer may need this code so let's leave it in the source for the moment
-%
%
-%\@ifundefined{usetheme}{}{\AtBeginDocument{\def\label#1{\strut%strut added to definition
+%
+%\@ifundefined{usetheme}{}{\AtBeginDocument{\def\label#1{\strut%strut added to definition
%\@bsphack
% \protected at write\@auxout{}%
% {\string\newlabel{#1}{{\@currentlabel}{\thepage}}}%
%\@esphack}}}
%%%%%%%%%%%%%%%%%%%%%%%%%%% END %%%%%%%%%%%%%%%%%%%%%%%%%%
-\endinput
\ No newline at end of file
+\endinput
Modified: trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-optional.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-optional.sty 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-optional.sty 2018-04-29 22:35:31 UTC (rev 47487)
@@ -214,34 +214,27 @@
% Note: The 2nd Argument of the \ulp command is filled in by experience - if you are not familiar with the command, you should experiment a bit. Usually, five tildes are enough, but be sure to check the outcome.
% \ule is meant to be the last word in a phrase that is underlined. Therefore, \ule does not have an extra length.
\usepackage[normalem]{ulem}
+\usepackage{calc}
+\newlength{\fulllength}
\newcommand{\ulp}[2]{%#1: stuff to underline, #2: extra length to skip the whitespace between to components
\settowidth{\LSPTmp}{#1}%
% several boxes are need to assure that words with ascending and descending letters are underlined at the same
% level, leading to the impression of a continuous stroke
\parbox[t]{\LSPTmp}{ %restrict first box to the length of first argument
- \settowidth{\LSPTmp}{#1#2} %inner box is larger than outerbox, so underlining will extend beyond length of outer box
+ \settowidth{\fulllength}{\parbox{\LSPTmp}{~}\parbox{#2mm}{~}} %inner box is larger than outerbox, so underlining will extend beyond length of outer box
% align parbox to bottom
% | mbox to prevent hyphenation
- \uline{\parbox[b]{\LSPTmp}{\mbox{#1#2}}}
+ \uline{\parbox[b]{\fulllength}{\mbox{#1}}}
}
}
\newcommand{\ule}[1]{%#1: stuff to underline, no extra length
- \ulp{#1}{}
+ \ulp{#1}{0}
}
-\usepackage{newfile}
-\newoutputstream{colorfigures}
-\openoutputfile{\jobname.clr}{colorfigures}
-\addtostream{colorfigures}{Note the offset incurred by the frontmatter!}
-\newenvironment{colorfigure}{\begin{figure}\addtostream{colorfigures}{\thepage}}{\end{figure}}
-\AtEndDocument{
- \closeoutputstream{colorfigures}
-}
-
\newcommand{\longrule}{\rule{1em}{.3pt}}
\usepackage{colortbl}
\newcommand{\shadecell}{\cellcolor{black!20!white}}
@@ -275,6 +268,47 @@
\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}}
+
+\newenvironment{indentquote}[1]%
+ {\list{}{\leftmargin=#1\rightmargin=0pt}\item[]}%
+ {\endlist}
+
+
+\newcommand{\phonrule}[3]{#1 $\to$ #2 / #3}
+\newcommand{\featurebox}[1]{$\left[\begin{tabular}{>{\scshape}c}#1\end{tabular}\right]$}
+
+
+\definecolor{RED}{cmyk}{0.05,1,0.8,0}
+
+%connect two elements with lines
+\newcommand{\connect}[2]{%
+ \tikz[overlay,remember picture]{%
+ \draw[-,thick] (#1) -- (#2) node {}; %
+ }
+}
+
+\newcommand{\examplesroman}{
+ \let\eachwordone=\upshape
+ \exfont{\upshape}
+}
+\newcommand{\examplesitalics}{
+ \let\eachwordone=\itshape
+ \exfont{\itshape}
+}
+
+\newenvironment{modquote}[1][6mm]% slightly less indented quote for hyphenation issues
+ {\list{}{\leftmargin=#1\rightmargin=0mm}\item[]}%
+ {\endlist}
+
+%%%%%%%%%%%%%%%%%%%%
+%%%% %%%%%
+%%%% PLOTS %%%%%
+%%%% %%%%%
+%%%%%%%%%%%%%%%%%%%%
+
\newcommand{\barplot}[4]{%
\begin{tikzpicture}
\begin{axis}[
@@ -295,7 +329,23 @@
\end{axis}
\end{tikzpicture}
}
-
-\newcommand{\rephrase}[2]{{\color{yellow!30!black}#2}\todo{replaced `#1'}}
-
-\newcommand{\missref}[2][]{\todo[#1]{missing reference #2}}
\ No newline at end of file
+\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
Modified: trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-subparts.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-subparts.sty 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-subparts.sty 2018-04-29 22:35:31 UTC (rev 47487)
@@ -1,6 +1,6 @@
% add an additional section level between part and chapter.
\usepackage[newparttoc]{titlesec}
-\usepackage{titletoc}
+\usepackage{titletoc}
% \titleformat{\part}[display]{\normalfont\Huge\bfseries}%
% {\partname~\thepart}{1pc}{\Huge\bfseries}
@@ -19,4 +19,3 @@
\titlecontents{subpart}[0pt]{\addvspace{1pc}\normalfont\bfseries}%
{\thecontentslabel\enspace ---\enspace}%
{\normalfont\bfseries}{\hspace{2em plus 1fill}\contentspage}
-
\ No newline at end of file
Modified: trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-tbls.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-tbls.sty 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-tbls.sty 2018-04-29 22:35:31 UTC (rev 47487)
@@ -10,31 +10,38 @@
\newcommand{\tblslinecolour}{lsYellow}
\mdfdefinestyle{yellowexercise}{%
- linewidth=1.5pt, linecolor=\tblslinecolour,
- innerleftmargin=5mm, innerrightmargin=5mm, innerbottommargin=5mm,
- frametitleaboveskip=15mm, frametitlebelowskip=10mm,frametitlerule=false, innertopmargin=0, repeatframetitle=false,
- firstextra={\useasboundingbox (P) rectangle (P);\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={\useasboundingbox (P) rectangle (P);\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.
+ everyline=true,
+ ignorelastdescenders=true,
+ 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.
}
-
+
\mdfdefinestyle{greyexercise}{%
- everyline=true,ignorelastdescenders=true,
- linewidth=0pt,backgroundcolor=\tblsboxcolor,
- innerleftmargin=5mm, innerrightmargin=5mm, innerbottommargin=5mm, innertopmargin=5mm,
- frametitleaboveskip=15mm, frametitlebelowskip=5mm,frametitlerule=false, repeatframetitle=false,
- firstextra={\useasboundingbox (P) rectangle (P);\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}};}, % if environment is on multiple pages, print this on the first page.
- singleextra={\useasboundingbox (P) rectangle (P);\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}};} % if env. does not span multiple pages, print the same.
+ everyline=true,
+ ignorelastdescenders=true,
+ middlelinewidth=0pt,linecolor=white,outerlinewidth=5mm,
+ leftline=false,rightline=false,bottomline=false,
+ 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}
+ };},
+ 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}
+};}
}
-
+
\mdfdefinestyle{tblsbox}{%
- leftline=false, rightline=false, frametitleaboveskip=10mm, frametitlebelowskip=5mm,frametitlerule=false, repeatframetitle=false, linewidth=\trennlinie, linecolor=\tblslinecolour, innerbottommargin=5mm, innertopmargin=5mm,innerleftmargin=0mm,innerrightmargin=0
+ leftline=false, rightline=false, frametitleaboveskip=10mm, frametitlebelowskip=5mm,frametitlerule=false, repeatframetitle=false, linewidth=\trennlinie, linecolor=\tblslinecolour, innerbottommargin=5mm, innertopmargin=5mm,innerleftmargin=0mm,innerrightmargin=0
}
-
+
\mdfdefinestyle{tblsframedbox}{%
- frametitleaboveskip=5mm, frametitlebelowskip=0mm,frametitlerule=false, repeatframetitle=false, linewidth=\trennlinie, linecolor=\tblslinecolour, innerbottommargin=5mm, innertopmargin=5mm
-}
-
+ frametitleaboveskip=5mm, frametitlebelowskip=0mm,frametitlerule=false, repeatframetitle=false, linewidth=\trennlinie, linecolor=\tblslinecolour, innerbottommargin=5mm, innertopmargin=5mm
+}
+
\newcommand{\tblsfillcolour}{black!12}
\mdfdefinestyle{tblsfilledbox}{%
hidealllines=true, backgroundcolor=\tblsfillcolour, frametitleaboveskip=5mm, frametitlebelowskip=0mm,frametitlerule=false, repeatframetitle=false, innerleftmargin=5mm, innerrightmargin=5mm, innerbottommargin=5mm, innertopmargin=5mm
@@ -86,22 +93,22 @@
}
%%% MDFRAMED END %%%
-
+
\newcommand{\tblsbwbox}[4][]{%
\\
- \noindent
+ \noindent
\colorbox{#2}{
\parbox{.97\textwidth}{
\centering
\parbox{.9\textwidth}{
- %add logo if requested
+ %add logo if requested
\ifthenelse{\equal{#1}{}}{\bigskip}{
\begin{flushleft}
- \hspace*{3.5mm} \raisebox{0mm}[0mm][0mm]{\color{white}\includegraphics[width=10mm]{langsci/graphics/#1.eps}}
- \end{flushleft}}
- %add header
+ \hspace*{3.5mm} \raisebox{0mm}[0mm][0mm]{\color{white}\includegraphics[width=10mm]{#1.eps}}
+ \end{flushleft}}
+ %add header
\boxheader{#3}
\begin{multicols*}{2}
#4
@@ -113,8 +120,8 @@
\\[1em]
}
-
+
\newcommand{\tblsbwboxdark}[3][]{%
\noindent
\tblsbwbox[#1]{gray}{#2}{#3}
@@ -145,10 +152,10 @@
\noindent
#1
\\[2em]
-\boxheader{#2}
+\boxheader{#2}
\\[1em]
\noindent%
-#3
+#3
\smallskip
\noindent
#1
@@ -171,15 +178,15 @@
\tblssandwich{\tblsthinline}{#1}{#2}
}
-\newcommand{\tblscolframebox}[3][]{
+\newcommand{\tblscolframebox}[3][]{
\fboxrule.8mm
\noindent
\begin{figure}
\begin{flushleft}
- \hspace*{3.5mm}
- \raisebox{-10mm}[0mm][0mm]{\ifthenelse{\equal{#1}{}}{}{\includegraphics[width=10mm]{langsci/graphics/#1.eps}}} \\
+ \hspace*{3.5mm}
+ \raisebox{-10mm}[0mm][0mm]{\ifthenelse{\equal{#1}{}}{}{\includegraphics[width=10mm]{#1.eps}}} \\
\end{flushleft}
- \color{lsYellow}\framebox[\textwidth]{%
+ \color{lsYellow}\framebox[\textwidth]{%
\color{black}
\parbox{.92\textwidth}{%
\vspace*{.5cm}
@@ -187,10 +194,9 @@
\begin{multicols*}{2}
#3
\end{multicols*}
- }
+ }
}
\end{figure}
}
-
-\newcommand{\boxheader}[1]{\medskip{\Large\bfseries\sffamily #1}}
\ No newline at end of file
+\newcommand{\boxheader}[1]{\medskip{\Large\bfseries\sffamily #1}}
Added: trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-tobi.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-tobi.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-tobi.sty 2018-04-29 22:35:31 UTC (rev 47487)
@@ -0,0 +1,7 @@
+\newcommand{\tobi}[3][0]{\parbox{0cm}{\raisebox{.8em}[0cm]{\hspace{#1mm}#3}}#2}
+
+\renewcommand{\H}[2][0]{\tobi[#1]{#2}{\textsc{h}}} %put H above letter
+\renewcommand{\L}[2][0]{\tobi[#1]{#2}{\textsc{l}}} %put L above letter
+\newcommand{\E}[2][0]{\tobi[#1]{#2}{\textsc{!}}} %put ! above letter (_E_xclamation)
+\renewcommand{\P}[2][0]{\tobi[#1]{#2}{\textsc{\%}}} %put % above letter (_P_ercentage)
+\renewcommand{\S}[2][0]{\tobi[#1]{#2}{\textsc{*}}} %put * above letter (_S_tar)
Property changes on: trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-tobi.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/xelatex/langsci/langscibook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/langscibook.cls 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/langscibook.cls 2018-04-29 22:35:31 UTC (rev 47487)
@@ -1,8 +1,8 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% File: langscibook.cls
%% Author: Language Science Press (http://langsci-press.org)
-%% Date: 2017-04-28 11:11:11 UTC
-%% Purpose: This file defines the basic document class
+%% Date: Fri Apr 27 2018
+%% Purpose: This file defines the basic document class
%% for books published with Language Science Press.
%% Language: LaTeX
%% Copyright 2012- Language Science Press
@@ -15,10 +15,10 @@
%% version 2005/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
-%%
+%%
%% The Current Maintainer of this work is Sebastian Nordhoff.
-%%
%%
+%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
@@ -32,7 +32,7 @@
% \- print on demand macros
% \- Output types (book, draft, cover)
% \- Page geometry
-% \- Fonts
+% \- Fonts
% \- Colors
% \- Book cover
% \- Series history
@@ -39,20 +39,21 @@
% \- Imprint
% \- Dedication
% \- Header and footer
-% \- Sectioning
+% \- Sectioning
% \- Epigrams
% \- Footnotes
% \- Quotes
+% \- Languages
% \- Citations
% \- Floats
% \- Appendices
% \- Indexes
-% \- Hyperref
+% \- Hyperref
% \- Edited volumes (Collection)
% \_ Miscellaneous
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{langscibook}[2017/04/26 Language Science Press]
+\ProvidesClass{langscibook}[2018/01/15 Language Science Press]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -60,10 +61,13 @@
% Paths
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\newcommand{\fontpath}{}
+\newcommand{\fontpath}{}
\newcommand{\logopath}{}
\newcommand{\seriesinfopath}{}
+\newcommand{\localepath}{}
\newcommand{\bstpath}{}
+\newcommand{\bbxpath}{}
+\newcommand{\cbxpath}{}
\newcommand{\stylepath}{}
% Paths can be overwritten with option "nonflat"
@@ -72,7 +76,7 @@
% Default values
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+
\usepackage{xspace}
\newcommand{\lsp}{Language Science Press\xspace}
\newcommand{\lsSeriesNumber}{??}
@@ -83,22 +87,24 @@
\newcommand{\lsISBNsoftcoverus}{000-0-000000-00-0}
\newcommand{\lsBookDOI}{??}
\newcommand{\lsChapterDOI}{??}
-\newcommand{\lsURL}{http://langsci-press.org/catalog}
+\newcommand{\lsID}{000}
+\newcommand{\lsURL}{http://langsci-press.org/catalog/book/\lsID}
\newcommand{\lsSeries}{eotms}
-\newcommand{\lsSpineBreadth}{20mm}
+% \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{\lsFontsize}{11pt}
\newcommand{\lsChapterFooterSize}{\small} %footers in editedvolumes
\newcommand{\lsCopyright}{CC-BY}
\newcommand{\lsSpinewidth}{20mm}
-\newcommand{\lsBiblatexBackend}{bibtex}
+\newcommand{\lsBiblatexBackend}{biber}
\newcommand{\logotext}{{\color{red}no logo}}
\newcommand{\lsYear}{\the\year}
-\newcommand{\lsBackBody}{Europan lingues es membres del sam familie. Lor separat existentie es un myth. Por scientie, musica, sport etc, litot Europa usa li sam vocabular. Li lingues differe solmen in li grammatica, li pronunciation e li plu commun vocabules. Omnicos directe al desirabilite de un nov lingua franca: On refusa continuar payar custosi traductores.}
+\newcommand{\lsBackBody}{Set blurb on back with {\textbackslash}BackBody\{my blurb\}}
\newcommand{\lsBackTitle}{\@title}
\newcommand{\BackTitle}[1]{\renewcommand{\lsBackTitle}{#1}}
-\newcommand{\BackBody}[1]{\renewcommand{\lsBackBody}{#1}}
+\newcommand{\BackBody}[1]{\renewcommand{\lsBackBody}{#1}}
\newcommand{\newlineCover}{\\} % \newline only on cover
\newcommand{\newlineSpine}{\\} % \newline only on spine
@@ -107,7 +113,7 @@
\newcommand{\lsSpineTitle}{\@title}
\newcommand{\lsSpineAuthor}{\@author}
\newcommand{\SpineTitle}[1]{\renewcommand{\lsSpineTitle}{#1}}
-\newcommand{\SpineAuthor}[1]{\renewcommand{\lsSpineAuthor}{#1}}
+\newcommand{\SpineAuthor}[1]{\renewcommand{\lsSpineAuthor}{#1}}
@@ -125,11 +131,12 @@
\newif\iflsCollection \lsCollectionfalse
\newif\iflsCollectionChapter \lsCollectionChapterfalse
\newif\iflsCollectionTOCLong \lsCollectionTOCLongfalse
-\newif\iflsNewtxmath \lsNewtxmathtrue
+\newif\iflsNewtxmath \lsNewtxmathfalse
\newif\iflsCover \lsCoverfalse %output format is cover
\newif\iflsUscover \lsUscoverfalse
\newif\iflsModfonts \lsModfontsfalse
\newif\iflsNoBabel \lsNoBabelfalse
+\newif\iflsBabelShorthands \lsBabelShorthandsfalse
\newif\iflsMultiauthors \lsMultiauthorsfalse
@@ -146,57 +153,102 @@
\DeclareStringOption{output}[book]
\define at key{langscibook}{output}{%
\renewcommand{\lsOutput}{#1}}
+\DeclareStringOption{booklanguage}[english]
+ \define at key{langscibook}{booklanguage}{%
+ \renewcommand{\lsBookLanguage}{#1}}
\DeclareStringOption{copyright}[CC-BY]
\define at key{langscibook}{copyright}{%
\renewcommand{\lsCopyright}{#1}}
-\DeclareStringOption{biblatexbackend}[bibtex]
+\DeclareStringOption{biblatexbackend}[biber]
\define at key{langscibook}{biblatexbackend}{%
\renewcommand{\lsBiblatexBackend}{#1}}
\DeclareStringOption{spinewidth}[20mm]
\define at key{langscibook}{spinewidth}{%
- \renewcommand{\lsSpinewidth}{#1}}
-\DeclareVoidOption{smallfont}{
+ \renewcommand{\lsSpinewidth}{#1}}
+\DeclareVoidOption{smallfont}{
\renewcommand{\lsFontsize}{10pt}}
-\DeclareVoidOption{undecapitalize}{
- \lsUndecapitalizetrue }
-\DeclareVoidOption{draftmode}{ % 'draftmode' instead of 'draft' due to undesirable side efects
+\DeclareVoidOption{undecapitalize}{
+ \lsUndecapitalizetrue }
+\DeclareVoidOption{draftmode}{ % 'draftmode' instead of 'draft' due to undesirable side efects
\lsDrafttrue
\overfullrule=5pt } % to indicate overfull hboxes
\DeclareVoidOption{openreview}{
\lsOpenReviewtrue%
\AtBeginDocument{\renewcommand{\lsISBNdigital}{000-0-000000-00-0}}}
-\DeclareVoidOption{nonflat}{
- \renewcommand{\fontpath}{./langsci/fonts/}
+\DeclareVoidOption{nonflat}{
+ \renewcommand{\fontpath}{./langsci/fonts/}
\renewcommand{\logopath}{./langsci/graphics/}
\renewcommand{\seriesinfopath}{./langsci/seriesinfo/}
+ \renewcommand{\localepath}{./langsci/locale/}
\renewcommand{\bstpath}{./langsci/bst/}
- \renewcommand{\stylepath}{./langsci/styles/}
+ \renewcommand{\bbxpath}{\bstpath biblatex-langsci-unified/bbx/}
+ % \renewcommand{\bbxpath}{\bstpath}
+ \renewcommand{\cbxpath}{\bstpath biblatex-langsci-unified/cbx/}
+ % \renewcommand{\cbxpath}{\bstpath}
+ \renewcommand{\stylepath}{./langsci/styles/}
}
-\DeclareVoidOption{nobabel}{
- \lsNoBabeltrue}
-\DeclareVoidOption{modfonts}{
+\DeclareVoidOption{nobabel}{
+ \lsNoBabeltrue}
+\DeclareVoidOption{babelshorthands}{
+ \lsBabelShorthandstrue}
+\DeclareVoidOption{modfonts}{
\lsModfontstrue}
-\DeclareVoidOption{multiauthors}{
+\DeclareVoidOption{multiauthors}{
\lsMultiauthorstrue}
-\DeclareVoidOption{showindex}{
+\DeclareVoidOption{showindex}{
\lsShowIndextrue}
-\DeclareVoidOption{biblatex}{
+\DeclareVoidOption{biblatex}{
\lsBiblatextrue}
\DeclareVoidOption{bibtex}{
\ClassWarningNoLine{langscibook}{BibTeX frontend deprecated. Please use BibLaTeX in the final version}
\lsBiblatexfalse}
-\DeclareVoidOption{nonewtxmath}{
+\DeclareVoidOption{nonewtxmath}{
\lsNewtxmathfalse}
-\DeclareVoidOption{collection}{
+\DeclareVoidOption{newtxmath}{
+ \lsNewtxmathtrue}
+\DeclareVoidOption{collection}{
\lsCollectiontrue}
-\DeclareVoidOption{collectionchapter}{
+\DeclareVoidOption{collectionchapter}{
\lsCollectiontrue%
\lsCollectionChaptertrue}
-\DeclareVoidOption{collectiontoclong}{
+\DeclareVoidOption{collectiontoclong}{
\lsCollectiontrue%
- \lsCollectionTOCLongtrue}
+ \lsCollectionTOCLongtrue}
+\DeclareVoidOption{chinesefont}{
+ \newfontfamily\cn[Mapping=tex-text,Ligatures=Common,Scale=MatchUppercase]{AR PL UMing CN}
+% \newcommand{\zh}[1]{{\cn #1}}
+ \XeTeXlinebreaklocale 'zh'
+ \XeTeXlinebreakskip = 0pt plus 1pt
+ \AdditionalFontImprint{UMing}
+}
+\DeclareVoidOption{japanesefont}{
+ \newfontfamily\jpn[Mapping=tex-text,Ligatures=Common,Scale=MatchUppercase]{TakaoPGothic} %Japanese
+% \newcommand{\jp}[1]{{{\jpn #1}}}
+ \XeTeXlinebreaklocale 'ja'
+ \AdditionalFontImprint{TakaoPGothic}
+}
+% \DeclareVoidOption{koreanfont}{
+% \newfontfamily\hangul[Mapping=tex-text,Ligatures=Common,Scale=MatchUppercase]{./SourceHanSerifK.otf}
+% \newcommand{\kr}[1]{{\sffamily #1}}
+% \AdditionalFontImprint{Korean}}
+\DeclareVoidOption{arabicfont}{
+ \newfontfamily\arabicfont[Script=Arabic,ItalicFont=*,Scale=1.4]{arabtype.ttf}
+% \newcommand{\textarabic}[1]{{\arabicfont #1}}
+ \AdditionalFontImprint{Arabtype}
+}
+\DeclareVoidOption{hebrewfont}{
+ \newfontfamily\hebrewfont[Script=Hebrew,ItalicFont=*, Scale=0.9]{SBLHebrew.ttf}
+% \newcommand{\texthebrew}[1]{{\hebrewfont #1}}
+ \AdditionalFontImprint{SBLHebrew}
+}
+\DeclareVoidOption{syriacfont}{
+ \newfontfamily\syriacfont[Script=Syriac]{EstrangeloEdessa.ttf}
+% \newcommand{\textsyriac}[1]{{\syriacfont #1}}
+ \AdditionalFontImprint{Estrangelo Edessa}
+}
\ProcessKeyvalOptions{langscibook}
-
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% Class
@@ -213,7 +265,7 @@
%chapterprefix=true,
%draft=yes,
%appendixprefix
- ]{scrbook}
+ ]{scrbook}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
@@ -224,9 +276,9 @@
\usepackage{morewrites} %more helper files to write to
\usepackage{etex}
\reserveinserts{18}
-\usepackage{xstring}
-\usepackage{graphicx}
-\usepackage{hyphenat}
+\usepackage{xstring}
+\usepackage{graphicx}
+\usepackage{hyphenat}
\usepackage{tikz} % Needed for covers and advert page
\usetikzlibrary{positioning}
@@ -236,9 +288,9 @@
\usepackage[hyphens]{url}
\urlstyle{same}
-
+
%% standard commands
-\usepackage{\stylepath langsci-basic}
+\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}
@@ -255,19 +307,18 @@
\newcommand{\podsetup}{
\lsCovertrue
\renewcommand{\maketitle}{} %no need for this
- \StrLen{\@subtitle}[\subtitleStrLen] % Get the length of the subtitle. Later, we use this length to check if a subtitle exists.
\pagestyle{empty}
\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.
- \renewcommand{\and}{, }%
- \renewcommand{\lastand}{ \& }%
+ \renewcommand{\and}{, }%
+ \renewcommand{\lastand}{ \& }%
\renewcommand{\affiliation}[1]{}
}
% \usepackage[outline]{contour}
-% Content creation for the spine. Including Logo, author, title, and volume number on spine.
-\newcommand{\podspine}{
+% Content creation for the spine. Including Logo, author, title, and volume number on spine.
+\newcommand{\podspine}{
\renewcommand{\newlineCover}{}
\renewcommand{\and}{, }
\renewcommand{\lastand}{ \& }
@@ -280,17 +331,17 @@
% 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}
+\node [below = 0mm of CoverSpine.north, anchor=north] (lspcls_splinenumber) {\color{\lsSeriesColor}
{\parbox{.47cm}{
\centering
- \sffamily
+ \sffamily
\huge
- \lsSeriesNumber
+ \lsSeriesNumber
}
}
};
- \node [font=\fontsize{18pt}{14pt}\selectfont, above left = 15mm and 4mm of lspcls_spinelogo.north, rotate=270] (lspcls_spinetitle) {\color{\lsSeriesColor} \lsSpineAuthorFont{\lsSpineAuthor\xspace\lsEditorSuffix} \hspace{13mm} \lsSpineTitleFont{\lsSpineTitle}};
+ \node [font=\fontsize{18pt}{14pt}\selectfont, above left = 15mm and 4mm of lspcls_spinelogo.north, rotate=270] (lspcls_spinetitle) {\color{\lsSeriesColor} \lsSpineAuthorFont{\lsSpineAuthor\xspace\lsEditorSuffix} \hspace{13mm} \lsSpineTitleFont{\lsSpineTitle}};
\renewcommand{\newlineCover}{\\}
}
@@ -301,38 +352,38 @@
\newcommand{\podgeometry}[3]{
\begin{pgfonlayer}{lspcls_bg} % Draw on the background layer
\node [ bg, % Draw the coloured background on the front cover
- left = #1 of current page.east,
- fill=\lsSeriesColor,
- minimum height=#2,
+ left = #1 of current page.east,
+ fill=\lsSeriesColor,
+ minimum height=#2,
minimum width=#3
] (CoverColouredRectangleFront) {}; % Die können wir noch dynamisch bestimmen % 7.5mm -> 10.675mm for bleed
- \node [ bg, % Draw the coloured background on the back cover
- right = #1 of current page.west,
- fill=\lsSeriesColor,
- minimum height=#2,
- minimum width=#3
- ] (CoverColouredRectangleBack) {};
+ \node [ bg, % Draw the coloured background on the back cover
+ right = #1 of current page.west,
+ fill=\lsSeriesColor,
+ minimum height=#2,
+ minimum width=#3
+ ] (CoverColouredRectangleBack) {};
\node at (current page.center) [ % Create a reference node for the spine
- bg,
- minimum height=#2,
+ bg,
+ minimum height=#2,
minimum width=\spinewidth,dashed
- ] (CoverSpine) {}; % add [draw] option for preview mode
- \end{pgfonlayer}
+ ] (CoverSpine) {}; % add [draw] option for preview mode
+ \end{pgfonlayer}
}
% Generates the content of the back cover
% Argument 1: Text width, corresponding to Argument 1 of \podfrontcovertoptext
\newcommand{\podbackcover}[1]{
- \node [ font=\fontsize{25pt}{10mm}\selectfont,
+ \node [ font=\fontsize{25pt}{10mm}\selectfont,
right,
- below right = 10mm and 7.5mm of CoverColouredRectangleBack.north west,
+ below right = 10mm and 7.5mm of CoverColouredRectangleBack.north west,
text width=#1
- ] (lspcls_backtitle) {\color{\lsCoverFontColour}\lsBackTitleFont{\raggedright\lsBackTitle\par}};
+ ] (lspcls_backtitle) {\color{white}\lsBackTitleFont{\raggedright\lsBackTitle\par}};
\node [ below = 10mm of lspcls_backtitle,
text width=#1,
align=justify
- ] {\color{\lsCoverFontColour}\lsBackBodyFont{\parindent=15pt\lsBackBody}};
- \node [ below right = 192.5mm and 97.5mm of CoverColouredRectangleBack.north west,
+ ] {\color{white}\lsBackBodyFont{\parindent=15pt\lsBackBody}};
+ \node [ below right = 192.5mm and 97.5mm of CoverColouredRectangleBack.north west,
text width=4cm] {%
\colorbox{white}{
\begin{pspicture}(0,0)(4.1,1in)
@@ -345,68 +396,69 @@
% Generates the content on the front cover, including title, author, subtitle. See below for remaining commands
% Argument 1: Text width on the front cover. Input: 12.34mm
% Argument 2: Font size on the front cover. Adjust to compensate varying text width. Input: 12.34pt
-\newcommand{\podfrontcovertoptext}[2]{
- \newcommand{\lsCoverFontColour}{white}
+\newcommand{\podfrontcovertoptext}[3][white]{
\renewcommand{\and}{\\}
\renewcommand{\lastand}{\\}
-
- \node [ execute at begin node={},
- font=\fontsize{#2}{17.25mm}\selectfont,
- below right = 10mm and 7.5mm of CoverColouredRectangleFront.north west,
- text width=#1,
+ \renewcommand{\newlineCover}{\\}
+
+ \node [ execute at begin node={},
+ font=\fontsize{#3}{17.25mm}\selectfont,
+ below right = 10mm and 7.5mm of CoverColouredRectangleFront.north west,
+ text width=#2,
align=left
- ] (lspcls_covertitle) {\color{\lsCoverFontColour}\lsCoverTitleFont{\raggedright\@title\par}};
-
- \ifnum\subtitleStrLen=0 % Is there a subtitle? If no, just print the author.
- \node [ font=\fontsize{25pt}{12.5mm}\selectfont,
- right,
- below = 11.2mm of lspcls_covertitle.south,
- text width=#1
- ] {\color{\lsCoverFontColour}\lsCoverAuthorFont\nohyphens{\lsEditorPrefix\@author\par}};
+ ] (lspcls_covertitle) {\color{#1}\lsCoverTitleFont{\raggedright\@title\par}};
+
+ \ifx\@subtitle\empty % Is there a subtitle? If no, just print the author.
+ \node [ font=\fontsize{25pt}{12.5mm}\selectfont,
+ right,
+ below = 11.2mm of lspcls_covertitle.south,
+ text width=#2
+ ] {\color{#1}\lsCoverAuthorFont\nohyphens{\lsEditorPrefix\@author\par}};
\else % If yes, create a node for subtitle and author
\node [ font=\fontsize{25pt}{10mm}\selectfont,
- below = 8mm of lspcls_covertitle.south,
- text width=#1
- ] (lspcls_coversubtitle) {\color{\lsCoverFontColour} \lsCoverSubTitleFont \nohyphens{\@subtitle}\par};
+ below = 8mm of lspcls_covertitle.south,
+ text width=#2,
+ align=left
+ ] (lspcls_coversubtitle) {\color{#1}\lsCoverSubTitleFont{\raggedright\@subtitle\par}};
\node [
- font=\fontsize{25pt}{12.5mm}\selectfont,
- right,
- below = 11.2mm of lspcls_coversubtitle.south,
- text width=#1
- ] {\color{\lsCoverFontColour}\lsCoverAuthorFont{\nohyphens{\lsEditorPrefix\@author\par}}};
+ font=\fontsize{25pt}{12.5mm}\selectfont,
+ right,
+ below = 11.2mm of lspcls_coversubtitle.south,
+ text width=#2
+ ] {\color{#1}\lsCoverAuthorFont{\nohyphens{\lsEditorPrefix\@author\par}}};
\fi
}
% Generates the bottom half of the front cover content: series, series number, logo.
-\newcommand{\podcoverbottomtext}{
- \node [ above right = 18.5mm and -.1mm of CoverColouredRectangleFront.south west,
- rectangle,
- fill=white,
+\newcommand{\podcoverbottomtext}[1][white]{
+ \node [ above right = 18.5mm and -.1mm of CoverColouredRectangleFront.south west,
+ rectangle,
+ fill=white,
minimum size=17pt] (lspcls_square) {}; % This is the white square at the bottom left of the front cover
- \node [ above left = 10mm and 7.5mm of CoverColouredRectangleFront.south east] {\color{\lsCoverFontColour}\includegraphics{\logopath langsci_logo_nocolor.pdf}}; % Print the Language Science press Logo
+ \node [ above left = 10mm and 7.5mm of CoverColouredRectangleFront.south east] {\color{#1}\includegraphics{\logopath langsci_logo_nocolor.pdf}}; % Print the Language Science press Logo
\path let \p1 = (lspcls_square.north east), % Calculate the exact coordinates for the Series Title to print.
- \p2 = (lspcls_covertitle.west)
+ \p2 = (lspcls_covertitle.west)
in node at (\x2,\y1) (lspcls_seriesinfo) [
font=\fontsize{17pt}{7.5mm}\selectfont,
right,
text width=95mm,
- anchor=north west]
- {\color{\lsCoverFontColour}\lsCoverSeriesFont{\lsSeriesTitle\par}};
+ anchor=north west]
+ {\color{#1}\lsCoverSeriesFont{\lsSeriesTitle\par}};
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% Output types
+% Output types
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \newcommand{\lsOutputLong}{long}
-\newcommand{\lsOutputBook}{book} % standard book
+\newcommand{\lsOutputBook}{book} % standard book
\newcommand{\lsOutputInprep}{inprep} % marks manuscript as in preparation
\newcommand{\lsOutputPaper}{paper} % paper in edited volume
-\newcommand{\lsOutputGuidelines}{guidelines} % guidelines
-\newcommand{\lsOutputCoverBODsc}{coverbodsc} % cover with BoD measurements
-\newcommand{\lsOutputCoverBODhc}{coverbodhc} % cover with BoD measurements
+\newcommand{\lsOutputGuidelines}{guidelines} % guidelines
+\newcommand{\lsOutputCoverBODsc}{coverbodsc} % cover with BoD measurements
+\newcommand{\lsOutputCoverBODhc}{coverbodhc} % cover with BoD measurements
\newcommand{\lsOutputCoverCS}{covercreatespace} % cover with CreateSpace measurements
@@ -421,20 +473,17 @@
\else % only if output!=paper
\renewcommand{\maketitle}{
\begin{titlepage}
-\thispagestyle{empty}
-
-
+ \thispagestyle{empty}
\ifx\lsOutput\lsOutputBook % only if output=book
\setcounter{page}{-1}
%% First titlepage:
{\lsFrontPage}
%%%%%%%%%%%%%%%%%%%
- \newpage\thispagestyle{empty}
- \null\newpage\thispagestyle{empty}
+ \pagenumbering{roman}\clearpage\thispagestyle{empty} % We use roman pagenumbering here instead of \frontmatter because scrbook's frontmatter command issues a \clear(double)page, which is unnec. in digital publications.
%% Series information:
{\lsSeriesHistory}
%%%%%%%%%%%%%%%%%%%%%
- \newpage\thispagestyle{empty}
+ \clearpage%\thispagestyle{empty}
%% Schmutztitel:
{\renewcommand{\lsCoverBlockColor}{white}
\renewcommand{\lsCoverFontColor}{\lsSeriesColor}
@@ -450,7 +499,7 @@
{\lsBackPage}
\null\newpage\thispagestyle{empty}
}
-\fi
+\fi
\ifx\lsOutput\lsOutputInprep % only if output=inprep
{\renewcommand{\lsCoverBlockColor}{white}
@@ -457,7 +506,7 @@
\renewcommand{\lsCoverFontColor}{black}
\lsCoverBlock
\lsCoverTitleAuthor}
-\fi
+\fi
\ifx\lsOutput\lsOutputGuidelines % only if output=guidelines
{\setcounter{page}{-1}
@@ -468,40 +517,40 @@
\fi
-\ifx\lsOutput\lsOutputCoverBODhc % only if output=cover
- \podsetup
- \begin{tikzpicture}[remember picture, overlay,bg/.style={outer sep=0}]
+\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}
- \podspine
- \podfrontcovertoptext{140mm}{51pt} % 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.
+ \podspine
+ \podfrontcovertoptext{140mm}{51pt} % 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
\newcommand{\lsISBNcover}{\lsISBNhardcover}
- \podbackcover{135.5mm}
- \end{tikzpicture}
+ \podbackcover{137mm}
+ \end{tikzpicture}
%exit the document right here
\end{titlepage}
- \end{document}
- \fi
-
+ \end{document}
+ \fi
-\ifx\lsOutput\lsOutputCoverBODsc % only if output=cover
- \podsetup
- \begin{tikzpicture}[remember picture, overlay,bg/.style={outer sep=0}]
+
+\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}
- \podspine
- \podfrontcovertoptext{140mm}{51pt} % 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.
+ \podspine
+ \podfrontcovertoptext{140mm}{51pt} % 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
\newcommand{\lsISBNcover}{\lsISBNsoftcover}
- \podbackcover{135.5mm}
- \end{tikzpicture}
+ \podbackcover{137mm}
+ \end{tikzpicture}
%exit the document right here
\end{titlepage}
- \end{document}
- \fi
-
-
+ \end{document}
+ \fi
+
+
% ============================
-\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}
@@ -508,28 +557,17 @@
\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
-% %unclear why this was different between BOD and CS
-% %-----------------------------
-% \node [above right = 18.5mm and -.1mm of CoverColouredRectangleFront.south west, rectangle, fill=white, minimum size=17pt] (lspcls_square) {}; % 2
-% \node [above left = 10mm and 7.5mm of CoverColouredRectangleFront.south east] {\color{\lsCoverFontColour}\includegraphics{\logopath langsci_logo_nocolor.pdf}};
-% % \node [below right = 197.5mm and 117.1mm of CoverColouredRectangleFront.north west] {\color{\lsCoverFontColour}\includegraphics{\logopath langsci_logo_nocolor.pdf}};
-% \path let \p1 = (lspcls_square.north east), \p2 = (lspcls_covertitle.west) in node at (\x2,\y1) (lspcls_seriesinfo) [font=\fontsize{17pt}{7.5mm}\selectfont, right, text width=95mm, anchor=north west] {\color{\lsCoverFontColour}\lsCoverSeriesFont{\lsSeriesTitle\par}};
-% %-----------------------------
\iflsUscover\newcommand{\lsISBNcover}{\lsISBNsoftcoverus}\else\newcommand{\lsISBNcover}{\lsISBNsoftcover}\fi
\podbackcover{140mm}
- \end{tikzpicture}
- %exit the document right here
+ \end{tikzpicture}
+ %exit the document right here
\end{titlepage}
- \end{document}
-\fi
-
+ \end{document}
+\fi
\end{titlepage}
-\frontmatter
-\renewcommand{\frontmatter}{}
-
-\null\newpage\thispagestyle{empty}
-\hypersetup{colorlinks=false, pdfborder={0 0 0}} % for hyperref
+% \null\newpage\thispagestyle{empty}
+\hypersetup{colorlinks=false, citecolor=brown, pdfborder={0 0 0}} % for hyperref
\color{black}
\lsInsideFont
@@ -542,12 +580,12 @@
\fi
%%%%%%%%%%%%%
-\null\newpage\thispagestyle{plain}
+% \null\newpage\thispagestyle{plain}
%\pagenumbering{roman} % or \frontmatter
%% Dedication:
\ifx\@dedication\empty{}
-\else{\lsDedication}
+\else{\newpage\lsDedication}
\fi
%%%%%%%%%%%%%%%%
@@ -559,20 +597,23 @@
\ifx\lsSeries\sidl
%\def\exfont{\normalsize\itshape}
\renewcommand{\eachwordone}{\itshape} % only \gll
-
+
\let\oldtable\table % footnotes in tables without horizontal line
\let\endoldtable\endtable
- \renewenvironment{table}{\setfootnoterule{0pt}\oldtable}{\endoldtable}
+ \renewenvironment{table}{\setfootnoterule{0pt}\oldtable}{\endoldtable}
\fi
\ifx\lsSeries\pmwe
- \renewcommand{\eachwordone}{\itshape}
+ \renewcommand{\eachwordone}{\itshape}
\fi
+\ifx\lsSeries\nc
+ \renewcommand{\eachwordone}{\itshape}
+\fi
-} %% \AtBeginDocument
+} %% \AtBeginDocument
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -579,11 +620,11 @@
%
% 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{\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}
@@ -591,68 +632,65 @@
\newlength{\spinewidth}
\newlength{\totalwidth}
\newlength{\totalheight}
-% \IfFileExists{./localmetadata.tex}{\ExecuteMetaData[localmetadata.tex]{coverdimen}}{\typeout{No local meta data found, therefore default spline length was chosen}} % Get only the information between the tag "coverdimen" from localmetadata.tex
\setlength{\bleed}{3.175mm}
\setlength{\spinewidth}{\lsSpinewidth} % Create Space Version
\usepackage{calc}
-
- \ifx\lsOutput\lsOutputCoverCS % if output = cover; This is the CreateSpace Version
+
+ \ifx\lsOutput\lsOutputCoverCS % if output = cover; This is the CreateSpace Version
\lsCovertrue
\setlength{\bleed}{3.175mm}
\setlength{\seitenbreite}{169.9mm}
- \setlength{\seitenhoehe}{244.1mm}
-
-
+ \setlength{\seitenhoehe}{244.1mm}
\setlength{\totalwidth}{\spinewidth+\seitenbreite+\seitenbreite+\bleed+\bleed}
\setlength{\totalheight}{\seitenhoehe+\bleed+\bleed}
\usepackage[paperheight=\totalheight, paperwidth=\totalwidth]{geometry}
\hyphenpenalty 750
\fi
-
-\ifx\lsOutput\lsOutputCoverBODhc
- \lsCovertrue
+
+\ifx\lsOutput\lsOutputCoverBODhc
+ \lsCovertrue
\newlength{\bodfold}
\newlength{\totalspine}
\setlength{\bodfold}{8mm}
\setlength{\seitenbreite}{192mm}
\setlength{\seitenhoehe}{280mm} % For BOD: Hardcover, Runder Rücken, Kaschiert, papier 80g/m², weiß, Papier 17x24cm
-% \setlength{\spinewidth}{\bodspine}
+% \setlength{\spinewidth}{\bodspine}
% \setlength{\totalspine}{\spinewidth+\bodfold+\bodfold}
- \setlength{\totalspine}{\spinewidth}
+ \setlength{\totalspine}{\spinewidth}
\setlength{\totalwidth}{\spinewidth+\seitenbreite+\seitenbreite}
\setlength{\totalheight}{\seitenhoehe}
\usepackage[paperheight=\totalheight, paperwidth=\totalwidth]{geometry}
\hyphenpenalty 750
\fi
-
-
-\ifx\lsOutput\lsOutputCoverBODsc
+
+
+\ifx\lsOutput\lsOutputCoverBODsc
\lsCovertrue
\newlength{\totalspine}
\setlength{\seitenbreite}{170mm}
\setlength{\seitenhoehe}{240mm} % For BOD: Softcover, papier 80g/m², weiß, Papier 17x24cm
\setlength{\bleed}{5mm}
- \setlength{\totalspine}{\spinewidth}
+ \setlength{\totalspine}{\spinewidth}
\setlength{\totalwidth}{\spinewidth+\seitenbreite+\seitenbreite+\bleed+\bleed}
\setlength{\totalheight}{\seitenhoehe+\bleed+\bleed}
\usepackage[paperheight=\totalheight, paperwidth=\totalwidth]{geometry}
\hyphenpenalty 750
\fi
-
-%Page size and text area if not cover
+%Page size and text area if not cover
+
\iflsCover
%output types cover have already been handled
\else % output != cover
- \usepackage[
+ \usepackage[
papersize={170mm,240mm}
,top=27.4mm % TODO nachgemessen, nach Vermassung eigentlich 30mm-16pt = 25.8mm
- ,inner=20.5mm,
+ ,inner=20.5mm,
,outer=24.5mm
%,showframe,pass
,marginparwidth=50pt
]{geometry}
-\fi
+\fi
\usepackage[
absolute % for absolute positioning in titlepage
@@ -664,14 +702,51 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% Fonts
+% Fonts
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\usepackage{ifxetex}
-\ifxetex\else\ClassError{langsci/langscibook}{Please use XeLaTeX!}{}\fi
+\ifxetex\else\ClassError{langsci/langscibook}{Please use XeLaTeX!}{}\fi
+
+%% Typesetting of mathematical formulas
\usepackage{amssymb} % has to be loaded before other stuff
-\PassOptionsToPackage{no-math}{fontspec} % must appear before metalogo or any fontspec stuff; deactivates fontspec's math settings, which is necessary to let newtxmath do the job
+\usepackage{amsmath} % has to be loaded before mathspec/unicode-math
+
+\iflsNewtxmath\else
+%% There is a known problem in the interplay between \binom, unicode-math, and OTF
+%% https://tex.stackexchange.com/questions/269980/wrong-parentheses-size-in-binom-with-xelatex-and-unicode-math-in-displaystyle
+\ifx\Umathcode\@undefined\else
+
+\DeclareRobustCommand{\genfrac}[6]{%
+ \def\@tempa{#1#2}%
+ \edef\@tempb{\@nx\@genfrac\@mathstyle{#4}%
+ % just \over or \above never withdelims versions
+ \ifx @#3@\@@over\else\@@above\fi
+ }%
+ \ifx\@tempa\@empty \else
+ \bgroup % so mathord not mathinner
+ \left\ifx\relax#1\relax.\else#1\fi % assumes . is null delimiter
+ % otherwise add specified delimiter
+ \kern-\nulldelimiterspace % fractions add extra nulldelimiter space
+ \fi
+ \@tempb{#3}{\mathstrut{#5}}{\mathstrut{#6}}%
+ \ifx\@tempa\@empty \else
+ \kern-\nulldelimiterspace
+ \right\ifx\relax#2\relax.\else#2\fi
+ \egroup
+ \fi
+}
+\fi
+%% Provides \setmathfont
+\usepackage{unicode-math}
+\fi
+
+\iflsNewtxmath
+%% Deprecated:
+\PassOptionsToPackage{no-math}{fontspec} % must appear before metalogo or any fontspec stuff; deactivates fontspec's math settings, which is necessary to let newtxmath do the job
+\fi
+
\usepackage{metalogo}\newcommand{\xelatex}{\XeLaTeX\xspace}
\usepackage{dejavu}
\usepackage{libertine}
@@ -679,20 +754,23 @@
\setmonofont[
Ligatures={TeX},Scale=MatchLowercase,
BoldFont = DejaVuSansMono-Bold.ttf ,
- SlantedFont = DejaVuSansMono-Oblique.ttf ,
- BoldSlantedFont = DejaVuSansMono-BoldOblique.ttf
+ SlantedFont = DejaVuSansMono-Oblique.ttf ,
+ BoldSlantedFont = DejaVuSansMono-BoldOblique.ttf
]{DejaVuSansMono.ttf}
-\iflsModfonts{% use Langsci fonts
+\iflsNewtxmath\else
+\setmathfont[AutoFakeBold]{libertinusmath-regular.otf}
+\fi
+
+\iflsModfonts% use Langsci fonts
\setsansfont[
%Ligatures={TeX,Common}, % not supported by ttf
Scale=MatchLowercase,
Path=\fontpath,
BoldFont = Arimo-Bold_B.ttf ,
- ItalicFont = Arimo-Italic_B.ttf ,
- BoldItalicFont = Arimo-BoldItalic_B.ttf
+ ItalicFont = Arimo-Italic_B.ttf ,
+ BoldItalicFont = Arimo-BoldItalic_B.ttf
]{Arimo_B.ttf}
-
\setmainfont[
Ligatures={TeX,Common},
@@ -706,8 +784,8 @@
SlantedFont = LinLibertine_R_B.otf,
SlantedFeatures = {FakeSlant=0.25},
BoldSlantedFeatures = {FakeSlant=0.25},
- SmallCapsFeatures = {FakeSlant=0},
- ]{LinLibertine_R_B.otf}
+ SmallCapsFeatures = {FakeSlant=0,Numbers=OldStyle},
+ ]{LinLibertine_R_B.otf}
\else % use standard fonts
\setsansfont[
%Ligatures={TeX,Common}, % not supported by ttf
@@ -714,10 +792,9 @@
Scale=MatchLowercase,
Path=\fontpath,
BoldFont = Arimo-Bold.ttf ,
- ItalicFont = Arimo-Italic.ttf ,
- BoldItalicFont = Arimo-BoldItalic.ttf
+ ItalicFont = Arimo-Italic.ttf ,
+ BoldItalicFont = Arimo-BoldItalic.ttf
]{Arimo-Regular.ttf}
-
\setmainfont[
Ligatures={TeX,Common},
@@ -731,16 +808,18 @@
SlantedFont = LinLibertine_R.otf,
SlantedFeatures = {FakeSlant=0.25},
BoldSlantedFeatures = {FakeSlant=0.25},
- SmallCapsFeatures = {FakeSlant=0},
- ]{LinLibertine_R.otf}
+ SmallCapsFeatures = {FakeSlant=0,Numbers=OldStyle},
+ ]{LinLibertine_R.otf}
\fi
+%% Deprecated:
\iflsNewtxmath % some users have problems when installing newtxmath
-% \usepackage[libertine]{newtxmath}
+ \usepackage[libertine]{newtxmath}
%% following http://tex.stackexchange.com/questions/297328/xelatex-does-not-load-newtxmath-with-linuxlibertine-sometimes
- %% due to a bug in XeTeX; unfortunately this is NOT extensively tested!
+ %% due to a bug in XeTeX. This also seems to fix an issue with \url in footnotes.
+ %% Unfortunately, this is NOT extensively tested!
\usepackage{xpatch}
\xpretocmd{\textsuperscript}
{{\sbox0{$\textstyle x$}}}
@@ -748,14 +827,14 @@
\AtBeginDocument{%
\DeclareSymbolFont{operators}{\encodingdefault}{\familydefault}{m}{n}%
\SetSymbolFont{operators}{bold}{\encodingdefault}{\familydefault}{b}{n}%
- }
-\fi
+ }
+\fi
\let\oldtabular\tabular % number in tabulars
\let\endoldtabular\endtabular
\renewenvironment{tabular}{\normalfont\addfontfeatures{Numbers=Lining}\selectfont\oldtabular}{\endoldtabular}
-%\frenchspacing
+\frenchspacing %see https://en.wikipedia.org/wiki/Sentence_spacing#Typography
\usepackage[final]{microtype}
\newcommand{\lsCoverTitleFont}[1]{\sffamily\addfontfeatures{Scale=MatchUppercase}\fontsize{52pt}{17.25mm}\selectfont #1}
@@ -775,7 +854,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% Colors:
+% Colors
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -782,27 +861,27 @@
\usepackage{xcolor}
\input{\seriesinfopath langsci-series.def} % \lsSeriesColor, \lsSeriesTitle, \lsISSN and colors are defined here
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% Cover:
+% Cover
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\usepackage{pst-barcode} % for generating bar codes
+\usepackage{pst-barcode} % for generating bar codes
\newcommand{\lsCoverFontColor}{white}
-\newcommand{\lsCoverBlockColor}{\lsSeriesColor}
-
-
+\newcommand{\lsCoverBlockColor}{\lsSeriesColor}
+
\newcommand{\lsEditorPrefix}{}
\newcommand{\lsEditorSuffix}{}
\iflsCollection % for collections: set \lsEditorSuffix depending on \@author
\AtBeginDocument{
\renewcommand{\newlineCover}{}
- \renewcommand{\newlineSpine}{}
- \renewcommand{\lsEditorPrefix}{{\Large Edited by\\}}
+ \renewcommand{\newlineSpine}{}
+ \renewcommand{\lsEditorPrefix}{{\Large Edited by\\}}
\renewcommand{\lsEditorSuffix}{(ed.)}
\iflsMultiauthors
- \renewcommand{\lsEditorSuffix}{(eds.)}
+ \renewcommand{\lsEditorSuffix}{(eds.)}
\fi
}
\else
@@ -825,7 +904,7 @@
\fi
\iflsOpenReview
\iflsDraft
- \ClassError{langsci/langscibook}{Open review mode not compatible with draft mode. Please disable one of them}{}
+ \ClassError{langsci/langscibook}{Open review mode not compatible with draft mode. Please disable one of them}{}
\fi
\begin{textblock}{170}(-20,75)
\rotatebox{30}{
@@ -840,7 +919,7 @@
}
\end{textblock}
\fi
- \iflsUndecapitalize
+ \iflsUndecapitalize
\begin{textblock}{170}(-20,75)
\rotatebox{30}{
\colorbox{red}{
@@ -854,7 +933,7 @@
}
\end{textblock}
\fi
-
+
}
\newcommand{\lsCoverTitleAuthor}{
@@ -874,9 +953,9 @@
\fi
\vspace{11.2mm} % 20mm - 25pt
-
+
\raggedright
- {\lsCoverAuthorFont
+ {\lsCoverAuthorFont
\lsEditorPrefix\@author\\}
\end{textblock}}
@@ -885,25 +964,69 @@
\color{white}
\raggedright\rule{3.6mm}{3.5mm}
\color{\lsCoverFontColor}
- \hspace{3mm}\parbox[t]{85mm}{\raggedright\lsCoverSeriesFont
+ \hspace{3mm}\parbox[t]{85mm}{\raggedright\lsCoverSeriesFont
\lsSeriesTitle\\}
\end{textblock}}
-\newcommand{\lsCoverLogo}{
+\newcommand{\lsCoverLogo}{
\begin{textblock}{33}(124.6,205)
- \raggedright\IfFileExists{\logopath langsci_logo_nocolor.pdf}{\includegraphics{\logopath langsci_logo_nocolor.pdf}}{langsci logo}
+ \raggedright\IfFileExists{\logopath langsci_logo_nocolor.pdf}{\includegraphics{\logopath langsci_logo_nocolor.pdf}}{langsci logo}
\end{textblock}}
+ \pgfdeclarelayer{lspcls_bg} % Create a background layer that serves as the canvas for the coloured rectangles.
+ \pgfsetlayers{lspcls_bg,main} % Order the background layer behind the main layer of TikZ.
+
\newcommand{\lsFrontPage}{ % Front page
- \lsCoverBlock
- \lsCoverTitleAuthor
- \lsCoverSeries
- \lsCoverLogo}
+ \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
+ \thispagestyle{empty}
+ \renewcommand{\and}{, }%
+ \renewcommand{\lastand}{ \& }%
+ \renewcommand{\affiliation}[1]{}
+\begin{tikzpicture}[remember picture, overlay,bg/.style={outer sep=0}]
+ \begin{pgfonlayer}{lspcls_bg}
+ \node [ bg,
+ left=7.5mm of current page.east,
+ fill=\lsSeriesColor,
+ minimum width=155mm,
+ minimum height=225mm
+ ] (CoverColouredRectangleFront) {};
+ \end{pgfonlayer}
+ \podfrontcovertoptext{140mm}{51pt}
+ \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
+\end{tikzpicture}
+}
-\newcommand{\lsSchmutztitel}{ % Schmutztitel
- \lsCoverBlock
- \lsCoverTitleAuthor
- \lsCoverLogo}
+\newcommand{\lsSchmutztitel}{% Schmutztitel
+ \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
+ \thispagestyle{empty}
+ \renewcommand{\and}{, }%
+ \renewcommand{\lastand}{ \& }%
+ \renewcommand{\affiliation}[1]{}%
+\begin{tikzpicture}[remember picture, overlay,bg/.style={outer sep=0}]
+ \begin{pgfonlayer}{lspcls_bg}
+ \node [ bg,
+ left=7.5mm of current page.east,
+ fill=white,
+ minimum width=155mm,
+ minimum height=225mm
+ ] (CoverColouredRectangleFront) {};
+ \end{pgfonlayer}
+ \podfrontcovertoptext[\lsSeriesColor]{140mm}{51pt}
+ \node [ above left = 10mm and 7.5mm of CoverColouredRectangleFront.south east] {\color{\lsSeriesColor}\includegraphics{\logopath langsci_logo_nocolor.pdf}}; % Print the Language Science press Logo
+\end{tikzpicture}
+}
%\usepackage{pdfpages}
\newcommand{\lsAdvertisement}{
@@ -911,33 +1034,52 @@
}
\newcommand{\lsBackPage}{ % Back page
- \lsCoverBlock
+% % \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}
+ \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}
+ \renewcommand{\and}{, }%
+ \renewcommand{\lastand}{ \& }%
+ \renewcommand{\affiliation}[1]{}
+ \newcommand{\lsISBNcover}{\lsISBNdigital}
+\begin{tikzpicture}[remember picture, overlay,bg/.style={outer sep=0}]
+ \begin{pgfonlayer}{lspcls_bg}
+ \node [ bg,
+ right=7.5mm of current page.west,
+ fill=\lsSeriesColor,
+ minimum width=155mm,
+ minimum height=225mm
+ ] (CoverColouredRectangleBack) {};
+ \end{pgfonlayer}
+ \podbackcover{137mm}
+ \end{tikzpicture}
+ }
- \begin{textblock}{115}(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}}
-
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% Series history:
+% Series history
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -946,7 +1088,7 @@
\raggedright\lsCoverSeriesHistoryFont
\IfFileExists{\seriesinfopath \lsSeries-info.tex}{\input{\seriesinfopath\lsSeries-info}}{
- Series information: \seriesinfopath \lsSeries-info.tex not found!}
+ Series information: \seriesinfopath \lsSeries-info.tex not found!}
\IfStrEq{\lsISSN}{??} % \IfStrEq from xstring
{}
@@ -957,9 +1099,10 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% Imprint:
+% Imprint
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
%% for imprint:
\def\translator#1{\gdef\@translator{#1}}
\translator{}
@@ -981,7 +1124,7 @@
\edef\fontstemp{\lsAdditionalFontsImprint}
\renewcommand{\lsAdditionalFontsImprint}{\fontstemp, #1}
}
-
+
%\def\@author{\@latex at warning@no at line{No \noexpand\author given}}
\newcommand{\ISBNdigital}[1]{\renewcommand{\lsISBNdigital}{#1}}
\newcommand{\ISBNsoftcover}[1]{\renewcommand{\lsISBNsoftcover}{#1}}
@@ -992,7 +1135,7 @@
\newcommand{\Series}[1]{\renewcommand{\lsSeries}{#1}}
\newcommand{\SeriesNumber}[1]{\renewcommand{\lsSeriesNumber}{#1}}
\newcommand{\BookDOI}[1]{\renewcommand{\lsBookDOI}{#1}}
-
+
\newcommand{\lsImpressumCitationText}{
\onlyAuthor
\renewcommand{\newlineCover}{}
@@ -1005,6 +1148,7 @@
}
\newcommand{\lsImpressum}{
+\thispagestyle{empty}
\raggedright
\lsImpressumCitationText
@@ -1016,33 +1160,36 @@
© \lsYear, \iflsCollection the authors\else\@author\fi
-\newcommand{\ccby}{CC-BY}
-\ifx\lsCopyright\ccby
+\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/
\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/
\fi
-
+
\begin{tabular}{@{}l@{~}l}
-ISBN: &
-\IfStrEq{\lsISBNdigital}{000-0-000000-00-0}
-{\color{red}no digital ISBN}
-{\lsISBNdigital~(Digital)}
+ISBN: &
+\IfStrEq{\lsISBNdigital}{000-0-000000-00-0}{%no digital ISBN, issue warning
+ \color{red}no digital ISBN
+}{%digital ISBN present, write ISBN
+ \lsISBNdigital~(Digital)
+}
\\
-&
-\IfStrEq{\lsISBNhardcover}{000-0-000000-00-0}
-{\color{red}no hardcover ISBN}
-{\lsISBNhardcover~(Hardcover)}
-\\&
-\IfStrEq{\lsISBNsoftcover}{000-0-000000-00-0}
-{\color{red}no softcover ISBN}
-{\lsISBNsoftcover~(Softcover)}
-\\
-% & \lsISBNhardcover~(Hardcover)\\
-% & \lsISBNsoftcover~(Softcover)\\
-% & \lsISBNsoftcoverus~(Softcover US)\\
+\IfStrEq{\lsISBNhardcover}{000-0-000000-00-0}{ %hardcover ISBN not present
+}{%hardcover ISBN present, write ISBN
+ &\lsISBNhardcover~(Hardcover)\\
+}
+
+\IfStrEq{\lsISBNsoftcover}{000-0-000000-00-0}{ %softcover ISBN not present
+ \IfStrEq{\lsISBNhardcover}{000-0-000000-00-0}{ %neither hardcover nor softcover, issue warning
+ \color{red} no print ISBNs!
+ }{%hardcover present, no warning
+ }
+}{%only softcover present, write ISBN
+ &\lsISBNsoftcover~(Softcover)\\
+}
\end{tabular}
\IfStrEq{\lsISSN}{??} % \IfStrEq from xstring
@@ -1051,11 +1198,12 @@
\IfStrEq{\lsBookDOI}{??} % \IfStrEq from xstring
{{\color{red} no DOI}}
- {\doi{\lsBookDOI}}
+ {\doi{\lsBookDOI}}\\
+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
-\bigskip
-
Cover and concept of design:
Ulrike Harbort \\
\if\@translator\empty\else
@@ -1078,7 +1226,7 @@
Open reviewing:
\@openreviewer \\
\fi
-Fonts: Linux Libertine, Arimo, DejaVu Sans Mono\lsAdditionalFontsImprint\\
+Fonts: Linux Libertine, Libertinus Math, Arimo, DejaVu Sans Mono\lsAdditionalFontsImprint\\
Typesetting software: \XeLaTeX
\bigskip
@@ -1090,43 +1238,40 @@
\vfill
-Storage and cataloguing done by FU Berlin \\[3ex]
+Storage and cataloguing done by FU Berlin \\[3ex]
-\IfFileExists{\logopath logo.pdf}{\includegraphics[width=5cm]{\logopath logo.pdf}}{\logotext} \\[3ex]
+\IfFileExists{\logopath storagelogo.pdf}{\includegraphics[width=5cm]{\logopath storagelogo.pdf}}{\logotext} \\[3ex]
-\vfill
+% \vfill
-
-
-\noindent
-\lsp has no responsibility for the persistence or accuracy of URLs for
-external or third-party Internet websites referred to in this
-publication, and does not guarantee that any content on such websites
-is, or will remain, accurate or appropriate.
+% \noindent
+% \lsp has no responsibility for the persistence or accuracy of URLs for
+% external or third-party Internet websites referred to in this
+% publication, and does not guarantee that any content on such websites
+% is, or will remain, accurate or appropriate.
}
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% Dedication:
+% Dedication
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\newcommand{\lsDedication}{
- \vspace*{.2\textheight}
+\newcommand{\lsDedication}{\thispagestyle{empty}
+ \vspace*{\fill}
\begin{center}
{\lsDedicationFont
- \@dedication }
+ \@dedication\par}
\end{center}
- \vfill
+ \vspace*{\fill}
\clearpage}
-
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% Header and footer:
+% Header and footer
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1153,8 +1298,8 @@
\renewcommand*{\partpagestyle}{empty}
\pagestyle{scrheadings}
-
-
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% Sectioning
@@ -1161,7 +1306,7 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\setcounter{secnumdepth}{4}
+\setcounter{secnumdepth}{4}
\def\subsubsubsection{\@startsection{paragraph}{3}{\z@}{-3.25ex plus
-1ex minus-.2ex}{1.5ex plus.2ex}{\reset at font\normalsize}}
@@ -1174,12 +1319,12 @@
\let\subsubsubsubsectionmark\@gobble
%% needed for hyperref
-\def\toclevel at subsubsubsection{4}
+\def\toclevel at subsubsubsection{4}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% Epigrams:
+% Epigrams
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1198,7 +1343,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% Footnotes:
+% Footnotes
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1219,8 +1364,8 @@
\let\oldFootnote\footnote
\newcommand\nextToken\relax
-\renewcommand\footnote[1]{%
-\oldFootnote{\xspace#1}\futurelet\nextToken\isFootnote}
+% \renewcommand\footnote[1]{% breaks more footnotes than it fixes
+% \oldFootnote{\xspace#1}\futurelet\nextToken\isFootnote}
\newcommand\isFootnote{%
\ifx\footnote\nextToken\textsuperscript{,}\fi}
@@ -1228,7 +1373,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% Quotes:
+% Quotes
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1248,40 +1393,158 @@
{\endlist}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Language-specific settings
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Must apear before biblatex and hyperref.
+
+%% languages
+\newcommand{\lsBookLanguageEnglish}{english}
+\newcommand{\lsBookLanguageFrench}{french}
+\newcommand{\lsBookLanguagePortuguese}{portuguese}
+\newcommand{\lsBookLanguageGerman}{german}
+\newcommand{\lsBookLanguageChinese}{chinese}
+
+\iflsNoBabel
+ \else
+ \iflsBabelShorthands
+ \ifx\lsBookLanguage\lsBookLanguageEnglish
+ \usepackage[german,\lsBookLanguage]{babel}
+ \addto\extrasenglish{\languageshorthands{german}\useshorthands{"}}
+ \fi
+ \ifx\lsBookLanguage\lsBookLanguageFrench
+ \usepackage[german,\lsBookLanguage]{babel}
+ \addto\extrasfrench{\languageshorthands{german}\useshorthands{"}}
+ \fi
+ \ifx\lsBookLanguage\lsBookLanguageGerman
+ \usepackage[german]{babel}
+ \fi
+ \ifx\lsBookLanguage\lsBookLanguagePortuguese
+ \usepackage[german,\lsBookLanguage]{babel}
+ \addto\extrasportuges{\languageshorthands{german}\useshorthands{"}}
+ \fi
+ \else
+ \usepackage[\lsBookLanguage]{babel}
+ \fi
+\fi
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% Citations:
+% Citations
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\usepackage[
natbib=true,
- \iflsUndecapitalize
- style=\bstpath biblatex-langsci-unified-undecap,
- \else
- style=\bstpath biblatex-langsci-unified,
- \fi
- citestyle=\bstpath langsci-authoryear-comp,
+ % \iflsUndecapitalize
+ % style=\bstpath biblatex-langsci-unified-undecap,
+ % \else
+ % style=\bstpath biblatex-langsci-unified,
+ % \fi
+ style=\bbxpath biblatex-langsci-unified,
+ citestyle=\cbxpath langsci-authoryear-comp,
+ useprefix = true, %sort von, van, de where they should appear
%refsection=chapter,
maxbibnames=99,
+ uniquename=false,
+ mincrossrefs=99,
+ maxcitenames=2,
isbn=false,
doi=false,
url=false,
eprint=false,
+ autolang=hyphen,
+ useprefix=true,
backend=\lsBiblatexBackend,
indexing=cite,
\iflsCollection\else
- toc=bib % make bibliography appear in toc
- \fi
- ]{biblatex}
+ toc=bib, % make bibliography appear in toc
+ \fi
+ datamodel=\bstpath 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
+% authorindex package) if it is defined, otherwise we use the author.
+% This gets F/T as shorthand right and puts the guys in the index.
+
+\renewbibmacro*{citeindex}{%
+ \ifciteindex
+ {\iffieldequalstr{labelnamesource}{shortauthor} % If biblatex uses shortauthor as the label of a bibitem
+ {\ifnameundef{authauthor} % we check whether there is something in authauthor
+ {\indexnames{author}} % if not, we use author
+ {\indexnames{authauthor}}} % if yes, we use authauthor
+ {\iffieldequalstr{labelnamesource}{author} % if biblatex uses author we similarly test for
+ % authauthor and use this field
+ {\ifnameundef{authauthor}% if defined use authauthor
+ {\indexnames{author}}
+ {\indexnames{authauthor}}} % if defined use this field
+ {\iffieldequalstr{labelnamesource}{shorteditor} % same for editor
+ {\ifnameundef{autheditor}
+ {\indexnames{editor}}
+ {\indexnames{autheditor}}}
+ {\indexnames{labelname}}}}} % as a fallback we index on whatever biblatex used.
+ {}}
+
+
+%% changes of citestyle (cbx) (FIXME: documentation missing)
\renewcommand{\postnotedelim}{: }%
-\renewcommand{\multicitedelim}{\addsemicolon\space}%
+\renewcommand{\multicitedelim}{\addsemicolon\space}%
\renewcommand{\compcitedelim}{\multicitedelim}
-\DeclareFieldFormat{postnote}{#1}%
-%\renewcommand{\nameyeardelim}{ }%
-\defbibheading{references}{\chapter{References}}
-
+% \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}
+\defbibheading{german}{\chapter{Literaturverzeichnis}\sloppy}
+\defbibheading{portuguese}{\chapter{Referências}\sloppy}
+\defbibheading{chinese}{\chapter{参考文献}\sloppy}
+
+
+% fix \citep* et.al.
+% unclear why it was overwritten, these are the definitions from blx-natbib.def
+\renewrobustcmd*{\citet}{%
+ \@ifstar
+ {\AtNextCite{\AtEachCitekey{\defcounter{maxnames}{999}}}%
+ \textcite}
+ {\textcite}}
+
+\renewrobustcmd*{\citep}{%
+ \@ifstar
+ {\AtNextCite{\AtEachCitekey{\defcounter{maxnames}{999}}}%
+ \parencite}
+ {\parencite}}
+
+\renewrobustcmd*{\citealt}{%
+ \@ifstar
+ {\AtNextCite{%
+ \def\nameyeardelim{\addspace}%
+ \AtEachCitekey{\defcounter{maxnames}{999}}}%
+ \orgcite}
+ {\AtNextCite{\def\nameyeardelim{\addspace}}%
+ \orgcite}}
+
+\renewrobustcmd*{\citealp}{%
+ \@ifstar
+ {\AtNextCite{\AtEachCitekey{\defcounter{maxnames}{999}}}%
+ \orgcite}
+ {\orgcite}}
+
+\let\citew\citet
+
+\let\orgcite=\cite
\let\cite=\citet % in order to prevent inconsistencies between \cite and \citet
%% penalties against widows and orphans in bibliography
@@ -1299,9 +1562,10 @@
% \def\blx at maxline{77}
% \makeatother
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% Floats:
+% Floats
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1336,7 +1600,7 @@
\usepackage{setspace}
\usepackage{caption}
-% \captionsetup{labelfont=bf}
+% \captionsetup{labelfont=bf}
\captionsetup{%
font={%
stretch=.8%
@@ -1346,9 +1610,11 @@
}
\setcapindent{0pt}
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% Appendices:
+% Appendices
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1370,7 +1636,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% Indexes:
+% Indexes
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1409,13 +1675,55 @@
\fi
}
+\newcommand{\lsIndexTitle}{Index}
\newcommand{\lsLanguageIndexTitle}{Language index} % This can be changed according to the language.
\newcommand{\lsSubjectIndexTitle}{Subject index}
\newcommand{\lsNameIndexTitle}{Name index}
+\newcommand{\lsPrefaceTitle}{Preface}
+\newcommand{\lsAcknowledgementTitle}{Acknowledgments}
+\newcommand{\lsAbbreviationsTitle}{Abbreviations}
+\newcommand{\lsReferencesTitle}{references} % This aligns with \defbibheading
+\IfFileExists{{\localepath langsci-hyphenation-universal}}{\input{\localepath langsci-hyphenation-universal}}{}
+\ifx\lsBookLanguage\lsBookLanguageFrench
+\renewcommand{\lsIndexTitle}{Index}
+\renewcommand{\lsNameIndexTitle}{Index des auteurs cités}
+\renewcommand{\lsSubjectIndexTitle}{Index des termes}
+\renewcommand{\lsLanguageIndexTitle}{Index des langues}
+\renewcommand{\lsPrefaceTitle}{Préface}
+\renewcommand{\lsAcknowledgementTitle}{Remerciements}
+\renewcommand{\lsAbbreviationsTitle}{Liste des abréviations utilisées dans les gloses des exemples}
+\renewcommand{\lsReferencesTitle}{french}
+\IfFileExists{{\localepath langsci-hyphenation-fr}}{\input{\localepath langsci-hyphenation-fr}}{}
+\fi
+
+\ifx\lsBookLanguage\lsBookLanguageGerman
+\renewcommand{\lsIndexTitle}{Register}
+\renewcommand{\lsNameIndexTitle}{Autorenregister}
+\renewcommand{\lsSubjectIndexTitle}{Sachregister}
+\renewcommand{\lsLanguageIndexTitle}{Sprachregister}
+\renewcommand{\lsPrefaceTitle}{Vorwort}
+\renewcommand{\lsAcknowledgementTitle}{Danksagung}
+\renewcommand{\lsAbbreviationsTitle}{Abkürzungsverzeichnis}
+\renewcommand{\lsReferencesTitle}{german}
+\IfFileExists{{\localepath langsci-hyphenation-de}}{\input{\localepath langsci-hyphenation-de}}{}
+\fi
+
+\ifx\lsBookLanguage\lsBookLanguagePortuguese
+\renewcommand{\lsIndexTitle}{Índices}
+\renewcommand{\lsNameIndexTitle}{Índice remissivo de autores citados}
+\renewcommand{\lsSubjectIndexTitle}{Índice remissivo temático}
+\renewcommand{\lsLanguageIndexTitle}{Índice remissivo de línguas}
+\renewcommand{\lsPrefaceTitle}{Prefácio}
+\renewcommand{\lsAcknowledgementTitle}{Agradecimentos}
+\renewcommand{\lsAbbreviationsTitle}{\colorbox{red}{Translation info for Abbv missing}}
+\renewcommand{\lsReferencesTitle}{portugese}
+\IfFileExists{{\localepath langsci-hyphenation-pt}}{\input{\localepath langsci-hyphenation-pt}}{}
+\fi
+
\AtBeginDocument{
\makeindex
- \newindex{lan}{ldx}{lnd}{\lsLanguageIndexTitle}
+ \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}
@@ -1480,9 +1788,9 @@
\RequirePackage{soul}
% \RequirePackage[noadjust]{marginnote}
\renewcommand{\marginpar}{\marginnote}
- \let\isold\is
- \let\ilold\il
- \let\iaold\ia
+ \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{\ili}[1]{\sethlcolor{yellow}\hl{#1}\ilold{#1}}
@@ -1494,7 +1802,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% Hyperref:
+% Hyperref
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1523,12 +1831,26 @@
\iflsBiblatex
\renewbibmacro*{finentry}{\finentry
\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}}}}
}
%\DeclareFieldFormat{doi}{{\color{lsGuidelinesGray}\doi{#1}}}
\fi
+%% autoref (part of hyperref)
+\ifx\lsBookLanguage\lsBookLanguageEnglish
+\renewcommand{\partautorefname}{Part}%
+\renewcommand{\chapterautorefname}{Chapter}%
+\renewcommand{\sectionautorefname}{Section}%
+\renewcommand{\subsectionautorefname}{Section}%
+\renewcommand{\subsubsectionautorefname}{Section}%
+\renewcommand{\figureautorefname}{Figure}%
+\renewcommand{\tableautorefname}{Table}%
+\renewcommand{\Hfootnoteautorefname}{Footnote}%
+\fi
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% Collection (edited volume):
@@ -1542,9 +1864,9 @@
%% inside \author:
-\renewcommand{\and}{}
+\renewcommand{\and}{}
\newcommand{\lastand}{}
-\newcommand{\affiliation}[1]{}
+\newcommand{\affiliation}[1]{}
%% to be used below chapter titles
\newcommand{\chaptersubtitle}[1]{
@@ -1554,19 +1876,19 @@
\@afterindentfalse
\@afterheading
}
-
+
\iflsCollection
\iflsBiblatex\else
\ClassError{langsci/langscibook}{Collection option not compatible with plain BibTeX. Please use biblatex option}{}
\fi
-
+
\AtBeginDocument{ % for the citation in the footer
\onlyAuthor
\renewcommand{\newlineCover}{}
- \renewcommand{\newlineSpine}{}
- \edef\lsCollectionTitle{\@title} % \edef immediately expands \@title
+ \renewcommand{\newlineSpine}{}
+ \edef\lsCollectionTitle{\@title\ifx\@subtitle\empty\else{: \@subtitle}\fi} % \edef immediately expands \@title
\edef\lsCollectionEditor{\@author}
\addbibresource{collection_tmp.bib}
\newwrite\tempfile % open temporary bib file
@@ -1576,16 +1898,16 @@
%% customize \tableofcontents
\renewcommand{\@dotsep}{2.5} % space between dots
-\renewcommand{\@tocrmarg}{1.5em} % right margin for leader
+\renewcommand{\@tocrmarg}{1.5em} % right margin for leader
\renewcommand{\@pnumwidth}{1.5em} % width of page numbers
\usepackage{tocstyle}
\usetocstyle{standard} %\usetocstyle{allwithdot}
-\settocfeature[toc]{raggedhook}{\raggedright}
+\settocfeature[toc]{raggedhook}{\raggedright}
\iflsCollectionTOCLong\else
\setcounter{tocdepth}{0}\fi % show only parts and chapters
\settocstylefeature[-1]{pagenumberbox}{\csname @gobble\endcsname} % parts without page number
\settocstylefeature[-1]{leaders}{\hfill} % parts without dots#
-
+
\usepackage{chngcntr}
\counterwithout{figure}{chapter}
\counterwithout{table}{chapter}
@@ -1616,16 +1938,16 @@
{\thefield{entrytype}}}
{\multicitedelim}
{\usebibmacro{postnote}}
- \renewcommand{\lsCollectionPaperCitationText}{\fullciteFooter{#1}}
-
+ \renewcommand{\lsCollectionPaperCitationText}{\fullciteFooter{#1}}
+
\include{#1}%
\addtocounter{page}{-1}
\edef\lsCollectionPaperLastPage{\thepage} % \lsCollectionPaperFirstPage is defined in \lsPaper
\addtocounter{page}{1}
-
+
%%% for citation in footer
%% preprocessing of author/editor names
- \onlyAuthor
+ \onlyAuthor
\renewcommand{\newlineCover}{}
\renewcommand{\newlineSpine}{}
\renewcommand{\newlineTOC}{}
@@ -1636,23 +1958,21 @@
%% 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={{\@title}},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},options={skipbib=true,skiplab=true}}}
+
\end{refsection}
\end{collectionpaper}}
\fi
-
-
\newcommand{\onlyAuthor}{% % collection paper
- \renewcommand{\and}{, }%
- \renewcommand{\lastand}{ \& }%
+ \renewcommand{\and}{, }%
+ \renewcommand{\lastand}{ \& }%
\renewcommand{\affiliation}[1]{}
}
-
+
\newcommand{\AuthorAffiliation}{
- \renewcommand{\and}{\newline\newline}
- \renewcommand{\lastand}{\newline\newline}
+ \renewcommand{\and}{\newline\newline}
+ \renewcommand{\lastand}{\newline\newline}
\renewcommand{\affiliation}[1]{\\[0.5ex]{\normalsize ##1}}}
\newcommand{\lsCollectionPaperHeaderAuthor}{{%
@@ -1659,7 +1979,7 @@
\renewcommand{\newlineCover}{}%
\renewcommand{\newlineTOC}{}%
\onlyAuthor\@author}}
-
+
\newcommand{\lsCollectionPaperHeaderTitle}{%
\renewcommand{\newlineCover}{}
\renewcommand{\newlineTOC}{}
@@ -1666,38 +1986,76 @@
\iflsCollectionChapter%
\thechapter\hspace{0.5em}\fi
\@title}
-
+
\newcommand{\lsCollectionPaperTOC}{{%
\iflsCollectionChapter%
\protect\numberline{\thechapter}\fi
- \@title\newline{\normalfont\@author}}}
-
+ \@title\ \newline{\normalfont\@author}}} % space between \@title and \newline is needed for bookmarks
+
\newcommand{\lsCollectionPaperTitle}{{%
\renewcommand{\newlineTOC}{}
- \renewcommand{\newlineCover}{\\}
+ \renewcommand{\newlineCover}{\\}
% \\[-1\baselineskip]
% \vspace*{-2\baselineskip}
\renewcommand{\chapterheadstartvskip}{}
{\LARGE \noindent \hspace*{-.7cm} Chapter \thechapter}\\ %there must be a better way to undo this length than a hard value
- \bigskip
+ \bigskip
\@title}}
-
+
+\newcommand{\lsCollectionPaperFooterTitle}{\@title}
+
+\newcommand{\lsCollectionPaperFrontmatterMode}{% %%% Sometimes, chapters like prefaces appear in edited volumes that need special treatment in their headers and TOC
+ \renewcommand{\lsCollectionPaperTitle}{{%
+ \renewcommand{\newlineTOC}{}
+ \renewcommand{\newlineCover}{\\}
+ \\[-1\baselineskip]
+ \noindent{\LARGE ~}\\
+ \bigskip
+ \noindent\@title}}
+
+ \renewcommand{\lsCollectionPaperTOC}{{%
+ \iflsCollectionChapter%
+ \protect\numberline{~}\fi
+ \@title\ \newline{\normalfont\@author}}}
+}
+
+\newcommand{\lsCollectionPaperMainmatterMode}{% %%% This resets the changes done by FrontmatterMode
+ \renewcommand{\lsCollectionPaperTitle}{{%
+ \renewcommand{\newlineTOC}{}
+ \renewcommand{\newlineCover}{\\}
+ \\[-1\baselineskip]
+% \vspace*{-2\baselineskip}
+ \noindent{\LARGE Chapter \thechapter}\\
+ \bigskip
+ \@title}}
+
+ \renewcommand{\lsCollectionPaperTOC}{{%
+ \iflsCollectionChapter%
+ \protect\numberline{\thechapter}\fi
+ \@title\ \newline{\normalfont\@author}}}}
+
\newcommand{\lsCollectionPaperAuthor}{{%
\renewcommand{\newlineTOC}{}
\renewcommand{\newlineCover}{\\[0.5ex]}
\AuthorAffiliation\Large\@author}}
-
+
\newcommand{\lsCollectionPaperCitation}{\scalebox{1.2}{
\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
+ \renewcommand{\lsCollectionPaperCitation}{Change with \string\papernote}
+\fi
+
\newcommand{\lsCollectionPaperCitationText}{\string\lsCollectionPaperCitationText.}
+\newcommand{\papernote}[1]{
+ \renewcommand{\lsCollectionPaperCitation}{#1}}
+
\newcommand{\lsPaper}{
\renewcommand{\maketitle}{
- \addtocounter{chapter}{1}
+ \refstepcounter{chapter}
\addchap*{\lsCollectionPaperTitle}
\global\edef\lsCollectionPaperFirstPage{\thepage} % for citation in footer
\onlyAuthor
@@ -1709,13 +2067,13 @@
\lsCollectionPaperAuthor%
\vspace*{\baselineskip}%
\ifx\@epigram\empty%
- \else {\epigraph{\@epigram\\[-5ex]}{\@epigramsource}%
- \epigram{}\epigramsource{}}%
- \fi%
+ \else {\epigraph{\@epigram\\[-5ex]}{\@epigramsource}%
+ \epigram{}\epigramsource{}}%
+ \fi%
\begin{quote}
\small\lsCollectionPaperAbstract
\end{quote}
- }
+ }
\renewcommand*{\thesection}{\arabic{section}}
\setcounter{section}{0}
@@ -1729,20 +2087,21 @@
}
-%writeout page numbers for separation of chapters
+%writeout page numbers for separation of chapters
% \usepackage{newfile}
% \newoutputstream{pages}
% \openoutputfile{\jobname.pgs}{pages}
% \newcommand{\writechapterpages}{\addtostream{pages}{\thepage}}
-%
+%
% \AtEndDocument{
% \closeoutputstream{pages}
% }
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% Miscellaneous:
+% Miscellaneous
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1752,9 +2111,15 @@
\newlength{\LSPTmp}
\newcommand*{\hspaceThis}[1]{\settowidth{\LSPTmp}{#1}\hspace*{\LSPTmp}}
-\iflsNoBabel
- \else
- \usepackage[english]{babel}
-\fi
+% no this does add vertical space instead of horizontal St. Mü. 04.03.2018
+% \newcommand*{\hspaceThis}[1]{\hphantom{#1}} %should be equivalent
-\endinput
\ No newline at end of file
+% in this example
+%% \eal
+%% \ex \hspaceThis{*~}The boy who is running fast can jump high. $\to$\\
+%% {}* Is the boy who running fast can jump high?
+%% \ex \hspaceThis{*~}The boy who can run fast can jump high. $\to$\\
+%% {}* Can the boy who run fast can jump high?
+%% \zl
+
+\endinput
Added: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-alarm.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-alarm.pdf
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-alarm.pdf 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-alarm.pdf 2018-04-29 22:35:31 UTC (rev 47487)
Property changes on: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-alarm.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-book.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-book.pdf
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-book.pdf 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-book.pdf 2018-04-29 22:35:31 UTC (rev 47487)
Property changes on: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-book.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-bulb.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-bulb.pdf
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-bulb.pdf 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-bulb.pdf 2018-04-29 22:35:31 UTC (rev 47487)
Property changes on: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-bulb.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-bulbon.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-bulbon.pdf
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-bulbon.pdf 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-bulbon.pdf 2018-04-29 22:35:31 UTC (rev 47487)
Property changes on: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-bulbon.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-code.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-code.pdf
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-code.pdf 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-code.pdf 2018-04-29 22:35:31 UTC (rev 47487)
Property changes on: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-code.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-explore.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-explore.pdf
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-explore.pdf 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-explore.pdf 2018-04-29 22:35:31 UTC (rev 47487)
Property changes on: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-explore.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-glass.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-glass.pdf
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-glass.pdf 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-glass.pdf 2018-04-29 22:35:31 UTC (rev 47487)
Property changes on: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-glass.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-glass2.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-glass2.pdf
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-glass2.pdf 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-glass2.pdf 2018-04-29 22:35:31 UTC (rev 47487)
Property changes on: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-glass2.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-law.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-law.pdf
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-law.pdf 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-law.pdf 2018-04-29 22:35:31 UTC (rev 47487)
Property changes on: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-law.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-more.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-more.pdf
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-more.pdf 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-more.pdf 2018-04-29 22:35:31 UTC (rev 47487)
Property changes on: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-more.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-pencil.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-pencil.pdf
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-pencil.pdf 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-pencil.pdf 2018-04-29 22:35:31 UTC (rev 47487)
Property changes on: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-pencil.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-people.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-people.pdf
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-people.pdf 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-people.pdf 2018-04-29 22:35:31 UTC (rev 47487)
Property changes on: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-people.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-r.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-r.pdf
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-r.pdf 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-r.pdf 2018-04-29 22:35:31 UTC (rev 47487)
Property changes on: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-r.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-receipt.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-receipt.pdf
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-receipt.pdf 2018-04-29 21:52:26 UTC (rev 47486)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-receipt.pdf 2018-04-29 22:35:31 UTC (rev 47487)
Property changes on: trunk/Master/texmf-dist/tex/xelatex/langsci/tbls-receipt.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
More information about the tex-live-commits
mailing list