diff options
author | Norbert Preining <norbert@preining.info> | 2021-09-02 03:03:14 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2021-09-02 03:03:14 +0000 |
commit | a16eced7ce206f6c49ce7fe3cb15235d019f7a4a (patch) | |
tree | 7822ae742dbb329508a8cbc1a60882acd66a9607 /macros/latex/contrib/univie-ling | |
parent | 692575a36c0469a733dc7a6f68e945db811fb0c6 (diff) |
CTAN sync 202109020303
Diffstat (limited to 'macros/latex/contrib/univie-ling')
16 files changed, 80 insertions, 44 deletions
diff --git a/macros/latex/contrib/univie-ling/README b/macros/latex/contrib/univie-ling/README index 1670d15cae..87baa1affc 100644 --- a/macros/latex/contrib/univie-ling/README +++ b/macros/latex/contrib/univie-ling/README @@ -80,6 +80,15 @@ also have a look at the example files. == CHANGES == +V. 1.14 (2021-09-01) + - univie-ling-paper.cls: + * Do not overwrite user-set \texttype with default value. + - univie-ling.bbx: + * Sentence-case journal issue title and online title. + * Emphasize journal subtitle. + - univie-ling-wlg.cfg: + * Update editorial board. + V. 1.13 (2020-11-11) - univie-ling.bbx: * Fix whitespace issue in thematic issue string. diff --git a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx index c88d648c0c..0862f1f1f4 100644 --- a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx +++ b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx @@ -36,7 +36,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesFile{univie-ling.bbx}[2020/11/11 v1.13 biblatex bibliography style] +\ProvidesFile{univie-ling.bbx}[2021/09/01 v1.14 biblatex bibliography style] % Load base style (authoryear) \RequireBibliographyStyle{authoryear} @@ -67,8 +67,11 @@ This is a fatal error. I'm aborting now}% \endinput} -% Option "issueeditor": Output journal issue editor -% (false by default) +% +% OPTIONS +% + +% Option "issueeditor": Output journal issue editor (false by default) \newtoggle{issueeditor} \DeclareBibliographyOption{issueeditor}[false]{% \settoggle{issueeditor}{#1}} @@ -143,6 +146,23 @@ {} {\printdate}}% +\renewbibmacro*{issue}{% + \ifboolexpr{ + test {\iffieldundef{issuetitle}} + and + test {\iffieldundef{issuesubtitle}} + } + {} + {\printtext{% + \printfield[issuetitle]{issuetitle}% + \iffieldundef{issuesubtitle}{}{ + \setunit{\subtitlepunct}% + \printfield[issuetitle]{issuesubtitle}% + }% + }% + }% +} + \renewbibmacro*{issue+date}{% \ifboolexpr{ test {\iffieldundef{issue}} @@ -202,10 +222,10 @@ \usebibmacro{#1}% }% \clearname{editor}% - \newunit}% period instead of space + \newunit}% period instead of space {\global\undef\bbx@lasthash \usebibmacro{labeltitle}% - \newunit}% period instead of space + \newunit}% period instead of space \usebibmacro{date+extradate}} \renewbibmacro*{translator}{% @@ -225,10 +245,10 @@ \usebibmacro{bbx:savehash}}% \usebibmacro{translator+othersstrg}% \clearname{translator}% - \newunit}% period instead of space + \newunit}% period instead of space {\global\undef\bbx@lasthash \usebibmacro{labeltitle}% - \newunit}% period instead of space + \newunit}% period instead of space \usebibmacro{date+extradate}} @@ -238,7 +258,7 @@ \renewbibmacro*{journal}{% \iffieldundef{journaltitle} {} - {\printtext{% + {\printtext[issuetitle]{% \printfield{journaltitle}% \setunit{\subtitlepunct}% \printfield{journalsubtitle}}}} @@ -256,10 +276,7 @@ \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 - % `issueeditor` that is defined at the top of this style file. + % Output journal issue editors only if requested by 'issueeditor' option \iftoggle{issueeditor} {% \newunit @@ -414,7 +431,8 @@ \iffieldundef{urlyear}% {}% {\setunit*{\addspace}% - \printtext[parens]{\bibstring{urlseen} \mkbibdateunified{urlyear}{urlmonth}{urlday}}}% + \printtext[parens]{\bibstring{urlseen} + \mkbibdateunified{urlyear}{urlmonth}{urlday}}}% } \renewbibmacro*{series+number}{% @@ -431,7 +449,7 @@ {} {\printnames[byeditor]{editor}% \setunit{\addspace}% - \printtext[parens]{\usebibmacro{editor+othersstrg}}% putting (ed.) or (eds.) after editors of books + \printtext[parens]{\usebibmacro{editor+othersstrg}}% \clearname{editor}% \newunit}% \usebibmacro{byeditorx}} @@ -579,13 +597,24 @@ % FIELD FORMATS % -\DeclareFieldFormat[article,book,mvbook,inbook,collection,mvcollection,incollection,inproceedings,thesis,unpublished]{titlecase}{\MakeSentenceCase*{#1}}% +% Sentence-case all variable (non-serial) English titles +\DeclareFieldFormat[article,book,mvbook,collection,mvcollection, + inbook,incollection,inproceedings, + thesis,unpublished,online]{titlecase}{\MakeSentenceCase*{#1}}% + +% Thematic issue title is non-serial as well +\DeclareFieldFormat[periodical]{issuetitle}{\MakeSentenceCase*{#1}} -\DeclareFieldFormat[article,inbook,incollection,inproceedings,patent,thesis,unpublished]{title}{#1} +% Plain (recte) shape for these +\DeclareFieldFormat[article,inbook,incollection,inproceedings, + patent,thesis,unpublished]{title}{#1} +% Emphasize thesis title \DeclareFieldFormat[thesis]{title}{\mkbibemph{#1}} -\DeclareFieldFormat{pages}{#1} % no pp. prefix, took \mkpageprefix out [kvf] +% no pp. prefix +\DeclareFieldFormat{pages}{#1} + \DeclareFieldFormat{doi}{% \ifhyperref {\href{https://doi.org/#1}{\nolinkurl{https://doi.org/#1}}} @@ -594,9 +623,6 @@ \DeclareFieldFormat{volume:unified:proc-as-article}{#1} -\DeclareFieldFormat[periodical]{issuetitle}{#1} - - % % DRIVERS % @@ -615,9 +641,8 @@ \newunit\newblock \printfield{version}% \newunit\newblock -% \usebibmacro{in:}% We don't use "In: " before journal titles \usebibmacro{journal+issuetitle+editor}% - \newblock% \newblock ensures period before pages + \newblock% \usebibmacro{note+pages}% \newunit\newblock \iftoggle{bbx:isbn} @@ -659,7 +684,7 @@ {}% \newunit \printfield{volumes}% - \setunit{\addspace}% crucial difference from standard.bbx: space and then (Series + number) + \setunit{\addspace}% \usebibmacro{series+number}% \newunit\newblock \printfield{note}% diff --git a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx index 8f9720a39a..6939d0adaa 100644 --- a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx +++ b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx @@ -34,7 +34,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesFile{univie-ling.cbx}[2020/11/11 v1.13 biblatex citation style] +\ProvidesFile{univie-ling.cbx}[2021/09/01 v1.14 biblatex citation style] \RequireCitationStyle{authoryear} diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf Binary files differindex 72a30b20f7..4cda010d9a 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf +++ b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex index 03fbb262fb..db86a378ae 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex +++ b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex @@ -63,7 +63,7 @@ \author{\texorpdfstring{Jürgen Spitzmüller% \thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}} -\date{Version 1.12, 2020/06/25} +\date{Version 1.14, 2021/09/01} \maketitle @@ -319,6 +319,8 @@ Templates are provided as well: \section{Release History} \begin{description} + \item 2021/09/01 (v.\,1.14) No change to this class. + \item 2020/11/11 (v.\,1.13) No change to this class. \item 2020/06/25 (v.\,1.12) No change to this class. \item 2020/05/05 (v.\,1.11) New option \joption{polyglossia}. \item 2020/05/01 (v.\,1.10) No change to this class. diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf Binary files differindex 7410cc1b98..36e277eb0c 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf +++ b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex index 596cf2b7e3..1526c3304a 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex +++ b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex @@ -59,7 +59,7 @@ \author{\texorpdfstring{Jürgen Spitzmüller% \thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}} -\date{Version 1.12, 2020/06/25} +\date{Version 1.14, 2021/09/01} \maketitle @@ -243,7 +243,7 @@ given that you have specified the following data in the preamble. \joption{vo} (Vorlesung), \joption{ue} (\"Ubung), \joption{ko} (Kolloquium) or \joption{pv} (Privatissimum). \item{\jcsmacro{semester\{<semester type>\}\{<year>\}}}: Type and year of the current semester. Type must be either \joption{ss} (summer term) or \joption{ws} (winter term). \item{\jcsmacro{instructor\{<name>\}}}: Title and name of your instructor (\emph{Dozent}). - \item{\jcsmacro{texttype\{<text type>\}}}: Text type (such as \emph{Forschungsbericht}). For \joption{ps} and \joption{se} course types, this is automatically set. + \item{\jcsmacro{texttype\{<text type>\}}}: Text type (such as \emph{Forschungsbericht}). For \joption{ps} and \joption{se} course types, this is automatically set (but can be overwritten with this macro). \end{description} \section{Declaration} @@ -343,6 +343,8 @@ Templates are provided as well: \section{Release History} \begin{itemize} + \item 2021/09/01 (v.\,1.14) Do not overwrite \jmacro{texttype} set by user with default value. + \item 2020/11/11 (v.\,1.13) No change to this class. \item 2020/06/25 (v.\,1.12) No change to this class. \item 2020/05/05 (v.\,1.11) New option \joption{polyglossia}. \item 2020/05/01 (v.\,1.10) No change to this class. @@ -361,14 +363,8 @@ Templates are provided as well: \item Switch default bibliography style (from APA to Unified). \item Initial release to CTAN. \end{itemize} - \item 2016/09/07 (v.\,0.8) - \begin{itemize} - \item Improve \jcsmacro{makedeclaration} output. - \end{itemize} - \item 2016/05/05 (v.\,0.7) - \begin{itemize} - \item Fix comma after \emph{et al.} with \textsf{biblatex-apa}. - \end{itemize} + \item 2016/09/07 (v.\,0.8) Improve \jcsmacro{makedeclaration} output. + \item 2016/05/05 (v.\,0.7) Fix comma after \emph{et al.} with \textsf{biblatex-apa}. \item 2016/04/30 (v.\,0.6) \begin{itemize} \item Reset the alignment after declaration. diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf Binary files differindex 5d8379f109..e734f2514b 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf +++ b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex index 0b2e25f613..dec3028054 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex +++ b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex @@ -59,7 +59,7 @@ \author{\texorpdfstring{Jürgen Spitzmüller% \thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}} -\date{Version 1.12, 2020/06/25} +\date{Version 1.14, 2021/09/01} \maketitle @@ -367,6 +367,8 @@ Templates are provided as well: \section{Release History} \begin{itemize} + \item 2021/09/01 (v.\,1.14) No change to this class. + \item 2020/11/11 (v.\,1.13) No change to this class. \item 2020/06/25 (v.\,1.12) No change to this class. \item 2020/05/05 (v.\,1.11)\begin{itemize} \item New option \joption{polyglossia}. diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf Binary files differindex 523eac6312..a4ea625bf3 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf +++ b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex index 627a7fe84e..8bc27ee14e 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex +++ b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex @@ -59,7 +59,7 @@ \author{\texorpdfstring{Jürgen Spitzmüller% \thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}} -\date{Version 1.13, 2020/11/11} +\date{Version 1.14, 2021/09/01} \maketitle @@ -232,6 +232,7 @@ A template is provided as well: \url{https://github.com/jspitz/univie-ling/raw/m \raggedright \begin{itemize} + \item 2021/09/01 (v.\,1.14) Update editorial board. \item 2020/11/11 (v.\,1.13) \begin{itemize} \item Use \textsf{totpages} package rather than \textsf{lastpage} in order to fix diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls index d283f4f3d0..796f0f503c 100644 --- a/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls +++ b/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls @@ -31,7 +31,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{univie-ling-expose}[2020/11/11 v1.13 Univie Linguistic Exposes (JSp)] +\ProvidesPackage{univie-ling-expose}[2021/09/01 v1.14 Univie Linguistic Exposes (JSp)] \RequirePackage{xkeyval} diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls index a9ad7ed788..a342dd5c4b 100644 --- a/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls +++ b/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls @@ -31,7 +31,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{univie-ling-paper}[2020/11/11 v1.13 Univie Linguistic Papers (JSp)] +\ProvidesPackage{univie-ling-paper}[2021/09/01 v1.14 Univie Linguistic Papers (JSp)] \RequirePackage{xkeyval} @@ -299,7 +299,7 @@ This includes all drawings, sketches, graphics and internet sources.} }{} \def\lectype{\csuse{lectype@#1}}% \def\lectypeverb{\csuse{lectypeverb@#1}}% - \def\@texttype{\csuse{texttype@#1}} + \iftoggle{customtexttype}{}{\def\@texttype{\csuse{texttype@#1}}} }% } @@ -315,7 +315,8 @@ This includes all drawings, sketches, graphics and internet sources.} } \def\@texttype{Seminararbeit} -\newcommand\texttype[1]{\def\@texttype{#1}} +\newtoggle{customtexttype} +\newcommand\texttype[1]{\def\@texttype{#1}\toggletrue{customtexttype}} \def\@course{} \newcommand\course[2]{\setkeys{lec}{lectype=#1}\def\@course{#2}} \def\@instructor{} diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls index 364d8519a1..8fc0eab3aa 100644 --- a/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls +++ b/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls @@ -31,7 +31,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{univie-ling-thesis}[2020/11/11 v1.13 Univie Linguistic Theses (JSp)] +\ProvidesPackage{univie-ling-thesis}[2021/09/01 v1.14 Univie Linguistic Theses (JSp)] \RequirePackage{xkeyval} diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cfg b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cfg index 5e6bfc32a7..09e106800f 100644 --- a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cfg +++ b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cfg @@ -8,7 +8,7 @@ % General Linguistics \edboardGL{Markus P\"ochtrager} % Applied Linguistics -\edboardAL{Mi-Cha Flubacher, Jonas Hassemer \& Sabine Lehner}% +\edboardAL{Mi-Cha Flubacher \& Florian Grosser}% % Historical Linguistics \edboardHL{Stefan Schumacher} diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls index c9b73cc905..972b527319 100644 --- a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls +++ b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls @@ -32,7 +32,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{univie-ling-wlg}[2020/11/11 v1.13 WLG journal layout (JSp)] +\ProvidesPackage{univie-ling-wlg}[2021/09/01 v1.14 WLG journal layout (JSp)] %% ============================================================ |