From 421788c062a43d8c13306971c77a92be90ee6b9b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 2 Mar 2018 22:42:35 +0000 Subject: univie-ling (2mar18) git-svn-id: svn://tug.org/texlive/trunk@46790 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/univie-ling/univie-ling-expose.cls | 2 +- .../tex/latex/univie-ling/univie-ling-paper.cls | 2 +- .../tex/latex/univie-ling/univie-ling-thesis.cls | 2 +- .../tex/latex/univie-ling/univie-ling-wlg.cls | 32 +++++++++++++++++++++- .../tex/latex/univie-ling/univie-ling.bbx | 16 +++++++---- .../tex/latex/univie-ling/univie-ling.cbx | 9 ++++-- 6 files changed, 50 insertions(+), 13 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 23b19efc5ea..4b996b96ff6 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}[2018/02/13 v1.2 Univie Linguistic Exposes (JSp)] +\ProvidesPackage{univie-ling-expose}[2018/03/02 v1.3 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 0574db09a73..7a96f58863a 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}[2018/02/13 v1.2 Univie Linguistic Papers (JSp)] +\ProvidesPackage{univie-ling-paper}[2018/03/02 v1.3 Univie Linguistic Papers (JSp)] \RequirePackage{xkeyval} 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 cee08881d75..d06d7f8be2d 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}[2018/02/13 v1.2 Univie Linguistic Theses (JSp)] +\ProvidesPackage{univie-ling-thesis}[2018/03/02 v1.3 Univie Linguistic Theses (JSp)] \RequirePackage{xkeyval} 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 71ebbbdfcbf..dc139124207 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}[2018/02/13 v1.2 WLG journal layout (JSp)] +\ProvidesPackage{univie-ling-wlg}[2018/03/02 v1.3 WLG journal layout (JSp)] %% ============================================================ @@ -214,12 +214,28 @@ \deftranslation[to=English]{applied}{Applied Linguistics} \deftranslation[to=German]{genhist}{Allgemeine und Historische Sprachwissenschaft} \deftranslation[to=English]{genhist}{General and Historical Linguistics} +\deftranslation[to=German]{license}{Dieses Werk unterliegt der Creative-Commons-Lizenz \doclicenseNameRef\\ + (Namensnennung -- Nicht kommerziell -- Keine Bearbeitungen)} +\deftranslation[to=English]{license}{This work is published under a Creative Commons \doclicenseNameRef\ license\\ + (Attribution-NonCommercial-NoDerivatives)} \AtBeginDocument{% \addto\captionsngerman{\renewcommand*\contentsname{Inhalt}} \addto\captionsnaustrian{\renewcommand*\contentsname{Inhalt}} } +\AtEndPreamble{ +% License +\PassOptionsToPackage{% + imagewidth=8em, + imagedistance=1em, + imagemodifier=-eu, + hyphenation=RaggedRight, + type={CC}, + modifier={by-nc-nd}, + version={4.0}}{doclicense} +\RequirePackage{doclicense} +} \newcommand\impressum{% \bgroup @@ -250,6 +266,20 @@ \end{labeling} \vspace*{-.5em} \noindent\translate{appform}\par +\setlength{\doclicense@hsize}{\textwidth-\doclicense@imagewidth-\doclicense@imagedistance}% +\begin{center} + \begin{minipage}{\doclicense@imagewidth} + \doclicenseImage% + \end{minipage} + \hfill + \begin{minipage}{\doclicense@hsize} + \ifthenelse{\isempty{\doclicense@hyphenation}}{}{% + \@nameuse{\doclicense@hyphenation}% + }% + \translate{license}% + \end{minipage} + \end{center} +\par \egroup } 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 1f59f379681..de2c9fb904d 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}[2018/02/13 v1.2 biblatex bibliography style] +\ProvidesFile{univie-ling.bbx}[2018/03/02 v1.3 biblatex bibliography style] % Load base style (authoryear) \RequireBibliographyStyle{authoryear} @@ -47,6 +47,10 @@ sorting=nyt, abbreviate, dateabbrev=false, + dateera=secular, + datezeros=false, + datecirca=true, + dateuncertain=true, dashed=false, isbn=false, eprint=false, @@ -112,7 +116,7 @@ \iffieldundef{pubstate}{% \iffieldundef{labelyear}{}{% \printlabeldateextra% - \iffieldundef{origyear}{}{\addspace\mkbibbrackets{\printorigdate}} + \iffieldundef{origyear}{}{\addspace\mkbibbrackets{\printorigdate}}% \clearfield{year}% }% }{% @@ -712,13 +716,13 @@ \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% - \setunit{\bibpagerefpunct}\newblock + \setunit{\bibpagerefpunct}\newblock% \usebibmacro{pageref}% \newunit\newblock \iftoggle{bbx:related} {\usebibmacro{related:init}% \usebibmacro{related}} - {}} + {}}% {\usebibmacro{author/translator+others}% \setunit{\labelnamepunct}\newblock \usebibmacro{title}% @@ -732,7 +736,7 @@ \printfield{version}% \newunit\newblock \usebibmacro{unified:proc-as-article:maintitle+booktitle}% - \usebibmacro{unified:proc-as-article:volume+number+eid} + \usebibmacro{unified:proc-as-article:volume+number+eid}% \newunit\newblock% \newblock ensures period before pages \usebibmacro{note+pages}% \newunit\newblock @@ -749,7 +753,7 @@ \iftoggle{bbx:related} {\usebibmacro{related:init}% \usebibmacro{related}} - {}} + {}}% \usebibmacro{finentry}} \DeclareBibliographyDriver{thesis}{% 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 b235bb9b2cf..6599851a89e 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}[2018/02/13 v1.2 biblatex citation style] +\ProvidesFile{univie-ling.cbx}[2018/03/02 v1.3 biblatex citation style] \RequireCitationStyle{authoryear} @@ -83,8 +83,11 @@ \renewcommand*{\postnotedelim}{\addcolon\space} -\DeclareFieldFormat{postnote}{#1} -\DeclareFieldFormat{multipostnote}{#1} +% Fallback for biblatex < 3.11 +\AtBeginDocument{\providecommand*\mknormrange[1]{#1}} + +\DeclareFieldFormat{postnote}{\mknormrange{#1}} +\DeclareFieldFormat{multipostnote}{\mknormrange{#1}} \renewcommand*{\multicitedelim}{\addsemicolon\space} \renewcommand*{\finalnamedelim}{\addspace\&\addspace} -- cgit v1.2.3