From b44760ef7d0945c16ec58b85b8820135cb82ac1b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 4 Nov 2018 20:28:00 +0000 Subject: univie-ling (4nov18) git-svn-id: svn://tug.org/texlive/trunk@49080 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/univie-ling/README | 8 +- .../doc/latex/univie-ling/univie-ling-expose.pdf | Bin 444329 -> 443390 bytes .../doc/latex/univie-ling/univie-ling-expose.tex | 60 ++----- .../doc/latex/univie-ling/univie-ling-paper.pdf | Bin 439029 -> 438503 bytes .../doc/latex/univie-ling/univie-ling-paper.tex | 62 +++---- .../doc/latex/univie-ling/univie-ling-thesis.pdf | Bin 442966 -> 442018 bytes .../doc/latex/univie-ling/univie-ling-thesis.tex | 64 +++---- .../doc/latex/univie-ling/univie-ling-wlg.pdf | Bin 328790 -> 329436 bytes .../doc/latex/univie-ling/univie-ling-wlg.tex | 55 ++---- .../tex/latex/univie-ling/univie-ling-expose.cls | 13 +- .../tex/latex/univie-ling/univie-ling-paper.cls | 13 +- .../tex/latex/univie-ling/univie-ling-thesis.cls | 13 +- .../tex/latex/univie-ling/univie-ling-wlg.cls | 13 +- .../tex/latex/univie-ling/univie-ling.bbx | 191 ++++++++++++--------- .../tex/latex/univie-ling/univie-ling.cbx | 2 +- 15 files changed, 201 insertions(+), 293 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/univie-ling/README b/Master/texmf-dist/doc/latex/univie-ling/README index a4e711d8c6f..7dbed5a54a8 100644 --- a/Master/texmf-dist/doc/latex/univie-ling/README +++ b/Master/texmf-dist/doc/latex/univie-ling/README @@ -80,7 +80,13 @@ also have a look at the example files. == CHANGES == -V. 1.5 (2018-09-03) +V. 1.6 (2018-11-04): + - all classes: + * Remove subexamples environment, since this is now provided + by covington. + - univie-ling.bbx: fix bookauthor with inbook type. + +V. 1.5 (2018-09-03): - all classes: * Introduce subexamples environment. - univie-ling-wlg: diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.pdf b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.pdf index 43e33bfc234..2ecb326fbb1 100644 Binary files a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.pdf and b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.pdf differ diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.tex b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.tex index d18ec151c62..f5e027ac330 100644 --- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.tex +++ b/Master/texmf-dist/doc/latex/univie-ling/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.5, 2018/09/03} +\date{Version 1.6, 2018/11/04} \maketitle @@ -245,36 +245,8 @@ You can redefine each of these commands, if needed, like this: \section{Linguistic examples and glosses} -The class automatically loads the \textsf{covington} package which provides macros for examples and glosses. Please refer to the \textsf{covington} manual for details. - -In addition to \textsf{covington}'s own macros, \uvlt\ defines a \jmacro{subexamples} environment for sub-examples. The code -\begin{lstlisting}[language={[LaTeX]TeX},basicstyle={\small\ttfamily},frame=single,morekeywords={enquote}] -\begin{subexamples} -\item First subexample. -\item Second subexample. -\end{subexamples} -\end{lstlisting} -will print something like this: -\begin{enumerate} - \item[(1)] - \begin{enumerate} - \item[(a)] First subexample. - \item[(b)] Second subexample. - \end{enumerate} -\end{enumerate} -as opposed to \textsf{covington}'s -\begin{lstlisting}[language={[LaTeX]TeX},basicstyle={\small\ttfamily},frame=single,morekeywords={enquote}] -\begin{examples} -\item First example. -\item Second example. -\end{examples} -\end{lstlisting} -which will print: -\begin{enumerate} - \item[(1)] First example. - \item[(2)] Second example. -\end{enumerate} -An \jcsmacro{item} can also hold glosses. +The class automatically loads the \textsf{covington} package which provides macros for examples and glosses. +Please refer to the \textsf{covington} manual \cite{covington} for details. \section{Bibliography}\label{bibliography} @@ -342,35 +314,41 @@ Templates are provided as well: \section{Release History} \begin{description} - \item 2018/09/03 (v. 1.5) Introduce \jmacro{subexamples} environment. - \item 2018/04/26 (v. 1.4) Fix full date issue in biblatex bibliography style. - \item 2018/03/02 (v. 1.3) No change to this class. - \item 2018/02/13 (v. 1.2) No change to this class. - \item 2018/02/11 (v. 1.1) No change to this class. - \item 2018/02/08 (v. 1.0) + \item 2018/11/04 (v.\,1.6) Remove \jmacro{subexamples} environment as this is now + provided by \textsf{covington}. + \item 2018/09/03 (v.\,1.5) Introduce \jmacro{subexamples} environment. + \item 2018/04/26 (v.\,1.4) Fix full date issue in biblatex bibliography style. + \item 2018/03/02 (v.\,1.3) No change to this class. + \item 2018/02/13 (v.\,1.2) No change to this class. + \item 2018/02/11 (v.\,1.1) No change to this class. + \item 2018/02/08 (v.\,1.0) \begin{itemize} \item Switch default bibliography style (from APA to Unified). \item Initial release to CTAN. \end{itemize} - \item 2016/05/05 (v. 0.7) + \item 2016/05/05 (v.\,0.7) \begin{itemize} \item Fix comma after \emph{et al.} with \textsf{biblatex-apa}. \end{itemize} - \item 2016/04/30 (v. 0.6) + \item 2016/04/30 (v.\,0.6) \begin{itemize} \item Set proper citation command for csquotes' integrated environments. \item Improve templates. \end{itemize} - \item 2016/03/23 (v. 0.5) + \item 2016/03/23 (v.\,0.5) \begin{itemize} \item Fix the output of German multi-name citations (DGPs guidelines). \item Extend documentation of bibliographic features. \end{itemize} - \item 2016/01/29 (v. 0.4) Initial release. + \item 2016/01/29 (v.\,0.4) Initial release. \end{description} \begin{thebibliography}{1} +\bibitem{covington} Covington, Michael A. and Spitzmüller, Jürgen: +\emph{The covington Package. Macros for Linguistics}. September 7, 2018. +\url{http://www.ctan.org/pkg/covington}. + \bibitem{apabibltx} Kime, Philip: \emph{APA Bib\LaTeX\ style. Citation and References macros for Bib\LaTeX}. March 3, 2016. \url{http://www.ctan.org/pkg/biblatex-apa}. diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.pdf b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.pdf index ec30f96e165..5f2b63fed80 100644 Binary files a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.pdf and b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.pdf differ diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.tex b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.tex index d5f0791bdcc..3f4b41490b6 100644 --- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.tex +++ b/Master/texmf-dist/doc/latex/univie-ling/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.5, 2018/09/03} +\date{Version 1.6, 2018/11/04} \maketitle @@ -271,36 +271,8 @@ You can redefine each of these commands, if needed, like this: \section{Linguistic examples and glosses} -The class automatically loads the \textsf{covington} package which provides macros for examples and glosses. Please refer to the \textsf{covington} manual for details. - -In addition to \textsf{covington}'s own macros, \uvlt\ defines a \jmacro{subexamples} environment for sub-examples. The code -\begin{lstlisting}[language={[LaTeX]TeX},basicstyle={\small\ttfamily},frame=single,morekeywords={enquote}] -\begin{subexamples} -\item First subexample. -\item Second subexample. -\end{subexamples} -\end{lstlisting} -will print something like this: -\begin{enumerate} - \item[(1)] - \begin{enumerate} - \item[(a)] First subexample. - \item[(b)] Second subexample. - \end{enumerate} -\end{enumerate} -as opposed to \textsf{covington}'s -\begin{lstlisting}[language={[LaTeX]TeX},basicstyle={\small\ttfamily},frame=single,morekeywords={enquote}] -\begin{examples} -\item First example. -\item Second example. -\end{examples} -\end{lstlisting} -which will print: -\begin{enumerate} - \item[(1)] First example. - \item[(2)] Second example. -\end{enumerate} -An \jcsmacro{item} can also hold glosses. +The class automatically loads the \textsf{covington} package which provides macros for examples and glosses. +Please refer to the \textsf{covington} manual \cite{covington} for details. \section{Bibliography}\label{bibliography} @@ -368,36 +340,38 @@ Templates are provided as well: \section{Release History} \begin{itemize} - \item 2018/09/03 (v. 1.5) Introduce \jmacro{subexamples} environment. - \item 2018/04/26 (v. 1.4) Fix full date issue in biblatex bibliography style. - \item 2018/03/02 (v. 1.3) No change to this class. - \item 2018/02/13 (v. 1.2) No change to this class. - \item 2018/02/11 (v. 1.1) No change to this class. - \item 2018/02/08 (v. 1.0) + \item 2018/11/04 (v.\,1.6) Remove \jmacro{subexamples} environment as this is now + provided by \textsf{covington}. + \item 2018/09/03 (v.\,1.5) Introduce \jmacro{subexamples} environment. + \item 2018/04/26 (v.\,1.4) Fix full date issue in biblatex bibliography style. + \item 2018/03/02 (v.\,1.3) No change to this class. + \item 2018/02/13 (v.\,1.2) No change to this class. + \item 2018/02/11 (v.\,1.1) No change to this class. + \item 2018/02/08 (v.\,1.0) \begin{itemize} \item Switch default bibliography style (from APA to Unified). \item Initial release to CTAN. \end{itemize} - \item 2016/09/07 (v. 0.8) + \item 2016/09/07 (v.\,0.8) \begin{itemize} \item Improve \jcsmacro{makedeclaration} output. \end{itemize} - \item 2016/05/05 (v. 0.7) + \item 2016/05/05 (v.\,0.7) \begin{itemize} \item Fix comma after \emph{et al.} with \textsf{biblatex-apa}. \end{itemize} - \item 2016/04/30 (v. 0.6) + \item 2016/04/30 (v.\,0.6) \begin{itemize} \item Reset the alignment after declaration. \item Set proper citation command for csquotes' integrated environments. \item Improve templates. \end{itemize} - \item 2016/03/23 (v. 0.5) + \item 2016/03/23 (v.\,0.5) \begin{itemize} \item Fix the output of German multi-name citations (DGPs guidelines). \item Extend documentation of bibliographic features. \end{itemize} - \item 2016/01/25 (v. 0.4): First (documented) release. + \item 2016/01/25 (v.\,0.4): First (documented) release. \begin{itemize} \item Add \jcsmacro{makedeclaration} command. \item Possibility to disable some pre-loaded packages. @@ -407,6 +381,10 @@ Templates are provided as well: \begin{thebibliography}{1} +\bibitem{covington} Covington, Michael A. and Spitzmüller, Jürgen: +\emph{The covington Package. Macros for Linguistics}. September 7, 2018. +\url{http://www.ctan.org/pkg/covington}. + \bibitem{apabibltx} Kime, Philip: \emph{APA Bib\LaTeX\ style. Citation and References macros for Bib\LaTeX}. March 3, 2016. \url{http://www.ctan.org/pkg/biblatex-apa}. diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.pdf b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.pdf index 16207793351..b1e01d7435d 100644 Binary files a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.pdf and b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.pdf differ diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.tex b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.tex index bd6b0574cd0..14173c9bb3f 100644 --- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.tex +++ b/Master/texmf-dist/doc/latex/univie-ling/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.5, 2018/09/03} +\date{Version 1.6, 2018/11/04} \maketitle @@ -270,36 +270,8 @@ You can redefine each of these commands, if needed, like this: \section{Linguistic examples and glosses} -The class automatically loads the \textsf{covington} package which provides macros for examples and glosses. Please refer to the \textsf{covington} manual for details. - -In addition to \textsf{covington}'s own macros, \uvlt\ defines a \jmacro{subexamples} environment for sub-examples. The code -\begin{lstlisting}[language={[LaTeX]TeX},basicstyle={\small\ttfamily},frame=single,morekeywords={enquote}] -\begin{subexamples} -\item First subexample. -\item Second subexample. -\end{subexamples} -\end{lstlisting} -will print something like this: -\begin{enumerate} - \item[(1)] - \begin{enumerate} - \item[(a)] First subexample. - \item[(b)] Second subexample. - \end{enumerate} -\end{enumerate} -as opposed to \textsf{covington}'s -\begin{lstlisting}[language={[LaTeX]TeX},basicstyle={\small\ttfamily},frame=single,morekeywords={enquote}] -\begin{examples} -\item First example. -\item Second example. -\end{examples} -\end{lstlisting} -which will print: -\begin{enumerate} - \item[(1)] First example. - \item[(2)] Second example. -\end{enumerate} -An \jcsmacro{item} can also hold glosses. +The class automatically loads the \textsf{covington} package which provides macros for examples and glosses. +Please refer to the \textsf{covington} manual \cite{covington} for details. \section{Bibliography}\label{bibliography} @@ -392,40 +364,42 @@ Templates are provided as well: \section{Release History} \begin{itemize} - \item 2018/09/03 (v. 1.5) Introduce \jmacro{subexamples} environment. - \item 2018/04/26 (v. 1.4) Fix full date issue in biblatex bibliography style. - \item 2018/03/02 (v. 1.3) No change to this class. - \item 2018/02/13 (v. 1.2) No change to this class. - \item 2018/02/11 (v. 1.1) No change to this class. - \item 2018/02/08 (v. 1.0) + \item 2018/11/04 (v.\,1.6) Remove \jmacro{subexamples} environment as this is now + provided by \textsf{covington}. + \item 2018/09/03 (v.\,1.5) Introduce \jmacro{subexamples} environment. + \item 2018/04/26 (v.\,1.4) Fix full date issue in biblatex bibliography style. + \item 2018/03/02 (v.\,1.3) No change to this class. + \item 2018/02/13 (v.\,1.2) No change to this class. + \item 2018/02/11 (v.\,1.1) No change to this class. + \item 2018/02/08 (v.\,1.0) \begin{itemize} \item Switch default bibliography style (from APA to Unified). \item Initial release to CTAN. \end{itemize} - \item 2016/05/05 (v. 0.9) + \item 2016/05/05 (v.\,0.9) \begin{itemize} \item Fix comma after \emph{et al.} with \textsf{biblatex-apa}. \end{itemize} - \item 2016/04/30 (v. 0.8) + \item 2016/04/30 (v.\,0.8) \begin{itemize} \item Set proper citation command for csquotes' integrated environments. \item Improve templates. \end{itemize} - \item 2016/04/28 (v. 0.7) + \item 2016/04/28 (v.\,0.7) \begin{itemize} \item Fix leading of thesis type on title page. \end{itemize} - \item 2016/03/23 (v. 0.6) + \item 2016/03/23 (v.\,0.6) \begin{itemize} \item Fix the output of German multi-name citations (DGPs guidelines). \item Extend documentation of bibliographic features. \end{itemize} - \item 2016/02/08 (v. 0.5) + \item 2016/02/08 (v.\,0.5) \begin{itemize} \item Fix the PDF logo for PDF/A output. \item Extend documentation of PDF/A production. \end{itemize} - \item 2016/01/25 (v. 0.4) First (documented) release. + \item 2016/01/25 (v.\,0.4) First (documented) release. \begin{itemize} \item Title page layout has been adapted to the new (bilingual) standards. \item add \joption{bachelor} thesis type. @@ -436,6 +410,10 @@ Templates are provided as well: \begin{thebibliography}{1} +\bibitem{covington} Covington, Michael A. and Spitzmüller, Jürgen: +\emph{The covington Package. Macros for Linguistics}. September 7, 2018. +\url{http://www.ctan.org/pkg/covington}. + \bibitem{apabibltx} Kime, Philip: \emph{APA Bib\LaTeX\ style. Citation and References macros for Bib\LaTeX}. March 3, 2016. \url{http://www.ctan.org/pkg/biblatex-apa}. diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.pdf b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.pdf index 6267b780009..d7b5e390656 100644 Binary files a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.pdf and b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.pdf differ diff --git a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.tex b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.tex index 9b0d70f3e50..34cc01680bc 100644 --- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.tex +++ b/Master/texmf-dist/doc/latex/univie-ling/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.5, 2018/09/03} +\date{Version 1.6, 2018/11/04} \maketitle @@ -192,36 +192,8 @@ Furthermore, the class features a \jcsmacro{versal\{\}} macro to typeset c \section{Linguistic examples and glosses} -The class automatically loads the \textsf{covington} package which provides macros for examples and glosses. Please refer to the \textsf{covington} manual for details. - -In addition to \textsf{covington}'s own macros, \uvlt\ defines a \jmacro{subexamples} environment for sub-examples. The code -\begin{lstlisting}[language={[LaTeX]TeX},basicstyle={\small\ttfamily},frame=single,morekeywords={enquote}] -\begin{subexamples} -\item First subexample. -\item Second subexample. -\end{subexamples} -\end{lstlisting} -will print something like this: -\begin{enumerate} - \item[(1)] - \begin{enumerate} - \item[(a)] First subexample. - \item[(b)] Second subexample. - \end{enumerate} -\end{enumerate} -as opposed to \textsf{covington}'s -\begin{lstlisting}[language={[LaTeX]TeX},basicstyle={\small\ttfamily},frame=single,morekeywords={enquote}] -\begin{examples} -\item First example. -\item Second example. -\end{examples} -\end{lstlisting} -which will print: -\begin{enumerate} - \item[(1)] First example. - \item[(2)] Second example. -\end{enumerate} -An \jcsmacro{item} can also hold glosses. +The class automatically loads the \textsf{covington} package which provides macros for examples and glosses. +Please refer to the \textsf{covington} manual \cite{covington} for details. \section{Bibliography}\label{bibliography} @@ -235,18 +207,29 @@ A layout for \LyX\footnote{See \url{https://www.lyx.org}.}\ can be retrieved fro A template is provided as well: \url{https://github.com/jspitz/univie-ling/raw/master/lyx/templates/template-wlg-article.lyx}. +\clearpage + \section{Release History} \begin{itemize} - \item 2018/09/03 (v. 1.5) + \item 2018/11/04 (v.\,1.6) Remove \jmacro{subexamples} environment as this is now provided by \textsf{covington}. + \item 2018/09/03 (v.\,1.5) \begin{itemize} \item Introduce \jmacro{subexamples} environment. \item Fix \joption{expertfonts} option. \end{itemize} - \item 2018/04/26 (v. 1.4) Fix full date issue in biblatex bibliography style. - \item 2018/03/02 (v. 1.3) Add (CC BY-NC-ND-4.0) license statement to copyright page (via \textsf{doclicense} package). - \item 2018/02/13 (v. 1.2) Rename \texttt{wlg.cls} to \texttt{univie-ling-wlg.cls} as per TeXLive request. - \item 2018/02/11 (v. 1.1) Initial release to CTAN. + \item 2018/04/26 (v.\,1.4) Fix full date issue in biblatex bibliography style. + \item 2018/03/02 (v.\,1.3) Add (CC BY-NC-ND-4.0) license statement to copyright page (via \textsf{doclicense} package). + \item 2018/02/13 (v.\,1.2) Rename \texttt{wlg.cls} to \texttt{univie-ling-wlg.cls} as per TeXLive request. + \item 2018/02/11 (v.\,1.1) Initial release to CTAN. \end{itemize} +\begin{thebibliography}{1} + + \bibitem{covington} Covington, Michael A. and Spitzmüller, Jürgen: + \emph{The covington Package. Macros for Linguistics}. September 7, 2018. + \url{http://www.ctan.org/pkg/covington}. + +\end{thebibliography} + \end{document} 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 256a638ff9e..93f59f5f96a 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/09/03 v1.5 Univie Linguistic Exposes (JSp)] +\ProvidesPackage{univie-ling-expose}[2018/11/04 v1.6 Univie Linguistic Exposes (JSp)] \RequirePackage{xkeyval} @@ -549,17 +549,6 @@ \ifcovington \RequirePackage{covington} \renewcommand{\p@equation}[1]{(#1)} -\newenvironment{subexamples}{% - \begin{example} - \begin{enumerate}[leftmargin=1.35em] - \renewcommand\theenumi{\alph{enumi}} - \renewcommand\labelenumi{(\theenumi)} - \renewcommand\p@enumi{\theequation\,}% -}% -{% - \end{enumerate} - \end{example} -} \fi %% ============================================================= 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 32487e33057..afeaf1eff90 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/09/03 v1.5 Univie Linguistic Papers (JSp)] +\ProvidesPackage{univie-ling-paper}[2018/11/04 v1.6 Univie Linguistic Papers (JSp)] \RequirePackage{xkeyval} @@ -652,17 +652,6 @@ This includes all drawings, sketches, graphics and internet sources.} \ifcovington \RequirePackage{covington} \renewcommand{\p@equation}[1]{(#1)} -\newenvironment{subexamples}{% - \begin{example} - \begin{enumerate}[leftmargin=1.35em] - \renewcommand\theenumi{\alph{enumi}} - \renewcommand\labelenumi{(\theenumi)} - \renewcommand\p@enumi{\theequation\,}% -}% -{% - \end{enumerate} - \end{example} -} \fi %% ============================================================= 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 932ce8ec56c..48a23773acc 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/09/03 v1.5 Univie Linguistic Theses (JSp)] +\ProvidesPackage{univie-ling-thesis}[2018/11/04 v1.6 Univie Linguistic Theses (JSp)] \RequirePackage{xkeyval} @@ -606,17 +606,6 @@ \ifcovington \RequirePackage{covington} \renewcommand{\p@equation}[1]{(#1)} -\newenvironment{subexamples}{% - \begin{example} - \begin{enumerate}[leftmargin=1.35em] - \renewcommand\theenumi{\alph{enumi}} - \renewcommand\labelenumi{(\theenumi)} - \renewcommand\p@enumi{\theequation\,}% -}% -{% - \end{enumerate} - \end{example} -} \fi %% ============================================================= 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 0fd75b9a5e8..adf34238a71 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/09/03 v1.5 WLG journal layout (JSp)] +\ProvidesPackage{univie-ling-wlg}[2018/11/04 v1.6 WLG journal layout (JSp)] %% ============================================================ @@ -863,17 +863,6 @@ pdfborder={0 0 0} \ifcovington \RequirePackage{covington} \renewcommand{\p@equation}[1]{(#1)} -\newenvironment{subexamples}{% - \begin{example} - \begin{enumerate}[leftmargin=1.35em] - \renewcommand\theenumi{\alph{enumi}} - \renewcommand\labelenumi{(\theenumi)} - \renewcommand\p@enumi{\theequation\,}% -}% -{% - \end{enumerate} - \end{example} -} \fi 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 9c0b0d6a2b6..4c65d94e357 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/09/03 v1.5 biblatex bibliography style] +\ProvidesFile{univie-ling.bbx}[2018/11/04 v1.6 biblatex bibliography style] % Load base style (authoryear) \RequireBibliographyStyle{authoryear} @@ -420,6 +420,11 @@ \newunit}% \usebibmacro{byeditorx}} +\renewbibmacro*{bybookauthor}{% + \ifnamesequal{author}{bookauthor} + {\bibstring{idem}} + {\printnames{bookauthor}}} + \renewbibmacro*{chapter+pages}{% \iffieldundef{chapter}% {}% @@ -671,89 +676,113 @@ \DeclareBibliographyAlias{incollection}{inproceedings} -\DeclareBibliographyAlias{inbook}{incollection} - \DeclareBibliographyDriver{inproceedings}{% \usebibmacro{bibindex}% \usebibmacro{begentry}% - \iffieldundef{issn} - {\usebibmacro{author/translator+others}% - \setunit{\labelnamepunct}\newblock - \usebibmacro{title}% - \newunit - \printlist{language}% - \newunit\newblock - \usebibmacro{byauthor}% - \usebibmacro{bytranslator+others}% - \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{author/translator+others}% + \setunit{\labelnamepunct}\newblock + \usebibmacro{title}% + \newunit + \printlist{language}% + \newunit\newblock + \usebibmacro{byauthor}% + \usebibmacro{bytranslator+others}% + \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{finentry}} + +\DeclareBibliographyDriver{inbook}{% + \usebibmacro{bibindex}% + \usebibmacro{begentry}% + \usebibmacro{author/translator+others}% + \setunit{\labelnamepunct}\newblock + \usebibmacro{title}% + \newunit + \printlist{language}% + \newunit\newblock + \usebibmacro{byauthor}% + \usebibmacro{bytranslator+others}% + \newunit\newblock + \usebibmacro{in:}% + \ifnameundef{bookauthor}{ + \ifnameundef{editor} + {\setunit{\addspace}} + {\usebibmacro{byeditor+others}\setunit{\addcomma\space}} + }{% + \usebibmacro{bybookauthor}% + } + \usebibmacro{maintitle+booktitle}% + \ifnameundef{editor} + {\setunit{\addspace}} + {\usebibmacro{byeditor+others}} + \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{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 d241bff6e9d..8dae4faaceb 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/09/03 v1.5 biblatex citation style] +\ProvidesFile{univie-ling.cbx}[2018/11/04 v1.6 biblatex citation style] \RequireCitationStyle{authoryear} -- cgit v1.2.3