From 58a234fa3ade348318dca1e7dda75b251a7635ce Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 3 Sep 2018 21:13:16 +0000 Subject: univie-ling (3sep18) git-svn-id: svn://tug.org/texlive/trunk@48567 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/univie-ling/README | 6 +++ .../doc/latex/univie-ling/univie-ling-expose.pdf | Bin 441905 -> 444329 bytes .../doc/latex/univie-ling/univie-ling-expose.tex | 38 +++++++++++++++++- .../doc/latex/univie-ling/univie-ling-paper.pdf | Bin 436990 -> 439029 bytes .../doc/latex/univie-ling/univie-ling-paper.tex | 36 ++++++++++++++++- .../doc/latex/univie-ling/univie-ling-thesis.pdf | Bin 440559 -> 442966 bytes .../doc/latex/univie-ling/univie-ling-thesis.tex | 36 ++++++++++++++++- .../doc/latex/univie-ling/univie-ling-wlg.pdf | Bin 325764 -> 328790 bytes .../doc/latex/univie-ling/univie-ling-wlg.tex | 43 ++++++++++++++++++++- .../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 | 19 +++++++-- .../tex/latex/univie-ling/univie-ling.bbx | 2 +- .../tex/latex/univie-ling/univie-ling.cbx | 2 +- 15 files changed, 206 insertions(+), 15 deletions(-) diff --git a/Master/texmf-dist/doc/latex/univie-ling/README b/Master/texmf-dist/doc/latex/univie-ling/README index 46f8f70f39b..a4e711d8c6f 100644 --- a/Master/texmf-dist/doc/latex/univie-ling/README +++ b/Master/texmf-dist/doc/latex/univie-ling/README @@ -80,6 +80,12 @@ also have a look at the example files. == CHANGES == +V. 1.5 (2018-09-03) + - all classes: + * Introduce subexamples environment. + - univie-ling-wlg: + * Fix expertfonts option. + V. 1.4 (2018-04-26): - univie-ling.bbx: Fix journal dates (if month and day is given). 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 ef1864dbe13..43e33bfc234 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 358e59a02d0..d18ec151c62 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.4, 2018/04/26} +\date{Version 1.5, 2018/09/03} \maketitle @@ -243,6 +243,39 @@ You can redefine each of these commands, if needed, like this: \renewcommand*\Meaning[1]{\enquote*{#1}} \end{lstlisting} +\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. + \section{Bibliography}\label{bibliography} \subsection{Default bibliography style (\emph{Unified Style for Linguistics})} @@ -308,7 +341,8 @@ Templates are provided as well: \section{Release History} -\begin{description} +\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. 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 b1acd5133e2..ec30f96e165 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 1d7980c0152..d5f0791bdcc 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.4, 2018/04/26} +\date{Version 1.5, 2018/09/03} \maketitle @@ -269,6 +269,39 @@ You can redefine each of these commands, if needed, like this: \renewcommand*\Meaning[1]{\enquote*{#1}} \end{lstlisting} +\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. + \section{Bibliography}\label{bibliography} \subsection{Default bibliography style (\emph{Unified Style for Linguistics})} @@ -335,6 +368,7 @@ 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. 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 89097e64736..16207793351 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 4011faa1b4e..bd6b0574cd0 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.4, 2018/04/26} +\date{Version 1.5, 2018/09/03} \maketitle @@ -268,6 +268,39 @@ You can redefine each of these commands, if needed, like this: \renewcommand*\Meaning[1]{\enquote*{#1}} \end{lstlisting} +\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. + \section{Bibliography}\label{bibliography} \subsection{Default bibliography style (\emph{Unified Style for Linguistics})} @@ -359,6 +392,7 @@ 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. 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 10547b6933e..6267b780009 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 b6ad80f31bb..9b0d70f3e50 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.4, 2018/04/26} +\date{Version 1.5, 2018/09/03} \maketitle @@ -116,7 +116,7 @@ and crucial if you need an alternative package that conflicts with one of the pr \begin{description} \setlength\itemsep{0pt} - \item{\joption{biblatex=true|false}}: If \joption{true}, \textsf{biblatex} is loaded with a suitable style. This is actually ecnouraged. + \item{\joption{biblatex=true|false}}: If \joption{true}, \textsf{biblatex} is loaded with a suitable style. This is actually encouraged. See sec.~\ref{bibliography} for details. \item{\joption{covington=true|false}}: If \joption{false}, \textsf{covington} is not loaded. Covington is used for numbered examples. \end{description} @@ -189,6 +189,40 @@ You can redefine each of these commands, if needed, like this: Furthermore, the class features a \jcsmacro{versal\{\}} macro to typeset capital text and acronyms (slightly scaled and tracked). + +\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. + \section{Bibliography}\label{bibliography} If the class option \joption{biblatex=true} is set, the \uvlt\ class loads a bibliography style which matches journal style sheet. These conventions draw on the @@ -204,6 +238,11 @@ A template is provided as well: \url{https://github.com/jspitz/univie-ling/raw/m \section{Release History} \begin{itemize} + \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. 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 fc6ae4c1ea8..256a638ff9e 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/04/25 v1.4 Univie Linguistic Exposes (JSp)] +\ProvidesPackage{univie-ling-expose}[2018/09/03 v1.5 Univie Linguistic Exposes (JSp)] \RequirePackage{xkeyval} @@ -549,6 +549,17 @@ \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 dfee3ec2b1f..32487e33057 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/04/25 v1.4 Univie Linguistic Papers (JSp)] +\ProvidesPackage{univie-ling-paper}[2018/09/03 v1.5 Univie Linguistic Papers (JSp)] \RequirePackage{xkeyval} @@ -652,6 +652,17 @@ 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 12e952e6d3b..932ce8ec56c 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/04/25 v1.4 Univie Linguistic Theses (JSp)] +\ProvidesPackage{univie-ling-thesis}[2018/09/03 v1.5 Univie Linguistic Theses (JSp)] \RequirePackage{xkeyval} @@ -606,6 +606,17 @@ \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 8d0041005a7..0fd75b9a5e8 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/04/25 v1.4 WLG journal layout (JSp)] +\ProvidesPackage{univie-ling-wlg}[2018/09/03 v1.5 WLG journal layout (JSp)] %% ============================================================ @@ -75,10 +75,10 @@ % expertfonts= % Load MinionPro \define@boolkey+{wlg}{expertf}[true]{% - \ifKV@wlg@covington - \covingtontrue + \ifKV@wlg@expertf + \experttrue \else - \covingtonfalse + \expertfalse \fi }{% \ClassWarning{univie-ling-wlg}{unknown expertfonts value}% @@ -863,6 +863,17 @@ 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 90ee0918ffb..9c0b0d6a2b6 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/04/25 v1.4 biblatex bibliography style] +\ProvidesFile{univie-ling.bbx}[2018/09/03 v1.5 biblatex bibliography style] % Load base style (authoryear) \RequireBibliographyStyle{authoryear} 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 fff8e6e2593..d241bff6e9d 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/04/25 v1.4 biblatex citation style] +\ProvidesFile{univie-ling.cbx}[2018/09/03 v1.5 biblatex citation style] \RequireCitationStyle{authoryear} -- cgit v1.2.3