diff options
Diffstat (limited to 'Master')
18 files changed, 218 insertions, 86 deletions
diff --git a/Master/texmf-dist/doc/latex/univie-ling/README b/Master/texmf-dist/doc/latex/univie-ling/README index 3992b6e1a27..9ca2bd9af75 100644 --- a/Master/texmf-dist/doc/latex/univie-ling/README +++ b/Master/texmf-dist/doc/latex/univie-ling/README @@ -80,6 +80,16 @@ also have a look at the example files. == CHANGES == +V. 1.11 (2020-05-05): + - univie-ling-paper.cls: + - univie-ling-expose.cls: + - univie-ling-thesis.cls: + * new option "polyglossia" + - univie-ling-thesis.cls: + * new option "pdfa" + - univie-ling-wlg.cls: + * update editorial board information. + V. 1.10 (2020-05-01): - univie-ling-wlg.cls: * fix encoding incompatibilities. diff --git a/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-deutsch.pdf b/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-deutsch.pdf Binary files differindex 9365a6b6e6b..c1de8f5eb87 100644 --- a/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-deutsch.pdf +++ b/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-deutsch.pdf diff --git a/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-deutsch.tex b/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-deutsch.tex index 6f9a1eb5666..ec96559ba74 100644 --- a/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-deutsch.tex +++ b/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-deutsch.tex @@ -1,13 +1,10 @@ % Beispieldatei für die Klasse ``univie-ling-thesis'' % Ãœbersetzen mit pdflatex -- biber -- pdflatex -\documentclass[naustrian]{univie-ling-thesis} - -\usepackage{babel} - % Verwende den vom Hochschulschriftenservice verlangten Standard PDF/A1-b % (siehe http://e-theses.univie.ac.at/elektronische_einreichung.html) -\usepackage[a-1b]{pdfx} -\hypersetup{pdfborder={0 0 0}} +\documentclass[naustrian,pdfa]{univie-ling-thesis} + +\usepackage{babel} % Standardmäßig wird das Biblatex-Paket mit Unified-Stil und % Biber-Backend geladen. diff --git a/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-english.pdf b/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-english.pdf Binary files differindex 4978646332e..2c95c63b6da 100644 --- a/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-english.pdf +++ b/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-english.pdf diff --git a/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-english.tex b/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-english.tex index 7b479f47775..4fea4ea8b47 100644 --- a/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-english.tex +++ b/Master/texmf-dist/doc/latex/univie-ling/templates/template-thesis-english.tex @@ -1,13 +1,10 @@ % Example file for the class ``univie-ling-thesis'' % Run pdflatex -- biber -- pdflatex -\documentclass[naustrian,english]{univie-ling-thesis} - -\usepackage{babel} - % Use the PDF/A1-b standard as required by the Hochschulschriften-Service % (see http://e-theses.univie.ac.at/elektronische_einreichung.html) -\usepackage[a-1b]{pdfx} -\hypersetup{pdfborder={0 0 0}} +\documentclass[naustrian,english,pdfa]{univie-ling-thesis} + +\usepackage{babel} % By default, the class loads the biblatex package % with Unified style and biber backend. diff --git a/Master/texmf-dist/doc/latex/univie-ling/templates/template-wlg-article.pdf b/Master/texmf-dist/doc/latex/univie-ling/templates/template-wlg-article.pdf Binary files differindex 3f2849c4b84..4c6af984c7a 100644 --- a/Master/texmf-dist/doc/latex/univie-ling/templates/template-wlg-article.pdf +++ b/Master/texmf-dist/doc/latex/univie-ling/templates/template-wlg-article.pdf 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 Binary files differindex a0b21eae63f..2b17fcbea10 100644 --- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.pdf +++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-expose.pdf 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 26a611ffcdb..7f664a24d77 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.10, 2020/05/01} +\date{Version 1.11, 2020/05/05} \maketitle @@ -78,8 +78,6 @@ In this case, however, some settings might have to be adjusted. This manual docu \tableofcontents -\clearpage - \section{Aims and scope} The \uvlt\ class has been written mainly with my own field in mind: Applied Linguistics. Therefore, the defaults are closely tied to @@ -128,7 +126,8 @@ The following package is required for an optional feature (not used by default): \begin{itemize} \setlength\itemsep{0pt} \item \textsf{biblatex-apa}: APA style for \textsf{biblatex}. - \item \textsf{fontspec}: Load OpenType fonts (with LuaTeX or XeTeX) + \item \textsf{fontspec}: Load OpenType fonts (with LuaTeX or XeTeX). + \item \textsf{polyglossia}: Multi-language and script support. \end{itemize} \section{Fonts}\label{fonts} @@ -170,6 +169,11 @@ The class provides the following option to set the font handling: nor \textsf{fontenc} (this choice is useful if you want to control the font handling completely yourself). \end{description} +\subsection{Polyglossia} + +If you need \textsf{polyglossia} rather than \textsf{babel} for language support, please do not use the package yourself, but +rather use the package option \joption{polyglossia=true}. This assures correct loading order. This also presets \joption{fonts=otf}. + \subsection{Package loading}\label{packageloading} Most of the extra features provided by the class can be switched off. This might be useful if you do not need the respective feature anyway, @@ -315,6 +319,7 @@ Templates are provided as well: \section{Release History} \begin{description} + \item 2020/05/05 (v.\,1.11) New option \joption{polyglossia}. \item 2020/05/01 (v.\,1.10) No change to this class. \item 2019/01/21 (v.\,1.9) No change to this class. \item 2019/01/15 (v.\,1.8) 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 Binary files differindex 78f1ef1fb55..2c9a11aa077 100644 --- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.pdf +++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-paper.pdf 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 c6915889721..8e9e4329333 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.10, 2020/05/01} +\date{Version 1.11, 2020/05/05} \maketitle @@ -74,8 +74,6 @@ be adjusted. This manual documents the class as well as the configuration possib \tableofcontents -\clearpage - \section{Aims and scope} The \uvlt\ class has been written mainly with my own field in mind: Applied Linguistics. Therefore, the defaults are closely tied to @@ -120,8 +118,9 @@ The following packages are required for specific features and loaded by default. The following package is required for an optional feature (not used by default): \begin{itemize} \setlength\itemsep{0pt} - \item \textsf{fontspec}: Load OpenType fonts (with LuaTeX or XeTeX) + \item \textsf{fontspec}: Load OpenType fonts (with LuaTeX or XeTeX). \item \textsf{biblatex-apa}: APA style for \textsf{biblatex}. + \item \textsf{polyglossia}: Multi-language and script support. \end{itemize} \section{Fonts}\label{fonts} @@ -184,6 +183,11 @@ The class provides the following option to set the font handling: nor \textsf{fontenc} (this choice is useful if you want to control the font handling completely yourself). \end{description} +\subsection{Polyglossia} + +If you need \textsf{polyglossia} rather than \textsf{babel} for language support, please do not use the package yourself, but +rather use the package option \joption{polyglossia=true}. This assures correct loading order. This also presets \joption{fonts=otf}. + \subsection{Package loading}\label{packageloading} Most of the extra features provided by the class can be switched off. This might be useful if you do not need the respective feature anyway, @@ -339,6 +343,7 @@ Templates are provided as well: \section{Release History} \begin{itemize} + \item 2020/05/05 (v.\,1.11) New option \joption{polyglossia}. \item 2020/05/01 (v.\,1.10) No change to this class. \item 2019/01/21 (v.\,1.9) No change to this class. \item 2019/01/15 (v.\,1.8) Fix encoding of German declaration string. 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 Binary files differindex 471763d75c1..4f79c0ebe80 100644 --- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.pdf +++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-thesis.pdf 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 4c43f624cef..63979e76f8e 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.10, 2020/05/01} +\date{Version 1.11, 2020/05/05} \maketitle @@ -122,7 +122,9 @@ The following package is required for an optional feature (not used by default): \begin{itemize} \setlength\itemsep{0pt} \item \textsf{biblatex-apa}: APA style for \textsf{biblatex}. - \item \textsf{fontspec}: Load OpenType fonts (with LuaTeX or XeTeX) + \item \textsf{fontspec}: Load OpenType fonts (with LuaTeX or XeTeX). + \item \textsf{polyglossia}: Multi-language and script support. + \item \textsf{pdfa}: Create PDF/A compliant files. \end{itemize} \section{Fonts}\label{fonts} @@ -185,6 +187,11 @@ The class provides the following option to set the font handling: nor \textsf{fontenc} (this choice is useful if you want to control the font handling completely yourself). \end{description} +\subsection{Polyglossia} + +If you need \textsf{polyglossia} rather than \textsf{babel} for language support, please do not use the package yourself, but +rather use the package option \joption{polyglossia=true}. This assures correct loading order. This also presets \joption{fonts=otf}. + \subsection{Package loading}\label{packageloading} Most of the extra features provided by the class can be switched off. This might be useful if you do not need the respective feature anyway, @@ -213,6 +220,7 @@ option (e.\,g., \joption{all=false,microtype=true} will switch off all packages \begin{description} \setlength\itemsep{0pt} \item{\joption{fdegree=true|false}}: Prefer feminine forms for the targeted degree on the title page (such as \emph{Magistra}, \emph{Doktorin}). Default: \joption{false}. + \item{\joption{pdfa=true|false}}: Generate PDF/A compliant output (see sec.~\ref{sec:pdfa} for details). Default: \joption{false}. \end{description} The class builds on \textsf{scrreprt} (KOMA report), which provides many more options to tweak the appearance of your document. You can use all these options via the \jfcsmacro{KOMAoptions} macro. Please refer to the \textsf{KOMA-Script} manual \cite{koma} for details. @@ -323,24 +331,20 @@ Please refer to the comprehensive KOMA-Script manual \cite{koma} for information Please also refer to the template files included in the package for some further usage instructions and hints. -\subsection{Generating PDF/A} +\subsection{Generating PDF/A}\label{sec:pdfa} In order to submit your thesis to the \emph{Hochschulschriften-Server}, it must follow the PDF/A-1 or PDF/A-2 standard (a specific form of PDF aimed at long-time archiving).\footnote{\url{http://e-theses.univie.ac.at/pdf-erstellung.html}} -With PDFLaTeX or LuaTeX, you can achieve PDF/A-1b or PDF/A-2b compliant files by means of the \textsf{pdfx} package. If you do not use specific color profiles in +With PDFLaTeX or LuaTeX, you can achieve PDF/A-1b or PDF/A-2b compliant files by means of the \textsf{pdfx} package.\footnote{XeTeX also works with recent versions of the \textsf{pdfx} package, if you use the command line option \texttt{--shell-escape -output-driver="xdvipdfmx -z 0"} of \texttt{xelatex}. Please refer to the \textsf{pdfx} manual for details.} If you do not use specific color profiles in your document and provided that all your graphics follow the requirements of the PDF/A standard (all fonts embedded, no transparency groups etc.), producing -a PDF/A-1b compliant file is straightforward. Firstly, put the following to the preamble: - -\begin{lstlisting}[language={[LaTeX]TeX},basicstyle={\small\ttfamily},frame=single,morekeywords={hypersetup}] -\usepackage[a-1b]{pdfx} -\hypersetup{pdfborder={0 0 0}} -\end{lstlisting} -The second line is not strictly necessary, but it prevents that colored borders -are drawn around the hyperlinks in your document. +a PDF/A-1b compliant file is straightforward: -Secondly, create a text file called \texttt{<name>.xmpdata} (where <name> is to be replaced by the name of your [master] TeX file or the produced PDF file, respectively), which contains some metadata of your document (author's name, title, keywords, etc.). This file needs to be stored next to your TeX file(s). Example \texttt{*.xmpdata} files are included in the \uvlt\ bundle (and used -in the accompanying templates); you can use them as a model and adapt them to your needs. +\begin{enumerate} + \item Use the class option \joption{pdfa=true}. + \item Create a text file called \texttt{<name>.xmpdata} (where <name> is to be replaced by the name of your [master] TeX file or the produced PDF file, respectively), which contains some metadata of your document (author's name, title, keywords, etc.). This file needs to be stored next to your TeX file(s). Example \texttt{*.xmpdata} files are included in the \uvlt\ bundle (and used in the accompanying templates); you can use them as a model and adapt them to your needs. +\end{enumerate} +% Note that \textsf{pdfx} does not verify whether the produced output really conforms to the standard. You need to use a PDF/A verification tool to ensure that. If you own Adobe Acrobat Pro, you can use its \emph{preflight} tool for this task. Alternatively, a number of free validation programs and online services are available on the Internet. @@ -363,6 +367,10 @@ Templates are provided as well: \section{Release History} \begin{itemize} + \item 2020/05/05 (v.\,1.11)\begin{itemize} + \item New option \joption{polyglossia}. + \item New option \joption{pdfa}. + \end{itemize} \item 2020/05/01 (v.\,1.10) No change to this class. \item 2019/01/21 (v.\,1.9) No change to this class. \item 2019/01/15 (v.\,1.8) Fix title abbreviations (MA, BA). 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 Binary files differindex d9bac596d16..c29b6a72206 100644 --- a/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.pdf +++ b/Master/texmf-dist/doc/latex/univie-ling/univie-ling-wlg.pdf 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 34fc150c1ef..ad802460233 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.10, 2020/05/01} +\date{Version 1.11, 2020/05/05} \maketitle @@ -212,11 +212,12 @@ A template is provided as well: \url{https://github.com/jspitz/univie-ling/raw/m \section{Release History} \begin{itemize} + \item 2020/05/05 (v.\,1.11) Update editorial board info. \item 2020/05/01 (v.\,1.10) Fix encoding incompatibilities. - \item 2019/01/21 (v.\,1.9) No change to this class. - \item 2019/01/15 (v.\,1.8) No change to this class. - \item 2018/11/07 (v.\,1.7) No change to this class. - \item 2018/11/04 (v.\,1.6) Remove \jmacro{subexamples} environment as this is now provided by \textsf{covington}. + \item 2019/01/21 (v.\,1.9) No change to this class. + \item 2019/01/15 (v.\,1.8) No change to this class. + \item 2018/11/07 (v.\,1.7) No change to this class. + \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. 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 b135db0976b..d49c8fff59f 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}[2019/05/01 v1.10 Univie Linguistic Exposes (JSp)] +\ProvidesPackage{univie-ling-expose}[2020/05/05 v1.11 Univie Linguistic Exposes (JSp)] \RequirePackage{xkeyval} @@ -41,6 +41,10 @@ \newif\ifrefsp\refsptrue \newif\ifcovington\covingtontrue \newif\ifmicrotype\microtypetrue +\newif\ifpolyglossia\polyglossiafalse +\newif\ifpsfonts\psfontstrue +\newif\ifotffonts\otffontsfalse +\newif\ifnofonts\nofontsfalse % all=<true|false> % Load all packages @@ -61,7 +65,7 @@ }{% \ClassWarning{univie-ling-expose}{unknown 'all' value}% } -\DeclareOptionX{all}{\setkeys{uvt}{all=#1}} +\DeclareOptionX{all}[true]{\setkeys{uvt}{all=#1}} % biblatex=<true|false> % Load biblatex @@ -74,7 +78,7 @@ }{% \ClassWarning{univie-ling-expose}{unknown biblatex value}% } -\DeclareOptionX{biblatex}{\setkeys{uvt}{biblatex=#1}} +\DeclareOptionX{biblatex}[true]{\setkeys{uvt}{biblatex=#1}} % apa=<true|false> % Load APA style @@ -87,7 +91,7 @@ }{% \ClassWarning{univie-ling-paper}{unknown apa value}% } -\DeclareOptionX{apa}{\setkeys{uvt}{apa=#1}} +\DeclareOptionX{apa}[true]{\setkeys{uvt}{apa=#1}} % caption=<true|false> % Load caption @@ -100,7 +104,7 @@ }{% \ClassWarning{univie-ling-expose}{unknown caption value}% } -\DeclareOptionX{caption}{\setkeys{uvt}{caption=#1}} +\DeclareOptionX{caption}[true]{\setkeys{uvt}{caption=#1}} % ref=<true|false> % Load varioref and prettyref @@ -113,7 +117,7 @@ }{% \ClassWarning{univie-ling-expose}{unknown ref value}% } -\DeclareOptionX{ref}{\setkeys{uvt}{ref=#1}} +\DeclareOptionX{ref}[true]{\setkeys{uvt}{ref=#1}} % covington=<true|false> % Load covington @@ -126,7 +130,7 @@ }{% \ClassWarning{univie-ling-expose}{unknown covington value}% } -\DeclareOptionX{covington}{\setkeys{uvt}{covington=#1}} +\DeclareOptionX{covington}[true]{\setkeys{uvt}{covington=#1}} % microtype=<true|false> % Load microtype @@ -139,11 +143,24 @@ }{% \ClassWarning{univie-ling-expose}{unknown microtype value}% } -\DeclareOptionX{microtype}{\setkeys{uvt}{microtype=#1}} +\DeclareOptionX{microtype}[true]{\setkeys{uvt}{microtype=#1}} + +% polyglossia=<true|false> +% Load polyglossia +\define@boolkey+{uvt}{polyglossia}[true]{% + \ifKV@uvt@polyglossia + \polyglossiatrue + \psfontsfalse + \otffontstrue + \nofontsfalse + \else + \polyglossiafalse + \fi +}{% + \ClassWarning{univie-ling-expose}{unknown polyglossia value}% +} +\DeclareOptionX{polyglossia}[true]{\setkeys{uvt}{polyglossia=#1}} -\newif\ifpsfonts\psfontstrue -\newif\ifotffonts\otffontsfalse -\newif\ifnofonts\nofontsfalse % fonts=<ps|otf|none> \define@choicekey*+{uvt}{fonts}[\val\nr]{ps,otf,none}{% \ifcase\nr\relax% ps: use PostScript fonts (classic LaTeX) @@ -160,7 +177,7 @@ \nofontstrue \fi }{% - \PackageWarning{jsdossier}{unknown fonts value '#1'}% + \PackageWarning{univie-ling-paper}{unknown fonts value '#1'}% } \DeclareOptionX{fonts}{\setkeys{uvt}{fonts=#1}} @@ -216,7 +233,6 @@ \ifpsfonts \usepackage[T1]{fontenc} -\usepackage[utf8]{inputenc} % Times \usepackage{mathptmx} @@ -566,6 +582,17 @@ \fi %% ============================================================= +%% POLYGLOSSIA: +%% ============================================================= + +\ifpolyglossia + \ifcaptionp + \RequirePackage{ragged2e} + \fi + \RequirePackage{polyglossia} +\fi + +%% ============================================================= %% BIBLIOGRAPHY: %% ============================================================= 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 c190660feb5..b63e553b589 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}[2019/05/01 v1.10 Univie Linguistic Papers (JSp)] +\ProvidesPackage{univie-ling-paper}[2020/05/05 v1.11 Univie Linguistic Papers (JSp)] \RequirePackage{xkeyval} @@ -42,6 +42,10 @@ \newif\ifcovington\covingtontrue \newif\ifmicrotype\microtypetrue \newif\ifmultiauthors\multiauthorsfalse +\newif\ifpolyglossia\polyglossiafalse +\newif\ifpsfonts\psfontstrue +\newif\ifotffonts\otffontsfalse +\newif\ifnofonts\nofontsfalse % all=<true|false> % Load all packages @@ -62,7 +66,7 @@ }{% \ClassWarning{univie-ling-paper}{unknown 'all' value}% } -\DeclareOptionX{all}{\setkeys{uvt}{all=#1}} +\DeclareOptionX{all}[true]{\setkeys{uvt}{all=#1}} % biblatex=<true|false> % Load biblatex @@ -75,7 +79,7 @@ }{% \ClassWarning{univie-ling-paper}{unknown biblatex value}% } -\DeclareOptionX{biblatex}{\setkeys{uvt}{biblatex=#1}} +\DeclareOptionX{biblatex}[true]{\setkeys{uvt}{biblatex=#1}} % apa=<true|false> % Load APA style @@ -88,7 +92,7 @@ }{% \ClassWarning{univie-ling-paper}{unknown apa value}% } -\DeclareOptionX{apa}{\setkeys{uvt}{apa=#1}} +\DeclareOptionX{apa}[true]{\setkeys{uvt}{apa=#1}} % caption=<true|false> % Load caption @@ -101,7 +105,7 @@ }{% \ClassWarning{univie-ling-paper}{unknown caption value}% } -\DeclareOptionX{caption}{\setkeys{uvt}{caption=#1}} +\DeclareOptionX{caption}[true]{\setkeys{uvt}{caption=#1}} % ref=<true|false> % Load varioref and prettyref @@ -114,7 +118,7 @@ }{% \ClassWarning{univie-ling-paper}{unknown ref value}% } -\DeclareOptionX{ref}{\setkeys{uvt}{ref=#1}} +\DeclareOptionX{ref}[true]{\setkeys{uvt}{ref=#1}} % covington=<true|false> % Load covington @@ -127,7 +131,7 @@ }{% \ClassWarning{univie-ling-paper}{unknown covington value}% } -\DeclareOptionX{covington}{\setkeys{uvt}{covington=#1}} +\DeclareOptionX{covington}[true]{\setkeys{uvt}{covington=#1}} % microtype=<true|false> % Load microtype @@ -138,13 +142,26 @@ \microtypefalse \fi }{% - \ClassWarning{univie-ling-thesis}{unknown microtype value}% + \ClassWarning{univie-ling-paper}{unknown microtype value}% +} +\DeclareOptionX{microtype}[true]{\setkeys{uvt}{microtype=#1}} + +% polyglossia=<true|false> +% Load polyglossia +\define@boolkey+{uvt}{polyglossia}[true]{% + \ifKV@uvt@polyglossia + \polyglossiatrue + \psfontsfalse + \otffontstrue + \nofontsfalse + \else + \polyglossiafalse + \fi +}{% + \ClassWarning{univie-ling-paper}{unknown polyglossia value}% } -\DeclareOptionX{microtype}{\setkeys{uvt}{microtype=#1}} +\DeclareOptionX{polyglossia}[true]{\setkeys{uvt}{polyglossia=#1}} -\newif\ifpsfonts\psfontstrue -\newif\ifotffonts\otffontsfalse -\newif\ifnofonts\nofontsfalse % fonts=<ps|otf|none> \define@choicekey*+{uvt}{fonts}[\val\nr]{ps,otf,none}{% \ifcase\nr\relax% ps: use PostScript fonts (classic LaTeX) @@ -161,7 +178,7 @@ \nofontstrue \fi }{% - \PackageWarning{jsdossier}{unknown fonts value '#1'}% + \PackageWarning{univie-ling-paper}{unknown fonts value '#1'}% } \DeclareOptionX{fonts}{\setkeys{uvt}{fonts=#1}} @@ -227,7 +244,6 @@ This includes all drawings, sketches, graphics and internet sources.} \ifpsfonts \usepackage[T1]{fontenc} -\usepackage[utf8]{inputenc} % Palatino \usepackage[osf]{mathpazo} @@ -669,6 +685,17 @@ This includes all drawings, sketches, graphics and internet sources.} \fi %% ============================================================= +%% POLYGLOSSIA: +%% ============================================================= + +\ifpolyglossia + \ifcaptionp + \RequirePackage{ragged2e} + \fi + \RequirePackage{polyglossia} +\fi + +%% ============================================================= %% BIBLIOGRAPHY: %% ============================================================= 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 b43242a9ed7..90f2bf95912 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}[2019/05/01 v1.10 Univie Linguistic Theses (JSp)] +\ProvidesPackage{univie-ling-thesis}[2020/05/05 v1.11 Univie Linguistic Theses (JSp)] \RequirePackage{xkeyval} @@ -41,6 +41,12 @@ \newif\ifrefsp\refsptrue \newif\ifcovington\covingtontrue \newif\ifmicrotype\microtypetrue +\newif\ifpolyglossia\polyglossiafalse +\newif\ifpsfonts\psfontstrue +\newif\ifotffonts\otffontsfalse +\newif\ifnofonts\nofontsfalse +\newif\iffdegree\fdegreefalse +\newif\ifpdfa\pdfafalse % all=<true|false> % Load all packages @@ -61,7 +67,7 @@ }{% \ClassWarning{univie-ling-thesis}{unknown 'all' value}% } -\DeclareOptionX{all}{\setkeys{uvt}{all=#1}} +\DeclareOptionX{all}[true]{\setkeys{uvt}{all=#1}} % biblatex=<true|false> % Load biblatex @@ -74,7 +80,7 @@ }{% \ClassWarning{univie-ling-thesis}{unknown biblatex value}% } -\DeclareOptionX{biblatex}{\setkeys{uvt}{biblatex=#1}} +\DeclareOptionX{biblatex}[true]{\setkeys{uvt}{biblatex=#1}} % apa=<true|false> % Load APA style @@ -87,7 +93,7 @@ }{% \ClassWarning{univie-ling-paper}{unknown apa value}% } -\DeclareOptionX{apa}{\setkeys{uvt}{apa=#1}} +\DeclareOptionX{apa}[true]{\setkeys{uvt}{apa=#1}} % caption=<true|false> % Load caption @@ -100,7 +106,7 @@ }{% \ClassWarning{univie-ling-thesis}{unknown caption value}% } -\DeclareOptionX{caption}{\setkeys{uvt}{caption=#1}} +\DeclareOptionX{caption}[true]{\setkeys{uvt}{caption=#1}} % ref=<true|false> % Load varioref and prettyref @@ -113,7 +119,7 @@ }{% \ClassWarning{univie-ling-thesis}{unknown ref value}% } -\DeclareOptionX{ref}{\setkeys{uvt}{ref=#1}} +\DeclareOptionX{ref}[true]{\setkeys{uvt}{ref=#1}} % covington=<true|false> % Load covington @@ -126,7 +132,7 @@ }{% \ClassWarning{univie-ling-thesis}{unknown covington value}% } -\DeclareOptionX{covington}{\setkeys{uvt}{covington=#1}} +\DeclareOptionX{covington}[true]{\setkeys{uvt}{covington=#1}} % microtype=<true|false> % Load microtype @@ -139,9 +145,8 @@ }{% \ClassWarning{univie-ling-thesis}{unknown microtype value}% } -\DeclareOptionX{microtype}{\setkeys{uvt}{microtype=#1}} +\DeclareOptionX{microtype}[true]{\setkeys{uvt}{microtype=#1}} -\newif\iffdegree\fdegreefalse % fdegree=<true|false> % Female degree forms \define@boolkey+{uvt}{fdegree}[true]{% @@ -153,11 +158,37 @@ }{% \ClassWarning{univie-ling-thesis}{unknown fdegree value}% } -\DeclareOptionX{fdegree}{\setkeys{uvt}{fdegree=#1}} +\DeclareOptionX{fdegree}[true]{\setkeys{uvt}{fdegree=#1}} + +% polyglossia=<true|false> +% Load polyglossia +\define@boolkey+{uvt}{polyglossia}[true]{% + \ifKV@uvt@polyglossia + \polyglossiatrue + \psfontsfalse + \otffontstrue + \nofontsfalse + \else + \polyglossiafalse + \fi +}{% + \ClassWarning{univie-ling-thesis}{unknown polyglossia value}% +} +\DeclareOptionX{polyglossia}[true]{\setkeys{uvt}{polyglossia=#1}} + +% pdfa=<true|false> +% PDF/A +\define@boolkey+{uvt}{pdfa}[true]{% + \ifKV@uvt@pdfa + \pdfatrue + \else + \pdfafalse + \fi +}{% + \ClassWarning{univie-ling-thesis}{unknown pdfa value}% +} +\DeclareOptionX{pdfa}[true]{\setkeys{uvt}{pdfa=#1}} -\newif\ifpsfonts\psfontstrue -\newif\ifotffonts\otffontsfalse -\newif\ifnofonts\nofontsfalse % fonts=<ps|otf|none> \define@choicekey*+{uvt}{fonts}[\val\nr]{ps,otf,none}{% \ifcase\nr\relax% ps: use PostScript fonts (classic LaTeX) @@ -174,7 +205,7 @@ \nofontstrue \fi }{% - \PackageWarning{jsdossier}{unknown fonts value '#1'}% + \PackageWarning{univie-ling-paper}{unknown fonts value '#1'}% } \DeclareOptionX{fonts}{\setkeys{uvt}{fonts=#1}} @@ -213,7 +244,6 @@ \ifpsfonts \usepackage[T1]{fontenc} -\usepackage[utf8]{inputenc} % Palatino \usepackage[osf]{mathpazo} @@ -622,6 +652,27 @@ ]{caption} \fi + +%% ============================================================= +%% PDF-A: +%% ============================================================= + +\ifpdfa + \RequirePackage[a-1b]{pdfx} + \hypersetup{pdfborder={0 0 0}} +\fi + +%% ============================================================= +%% POLYGLOSSIA: +%% ============================================================= + +\ifpolyglossia + \ifcaptionp + \RequirePackage{ragged2e} + \fi + \RequirePackage{polyglossia} +\fi + %% ============================================================= %% BIBLIOGRAPHY: %% ============================================================= 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 f24a6c12bf7..1e74546d3c8 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}[2019/01/21 v1.9 WLG journal layout (JSp)] +\ProvidesPackage{univie-ling-wlg}[2020/05/05 v1.11 WLG journal layout (JSp)] %% ============================================================ @@ -212,8 +212,12 @@ All issues as of 72 (2005) are available online.} \deftranslation[to=German]{applied}{Angewandte Sprachwissenschaft} \deftranslation[to=English]{applied}{Applied Linguistics} -\deftranslation[to=German]{genhist}{Allgemeine und Historische Sprachwissenschaft} +\deftranslation[to=German]{genhist}{Allgemeine Sprachwissenschaft} +\deftranslation[to=German]{general}{Allgemeine Sprachwissenschaft} +\deftranslation[to=German]{hist}{Historische Sprachwissenschaft} \deftranslation[to=English]{genhist}{General and Historical Linguistics} +\deftranslation[to=English]{general}{General Linguistics} +\deftranslation[to=English]{hist}{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\\ @@ -249,9 +253,9 @@ \setlength\parsep{0pt} \setlength{\parskip}{0pt} \item[\textbf{\translate{edboard}:}] - Christian Bendl, - Mi-Cha Flubacher (\translate{applied}),\\ - Stefan Schumacher (\translate{genhist}) + Markus P\"ochtrager (\translate{general}),\\ + Mi-Cha Flubacher, Jonas Hassemer \& Sabine Lehner (\translate{applied}),\\ + Stefan Schumacher (\translate{hist}) %\item[\textbf{\translate{techboard}:}] Markus Rheindorf \item[\textbf{\translate{contact}:}] \href{mailto:wlg@univie.ac.at}{wlg@univie.ac.at} \item[\textbf{Homepage:}] \expandafter\url{\wlgurl} |