From 1d64c92bb464637964125c37de161378370879ce Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 1 Sep 2021 20:46:46 +0000 Subject: univie-ling (1sep21) git-svn-id: svn://tug.org/texlive/trunk@60391 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/univie-ling/univie-ling-expose.cls | 2 +- .../tex/latex/univie-ling/univie-ling-paper.cls | 7 ++- .../tex/latex/univie-ling/univie-ling-thesis.cls | 2 +- .../tex/latex/univie-ling/univie-ling-wlg.cfg | 2 +- .../tex/latex/univie-ling/univie-ling-wlg.cls | 2 +- .../tex/latex/univie-ling/univie-ling.bbx | 71 +++++++++++++++------- .../tex/latex/univie-ling/univie-ling.cbx | 2 +- 7 files changed, 57 insertions(+), 31 deletions(-) (limited to 'Master/texmf-dist/tex/latex/univie-ling') diff --git a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-expose.cls b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-expose.cls index d283f4f3d02..796f0f503ca 100644 --- a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-expose.cls +++ b/Master/texmf-dist/tex/latex/univie-ling/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/Master/texmf-dist/tex/latex/univie-ling/univie-ling-paper.cls b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-paper.cls index a9ad7ed788d..a342dd5c4b6 100644 --- a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-paper.cls +++ b/Master/texmf-dist/tex/latex/univie-ling/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/Master/texmf-dist/tex/latex/univie-ling/univie-ling-thesis.cls b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-thesis.cls index 364d8519a1f..8fc0eab3aa4 100644 --- a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-thesis.cls +++ b/Master/texmf-dist/tex/latex/univie-ling/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/Master/texmf-dist/tex/latex/univie-ling/univie-ling-wlg.cfg b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-wlg.cfg index 5e6bfc32a79..09e106800f6 100644 --- a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-wlg.cfg +++ b/Master/texmf-dist/tex/latex/univie-ling/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/Master/texmf-dist/tex/latex/univie-ling/univie-ling-wlg.cls b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-wlg.cls index c9b73cc905d..972b527319d 100644 --- a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-wlg.cls +++ b/Master/texmf-dist/tex/latex/univie-ling/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)] %% ============================================================ diff --git a/Master/texmf-dist/tex/latex/univie-ling/univie-ling.bbx b/Master/texmf-dist/tex/latex/univie-ling/univie-ling.bbx index c88d648c0cd..0862f1f1f4d 100644 --- a/Master/texmf-dist/tex/latex/univie-ling/univie-ling.bbx +++ b/Master/texmf-dist/tex/latex/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/Master/texmf-dist/tex/latex/univie-ling/univie-ling.cbx b/Master/texmf-dist/tex/latex/univie-ling/univie-ling.cbx index 8f9720a39a5..6939d0adaa4 100644 --- a/Master/texmf-dist/tex/latex/univie-ling/univie-ling.cbx +++ b/Master/texmf-dist/tex/latex/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} -- cgit v1.2.3