texlive[73027] Master/texmf-dist: langsci (3dec24)

commits+karl at tug.org commits+karl at tug.org
Tue Dec 3 22:59:04 CET 2024


Revision: 73027
          https://tug.org/svn/texlive?view=revision&revision=73027
Author:   karl
Date:     2024-12-03 22:59:04 +0100 (Tue, 03 Dec 2024)
Log Message:
-----------
langsci (3dec24)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/xelatex/langsci/README.md
    trunk/Master/texmf-dist/doc/xelatex/langsci/examples/samplemonograph.pdf
    trunk/Master/texmf-dist/doc/xelatex/langsci/examples/samplemonograph.tex
    trunk/Master/texmf-dist/doc/xelatex/langsci/examples/samplepaper.pdf
    trunk/Master/texmf-dist/doc/xelatex/langsci/examples/samplepaper.tex
    trunk/Master/texmf-dist/doc/xelatex/langsci/examples/samplevolume.pdf
    trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-affiliations.sty
    trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-gb4e.sty
    trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-optional.sty
    trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-textipa.sty
    trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-unified.bbx
    trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-unified.cbx
    trunk/Master/texmf-dist/tex/xelatex/langsci/langscibook.cls

Added Paths:
-----------
    trunk/Master/texmf-dist/doc/xelatex/langsci/documentation/langsci-gb4e.pdf

Removed Paths:
-------------
    trunk/Master/texmf-dist/doc/xelatex/langsci/documentation/langsci-gb4.pdf
    trunk/Master/texmf-dist/doc/xelatex/langsci/documentation/langscitmp.bib
    trunk/Master/texmf-dist/doc/xelatex/langsci/examples/collection_tmp.bib
    trunk/Master/texmf-dist/doc/xelatex/langsci/examples/langscitmp.bib

Modified: trunk/Master/texmf-dist/doc/xelatex/langsci/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/xelatex/langsci/README.md	2024-12-03 21:58:50 UTC (rev 73026)
+++ trunk/Master/texmf-dist/doc/xelatex/langsci/README.md	2024-12-03 21:59:04 UTC (rev 73027)
@@ -1,7 +1,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Project: langsci
 %% Author: Language Science Press (http://langsci-press.org)
-%% Date: 2024-02-08 11:11:11 UTC
+%% Date: 2024-12-03 11:11:11 UTC
 %% Purpose: publishing boks with Language Science Press.
 %% Languages: LaTeX, tikz, eps
 %% Copyright 2012- Language Science Press
@@ -50,7 +50,7 @@
 The following optional packages are also provided, but have to be included manually if desired:
 
     langsci-optional.sty: additional useful commands
-    langsci-gb4e.sty and langsci-cgloss.sty typeset linguistic examples
+    langsci-gb4e.sty: typeset linguistic examples
     langsci-lgr.sty: the Leipzig glossing rule definitions
     langsci-bidi.sty: bidirectional text
     langsci-tbls.sty: macros for the textbook series Textbooks in Language Sciences

Deleted: trunk/Master/texmf-dist/doc/xelatex/langsci/documentation/langsci-gb4.pdf
===================================================================
(Binary files differ)

Added: trunk/Master/texmf-dist/doc/xelatex/langsci/documentation/langsci-gb4e.pdf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/doc/xelatex/langsci/documentation/langsci-gb4e.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/xelatex/langsci/documentation/langsci-gb4e.pdf	2024-12-03 21:58:50 UTC (rev 73026)
+++ trunk/Master/texmf-dist/doc/xelatex/langsci/documentation/langsci-gb4e.pdf	2024-12-03 21:59:04 UTC (rev 73027)

Property changes on: trunk/Master/texmf-dist/doc/xelatex/langsci/documentation/langsci-gb4e.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Deleted: trunk/Master/texmf-dist/doc/xelatex/langsci/documentation/langscitmp.bib
===================================================================
--- trunk/Master/texmf-dist/doc/xelatex/langsci/documentation/langscitmp.bib	2024-12-03 21:58:50 UTC (rev 73026)
+++ trunk/Master/texmf-dist/doc/xelatex/langsci/documentation/langscitmp.bib	2024-12-03 21:59:04 UTC (rev 73027)
@@ -1 +0,0 @@
- at book{langsci-current-book, author = {Sebastian Nordhoff}, title = {{The \texttt {langscibook} {\LaTeX } class}}, year = {2024}, series = {Language Science Press Guidelines}, number = {\unhbox \voidb at x \protect \penalty \@M \ }, location = {Berlin}, publisher = {Language Science Press}, options = {dataonly=true} } 

Deleted: trunk/Master/texmf-dist/doc/xelatex/langsci/examples/collection_tmp.bib
===================================================================
--- trunk/Master/texmf-dist/doc/xelatex/langsci/examples/collection_tmp.bib	2024-12-03 21:58:50 UTC (rev 73026)
+++ trunk/Master/texmf-dist/doc/xelatex/langsci/examples/collection_tmp.bib	2024-12-03 21:59:04 UTC (rev 73027)
@@ -1,2 +0,0 @@
- at incollection{samplepaper,author={Chap ter Author and Noam Chimpsky and Jane Wilson },title={{Introduction}},booktitle={{Sample edited volume{: Including sample chapter}}},editor={Jane Doe},publisher={Language Science Press.},Address={Berlin},year={2024},pages={1--2},doi={??},keywords={withinvolume}}
- at incollection{samplepaperfooter,author={Chap ter Author and Noam Chimpsky and Jane Wilson },title={{Introduction}},booktitle={{Sample edited volume{: Including sample chapter}}},editor={Jane Doe},publisher={Language Science Press.},Address={Berlin},year={2024},pages={1--2},doi={??},options={dataonly=true}}

Deleted: trunk/Master/texmf-dist/doc/xelatex/langsci/examples/langscitmp.bib
===================================================================
--- trunk/Master/texmf-dist/doc/xelatex/langsci/examples/langscitmp.bib	2024-12-03 21:58:50 UTC (rev 73026)
+++ trunk/Master/texmf-dist/doc/xelatex/langsci/examples/langscitmp.bib	2024-12-03 21:59:04 UTC (rev 73027)
@@ -1 +0,0 @@
- at book{langsci-current-book, author = {Pat Jaeung}, title = {{Sample monograph}}, year = {2024}, series = {Conceptual Foundations of Language Science}, number = {123}, location = {Berlin}, publisher = {Language Science Press}, options = {dataonly=true} } 

Modified: trunk/Master/texmf-dist/doc/xelatex/langsci/examples/samplemonograph.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/xelatex/langsci/examples/samplemonograph.tex
===================================================================
--- trunk/Master/texmf-dist/doc/xelatex/langsci/examples/samplemonograph.tex	2024-12-03 21:58:50 UTC (rev 73026)
+++ trunk/Master/texmf-dist/doc/xelatex/langsci/examples/samplemonograph.tex	2024-12-03 21:59:04 UTC (rev 73027)
@@ -33,7 +33,7 @@
 \backmatter
 \sloppy
 \phantomsection%this allows hyperlink in ToC to work
-\printbibliography[heading=\lsReferencesTitle]
+\printbibliography[heading=references]
 \cleardoublepage
 
 \phantomsection

Modified: trunk/Master/texmf-dist/doc/xelatex/langsci/examples/samplepaper.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/xelatex/langsci/examples/samplepaper.tex
===================================================================
--- trunk/Master/texmf-dist/doc/xelatex/langsci/examples/samplepaper.tex	2024-12-03 21:58:50 UTC (rev 73026)
+++ trunk/Master/texmf-dist/doc/xelatex/langsci/examples/samplepaper.tex	2024-12-03 21:59:04 UTC (rev 73027)
@@ -10,18 +10,18 @@
 }
 
 % \IfFileExists{../main.tex}{%adjust to name of your master file
-% \IfFileExists{samplevolume.tex}{
-%   \bibliography{langsci-test}
-%   \papernote{\scriptsize\normalfont
-%     To appear in:
-%     Change Volume Editor.
-%     Change volume title.
-%     Berlin: Language Science Press. [preliminary page numbering]
-%   }
-%   \pagenumbering{roman}
-%   \setcounter{chapter}{23}%adjust the chapter number
-%   \addtocounter{chapter}{-1}
-% }{}
+\IfFileExists{samplevolume.tex}{
+  \bibliography{langsci-test}
+  \papernote{\scriptsize\normalfont
+    To appear in:
+    Change Volume Editor.
+    Change volume title.
+    Berlin: Language Science Press. [preliminary page numbering]
+  }
+  \pagenumbering{roman}
+  \setcounter{chapter}{23}%adjust the chapter number
+  \addtocounter{chapter}{-1}
+}{}
 
 % \usepackage{langsci-optional}
 \begin{document}

Modified: trunk/Master/texmf-dist/doc/xelatex/langsci/examples/samplevolume.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-affiliations.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-affiliations.sty	2024-12-03 21:58:50 UTC (rev 73026)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-affiliations.sty	2024-12-03 21:59:04 UTC (rev 73027)
@@ -17,7 +17,7 @@
 %% langsci-affiliations was developed at Language Science Press to help in the
 %% production of scientific texts in linguistics.
 %% 
-%% Copyright (C) 2023 by Felix Kopecky, Language Science Press
+%% Copyright (C) 2023–2024 by Language Science Press
 %% 
 %% This work consists of the file  langsci-affiliations.dtx
 %%           and the derived files langsci-affiliations.sty,
@@ -46,8 +46,7 @@
 
 
 \RequirePackage{xparse}
-\ProvidesExplPackage {langsci-affiliations}
-{2023-10-12} {1.2}
+\ProvidesExplPackage {langsci-affiliations} {2024-04-09} {1.4}
 {A LaTeX3 package to collect and order authors and affiliations}
 
 \NewDocumentCommand{\ResolveAffiliations}{ O{} +m }
@@ -110,6 +109,10 @@
         = \l__affiliations_afil_separator_tl,
     separator~between~affiliations .initial:n
         = {~},
+    output~authors~paragraph~format .cs_set:Np
+        = \__affiliations_output_authors_paragraph_format:,
+    output~authors~paragraph~format .initial:n
+        = {\raggedright},
     output~authors~font .cs_set:Np
         = \__affiliations_output_authors_font:,
     output~authors~font .initial:n
@@ -118,6 +121,10 @@
         = \__affiliations_output_affiliation_font:,
     output~affiliation~font .initial:n
         = {\normalsize},
+    output~affiliation~paragraph~format .cs_set:Np
+        = \__affiliations_output_affiliation_paragraph_format:,
+    output~affiliation~paragraph~format .initial:n
+        = {\raggedright},
     input~names~separator .tl_set:N
         = \l__affiliations_input_names_sep_tl,
     input~names~separator .initial:n
@@ -125,7 +132,11 @@
     input~affiliation~separator .tl_set:N
         = \l_affiliations_input_afil_sep_tl,
     input~affiliation~separator .initial:n
-        = {;}
+        = {;},
+    author~affiliation~skip .dim_set:N
+        = \l__author_affil_sep_dim,
+    author~affiliation~skip .initial:n
+        = {0.5ex}
   }
 
 \cs_generate_variant:Nn \prop_put:Nnn { Nxx }
@@ -267,7 +278,8 @@
               \seq_put_right:Nx \l__affiliations_tmpa_seq
                 {
                   \tl_rescan:nn {} {##1}
-                  \exp_not:N \textsuperscript{\tl_use:N \l__affiliations_tmpb_tl}
+                  \exp_not:N
+                    \textsuperscript{\tl_use:N \l__affiliations_tmpb_tl}
                 }
             }
             {before}
@@ -276,7 +288,8 @@
                 {
                   \exp_not:N \__affiliations_recover_orcid:n { ##1 }
                   \tl_rescan:nn {} {##1}
-                  \exp_not:N \textsuperscript{\tl_use:N \l__affiliations_tmpb_tl}
+                  \exp_not:N
+                    \textsuperscript{\tl_use:N \l__affiliations_tmpb_tl}
                 }
             }
             {after}
@@ -285,7 +298,8 @@
                 {
                   \tl_rescan:nn {} {##1}
                   \exp_not:N \__affiliations_recover_orcid:n { ##1 }
-                  \exp_not:N \textsuperscript{\tl_use:N \l__affiliations_tmpb_tl}
+                  \exp_not:N
+                    \textsuperscript{\tl_use:N \l__affiliations_tmpb_tl}
                 }
             }
           }
@@ -329,7 +343,9 @@
                                {}
                                \l__affiliations_names_tmp_tl
 
+        \tl_trim_spaces:N \l__affiliations_names_tmp_tl
 
+
         \prop_put:Nxx \l__affiliations_tmpa_prop
         { \tl_use:N \l__affiliations_names_tmp_tl }
         { \seq_item:Nn \l__affiliations_tmp_affil_seq {2} }
@@ -345,12 +361,23 @@
             \prop_map_function:NN \l__affiliations_tmpa_prop
                                   \__affiliations_resolve_affiliations:
             \group_begin:
-              \__affiliations_output_authors_font:
-              \__affiliations_output_authors:
-            \group_end:\\[0.5ex]
+              \noindent
+              \parbox {\linewidth}
+                {
+                  \__affiliations_output_authors_paragraph_format:
+                  \__affiliations_output_authors_font:
+                  \__affiliations_output_authors:
+                }
+            \group_end:
+            \skip_vertical:N \l__author_affil_sep_dim
             \group_begin:
-              \__affiliations_output_affiliation_font:
-              \__affiliations_output_affiliations:
+              \noindent
+              \parbox {\linewidth}
+                {
+                  \__affiliations_output_affiliation_paragraph_format:
+                  \__affiliations_output_affiliation_font:
+                  \__affiliations_output_affiliations:
+                }
             \group_end:
           }
           {
@@ -365,8 +392,8 @@
                         {
                           \group_begin:
                             \exp_not:N \__affiliations_output_authors_font:
-                            \tl_rescan:nn {} {##1}\\[0.5ex]
-                          \group_end:
+                            \tl_rescan:nn {} {##1}
+                          \group_end:\\[\dim_use:N \l__author_affil_sep_dim]
                           \group_begin:
                             \exp_not:N \__affiliations_output_affiliation_font:
                             \tl_rescan:nn {} {##2}
@@ -380,7 +407,7 @@
                           \group_begin:
                             \exp_not:N \__affiliations_output_authors_font:
                             \exp_not:N \__affiliations_recover_orcid:n { ##1 }
-                            \tl_rescan:nn {} {##1}\\[0.5ex]
+                            \tl_rescan:nn {} {##1}\\[\dim_use:N \l__author_affil_sep_dim]
                           \group_end:
                           \group_begin:
                             \exp_not:N \__affiliations_output_affiliation_font:
@@ -395,7 +422,8 @@
                           \group_begin:
                             \exp_not:N \__affiliations_output_authors_font:
                             \tl_rescan:nn {} {##1}
-                            \exp_not:N \__affiliations_recover_orcid:n { ##1 }\\[0.5ex]
+                            \exp_not:N \__affiliations_recover_orcid:n { ##1 }
+                            \\[\dim_use:N \l__author_affil_sep_dim]
                           \group_end:
                           \group_begin:
                             \exp_not:N \__affiliations_output_affiliation_font:
@@ -405,6 +433,7 @@
                     }
                   }
               }
+            \noindent
             \seq_use:Nnnn \l__affiliations_tmpa_seq
                             {\l__affiliations_separator_between_two_tl}
                             {\l__affiliations_separator_between_mult_tl}
@@ -421,24 +450,27 @@
               {
                 {none}
                   {
-                    \seq_put_right:Nx \l__affiliations_tmpa_seq
-                                      { \tl_rescan:nn {} {##1} }
+                    \seq_put_right:Nx
+                      \l__affiliations_tmpa_seq
+                      { \tl_rescan:nn {} {##1} }
                   }
                 {before}
                   {
-                    \seq_put_right:Nx \l__affiliations_tmpa_seq
-                                      {
-                                        \exp_not:N \__affiliations_recover_orcid:n { ##1 }
-                                        \tl_rescan:nn {} {##1}
-                                      }
+                    \seq_put_right:Nx
+                      \l__affiliations_tmpa_seq
+                        {
+                          \exp_not:N \__affiliations_recover_orcid:n { ##1 }
+                          \tl_rescan:nn {} {##1}
+                        }
                   }
                 {after}
                   {
-                    \seq_put_right:Nx \l__affiliations_tmpa_seq
-                                      {
-                                        \tl_rescan:nn {} {##1}
-                                        \exp_not:N \__affiliations_recover_orcid:n { ##1 }
-                                      }
+                    \seq_put_right:Nx
+                      \l__affiliations_tmpa_seq
+                        {
+                          \tl_rescan:nn {} {##1}
+                          \exp_not:N \__affiliations_recover_orcid:n { ##1 }
+                        }
                   }
                 }
           }

Modified: trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-gb4e.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-gb4e.sty	2024-12-03 21:58:50 UTC (rev 73026)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-gb4e.sty	2024-12-03 21:59:04 UTC (rev 73027)
@@ -1,7 +1,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%      File: langsci-gb4e.sty
 %%    Author: Language Science Press (http://langsci-press.org)
-%%      Date: 2022-10-21
+%%      Date: 2024-12-03
 %%   Purpose: This file contains an adapted version of the gb4e package
 %%            for typetting linguistic examples. It also includes
 %%            adapted versions of the cgloss and jambox packages
@@ -9,17 +9,20 @@
 %%   Licence: The LaTeX Project Public License, Version 1.3c
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\ProvidesPackage{langsci-gb4e}[2022/10/21]
+\ProvidesPackage{langsci-gb4e}[2024/12/03]
 
 \usepackage{etoolbox}
 
 \newtoggle{cgloss}
 \toggletrue{cgloss}
+\DeclareOption{nocgloss}{\togglefalse{cgloss}}
 \newtoggle{jambox}
 \toggletrue{jambox}
+\DeclareOption{nojambox}{\togglefalse{jambox}}
+\newtoggle{autoexewidth}
+\toggletrue{autoexewidth}
+\DeclareOption{manualexewidth}{\togglefalse{autoexewidth}}
 \newtoggle{gb4eLowerPenalty}
-\DeclareOption{nocgloss}{\togglefalse{cgloss}}
-\DeclareOption{nojambox}{\togglefalse{jambox}}
 \DeclareOption{lowerpenalty}{\toggletrue{gb4eLowerPenalty}}
 \DeclareOption*{\PackageWarning{langsci-gb4e}{Unknown option ‘\CurrentOption’}}
 \ProcessOptions\relax
@@ -242,10 +245,17 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \def\exe{%
+    \iftoggle{autoexewidth}{%
     %\ifnum\value{equation}>9 \exewidth{(23)}\else\fi%
     %inserted by LangSci, for large example numbers
-    \ifnum\value{equation}>998 \exewidth{(1235)}\else\ifnum\value{equation}>98 \exewidth{(235)}\fi\fi%
-    \@ifnextchar [{\@exe}{\@exe[\@exwidth]}}
+    \ifnum\value{equation}>998%
+       \exewidth{(1235)}%
+    \else\ifnum\value{equation}>98%
+       \exewidth{(235)}%
+    \fi\fi%
+    }{}%
+    \@ifnextchar [{\@exe}{\@exe[\@exwidth]}%
+}
 
 \def\@exe[#1]{\ifnum \@xnumdepth >0%
                  \if at xrec\@exrecwarn\fi%

Modified: trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-optional.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-optional.sty	2024-12-03 21:58:50 UTC (rev 73026)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-optional.sty	2024-12-03 21:59:04 UTC (rev 73027)
@@ -1,7 +1,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%      File: langsci-optional.sty
 %%    Author: Language Science Press (http://langsci-press.org)
-%%      Date: 2016-01-16 16:47:43 UTC
+%%      Date: 2024-12-03 11:47:43 UTC
 %%   Purpose: This file contains useful, but not essential,
 %%            macros for books using langscibook.cls
 %%  Language: LaTeX
@@ -235,29 +235,42 @@
   }
 }
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%% Experimental feature for pointing out moving things. %%%%
-%%%% Buggy? Write to: kopeckyf at hu-berlin.de               %%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \usetikzlibrary{arrows,arrows.meta}
 \newcounter{lsConnectTempGroup}
-\NewDocumentCommand\ConnectTail{m O{\thelsConnectTempGroup}}{%read: mandatory arg #1, optional argument #2 with the current group counter as its default value.
-    \edef\lsConnectTempPosition{#2}%\edef expands the argument, which means reading the current value of the counter.
+% Arguments: 
+% mandatory arg #1, 
+% optional argument #2 with the current group counter as its default value.
+\NewDocumentCommand\ConnectTail{m O{\thelsConnectTempGroup}}{%
+    \edef\lsConnectTempPosition{#2}%\edef reads the current value of the counter.
     {\tikz[remember picture,
            anchor=base, baseline,
            inner xsep=0pt,
-           inner ysep=-.5ex]\node (ConnectTempTail\lsConnectTempPosition) {\strut{}#1};}%\strut for baseline
+           inner ysep=-.5ex]
+           \node (ConnectTempTail\lsConnectTempPosition) {\strut{}#1};}%
 }
-\NewDocumentCommand\ConnectHead{s O{1ex} m O{\thelsConnectTempGroup}}{%read: star #1, optional argument (distance of arrow from text= std. one x-height), mand. arg. (node text), optional argument #2, the group specifier
+% Arguments: 
+% star #1, 
+% optional argument (distance of arrow from text= std. one x-height), 
+% mand. arg. (node text), 
+% optional argument #2, the group specifier
+% optional argument #3, some node text
+\NewDocumentCommand\ConnectHead{s O{1ex} m O{\thelsConnectTempGroup}}{%
     \edef\lsConnectTempPosition{#4}%
-    \stepcounter{lsConnectTempGroup}%We have a match, let's update the group counter
+    %We have a match, let's update the group counter
+    \stepcounter{lsConnectTempGroup}%
     {\tikz[remember picture,
            anchor=base, baseline,
            inner xsep=0pt,
-           inner ysep=-.5ex] \node (ConnectTempHead\lsConnectTempPosition) {\strut{}#3};%
-     \tikz[remember picture] \draw[% we have a tail and a head, let's bring them together
-                                \IfBooleanTF#1{{Triangle[]}-}{-{Triangle[]}},% Check if the starred version is used. The starred version is right->left, the normal version left->right
-                                overlay] (ConnectTempTail\lsConnectTempPosition.south) -- ++(0,-#2) -| (ConnectTempHead\lsConnectTempPosition.south);
+           inner ysep=-.5ex] 
+           \node (ConnectTempHead\lsConnectTempPosition) {\strut{}#3};%
+     \tikz[remember picture] \draw[overlay,
+                                % Check if the starred version is used. The 
+                                % starred version is right->left, the normal 
+                                % version left->right
+                                \IfBooleanTF#1{{Triangle[]}-}{-{Triangle[]}}] 
+                                (ConnectTempTail\lsConnectTempPosition.south) 
+                                -- ++(0,-#2) -| 
+                                (ConnectTempHead\lsConnectTempPosition.south);%
     }%
 }
 
@@ -346,7 +359,7 @@
 \providecommand{\lsptoprule}{\midrule\toprule}
 \providecommand{\lspbottomrule}{\bottomrule\midrule}
 
-\providecommand{\REF}[2][]{(\ref{#2#1})}
+\providecommand{\REF}[2][]{(\ref{#2}#1)}
 
 
 \newcommand{\glottocodes}[1]{}

Modified: trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-textipa.sty
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-textipa.sty	2024-12-03 21:58:50 UTC (rev 73026)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-textipa.sty	2024-12-03 21:59:04 UTC (rev 73027)
@@ -45,7 +45,7 @@
 \renewcommand{\textdyoghlig}{ʤ}
 \renewcommand{\textdzlig}{ʣ}
 \newcommand{\texteng}{ŋ}
-\renewcommand{\textepsilon}{ɛ}
+\providecommand{\textepsilon}{ɛ}
 \renewcommand{\textesh}{ʃ}
 \newcommand{\texteth}{ð}
 \newcommand{\textezh}{ȝ}
@@ -52,7 +52,7 @@
 \newcommand{\textfallrise}{᷉}
 \renewcommand{\textfishhookr}{ɾ}
 \newcommand{\textg}{ɡ}
-\renewcommand{\textgamma}{ɣ}
+\providecommand{\textgamma}{ɣ}
 \newcommand{\textglobfall}{↘}
 \newcommand{\textglobrise}{↗}
 \renewcommand{\textglotstop}{ʔ}
@@ -112,7 +112,7 @@
 \renewcommand{\textrevepsilon}{ɜ}
 \renewcommand{\textrevglotstop}{ʕ}
 \renewcommand{\textrevyogh}{ʢ}
-\renewcommand{\textrho}{ρ}
+\providecommand{\textrho}{ρ}
 \renewcommand{\textrhookrevepsilon}{ɝ}
 \renewcommand{\textrhookschwa}{ɚ}
 \newcommand{\textrhoticity}{˞}
@@ -152,7 +152,7 @@
 \renewcommand{\textscy}{ʏ}
 \newcommand{\textseagull}{̼}
 \renewcommand{\textsecstress}{ˌ}
-\renewcommand{\textsigma}{}
+\providecommand{\textsigma}{σ}
 % \newcommand{\textstretchc}{}%\newcommand{\textstretchcvar}{ʗ}
 % \newcommand{\textsu}{}
 \newcommand{\textsubacute}{̗}

Modified: trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-unified.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-unified.bbx	2024-12-03 21:58:50 UTC (rev 73026)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-unified.bbx	2024-12-03 21:59:04 UTC (rev 73027)
@@ -48,6 +48,23 @@
 \newtoggle{issueandeditor}
 \DeclareBibliographyOption{issueandeditor}[true]{%
   \settoggle{issueandeditor}{#1}}
+  
+%  Automated capitalisation after colons
+%  Copies from apa.bbx, which copied and adapted from ieee.bbx
+% {<process>} {*} {<text>}
+\newcommand*{\bbx at colon@search}[3]{%
+  \bbx at colon@search at aux#1#2\empty#3: \stop
+}
+\long\def\bbx at colon@search at aux#1#2#3: #4\stop{%
+  \expandafter#1\expandafter#2\expandafter{#3}%
+  \ifblank{#4}
+    {}
+    {%
+      : %
+      \bbx at colon@search at aux#1#2\empty#4\stop
+    }%
+}
+%
 
 % Formatting directives for name lists
 % ------------------------------------------------------------------
@@ -463,7 +480,7 @@
 }
 
 % basically everything is in sentence case, other than journals and book series (recurring titles)
-\DeclareFieldFormat[article,book,collection,incollection,inproceedings,thesis,unpublished]{titlecase}{\MakeSentenceCase*{#1}}%
+\DeclareFieldFormat[article,book,collection,inbook,incollection,inproceedings,thesis,unpublished]{titlecase}{\bbx at colon@search\MakeSentenceCase*{#1}}
 
 % No quotes around titles
 \DeclareFieldFormat[article,inbook,incollection,inproceedings,patent,thesis,unpublished]{title}{#1}

Modified: trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-unified.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-unified.cbx	2024-12-03 21:58:50 UTC (rev 73026)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/langsci-unified.cbx	2024-12-03 21:59:04 UTC (rev 73027)
@@ -210,13 +210,23 @@
 \newbibmacro*{cite:labelyear+extradate}{%
   \iffieldundef{labelyear}
     {}
-    {\printtext[bibhyperref]{\printlabeldateextra}}}
+    {\printtext[bibhyperref]{\printlabeldateextra}}%
+     \usebibmacro{cite:thisvolume}%
+    }
 
 \newbibmacro*{cite:extradate}{%
   \iffieldundef{extradate}
     {}
-    {\printtext[bibhyperref]{\printfield{extradate}}}}
+    {\printtext[bibhyperref]{\printfield{extradate}}}%
+     \usebibmacro{cite:thisvolume}%
+  }
 
+\newbibmacro*{cite:thisvolume}{%
+  \ifkeyword{LSPWithinVolume}
+    {\addspace\printtext[bibhyperref]{[this volume]}}
+    {}%
+}
+
 \newbibmacro*{textcite:postnote}{%
   \usebibmacro{postnote}%
   \ifthenelse{\value{multicitecount}=\value{multicitetotal}}
@@ -294,40 +304,11 @@
   {}
   {\usebibmacro{textcite:postnote}}
   
-% "This volume" citation commands
-\DeclareCiteCommand{\citetv}
-  {\usebibmacro{prenote}}
-  {\ifciteindex
-     {\indexnames{labelname}}
-     {}%
-   \printtext[bibhyperref]{\printnames{labelname}\addspace\printfield{year}}}
-  {\multicitedelim}
-  {\printtext[bibhyperref]{\usebibmacro{postnote}\addspace[this volume]}}
+% Legacy "his volume" citation commands
+\newrobustcmd*{\citetv}{\cite}
+\newrobustcmd*{\textcitetv}{\textcite}
+\newrobustcmd*{\parencitetv}{\parencite}
   
-\DeclareCiteCommand{\textcitetv}
-  {\usebibmacro{prenote}}
-  {\ifciteindex
-     {\indexnames{labelname}}
-     {}%
-   \printtext[bibhyperref]{\printnames{labelname}\addspace\bibopenparen\printfield{year}}}
-  {\multicitedelim}
-  {\printtext[bibhyperref]{\usebibmacro{postnote}\addspace[this volume]\bibcloseparen}}
-  
-\DeclareCiteCommand{\parencitetv}
-  {\usebibmacro{prenote}}
-  {\ifciteindex
-     {\indexnames{labelname}}
-     {}%
-   \printtext[bibhyperref]{\bibopenparen\printnames{labelname}\addspace\printfield{year}}}
-  {\multicitedelim}
-  {\printtext[bibhyperref]{\usebibmacro{postnote}\addspace[this volume]\bibcloseparen}}
-  
-\DeclareCiteCommand{\citeyeartv}
-  {\boolfalse{citetracker}\boolfalse{pagetracker}\usebibmacro{prenote}}
-  {\printtext[bibhyperref]{\iffieldundef{year}{\printfield{labelyear}}{\printfield{year}}\printfield{extradate}}}
-  {\multicitedelim}
-  {\usebibmacro{postnote}\addspace[this volume]}
-  
 % A cite command to produce the full reference in the footer of the landing page of 
 % a paper in an edited volume
 
@@ -386,12 +367,20 @@
   {\printtext[bibhyperref]{\iffieldundef{year}{\printfield{labelyear}}{\printfield{year}}\printfield{extradate}}}
   {\multicitedelim}
   {\usebibmacro{postnote}}
+  
+\DeclareCiteCommand{\citeyeartv}
+  {\boolfalse{citetracker}%
+   \boolfalse{pagetracker}%
+   \usebibmacro{prenote}}
+  {\printtext[bibhyperref]{\iffieldundef{year}{\printfield{labelyear}}{\printfield{year}}\printfield{extradate}\usebibmacro{cite:thisvolume}}}
+  {\multicitedelim}
+  {\usebibmacro{postnote}}
 
 \DeclareCiteCommand{\citeyearpar}[\mkbibparens]
   {\boolfalse{citetracker}%
    \boolfalse{pagetracker}%
    \usebibmacro{prenote}}
-  {\printtext[bibhyperref]{\iffieldundef{year}{\printfield{labelyear}}{\printfield{year}}\printfield{extradate}}}
+  {\printtext[bibhyperref]{\iffieldundef{year}{\printfield{labelyear}}{\printfield{year}}\printfield{extradate}\usebibmacro{cite:thisvolume}}}
   {\multicitedelim}
   {\usebibmacro{postnote}}
 
@@ -405,7 +394,7 @@
 \DeclareCiteCommand{\posscitealt}
   {\boolfalse{citetracker}%
    \boolfalse{pagetracker}}
-  {\printtext[bibhyperref]{\printnames{labelname}'s \iffieldundef{year}{\printfield{labelyear}}{\printfield{year}}\printfield{extradate}}}
+  {\printtext[bibhyperref]{\printnames{labelname}'s \iffieldundef{year}{\printfield{labelyear}}{\printfield{year}}\printfield{extradate}\usebibmacro{cite:thisvolume}}}
   {}
   {}
 

Modified: trunk/Master/texmf-dist/tex/xelatex/langsci/langscibook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/xelatex/langsci/langscibook.cls	2024-12-03 21:58:50 UTC (rev 73026)
+++ trunk/Master/texmf-dist/tex/xelatex/langsci/langscibook.cls	2024-12-03 21:59:04 UTC (rev 73027)
@@ -1,7 +1,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%      
 %%      File: langscibook.cls
 %%    Author: Language Science Press (http://langsci-press.org)
-%%      Date: 2024-02-07 14:00 CET
+%%      Date: 2022-02-08 14:00 CET
 %%   Purpose: This file defines the basic document class
 %%            for books published with Language Science Press.
 %%  Language: LaTeX
@@ -310,9 +310,7 @@
     fontsize=\lsFontsize,% default is 11pt
     footnotes=multiple,
     numbers=noenddot,% no point after last number of chapters/sections
-    \notbool{collection}{
-      toc=bib, % make bibliography appear in toc
-    }{}
+    toc=bib, % make bibliography appear in toc
     index=totoc,
     headings=optiontohead,
     footnotes=multiple
@@ -593,10 +591,12 @@
             \setuptitle
           }
 
-        %% for those who like the example in numbered example sentences to be typeset in italics
-        %% this is possible for a complete series only.
+        %% Series-specific layout settings, governs the entire series
+        %% In SIDL, COGL and RCG, examples are put in italics. Sections are
+        %% referenced using the section sign “§”.
+        
         \ifx\lsSeries\sidl
-        %\def\exfont{\normalsize\itshape}
+        \renewcommand{\sectref}[1]{§\ref{#1}}
         \let\eachwordone=\itshape % only \gll
 
         \let\oldtable\table   % footnotes in tables without horizontal line
@@ -614,18 +614,13 @@
         
         \ifx\lsSeries\cogl
         \let\eachwordone=\itshape
+        \renewcommand{\sectref}[1]{§\ref{#1}}
         \fi
         
         \ifx\lsSeries\rcg
         \let\eachwordone=\itshape
+        \renewcommand{\sectref}[1]{§\ref{#1}}
         \fi
-        
-        \ifx\lsSeries\eotms
-        \renewcommand{\sectref}[1]{Section~\ref{#1}}
-        \fi
-        \ifx\lsSeries\ahl
-        \renewcommand{\sectref}[1]{Section~\ref{#1}}
-        \fi
     } %% \AtBeginDocument
 }{} %notbool paper
 
@@ -1582,25 +1577,15 @@
 	indexing=cite
 ]{biblatex}
 
-%% DOIs are handled after hyperref.
-\defbibheading{references}{\chapter{References}\sloppy}
-\defbibheading{english}{\chapter{References}\sloppy}
-\defbibheading{french}{\chapter{Références bibliographiques}\sloppy}
-\defbibheading{spanish}{\chapter{Referencias bibliográficas}\sloppy}
-\defbibheading{german}{\chapter{Literaturverzeichnis}\sloppy}
-\defbibheading{portuguese}{\chapter{Referências}\sloppy}
-\defbibheading{chinese}{\chapter{参考文献}\sloppy}
-
-%% penalties against widows and orphans in bibliography
-%% http://tex.stackexchange.com/questions/297705/atbeginenvironment-does-not-work-with-natbib/297721#297721
-\apptocmd{\thebibliography}{%
-\clubpenalty\@M
-\@clubpenalty\clubpenalty
-\widowpenalty\@M
+\defbibheading{references}[\lsReferencesTitle]{%
+  \addchap{#1}
+  \markdouble{#1}
+  \clubpenalty\@M
+  \@clubpenalty\clubpenalty
+  \widowpenalty\@M
+  \emergencystretch=3em
 }
-{}{}
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %    Floats
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1863,7 +1848,7 @@
 \renewcommand{\Hfootnoteautorefname}{Footnote}%
 \fi
 
-\providecommand{\sectref}[1]{§\ref{#1}}
+\providecommand{\sectref}[1]{Section~\ref{#1}}
 \providecommand{\chapref}[1]{Chapter~\ref{#1}}
 \providecommand{\partref}[1]{Part~\ref{#1}}
 \providecommand{\tabref}[1]{Table~\ref{#1}}
@@ -1952,7 +1937,7 @@
   \renewcommand{\newlineSpine}{}
   \renewcommand{\newlineTOC}{}  
   %% write bib entry to file
-  \immediate\write\tempfile{@incollection{#1,author={\authorToBib},title={{\expandonce{\titleTemp}}},booktitle={{\expandonce{\lsCollectionTitle}}},editor={\lsCollectionEditor},publisher={Language Science Press.},Address={Berlin},year={\lsYear},pages={\lsCollectionPaperFirstPage --\lsCollectionPaperLastPage},doi={\lsChapterDOI},keywords={withinvolume}}}
+  \immediate\write\tempfile{@incollection{#1,author={\authorToBib},title={{\expandonce{\titleTemp}}},booktitle={{\expandonce{\lsCollectionTitle}}},editor={\lsCollectionEditor},publisher={Language Science Press.},Address={Berlin},year={\lsYear},pages={\lsCollectionPaperFirstPage --\lsCollectionPaperLastPage},doi={\lsChapterDOI},keywords={LSPWithinVolume}}}
   \immediate\write\tempfile{@incollection{#1footer,author={\authorToBib},title={{\expandonce{\titleTemp}}},booktitle={{\expandonce{\lsCollectionTitle}}},editor={\lsCollectionEditor},publisher={Language Science Press.},Address={Berlin},year={\lsYear},pages={\lsCollectionPaperFirstPage --\lsCollectionPaperLastPage},doi={\lsChapterDOI},options={dataonly=true}}}
 }
 
@@ -1988,10 +1973,11 @@
             % and their affiliation(s) are part of the \chapter block.
             \CountAuthorsFromAffiliations{\@author}
             \lsDeterminePaperAuthorAffiliationIndexing{}
-            \setchapterpreamble[u]{\ResolveAffiliations{\@author}\\}
+            \setchapterpreamble[u]{\ResolveAffiliations{\@author}}
             \chapter
             [tocentry={\titleToToC~\newline{\normalfont\ResolveAffiliations{\@author}}}]
             {\titleTemp}
+            \vskip1.15\baselineskip plus .1\baselineskip minus .167\baselineskip
             \begin{quote}
                 \small\lsCollectionPaperAbstract
             \end{quote}
@@ -2156,7 +2142,7 @@
 \newcommand{\lsPrefaceTitle}{Preface}
 \newcommand{\lsAcknowledgementTitle}{Acknowledgments}
 \newcommand{\lsAbbreviationsTitle}{Abbreviations}
-\newcommand{\lsReferencesTitle}{references} % This aligns with \defbibheading
+\newcommand{\lsReferencesTitle}{References} % This aligns with \defbibheading
 
 \ifx\lsBookLanguage\lsBookLanguageFrench
     \renewcommand{\lsIndexTitle}{Index}
@@ -2166,7 +2152,7 @@
     \renewcommand{\lsPrefaceTitle}{Préface}
     \renewcommand{\lsAcknowledgementTitle}{Remerciements}
     \renewcommand{\lsAbbreviationsTitle}{Liste des abréviations utilisées dans les gloses des exemples}
-    \renewcommand{\lsReferencesTitle}{french}
+    \renewcommand{\lsReferencesTitle}{Références bibliographiques}
     \ifbool{babel}{
         \renewcommand\frenchfigurename{Figure}
         \renewcommand\frenchtablename{Tableau}
@@ -2181,7 +2167,7 @@
     \renewcommand{\lsPrefaceTitle}{Prefacio}
     \renewcommand{\lsAcknowledgementTitle}{Agradecimientos}
     \renewcommand{\lsAbbreviationsTitle}{Abreviaciones}
-    \renewcommand{\lsReferencesTitle}{spanish}
+    \renewcommand{\lsReferencesTitle}{Referencias bibliográficas}
 \fi
 
 \ifx\lsBookLanguage\lsBookLanguageGerman
@@ -2192,7 +2178,7 @@
     \renewcommand{\lsPrefaceTitle}{Vorwort}
     \renewcommand{\lsAcknowledgementTitle}{Danksagung}
     \renewcommand{\lsAbbreviationsTitle}{Abkürzungsverzeichnis}
-    \renewcommand{\lsReferencesTitle}{german}
+    \renewcommand{\lsReferencesTitle}{Literaturverzeichnis}
 \fi
 
 \ifx\lsBookLanguage\lsBookLanguagePortuguese
@@ -2203,7 +2189,7 @@
     \renewcommand{\lsPrefaceTitle}{Prefácio}
     \renewcommand{\lsAcknowledgementTitle}{Agradecimentos}
     \renewcommand{\lsAbbreviationsTitle}{\colorbox{red}{Translation info for Abbv missing}}
-    \renewcommand{\lsReferencesTitle}{portugese}
+    \renewcommand{\lsReferencesTitle}{Referências}
 \fi
 
 \ifx\lsBookLanguage\lsBookLanguageChinese
@@ -2213,7 +2199,8 @@
     \renewcommand{\lsLanguageIndexTitle}{语言索引}
     \renewcommand{\lsPrefaceTitle}{前言}
     \renewcommand{\lsAcknowledgementTitle}{致谢}
-    \renewcommand{\lsAbbreviationsTitle}{\colorbox{red}{Translation info for Abbv missing}}
+    \renewcommand{\lsAbbreviationsTitle}{缩写}
+    \renewcommand{\lsReferencesTitle}{参考文献}
 \fi
 
 



More information about the tex-live-commits mailing list.