diff options
Diffstat (limited to 'macros')
54 files changed, 2165 insertions, 894 deletions
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/LICENSE b/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/LICENSE new file mode 100644 index 0000000000..cf1ab25da0 --- /dev/null +++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/LICENSE @@ -0,0 +1,24 @@ +This is free and unencumbered software released into the public domain. + +Anyone is free to copy, modify, publish, use, compile, sell, or +distribute this software, either in source code form or as a compiled +binary, for any purpose, commercial or non-commercial, and by any +means. + +In jurisdictions that recognize copyright laws, the author or authors +of this software dedicate any and all copyright interest in the +software to the public domain. We make this dedication for the benefit +of the public at large and to the detriment of our heirs and +successors. We intend this dedication to be an overt act of +relinquishment in perpetuity of all present and future rights to this +software under copyright law. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +For more information, please refer to <http://unlicense.org> diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/README.md b/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/README.md new file mode 100644 index 0000000000..b39a3a0290 --- /dev/null +++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/README.md @@ -0,0 +1,24 @@ +# SimplePlus Beamer Theme + +A simple and clean beamer template. + +**Website:** + +https://github.com/PM25/SimplePlus-BeamerTheme + +**Overleaf:** + +https://www.overleaf.com/latex/templates/simpleplus-beamertheme/wfmfjhdcrdfx + +**Author:** + +Pin-Yen Huang (pyhuang97@gmail.com) + +**Compiled sample document:** + +beamertheme-simpleplus-sample.pdf + +## License + +This is free and unencumbered software released into the public domain. +For more information, please see the file `LICENSE` or refer to <http://unlicense.org>.
\ No newline at end of file diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamercolorthemeSimplePlus.sty b/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamercolorthemeSimplePlus.sty new file mode 100644 index 0000000000..906498e407 --- /dev/null +++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamercolorthemeSimplePlus.sty @@ -0,0 +1,33 @@ +% !TEX TS-program = xelatex +% !TEX encoding = UTF-8 Unicode + +%---------------------------------------------------------------------------------------- +% Package: beamertheme-SimplePlus +% Author: Pin-Yen Huang (pyhuang97@gmail.com) +% Version: 1.0, 2021-12-16 +% Link: https://github.com/PM25/SimplePlus-BeamerTheme +% This is free and unencumbered software released into the +% public domain; see <http://unlicense.org> for details. +%---------------------------------------------------------------------------------------- + +% define color +\definecolor{InvisibleRed}{rgb}{0.97, 0.92, 0.92} +\definecolor{InvisibleGreen}{rgb}{0.92, 0.97, 0.92} +\definecolor{InvisibleBlue}{rgb}{0.92, 0.92, 0.97} + +\definecolor{MediumRed}{rgb}{0.925, 0.345, 0.345} +\definecolor{MediumGreen}{rgb}{0.37, 0.7, 0.66} +\definecolor{MediumBlue}{rgb}{0.015, 0.315, 0.45} + +\definecolor{DarkBlue}{rgb}{0.05, 0.15, 0.35} + +% set color +\usecolortheme[named=DarkBlue]{structure} + +\setbeamercolor{titlelike}{parent=structure} +\setbeamercolor{block title}{bg=MediumBlue} +\setbeamercolor{block body}{bg=InvisibleBlue} +\setbeamercolor{block title example}{bg=MediumGreen} +\setbeamercolor{block body example}{bg=InvisibleGreen} +\setbeamercolor{block title alerted}{bg=MediumRed} +\setbeamercolor{block body alerted}{bg=InvisibleRed}
\ No newline at end of file diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamerfontthemeSimplePlus.sty b/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamerfontthemeSimplePlus.sty new file mode 100644 index 0000000000..9c57bc7cc3 --- /dev/null +++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamerfontthemeSimplePlus.sty @@ -0,0 +1,38 @@ +% !TEX TS-program = xelatex +% !TEX encoding = UTF-8 Unicode + +%---------------------------------------------------------------------------------------- +% Package: beamertheme-SimplePlus +% Author: Pin-Yen Huang (pyhuang97@gmail.com) +% Version: 1.0, 2021-12-16 +% Link: https://github.com/PM25/SimplePlus-BeamerTheme +% This is free and unencumbered software released into the +% public domain; see <http://unlicense.org> for details. +%---------------------------------------------------------------------------------------- + +\mode<presentation> + +%%%%%%%%%%%% fonts + +\setbeamerfont{structure}{family=\sffamily,series=\mdseries} + +\setbeamerfont{title}{size=\huge,series=\bfseries,parent=structure} +\setbeamerfont{subtitle}{size=\normalsize,parent=title} + +\setbeamerfont{date}{size=\scriptsize,series=\mdseries,parent=structure} +\setbeamerfont{author}{size=\large,series=\mdseries,parent=structure} +\setbeamerfont{institute}{size=\scriptsize,series=\mdseries,parent=structure} + +\setbeamerfont{section in toc}{size=\Large,series=\bfseries,parent=structure} +\setbeamerfont{section in head/foot}{size=\tiny,parent=structure} +\setbeamerfont{subsection in toc}{size=\small,series=\mdseries,parent={section in toc}} + +\setbeamerfont{frametitle}{size=\LARGE,series=\bfseries,parent=structure} +\setbeamerfont{framesubtitle}{parent=frametitle,size=\Large} + +\setbeamerfont{caption}{size=\footnotesize} +\setbeamerfont{item}{parent=structure,series=\mdseries} +\setbeamerfont{block title}{size=\large,series=\mdseries,parent={structure,block body}} + +\mode +<all> diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamerinnerthemeSimplePlus.sty b/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamerinnerthemeSimplePlus.sty new file mode 100644 index 0000000000..43ab163d18 --- /dev/null +++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamerinnerthemeSimplePlus.sty @@ -0,0 +1,60 @@ +% !TEX TS-program = xelatex +% !TEX encoding = UTF-8 Unicode + +%---------------------------------------------------------------------------------------- +% Package: beamertheme-SimplePlus +% Author: Pin-Yen Huang (pyhuang97@gmail.com) +% Version: 1.0, 2021-12-16 +% Link: https://github.com/PM25/SimplePlus-BeamerTheme +% This is free and unencumbered software released into the +% public domain; see <http://unlicense.org> for details. +%---------------------------------------------------------------------------------------- + +\pgfdeclareverticalshading[lower.bg,upper.bg]{bmb@transition}{200cm}{% + color(0pt)=(lower.bg); color(2pt)=(lower.bg); color(4pt)=(lower.bg)} + +\setbeamersize{text margin left=2em,text margin right=2em} + +% table of contents (overview) +\setbeamertemplate{section in toc}[sections numbered] +\setbeamertemplate{subsection in toc}{\leavevmode\leftskip=3.2em\rlap{\hskip-2em\inserttocsectionnumber.\inserttocsubsectionnumber}\inserttocsubsection\par} + +\setbeamertemplate{footline}[frame number] +\setbeamertemplate{navigation symbols}{} +\setbeamertemplate{blocks}[rounded][shadow=false] +\setbeamertemplate{enumerate items}[default] + +\setbeamertemplate{frametitle}{\vspace*{0.5em}\bfseries\insertframetitle\par\vskip-6pt\hrulefill\vspace{-0.1em}} + +\setbeamertemplate{title page}{ + \vspace{7em} + \begingroup + \centering + % ------------------------ + \begin{beamercolorbox}[sep=8pt,center]{title} + \usebeamerfont{title}\inserttitle\par% + \ifx\insertsubtitle\@empty% + \else% + \vskip0.25em% + {\usebeamerfont{subtitle}\usebeamercolor[fg]{subtitle}\insertsubtitle\par}% + \fi% + \end{beamercolorbox}% + \vskip0.5em\par + % ------------------------ + \begin{beamercolorbox}[sep=8pt,center]{author} + \usebeamerfont{author}\insertauthor + \end{beamercolorbox} + \vskip-1em + % ------------------------ + \begin{beamercolorbox}[sep=8pt,center]{institute} + \usebeamerfont{institute}\insertinstitute + \end{beamercolorbox} + % ------------------------ + \begin{beamercolorbox}[sep=8pt,center]{date} + \usebeamerfont{date}\insertdate + \end{beamercolorbox}\vskip0.5em + % ------------------------ + {\usebeamercolor[fg]{titlegraphic}\inserttitlegraphic\par} + \endgroup + \vfill +}
\ No newline at end of file diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamertheme-simpleplus-sample.pdf b/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamertheme-simpleplus-sample.pdf Binary files differnew file mode 100644 index 0000000000..4f56de719a --- /dev/null +++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamertheme-simpleplus-sample.pdf diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamertheme-simpleplus-sample.tex b/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamertheme-simpleplus-sample.tex new file mode 100644 index 0000000000..17e105a5b8 --- /dev/null +++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamertheme-simpleplus-sample.tex @@ -0,0 +1,161 @@ +%---------------------------------------------------------------------------------------- +% PACKAGES AND THEMES +%---------------------------------------------------------------------------------------- +\documentclass[aspectratio=169,xcolor=dvipsnames]{beamer} +\usetheme{SimplePlus} + +\usepackage{hyperref} +\usepackage{graphicx} % Allows including images +\usepackage{booktabs} % Allows the use of \toprule, \midrule and \bottomrule in tables + +%---------------------------------------------------------------------------------------- +% TITLE PAGE +%---------------------------------------------------------------------------------------- + +\title[short title]{Simple Beamer Theme} % The short title appears at the bottom of every slide, the full title is only on the title page +\subtitle{Subtitle} + +\author[Pin-Yen] {Pin-Yen Huang} + +\institute[NTU] % Your institution as it will appear on the bottom of every slide, may be shorthand to save space +{ + Department of Computer Science and Information Engineering \\ + National Taiwan University % Your institution for the title page +} +\date{Dec 16, 2021} % Date, can be changed to a custom date + + +%---------------------------------------------------------------------------------------- +% PRESENTATION SLIDES +%---------------------------------------------------------------------------------------- + +\begin{document} + +\begin{frame} + % Print the title page as the first slide + \titlepage +\end{frame} + +\begin{frame}{Overview} + % Throughout your presentation, if you choose to use \section{} and \subsection{} commands, these will automatically be printed on this slide as an overview of your presentation + \tableofcontents +\end{frame} + +%------------------------------------------------ +\section{First Section} +%------------------------------------------------ + +\begin{frame}{Bullet Points} + \begin{itemize} + \item Lorem ipsum dolor sit amet, consectetur adipiscing elit + \item Aliquam blandit faucibus nisi, sit amet dapibus enim tempus eu + \item Nulla commodo, erat quis gravida posuere, elit lacus lobortis est, quis porttitor odio mauris at libero + \item Nam cursus est eget velit posuere pellentesque + \item Vestibulum faucibus velit a augue condimentum quis convallis nulla gravida + \end{itemize} +\end{frame} + +%------------------------------------------------ + +\begin{frame}{Blocks of Highlighted Text} + In this slide, some important text will be \alert{highlighted} because it's important. Please, don't abuse it. + + \begin{block}{Block} + Sample text + \end{block} + + \begin{alertblock}{Alertblock} + Sample text in red box + \end{alertblock} + + \begin{examples} + Sample text in green box. The title of the block is ``Examples". + \end{examples} +\end{frame} + +%------------------------------------------------ + +\begin{frame}{Multiple Columns} + \begin{columns}[c] % The "c" option specifies centered vertical alignment while the "t" option is used for top vertical alignment + + \column{.45\textwidth} % Left column and width + \textbf{Heading} + \begin{enumerate} + \item Statement + \item Explanation + \item Example + \end{enumerate} + + \column{.5\textwidth} % Right column and width + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer lectus nisl, ultricies in feugiat rutrum, porttitor sit amet augue. Aliquam ut tortor mauris. Sed volutpat ante purus, quis accumsan dolor. + + \end{columns} +\end{frame} + +%------------------------------------------------ +\section{Second Section} +%------------------------------------------------ + +\begin{frame}{Table} + \begin{table} + \begin{tabular}{l l l} + \toprule + \textbf{Treatments} & \textbf{Response 1} & \textbf{Response 2} \\ + \midrule + Treatment 1 & 0.0003262 & 0.562 \\ + Treatment 2 & 0.0015681 & 0.910 \\ + Treatment 3 & 0.0009271 & 0.296 \\ + \bottomrule + \end{tabular} + \caption{Table caption} + \end{table} +\end{frame} + +%------------------------------------------------ + +\begin{frame}{Theorem} + \begin{theorem}[Mass--energy equivalence] + $E = mc^2$ + \end{theorem} +\end{frame} + +%------------------------------------------------ + +\begin{frame}{Figure} + Uncomment the code on this slide to include your own image from the same directory as the template .TeX file. + %\begin{figure} + %\includegraphics[width=0.8\linewidth]{test} + %\end{figure} +\end{frame} + +%------------------------------------------------ + +\begin{frame}[fragile] % Need to use the fragile option when verbatim is used in the slide + \frametitle{Citation} + An example of the \verb|\cite| command to cite within the presentation:\\~ + + This statement requires citation \cite{p1}. +\end{frame} + +%------------------------------------------------ + +\begin{frame}{References} + % Beamer does not support BibTeX so references must be inserted manually as below + \footnotesize{ + \begin{thebibliography}{99} + \bibitem[Smith, 2012]{p1} John Smith (2012) + \newblock Title of the publication + \newblock \emph{Journal Name} 12(3), 45 -- 678. + \end{thebibliography} + } +\end{frame} + +%------------------------------------------------ + +\begin{frame} + \Huge{\centerline{\textbf{The End}}} +\end{frame} + +%---------------------------------------------------------------------------------------- + +\end{document}
\ No newline at end of file diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamerthemeSimplePlus.sty b/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamerthemeSimplePlus.sty new file mode 100644 index 0000000000..5ff53a743e --- /dev/null +++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamerthemeSimplePlus.sty @@ -0,0 +1,23 @@ +% !TEX TS-program = xelatex +% !TEX encoding = UTF-8 Unicode + +%---------------------------------------------------------------------------------------- +% Package: beamertheme-SimplePlus +% Author: Pin-Yen Huang (pyhuang97@gmail.com) +% Version: 1.0, 2021-12-16 +% Link: https://github.com/PM25/SimplePlus-BeamerTheme +% This is free and unencumbered software released into the +% public domain; see <http://unlicense.org> for details. +%---------------------------------------------------------------------------------------- + +\mode<presentation> + +% Settings +\usetheme{Madrid} +\useinnertheme{circles} + +\usefonttheme{SimplePlus} +\usecolortheme{SimplePlus} +\useinnertheme{SimplePlus} + +\mode<all>
\ No newline at end of file diff --git a/macros/latex/contrib/iexec/iexec.dtx b/macros/latex/contrib/iexec/iexec.dtx index ff627551a5..bdcb5609c9 100644 --- a/macros/latex/contrib/iexec/iexec.dtx +++ b/macros/latex/contrib/iexec/iexec.dtx @@ -50,12 +50,13 @@ %<package>\NeedsTeXFormat{LaTeX2e} %<package>\ProvidesPackage{iexec} %<*package> -[2022-10-15 0.9.1 Inputable Shell Executions] +[2022-10-21 0.10.1 Inputable Shell Executions] %</package> %<*driver> \documentclass{ltxdoc} \usepackage[tt=false, type1=true]{libertine} \usepackage{microtype} +\usepackage[dtx]{docshots} \usepackage{iexec} \usepackage{href-ul} \PageIndex @@ -81,29 +82,16 @@ % This package helps you execute shell commands right from the % document and then put their output to the document: % -% \begin{multicols}{2} -% \setlength{\parskip}{0pt} -% \small -% \raggedcolumns -%\iffalse -%<*verb> -%\fi -\begin{verbatim} -\documentclass{article} -\usepackage{iexec} -\begin{document} -Today is - \iexec{date +\%e-\%b-\%Y} -\end{document} -\end{verbatim} -%\iffalse -%</verb> -%\fi -% -% \columnbreak -% -% Today is \iexec[log]{date +\%e-\%b-\%Y} -% \end{multicols} +% \begin{docshot} +% \documentclass{article} +% \usepackage{iexec} +% \usepackage[paperwidth=3in]{geometry} +% \pagestyle{empty} +% \begin{document} +% Today is \textbf{% +% \iexec{date +\%e-\%b-\%Y}} +% \end{document} +% \end{docshot} % \DescribeMacro{\iexec} The only command provided by this package is |\iexec| \oarg{options} \marg{cmd}. % Its only mandatory argument \meta{cmd} is the command to be executed @@ -117,19 +105,16 @@ Today is % \section{Options} -% \DescribeMacro{quiet} If you don't want the output to be visible, +% \DescribeMacro{quiet} +% If you don't want the output to be visible, % use |\phantom\{\iexec{...}}|. % Otherwise, you can use |quiet| option: %\iffalse %<*verb> %\fi \begin{verbatim} -\documentclass{article} -\usepackage{iexec} -\begin{document} I just want to delete some file: \iexec[quiet]{rm -f foo.txt} -\end{document} \end{verbatim} %\iffalse %</verb> @@ -137,41 +122,36 @@ I just want to delete some file: % In this case, whatever the shell command produces will not be included % into the document. -% \DescribeMacro{stdout} The output of your code is saved into the file provided as an +% \DescribeMacro{stdout} +% The output of your code is saved into the file provided as an % optional argument of |\iexec| (the default value is |iexec.tmp|): %\iffalse %<*verb> %\fi \begin{verbatim} -\documentclass{article} -\usepackage{iexec} -\begin{document} Today is \iexec[stdout=date.txt]{date +\%e-\%b-\%Y | tr -d '\\n'}. -\end{document} \end{verbatim} %\iffalse %</verb> %\fi % The tailing part of the command here removes all ends-of-line. -% \DescribeMacro{stderr} The error output of the code is saved into the file provided as an +% \DescribeMacro{stderr} +% The error output of the code is saved into the file provided as an % optional argument of |\iexec| (by default the error output % is streamed into |stdout|): %\iffalse %<*verb> %\fi \begin{verbatim} -\documentclass{article} -\usepackage{iexec} -\begin{document} Today is \iexec[stderr=my.txt]{broken-command}. -\end{document} \end{verbatim} %\iffalse %</verb> %\fi -% \DescribeMacro{trace} The file specified will be deleted right after its usage. If you don't +% \DescribeMacro{trace} +% The file specified will be deleted right after its usage. If you don't % want this to happen, use |trace| package option: all files will remain % in the directory where they were created. % It's possible to turn tracing on globbaly, for the entire document, using @@ -190,7 +170,8 @@ This file won't be deleted: \iexec[stdout=me.txt]{whoami}. %</verb> %\fi -% \DescribeMacro{append} The stdout produced will be appended to the file specified: +% \DescribeMacro{append} +% The stdout produced will be appended to the file specified: %\iffalse %<*verb> %\fi @@ -207,31 +188,38 @@ This file won't be deleted: \iexec[stdout=me.txt]{whoami}. %</verb> %\fi -% \DescribeMacro{log} The stdout produced will be printed in \TeX{} log: +% \DescribeMacro{log} +% The stdout produced will be printed in \TeX{} log: %\iffalse %<*verb> %\fi \begin{verbatim} -\documentclass{article} -\usepackage{iexec} -\begin{document} \iexec[log]{echo 'Hello, \\LaTeX!'} -\end{document} \end{verbatim} %\iffalse %</verb> %\fi -% \DescribeMacro{null} The stdout of the command will be sent to |/dev/null|: +% \DescribeMacro{null} +% The stdout of the command will be sent to |/dev/null|: %\iffalse %<*verb> %\fi \begin{verbatim} -\documentclass{article} -\usepackage{iexec} -\begin{document} \iexec[null]{rm some-file.txt} -\end{document} +\end{verbatim} +%\iffalse +%</verb> +%\fi + +% \DescribeMacro{ignore} +% By default, we report an error if exit code is not equal to zero. You can suppress +% this with |ignore| option: +%\iffalse +%<*verb> +%\fi +\begin{verbatim} +\iexec[ignore]{broken-command} \end{verbatim} %\iffalse %</verb> @@ -241,15 +229,6 @@ This file won't be deleted: \iexec[stdout=me.txt]{whoami}. % \section{Implementation} -% \changes{v0.2.0}{2021/07/10}{Initial version} -% \changes{v0.4.0}{2021/08/01}{Runtime verification for --shell-escape option} -% \changes{v0.4.1}{2021/08/08}{Options trace, stdout, and quiet added} -% \changes{v0.5.0}{2022/01/08}{Major bug fixes} -% \changes{v0.6.0}{2022/10/09}{Additional options 'log' and 'append'} -% \changes{v0.7.0}{2022/10/10}{Additional option 'null'} -% \changes{v0.8.0}{2022/10/11}{Bug fixes} -% \changes{v0.9.0}{2022/10/12}{Additional option 'stderr'} - % First, we include \href{https://ctan.org/pkg/shellesc}{shellesc} package, which % we use to execute shell commands: % \begin{macrocode} @@ -267,6 +246,9 @@ This file won't be deleted: \iexec[stdout=me.txt]{whoami}. % \end{macrocode} % Then, we prepare to parse the options of |\iexec| command: +% \changes{v0.10.0}{2022/10/19}{The option "ignore" suppresses the checking of "iexec.ret" value.} +% \changes{v0.7.0}{2022/09/25}{The option "append" was introduced --- if it's turned on, stdout will be appended to the file, instead of rewriting it (this is how it was before).} +% \changes{v0.7.0}{2022/09/25}{The option "log" was introduced, to turn on log/debug messages in TeX log (they were all visible always, which was sometimes annoying. Also, this option enables printing of the entire content of stdout to the log too (this may be pretty convenient for debugging).} % \begin{macrocode} \RequirePackage{pgfkeys} \makeatletter\pgfkeys{ @@ -280,6 +262,7 @@ This file won't be deleted: \iexec[stdout=me.txt]{whoami}. log/.store in = \iexec@log, null/.store in = \iexec@null, quiet/.store in = \iexec@quiet, + ignore/.store in = \iexec@ignore, stdout }\makeatother % \end{macrocode} @@ -307,9 +290,12 @@ This file won't be deleted: \iexec[stdout=me.txt]{whoami}. % \begin{macro}{\iexec} % Then, we define |\iexec| command. % It is implemented with the help of |\ShellEscape| from |shellesc| package: +% \changes{v0.10.0}{2022/10/19}{The file "iexec.ret" is reused for all scripts.} % \begin{macrocode} -\makeatletter\newcommand\iexec[2][]{% - \begingroup +\makeatletter +\newread\iexec@retfile +\newcommand\iexec[2][]{% + \begingroup% \pgfqkeys{/iexec}{#1}% % \end{macrocode} % First, we verify that |latex| is running with |--shell-escape| option, since without @@ -323,7 +309,9 @@ This file won't be deleted: \iexec[stdout=me.txt]{whoami}. % \end{macrocode} % Then, start the log from a clean line: % \begin{macrocode} - \message{^^J}% + \ifdefined\iexec@log% + \message{^^J}% + \fi% % \end{macrocode} % Then, we define a few special chars in order to escape them in the shell % (the full @@ -335,36 +323,60 @@ This file won't be deleted: \iexec[stdout=me.txt]{whoami}. \let\}\@charrb% % \end{macrocode} % Then, we execute it: +% \changes{v0.10.0}{2022/10/19}{The ability to track exit code was added. Now, the code is saved into "iexec.ret" file, which is then read and checked for zero value.} +% \changes{v0.8.0}{2022/10/05}{The option "null" was introduced, allowing redirection of stdout to "/dev/null". Doesn't work on Windows, though.} +% \changes{v0.9.0}{2022/10/15}{The option "stderr" was introduced, allowing redirection of stderr to a file. Without this option specified, stderr will go to stdout.} % \begin{macrocode} \def\iexec@cmd{(#2) \ifdefined\iexec@append>\fi> \ifdefined\iexec@null/dev/null\else\iexec@stdout\fi - \space\ifdefined\iexec@stderr2>\iexec@stderr\else2>&1\fi} + \space\ifdefined\iexec@stderr2>\iexec@stderr\else2>&1\fi + \ifdefined\iexec@ignore\else; echo $? >iexec.ret\fi} \ShellEscape{\iexec@cmd}% % \end{macrocode} % Then, a message is printed to TeX log: % \begin{macrocode} - \message{iexec: [\iexec@cmd]^^J}% + \ifdefined\iexec@log% + \message{iexec: [\iexec@cmd]^^J}% + \fi% \endgroup% % \end{macrocode} % Then, if required, the content of the stdout file will be printed to the log: % \begin{macrocode} - \ifdefined\iexec@null\else - \ifdefined\iexec@log - \message{iexec: this is the content of \iexec@stdout:^^J}% - \iexec@typeout{\iexec@stdout} + \ifdefined\iexec@null\else% + \ifdefined\iexec@log% + \message{iexec: This is the content of \iexec@stdout:^^J}% + \iexec@typeout{\iexec@stdout}% \message{<EOF>^^J}% \fi\fi% % \end{macrocode} +% Then, we check exit code: +% \begin{macrocode} + \ifdefined\iexec@log\else% + \immediate\openin\iexec@retfile=iexec.ret% + \read\iexec@retfile to \iexec@ret% + \immediate\closein\iexec@retfile% + \ifnum\iexec@ret=0\else% + \PackageError{iexec}{Exit code is \iexec@ret}{}% + \fi% + \fi% +% \end{macrocode} % Then, include the produced output into the current document: % \begin{macrocode} - \ifdefined\iexec@null\else - \ifdefined\iexec@quiet - \message{iexec: Due to 'quiet' option we didn't read - the content of '\iexec@stdout' (\pdffilesize{} bytes)^^J}% + \ifdefined\iexec@null\else% + \ifdefined\iexec@quiet% + \ifdefined\iexec@log% + \message{iexec: Due to 'quiet' option we didn't read + the content of '\iexec@stdout' + \ifdefined\pdffilesize(\pdffilesize{\iexec@stdout} + bytes)\fi^^J}% + \fi% \else% - \message{iexec: We include the content of - '\iexec@stdout' (\pdffilesize{} bytes)...^^J}% + \ifdefined\iexec@log% + \message{iexec: We include the content of + '\iexec@stdout'\ifdefined\pdffilesize(\pdffilesize + {\iexec@stdout} bytes)\fi...^^J}% + \fi% \input{\iexec@stdout}% \message{iexec: The content of '\iexec@stdout' was included into the document^^J}% @@ -372,17 +384,23 @@ This file won't be deleted: \iexec[stdout=me.txt]{whoami}. % \end{macrocode} % Finally, delete the file or leave it untouched: % \begin{macrocode} - \ifdefined\iexec@null\else + \ifdefined\iexec@null\else% \ifiexec@trace% - \message{iexec: Due to package option 'trace', - the file '\iexec@stdout' was not deleted^^J}% + \ifdefined\iexec@log% + \message{iexec: Due to package option 'trace', + the file '\iexec@stdout' was not deleted^^J}% + \fi% \else% \ifdefined\iexec@traceit% - \message{iexec: Due to 'trace' option, - the file '\iexec@stdout' was not deleted^^J}% + \ifdefined\iexec@log% + \message{iexec: Due to 'trace' option, + the file '\iexec@stdout' was not deleted^^J}% + \fi% \else% \ShellEscape{rm \iexec@stdout}% - \message{iexec: The file '\iexec@stdout' was deleted^^J}% + \ifdefined\iexec@log% + \message{iexec: The file '\iexec@stdout' was deleted^^J}% + \fi% \fi% \fi\fi% \endgroup @@ -393,7 +411,7 @@ This file won't be deleted: \iexec[stdout=me.txt]{whoami}. % \Finale %\clearpage -% %\PrintChanges + %\clearpage %\PrintIndex diff --git a/macros/latex/contrib/iexec/iexec.pdf b/macros/latex/contrib/iexec/iexec.pdf Binary files differindex 3b14fd32d0..96f30b1582 100644 --- a/macros/latex/contrib/iexec/iexec.pdf +++ b/macros/latex/contrib/iexec/iexec.pdf diff --git a/macros/latex/contrib/qrbill/README.md b/macros/latex/contrib/qrbill/README.md index 8079883d18..03eff67b34 100644 --- a/macros/latex/contrib/qrbill/README.md +++ b/macros/latex/contrib/qrbill/README.md @@ -4,7 +4,7 @@ Copyright (C) Marei Peischl (peiTeX) <marei@peitex.de>, 2020–2022 This work is part of a collaborative project of Marei Peischl (peiTeX) and Alex Antener (foobar LLC). -qrbill 2022/10/18 v1.06 +qrbill 2022/10/20 v1.07 *************************************************************************** @@ -77,4 +77,6 @@ For further information on l3build and other options please have a look at the c * v1.06 (2022-10-18) - additional customization for vrule - add possibilities to ignore data fields if empty - - allow the usage of commas within the billing info
\ No newline at end of file + - allow the usage of commas within the billing info + * v1.07 (2022-10-20) + - fix utf8 encoding für qrmode=package
\ No newline at end of file diff --git a/macros/latex/contrib/qrbill/qrbill.dtx b/macros/latex/contrib/qrbill/qrbill.dtx index fab4a79821..6d169404d5 100644 --- a/macros/latex/contrib/qrbill/qrbill.dtx +++ b/macros/latex/contrib/qrbill/qrbill.dtx @@ -54,7 +54,7 @@ % \fi % \iffalse %<*driver> -\ProvidesFile{qrbill.dtx}[2022/10/18 v1.06 \ create QR-bills based on the Swiss standard] +\ProvidesFile{qrbill.dtx}[2022/10/20 v1.07 \ create QR-bills based on the Swiss standard] \documentclass[english, parskip=half-]{scrartcl} \usepackage{iftex} \ifPDFTeX @@ -514,7 +514,7 @@ % \section{Implementation} % \begin{macrocode} \RequirePackage{expl3} -\ProvidesExplPackage{qrbill}{2022/10/18}{1.06}{ +\ProvidesExplPackage{qrbill}{2022/10/20}{1.07}{ Template for QR-bills based on the Swiss Payment Standards } \RequirePackage{iftex} @@ -690,16 +690,7 @@ \dim_new:N \g_qrbill_QRcode_dim \dim_gset:Nn \g_qrbill_QRcode_dim {46mm} \bool_if:NT \g__qrbill_luamode_bool { - \file_if_exist:nTF {qrencode.lua} { - \lua_load_module:n {qrbill-latexluaqrcode} - } { - \msg_new:nnn {qrbill} {luaqrcode-not-found} { - Could~not~find~the~required~library~for~qrmode=lua.\\ - I~will~switch~to~qrmode=package. - } - \msg_warning:nn {qrbill} {luaqrcode-not-found} - \bool_gset_false:N \g__qrbill_luamode_bool - } + \lua_load_module:n {qrbill-latexluaqrcode} % qrcode setup \dim_new:N \l__qrbill_QRblocksize_dim @@ -719,6 +710,10 @@ } } +% \end{macrocode} +% \changes{v1.07}{2022/10/20}{patch the qrcode package to work with utf-8 strings} +% \begin{macrocode} + \bool_if:NF \g__qrbill_luamode_bool { \usepackage{qrcode} % modified version of \qr@encode@binary to allow utf8 qrcodes required by swiss qrbill scheme @@ -731,17 +726,16 @@ % %First, the mode indicator. \def\qr@codetext{4}% %This means `binary' - % - %Next, the character count. - \xdef\qr@stringlength{\tl_count:o {\qr@plaintext}}% + % patch character count mechanism, because we have to encode to hex before counting so the package does accept our utf8 string + \__qrbill_qr_get_string_length_encoded:n { \qr@plaintext } %Set \qr@charactercountlengthinhex to \qr@charactercountbits@byte/4% \edef\qr@charactercountlengthinhex{\int_eval:n {\qr@charactercountbits@byte / 4}}% \qr@decimaltohex[\qr@charactercountlengthinhex]{\qr@charactercount}{\qr@stringlength}% \xa\g@addto@macro\xa\qr@codetext\xa{\qr@charactercount}% % %Now comes the actual data. - \exp_args:NNx \str_set_convert:Nnnn \l_tmpa_str { \qr@plaintext } {iso88591} {utf8} - \exp_args:NNV \str_set_convert:Nnnn \l_tmpa_str \l_tmpa_str {} {latin1/hex} + \exp_args:NNx \str_set_convert:Nnnn \l_tmpa_str { \qr@plaintext } {} {utf8/hex} + \str_gput_right:NV \qr@codetext \l_tmpa_str \xdef\qr@codetext{\exp_args:No \str_lowercase:n {\qr@codetext}} %Now the terminator. @@ -769,8 +763,33 @@ } \cs_set:Nn \qrbill_parse_QRcode:n { \cs_set_eq:NN \qr@encode@binary \__qrbill_encode_unicode_binary:n - \raisebox{\depth}{\cs_set_eq:NN \qr@encode@binary \__qrbill_encode_unicode_binary:n\qrcode[height= \g_qrbill_QRcode_dim]{#1}} + \raisebox{\depth}{ + \__qrbill_enable_unicode_qrcode_patch: + \qrcode[height= \g_qrbill_QRcode_dim]{#1} + } } + + \cs_new:Nn \__qrbill_qr_get_string_length_encoded:n {% + \exp_args:NNx \str_set_convert:Nnnn \l_tmpa_str { #1 } {} {utf8/hex} + \xdef\qr@stringlength{\int_eval:n {\str_count:N \l_tmpa_str / 2}} + } + + \cs_new:Nn \__qrbill_qr_padatfront:nn {% + % #1 = macro containing text to pad + % #2 = desired number of characters + % Pads a number with initial zeros. + \prg_replicate:nn {\int_max:nn {0} {#2- \tl_count:N #1}} { + \qr@g@preface@macro{#1}{0} + } + } + + \let\orig@qr@getstringlength\qr@getstringlength + + \cs_new:Nn \__qrbill_enable_unicode_qrcode_patch: { + \cs_set_eq:NN \qr@padatfront \__qrbill_qr_padatfront:nn + \AddToHook{cmd/qr@choose@best@version/before}{\cs_set_eq:NN \qr@getstringlength\__qrbill_qr_get_string_length_encoded:n} + \AddToHook{cmd/qr@choose@best@version/after}{\let\qr@getstringlength\orig@qr@getstringlength} + } } \cs_generate_variant:Nn \qrbill_parse_QRcode:n {V} @@ -1182,7 +1201,8 @@ } } %necessary to preserve spaces! - \str_replace_all:Nnn \l_qrbill_data_str {~ } {\ } + \bool_if:NF \g__qrbill_luamode_bool + { \str_replace_all:Nnn \l_qrbill_data_str {~ } {\ } } \prop_map_inline:Nn \g__qrbill_replacement_prop { \str_replace_all:Nnn \l_qrbill_data_str {##1} {##2} } diff --git a/macros/latex/contrib/qrbill/qrbill.pdf b/macros/latex/contrib/qrbill/qrbill.pdf Binary files differindex fe8ddd638a..3684e2c948 100644 --- a/macros/latex/contrib/qrbill/qrbill.pdf +++ b/macros/latex/contrib/qrbill/qrbill.pdf diff --git a/macros/latex/contrib/univie-ling/README b/macros/latex/contrib/univie-ling/README index 39360949f0..d021520e3b 100644 --- a/macros/latex/contrib/univie-ling/README +++ b/macros/latex/contrib/univie-ling/README @@ -90,6 +90,17 @@ also have a look at the example files. == CHANGES == +V. 2.1 (2022-10-21): + - univie-ling-wlg: + * Add a sans (Source Sans Pro or MyriadPro) and monospaced (DejaVu Sans Mono) + font. + * Add draftmark option. + - univie-ling-handout: + - univie-ling-expose: + - univie-ling-paper: + - univie-ling-thesis: + * Fix polyglossia option. + V. 2.0 (2022-10-02): - Add general documentation (univie-ling.pdf). - univie-ling-handout: @@ -109,6 +120,7 @@ V. 1.20 (2022-09-08): - univie-ling-thesis: - univie-ling-wlg: * Load varioref \AtBeginDocument. + V. 1.19 (2022-06-18): - Add handout class. - univie-ling-expose: diff --git a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx index 297bf740f1..1564b3a9ee 100644 --- a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx +++ b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx @@ -37,7 +37,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesFile{univie-ling.bbx}[2022/10/02 v.2.0 biblatex bibliography style] +\ProvidesFile{univie-ling.bbx}[2022/10/21 v.2.1 biblatex bibliography style] % Load base style (authoryear-comp) \RequireBibliographyStyle{authoryear-comp} diff --git a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx index e4937b0fa3..a643cacf26 100644 --- a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx +++ b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.cbx @@ -35,7 +35,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesFile{univie-ling.cbx}[2022/10/02 v.2.0 biblatex citation style] +\ProvidesFile{univie-ling.cbx}[2022/10/21 v.2.1 biblatex citation style] \RequireCitationStyle{authoryear-comp} diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.pdf Binary files differindex 12cb21db93..570c4e2e3b 100644 --- a/macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.pdf +++ b/macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.pdf diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-expose-english.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-expose-english.pdf Binary files differindex dac6d7b74a..23b602db8c 100644 --- a/macros/latex/contrib/univie-ling/doc/templates/template-expose-english.pdf +++ b/macros/latex/contrib/univie-ling/doc/templates/template-expose-english.pdf diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-handout-deutsch.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-handout-deutsch.pdf Binary files differindex 72b734d553..f578a135e8 100644 --- a/macros/latex/contrib/univie-ling/doc/templates/template-handout-deutsch.pdf +++ b/macros/latex/contrib/univie-ling/doc/templates/template-handout-deutsch.pdf diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-handout-english.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-handout-english.pdf Binary files differindex aa429549f5..c0451d826f 100644 --- a/macros/latex/contrib/univie-ling/doc/templates/template-handout-english.pdf +++ b/macros/latex/contrib/univie-ling/doc/templates/template-handout-english.pdf diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-paper-deutsch.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-paper-deutsch.pdf Binary files differindex 83b8b152df..0b089403c9 100644 --- a/macros/latex/contrib/univie-ling/doc/templates/template-paper-deutsch.pdf +++ b/macros/latex/contrib/univie-ling/doc/templates/template-paper-deutsch.pdf diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-paper-english.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-paper-english.pdf Binary files differindex e6c62d407c..3a7992cdf7 100644 --- a/macros/latex/contrib/univie-ling/doc/templates/template-paper-english.pdf +++ b/macros/latex/contrib/univie-ling/doc/templates/template-paper-english.pdf diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdf Binary files differindex ba8f0ab19e..0719df2af3 100644 --- a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdf +++ b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdf diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.pdf Binary files differindex e780fe4f91..d5baf32825 100644 --- a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.pdf +++ b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.pdf diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf Binary files differindex a41185e64c..99040225d2 100644 --- a/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf +++ b/macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.pdf diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf Binary files differindex 9f6d69016b..f1f8ad6505 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf +++ b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex index 82941e94cd..f7984c7280 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex +++ b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex @@ -63,7 +63,7 @@ \author{\texorpdfstring{Jrgen Spitzmller% \thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jrgen Spitzmller}} -\date{Version 2.0, 2022/10/02} +\date{Version 2.1, 2022/10/21} \maketitle @@ -341,7 +341,11 @@ Templates are provided as well: \section{Release History} \begin{description} - \item 2022/10/02 (v.\,2.0) + \item 2022/10/21 (v.\,2.1) + \begin{itemize} + \item Fix \joption{polyglossia} option. + \end{itemize} + \item 2022/10/02 (v.\,2.0) \begin{itemize} \item Use \textsf{l3keys} rather than \textsf{xkeyval} for key-value option handling. \item Fix some \textsf{varioref} definitions. diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-handout.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-handout.pdf Binary files differindex e308a78e55..7350488fd3 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling-handout.pdf +++ b/macros/latex/contrib/univie-ling/doc/univie-ling-handout.pdf diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-handout.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-handout.tex index 1dbba9f736..15d5a07eab 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling-handout.tex +++ b/macros/latex/contrib/univie-ling/doc/univie-ling-handout.tex @@ -63,7 +63,7 @@ \author{\texorpdfstring{Jrgen Spitzmller% \thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jrgen Spitzmller}} -\date{Version 2.0, 2022/10/02} +\date{Version 2.1, 2022/10/21} \maketitle @@ -385,6 +385,10 @@ Templates are provided as well: \section{Release History} \begin{description} + \item 2022/10/21 (v.\,2.1) + \begin{itemize} + \item Fix \joption{polyglossia} option. + \end{itemize} \item 2022/10/02 (v.\,2.0) \begin{itemize} \item Use \textsf{l3keys} rather than \textsf{xkeyval} for key-value option handling. diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf Binary files differindex 7838dcbfef..f7025aba1a 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf +++ b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex index bfd39d1995..c3b67f8602 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex +++ b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex @@ -63,7 +63,7 @@ \author{\texorpdfstring{Jrgen Spitzmller% \thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jrgen Spitzmller}} -\date{Version 2.0, 2022/10/02} +\date{Version 2.1, 2022/10/21} \maketitle @@ -374,6 +374,10 @@ Templates are provided as well: \section{Release History} \begin{itemize} + \item 2022/10/21 (v.\,2.1) + \begin{itemize} + \item Fix \joption{polyglossia} option. + \end{itemize} \item 2022/10/02 (v.\,2.0) \begin{itemize} \item Use \textsf{l3keys} rather than \textsf{xkeyval} for key-value option handling. diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf Binary files differindex 096cdf536d..6997a5f366 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf +++ b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex index d181c6cc78..cdec8d14ad 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex +++ b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex @@ -59,7 +59,7 @@ \author{\texorpdfstring{Jrgen Spitzmller% \thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jrgen Spitzmller}} -\date{Version 2.0, 2022/10/02} +\date{Version 2.1, 2022/10/21} \maketitle @@ -404,7 +404,11 @@ Templates are provided as well: \section{Release History} \begin{itemize} - \item 2022/10/02 (v.\,2.0) + \item 2022/10/21 (v.\,2.1) + \begin{itemize} + \item Fix \joption{polyglossia} option. + \end{itemize} + \item 2022/10/02 (v.\,2.0) \begin{itemize} \item Use \textsf{l3keys} rather than \textsf{xkeyval} for key-value option handling. \item Fix some \textsf{varioref} definitions. diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf Binary files differindex b57238618d..527c0b2d59 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf +++ b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex index 7805945596..ee433f9e13 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex +++ b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex @@ -59,7 +59,7 @@ \author{\texorpdfstring{Jrgen Spitzmller% \thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jrgen Spitzmller}} -\date{Version 2.0, 2022/10/02} +\date{Version 2.1, 2022/10/21} \maketitle @@ -81,14 +81,16 @@ be used for contributions to this journal. It comes with suitable \textsf{biblat The class uses PostScript (a.\,k.\,a. Type\,1) fonts and thus requires classic (PDF)LaTeX. -By default, the class uses by default \emph{Crimson} as a serif font (via the \textsf{cochineal} package). -Alternatively, the quite similar shaped \emph{MinionPro} can also be used. -It covers more glyphs and is probably a bit more polished than \emph{Cochineal}, but due to license reasons it is not included in the common -\LaTeX\ distributions. \emph{MinionPro} is provided by the excellent \textsf{FontPro} package.% +By default, the class uses \emph{Cochineal} as a serif font, an extended fork of \emph{Crimson}, +\emph{Source Sans Pro} as sans serif, and \emph{DejaVu Sans Mono} as monospaced font. +Alternatively, the quite similar shaped \emph{MinionPro} (serif) and \emph{MyriadPro} (sans) can also be used. +They cover more glyphs and are probably a bit more polished than \emph{Cochineal} and \emph{Source Sans Pro}, but due to license reasons +they are not included in the common \LaTeX\ distributions. Both \emph{MinionPro} and \emph{MyriadPro} are provided by the excellent +\textsf{FontPro} package.% \footnote{\url{https://github.com/sebschub/FontPro} <25.\,01.\,2017>.} However, some effort is needed to install the package and fonts. Please refer to the package's documentation in case you are interested. -If you want to use \emph{MinionPro}, use the class option \joption{expertfonts=true} (see sec.~\ref{coptions}). +If you want to use the \emph{MinionPro}/\emph{MyriadPro} pair of fonts, use the class option \joption{expertfonts=true} (see sec.~\ref{coptions}). \section{Class Options}\label{coptions} @@ -105,7 +107,8 @@ needed to use this class should be included in your LaTeX distribution and thus The class provides the following option to set the font handling: \begin{description} \setlength\itemsep{0pt} - \item{\joption{expertfonts=true|false}}: if this option is set to true, \emph{MinionPro} is used instead of \emph{Crimson}. + \item{\joption{expertfonts=true|false}}: if this option is set to true, \emph{MinionPro} and \emph{MyriadPro} are used instead of \emph{Crimson} + and \emph{Source Sans Pro}. See sec.~\ref{fonts} for details. \end{description} @@ -137,6 +140,11 @@ The class can generate a titlepage in two different forms. the journal metadata. Pagination info in these places is suppressed. \end{description} +\subsection{Draft mode}\label{draft} + +The option \joption{draftmark=true|false|firstpage} allows you to mark your document as a draft, which is indicated by a watermark (including the current date). This might be useful when sharing preliminary versions with the editors. +With \joption{draftmark=true}, this mark is printed on top of each page. With \joption{draftmark=firstpage}, the draft mark appears on the title page only. + \section{General settings} \subsection{Editorial data} @@ -233,7 +241,12 @@ A template is provided as well: \url{https://github.com/jspitz/univie-ling/raw/m \raggedright \begin{itemize} - \item 2022/10/02 (v.\,2.0) + \item 2022/10/21 (v.\,2.1) + \begin{itemize} + \item Add a sans (\emph{Source Sans Pro} or \emph{MyriadPro}) and monospaced (\emph{DejaVu Sans Mono}) font. + \item Add \joption{draftmark} option. + \end{itemize} + \item 2022/10/02 (v.\,2.0) \begin{itemize} \item Use \textsf{l3keys} rather than \textsf{xkeyval} for key-value option handling. \item Fix and properly localize some \textsf{varioref} definitions. diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling.pdf Binary files differindex 5431d65c90..3d19d59c0f 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling.pdf +++ b/macros/latex/contrib/univie-ling/doc/univie-ling.pdf diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling.tex b/macros/latex/contrib/univie-ling/doc/univie-ling.tex index 21698e7028..0f6e3da8f8 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling.tex +++ b/macros/latex/contrib/univie-ling/doc/univie-ling.tex @@ -42,7 +42,7 @@ \author{\texorpdfstring{Jrgen Spitzmller% \thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jrgen Spitzmller}} -\date{Version 2.0, 2022/10/02} +\date{Version 2.1, 2022/10/21} \maketitle diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls index 102a7e0bcc..570067b9c8 100644 --- a/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls +++ b/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls @@ -32,7 +32,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{univie-ling-expose}[2022/10/02 v.2.0 Univie Linguistic Exposes (JSp)] +\ProvidesPackage{univie-ling-expose}[2022/10/21 v.2.1 Univie Linguistic Exposes (JSp)] %% ============================================================ @@ -58,106 +58,108 @@ \ExplSyntaxOn \keys_define:nn { uve } { - % all=<true|false> - % Load all (most) packages - all.code:n = - { \bool_if:nTF {#1} { - \@uve@biblatextrue - \@uve@captionptrue - \@uve@refsptrue - \@uve@covingtontrue - \@uve@microtypetrue - }{ - \@uve@biblatexfalse - \@uve@captionpfalse - \@uve@refspfalse - \@uve@covingtonfalse - \@uve@microtypefalse - } - }, - all.usage:n = preamble, - % apa=<true|false> - % Load APA style - apa.legacy_if_set:n = @uve@apa, - apa.usage:n = preamble, - % biblatex=<true|false> - % Load biblatex - biblatex.legacy_if_set:n = @uve@biblatex, - biblatex.usage:n = preamble, - % caption=<true|false> - % Load caption - caption.legacy_if_set:n = @uve@captionp, - caption.usage:n = preamble, - % covington=<true|false> - % Load covington - covington.legacy_if_set:n = @uve@covington, - covington.usage:n = preamble, - % fontenc=<value|none> - % customize font encoding - fontenc.code:n = - { \str_if_eq:NNTF { #1 } { none } { - \@uve@usefontencfalse - }{ - \def\uve@fontenc{#1} - } - }, - fontenc.usage:n = preamble, - % microtype=<true|false> - % Load microtype - microtype.legacy_if_set:n = @uve@microtype, - microtype.usage:n = preamble, - % polyglossia=<true|false> - % Load polyglossia - polyglossia.legacy_if_set:n = @uve@polyglossia, - polyglossia.code:n = - { \bool_if:nT {#1} { - \@uve@psfontsfalse - \@uve@otffontstrue - } - }, - polyglossia.usage:n = preamble, - % ref=<true|false> - % Load varioref and prettyref - ref.legacy_if_set:n = @uve@refsp, - ref.usage:n = preamble, - % draftmark=<true|false|firstpage> - % Print draftmark - draftmark .choice:, - % true - draftmark / true .code:n = - { \@uve@draftmarktrue - \@uve@draftmarkfpfalse - }, - % false - draftmark / false .code:n = - { \@uve@draftmarkfalse - \@uve@draftmarkfpfalse - }, - % firstpage - draftmark / firstpage .code:n = - { \@uve@draftmarktrue - \@uve@draftmarkfptrue - }, - % no val equals to true - draftmark .default:n = {true}, - % fonts=<ps|otf|none> - % Select font scheme - fonts .choice:, - % ps: use PostScript fonts (classic LaTeX) - fonts / ps .code:n = - { \@uve@psfontstrue - \@uve@otffontsfalse - }, - % otf: use OpenType fonts (fontspec) - fonts / otf .code:n = - { \@uve@psfontsfalse - \@uve@otffontstrue - }, - % none: Use no font package - fonts / none .code:n = - { \@uve@psfontsfalse - \@uve@otffontsfalse - }, + % all=<true|false> + % Load all (most) packages + all.code:n = + { \bool_if:nTF {#1} { + \@uve@biblatextrue + \@uve@captionptrue + \@uve@refsptrue + \@uve@covingtontrue + \@uve@microtypetrue + }{ + \@uve@biblatexfalse + \@uve@captionpfalse + \@uve@refspfalse + \@uve@covingtonfalse + \@uve@microtypefalse + } + }, + all.usage:n = preamble, + % apa=<true|false> + % Load APA style + apa.legacy_if_set:n = @uve@apa, + apa.usage:n = preamble, + % biblatex=<true|false> + % Load biblatex + biblatex.legacy_if_set:n = @uve@biblatex, + biblatex.usage:n = preamble, + % caption=<true|false> + % Load caption + caption.legacy_if_set:n = @uve@captionp, + caption.usage:n = preamble, + % covington=<true|false> + % Load covington + covington.legacy_if_set:n = @uve@covington, + covington.usage:n = preamble, + % fontenc=<value|none> + % customize font encoding + fontenc.code:n = + { \str_if_eq:NNTF { #1 } { none } { + \@uve@usefontencfalse + }{ + \def\uve@fontenc{#1} + } + }, + fontenc.usage:n = preamble, + % microtype=<true|false> + % Load microtype + microtype.legacy_if_set:n = @uve@microtype, + microtype.usage:n = preamble, + % polyglossia=<true|false> + % Load polyglossia + polyglossia.code:n = + { \bool_if:nTF {#1} { + \@uve@psfontsfalse + \@uve@otffontstrue + \@uve@polyglossiatrue + }{ + \@uve@polyglossiafalse + } + }, + polyglossia.usage:n = preamble, + % ref=<true|false> + % Load varioref and prettyref + ref.legacy_if_set:n = @uve@refsp, + ref.usage:n = preamble, + % draftmark=<true|false|firstpage> + % Print draftmark + draftmark .choice:, + % true + draftmark / true .code:n = + { \@uve@draftmarktrue + \@uve@draftmarkfpfalse + }, + % false + draftmark / false .code:n = + { \@uve@draftmarkfalse + \@uve@draftmarkfpfalse + }, + % firstpage + draftmark / firstpage .code:n = + { \@uve@draftmarktrue + \@uve@draftmarkfptrue + }, + % no val equals to true + draftmark .default:n = {true}, + % fonts=<ps|otf|none> + % Select font scheme + fonts .choice:, + % ps: use PostScript fonts (classic LaTeX) + fonts / ps .code:n = + { \@uve@psfontstrue + \@uve@otffontsfalse + }, + % otf: use OpenType fonts (fontspec) + fonts / otf .code:n = + { \@uve@psfontsfalse + \@uve@otffontstrue + }, + % none: Use no font package + fonts / none .code:n = + { \@uve@psfontsfalse + \@uve@otffontsfalse + }, } \ExplSyntaxOff @@ -177,13 +179,13 @@ %% ============================================================ \LoadClass[% - a4paper, - fontsize=12pt, - captions=tableheading, - listof=totoc, - numbers=noenddot, - titlepage=true, - sectionentrydots=true + a4paper, + fontsize=12pt, + captions=tableheading, + listof=totoc, + numbers=noenddot, + titlepage=true, + sectionentrydots=true ]{scrartcl}[2003/04/22] \RequirePackage{array} @@ -332,7 +334,7 @@ \RequirePackage{geometry} -\usepackage{setspace} +\RequirePackage{setspace} \onehalfspacing % Header and pagination: @@ -439,39 +441,39 @@ \end{center} \vspace{2\baselineskip} \begin{center} - {\usekomafont{tpcaption}\translate{tpcaption}\par} - {\ifx\@title\@empty\else + {\usekomafont{tpcaption}\translate{tpcaption}\par} + {\ifx\@title\@empty\else \usekomafont{title}{\enquote{\@title% \ifx\@subtitle\@empty\else\linebreak\@subtitle\fi}\par}% - \fi - } - \vskip 2em - {% - {\usekomafont{tpcaption}\translate{author}\par} - \usekomafont{author}{% - \lineskip 0.75em% - \begin{tabular}[t]{c} - \@author - \end{tabular}\par - }% - }% - \end{center}\par - \vfill - {\usekomafont{date}{\translate{vienna}, \translate{monthyear}\par}}% - \vskip 2em - \usekomafont{codes}{% - \begin{tabular}[t]{@{}>{\raggedright}p{0.4\columnwidth}>{\raggedright}p{0.1\columnwidth}>{\raggedright}p{0.4\columnwidth}} - \translate{stkz}: & & \@studienkennzahl\tabularnewline - \noalign{\vskip6pt} - \translate{strt}: & & \@studienrichtung\tabularnewline - \noalign{\vskip6pt} - \translate{supervisor}: & & \@supervisor\tabularnewline% - \noalign{\vskip6pt} - \ifx\@cosupervisor\@empty\else\translate{cosupervisor}: & & \@cosupervisor\tabularnewline\fi - \noalign{\vskip6pt} - \ifx\@beirat\@empty\else\translate{beirat}: & & \@beirat\fi - \end{tabular}\par - } + \fi + } + \vskip 2em + {% + {\usekomafont{tpcaption}\translate{author}\par} + \usekomafont{author}{% + \lineskip 0.75em% + \begin{tabular}[t]{c} + \@author + \end{tabular}\par + }% + }% + \end{center}\par + \vfill + {\usekomafont{date}{\translate{vienna}, \translate{monthyear}\par}}% + \vskip 2em + \usekomafont{codes}{% + \begin{tabular}[t]{@{}>{\raggedright}p{0.4\columnwidth}>{\raggedright}p{0.1\columnwidth}>{\raggedright}p{0.4\columnwidth}} + \translate{stkz}: & & \@studienkennzahl\tabularnewline + \noalign{\vskip6pt} + \translate{strt}: & & \@studienrichtung\tabularnewline + \noalign{\vskip6pt} + \translate{supervisor}: & & \@supervisor\tabularnewline% + \noalign{\vskip6pt} + \ifx\@cosupervisor\@empty\else\translate{cosupervisor}: & & \@cosupervisor\tabularnewline\fi + \noalign{\vskip6pt} + \ifx\@beirat\@empty\else\translate{beirat}: & & \@beirat\fi + \end{tabular}\par + } \par \@thanks\let\@thanks\@empty \null @@ -491,8 +493,8 @@ \fi \ifx\titlepage@restore\relax\else\clearpage\titlepage@restore\fi \end{titlepage} - \setcounter{footnote}{0}% - \expandafter\ifnum \csname scr@v@3.12\endcsname>\scr@compatibility\relax + \setcounter{footnote}{0}% + \expandafter\ifnum \csname scr@v@3.12\endcsname>\scr@compatibility\relax \let\thanks\relax \let\maketitle\relax \let\@maketitle\relax @@ -580,9 +582,9 @@ \if@uve@captionp \RequirePackage[format=plain, - justification=RaggedRight, - singlelinecheck=false - ]{caption} + justification=RaggedRight, + singlelinecheck=false + ]{caption} \fi %% ============================================================= diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-handout.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-handout.cls index 293064b15d..8327970b1f 100644 --- a/macros/latex/contrib/univie-ling/tex/univie-ling-handout.cls +++ b/macros/latex/contrib/univie-ling/tex/univie-ling-handout.cls @@ -33,7 +33,7 @@ \NeedsTeXFormat{LaTeX2e}[1997/06/01] -\ProvidesClass{univie-ling-handout}[2022/10/02 v.2.0 Univie Ling handout class (JSp)] +\ProvidesClass{univie-ling-handout}[2022/10/21 v.2.1 Univie Ling handout class (JSp)] %% ============================================================ %% CLASS OPTIONS @@ -68,40 +68,40 @@ \def\uvh@printsmalllogo{\includegraphics[height=14mm]{univielogo}} % German CD (default) \def\uvh@cd@german{ - \def\uvh@name{\uvh@name@de} - \def\uvh@shortname{\uvh@shortname@de} - \def\uvh@university{Universit\"at Wien} - \def\uvh@department{\uvh@department@de} - \def\uvh@location{\uvh@location@de} - \def\uvh@country{\uvh@country@de} - \def\uvh@function{\uvh@function@de} - \def\uvh@secfunction{\uvh@secfunction@de} - \def\uvh@phoneprefix{T} - \def\uvh@faxprefix{F} - \def\uvh@emailprefix{} - \def\uvh@urlprefix{} - \def\uvh@pageprefix{Seite} - \def\uvh@headerdeptsep{\ $\cdot$\ } - \def\uvh@headernamesep{,\ } - \def\and{\\} + \def\uvh@name{\uvh@name@de} + \def\uvh@shortname{\uvh@shortname@de} + \def\uvh@university{Universit\"at Wien} + \def\uvh@department{\uvh@department@de} + \def\uvh@location{\uvh@location@de} + \def\uvh@country{\uvh@country@de} + \def\uvh@function{\uvh@function@de} + \def\uvh@secfunction{\uvh@secfunction@de} + \def\uvh@phoneprefix{T} + \def\uvh@faxprefix{F} + \def\uvh@emailprefix{} + \def\uvh@urlprefix{} + \def\uvh@pageprefix{Seite} + \def\uvh@headerdeptsep{\ $\cdot$\ } + \def\uvh@headernamesep{,\ } + \def\and{\\} } \def\uvh@cd@english{% - \def\uvh@name{\uvh@name@en} - \def\uvh@shortname{\uvh@shortname@en} - \def\uvh@university{University of Vienna} - \def\uvh@department{\uvh@department@en} - \def\uvh@location{\uvh@location@en} - \def\uvh@country{\uvh@country@en} - \def\uvh@function{\uvh@function@en} - \def\uvh@secfunction{\uvh@secfunction@en} - \def\uvh@phoneprefix{T} - \def\uvh@faxprefix{F} - \def\uvh@emailprefix{} - \def\uvh@urlprefix{} - \def\uvh@pageprefix{Page} - \def\uvh@headerdeptsep{\ $\cdot$\ } - \def\uvh@headernamesep{,\ } - \def\uvh@secnamesep{,\ } + \def\uvh@name{\uvh@name@en} + \def\uvh@shortname{\uvh@shortname@en} + \def\uvh@university{University of Vienna} + \def\uvh@department{\uvh@department@en} + \def\uvh@location{\uvh@location@en} + \def\uvh@country{\uvh@country@en} + \def\uvh@function{\uvh@function@en} + \def\uvh@secfunction{\uvh@secfunction@en} + \def\uvh@phoneprefix{T} + \def\uvh@faxprefix{F} + \def\uvh@emailprefix{} + \def\uvh@urlprefix{} + \def\uvh@pageprefix{Page} + \def\uvh@headerdeptsep{\ $\cdot$\ } + \def\uvh@headernamesep{,\ } + \def\uvh@secnamesep{,\ } } \uvh@cd@german @@ -110,170 +110,172 @@ \ExplSyntaxOn \keys_define:nn { uvh } { - % all=<true|false> - % Load all (most) packages - all.code:n = - { \bool_if:nTF {#1} { - \@uvh@biblatextrue - \@uvh@captionptrue - \@uvh@refsptrue - \@uvh@covingtontrue - \@uvh@microtypetrue - }{ - \@uvh@biblatexfalse - \@uvh@captionpfalse - \@uvh@refspfalse - \@uvh@covingtonfalse - \@uvh@microtypefalse - } - }, - all.usage:n = preamble, - % apa=<true|false> - % Load APA style - apa.legacy_if_set:n = @uvh@apa, - apa.usage:n = preamble, - % biblatex=<true|false> - % Load biblatex - biblatex.legacy_if_set:n = @uvh@biblatex, - biblatex.usage:n = preamble, - % breakevent=<true|false> - % Line break in heading between event and event spec (location, date etc.) - breakevent.legacy_if_set:n = @uvh@breakevent, - breakevent.usage:n = preamble, - % bwlogo=<true|false> - % Print monochrome logo? - bwlogo.code:n = - { \bool_if:nTF {#1} { - \def\uvh@printlogo{\includegraphics[width=74mm]{univielogo-sw}} - \def\uvh@printsmalllogo{\includegraphics[height=14mm]{univielogo-sw}} - }{ - \def\uvh@printlogo{\includegraphics[width=74mm]{univielogo}} - \def\uvh@printsmalllogo{\includegraphics[height=14mm]{univielogo}} - } - }, - bwlogo.usage:n = preamble, - % caption=<true|false> - % Load caption - caption.legacy_if_set:n = @uvh@captionp, - caption.usage:n = preamble, - % covington=<true|false> - % Load covington - covington.legacy_if_set:n = @uvh@covington, - covington.usage:n = preamble, - % firstpagination=<true|false> - % Suppress pagination on first page? - firstpagination.legacy_if_set:n = @uvh@pageonfirst, - firstpagination.usage:n = preamble, - % foldmarks=<true|false> - % Output fold marks? - foldmarks.legacy_if_set:n = @uvh@foldmarks, - foldmarks.usage:n = preamble, - % fontenc=<value|none> - % customize font encoding - fontenc.code:n = - { \str_if_eq:NNTF { #1 } { none } { - \@uvh@usefontencfalse - }{ - \def\uvh@fontenc{#1} - } - }, - fontenc.usage:n = preamble, - % fontsize=<size> - % Set base font size - fontsize.tl_set:N = \uvh@fontsize, - fontsize.usage:n = preamble, - % landscape=<true|false> - % Set landscape - landscape.legacy_if_set:n = @uvh@landscape, - landscape.usage:n = preamble, - % microtype=<true|false> - % Load microtype - microtype.legacy_if_set:n = @uvh@microtype, - microtype.usage:n = preamble, - % papersize=<size> - % Set paper size - papersize.tl_set:N = \uvh@papersize, - papersize.usage:n = preamble, - % polyglossia=<true|false> - % Load polyglossia - polyglossia.legacy_if_set:n = @uvh@polyglossia, - polyglossia.code:n = - { \bool_if:nT {#1} { - \@uvh@psfontsfalse - \@uvh@otffontstrue - } - }, - polyglossia.usage:n = preamble, - % pplogo=<true|false> - % Print logo on page 2ff. - pplogo.legacy_if_set:n = @uvh@pplogo, - pplogo.usage:n = preamble, - % punchmarks=<true|false> - % Output punch marks? - punchmarks.legacy_if_set:n = @uvh@punchmark, - punchmarks.usage:n = preamble, - % ref=<true|false> - % Load varioref and prettyref - ref.legacy_if_set:n = @uvh@refsp, - ref.usage:n = preamble, - % swaphead=<true|false> - % Swap title and event in header - swaphead.legacy_if_set:n = @uvh@swaphead, - swaphead.usage:n = preamble, - % totalpages=<true|false> - % Output total page number - totalpages.legacy_if_set:n = @uvh@lastpage, - totalpages.usage:n = preamble, - % widesubtitle=<true|false> - % Print subtitle over the whole text width - % (may conflict with address field) - widesubtitle.legacy_if_set:n = @uvh@usewidesubtitle, - widesubtitle.usage:n = preamble, - % cd=<german|english> - % CD Language - cd .choice:, - % german - cd / german .code:n = { \uvh@cd@german }, - % english - cd / english .code:n = { \uvh@cd@english }, - % draftmark=<true|false|firstpage> - % Print draftmark - draftmark .choice:, - % true - draftmark / true .code:n = - { \@uvh@draftmarktrue - \@uvh@draftmarkfpfalse - }, - % false - draftmark / false .code:n = - { \@uvh@draftmarkfalse - \@uvh@draftmarkfpfalse - }, - % firstpage - draftmark / firstpage .code:n = - { \@uvh@draftmarktrue - \@uvh@draftmarkfptrue - }, - % no val equals to true - draftmark .default:n = {true}, - % fonts=<ps|otf|none> - % Select font scheme - fonts .choice:, - % ps: use PostScript fonts (classic LaTeX) - fonts / ps .code:n = - { \@uvh@psfontstrue - \@uvh@otffontsfalse - }, - % otf: use OpenType fonts (fontspec) - fonts / otf .code:n = - { \@uvh@psfontsfalse - \@uvh@otffontstrue - }, - % none: Use no font package - fonts / none .code:n = - { \@uvh@psfontsfalse - \@uvh@otffontsfalse - }, + % all=<true|false> + % Load all (most) packages + all.code:n = + { \bool_if:nTF {#1} { + \@uvh@biblatextrue + \@uvh@captionptrue + \@uvh@refsptrue + \@uvh@covingtontrue + \@uvh@microtypetrue + }{ + \@uvh@biblatexfalse + \@uvh@captionpfalse + \@uvh@refspfalse + \@uvh@covingtonfalse + \@uvh@microtypefalse + } + }, + all.usage:n = preamble, + % apa=<true|false> + % Load APA style + apa.legacy_if_set:n = @uvh@apa, + apa.usage:n = preamble, + % biblatex=<true|false> + % Load biblatex + biblatex.legacy_if_set:n = @uvh@biblatex, + biblatex.usage:n = preamble, + % breakevent=<true|false> + % Line break in heading between event and event spec (location, date etc.) + breakevent.legacy_if_set:n = @uvh@breakevent, + breakevent.usage:n = preamble, + % bwlogo=<true|false> + % Print monochrome logo? + bwlogo.code:n = + { \bool_if:nTF {#1} { + \def\uvh@printlogo{\includegraphics[width=74mm]{univielogo-sw}} + \def\uvh@printsmalllogo{\includegraphics[height=14mm]{univielogo-sw}} + }{ + \def\uvh@printlogo{\includegraphics[width=74mm]{univielogo}} + \def\uvh@printsmalllogo{\includegraphics[height=14mm]{univielogo}} + } + }, + bwlogo.usage:n = preamble, + % caption=<true|false> + % Load caption + caption.legacy_if_set:n = @uvh@captionp, + caption.usage:n = preamble, + % covington=<true|false> + % Load covington + covington.legacy_if_set:n = @uvh@covington, + covington.usage:n = preamble, + % firstpagination=<true|false> + % Suppress pagination on first page? + firstpagination.legacy_if_set:n = @uvh@pageonfirst, + firstpagination.usage:n = preamble, + % foldmarks=<true|false> + % Output fold marks? + foldmarks.legacy_if_set:n = @uvh@foldmarks, + foldmarks.usage:n = preamble, + % fontenc=<value|none> + % customize font encoding + fontenc.code:n = + { \str_if_eq:NNTF { #1 } { none } { + \@uvh@usefontencfalse + }{ + \def\uvh@fontenc{#1} + } + }, + fontenc.usage:n = preamble, + % fontsize=<size> + % Set base font size + fontsize.tl_set:N = \uvh@fontsize, + fontsize.usage:n = preamble, + % landscape=<true|false> + % Set landscape + landscape.legacy_if_set:n = @uvh@landscape, + landscape.usage:n = preamble, + % microtype=<true|false> + % Load microtype + microtype.legacy_if_set:n = @uvh@microtype, + microtype.usage:n = preamble, + % papersize=<size> + % Set paper size + papersize.tl_set:N = \uvh@papersize, + papersize.usage:n = preamble, + % polyglossia=<true|false> + % Load polyglossia + polyglossia.code:n = + { \bool_if:nTF {#1} { + \@uvh@psfontsfalse + \@uvh@otffontstrue + \@uvh@polyglossiatrue + }{ + \@uvh@polyglossiafalse + } + }, + polyglossia.usage:n = preamble, + % pplogo=<true|false> + % Print logo on page 2ff. + pplogo.legacy_if_set:n = @uvh@pplogo, + pplogo.usage:n = preamble, + % punchmarks=<true|false> + % Output punch marks? + punchmarks.legacy_if_set:n = @uvh@punchmark, + punchmarks.usage:n = preamble, + % ref=<true|false> + % Load varioref and prettyref + ref.legacy_if_set:n = @uvh@refsp, + ref.usage:n = preamble, + % swaphead=<true|false> + % Swap title and event in header + swaphead.legacy_if_set:n = @uvh@swaphead, + swaphead.usage:n = preamble, + % totalpages=<true|false> + % Output total page number + totalpages.legacy_if_set:n = @uvh@lastpage, + totalpages.usage:n = preamble, + % widesubtitle=<true|false> + % Print subtitle over the whole text width + % (may conflict with address field) + widesubtitle.legacy_if_set:n = @uvh@usewidesubtitle, + widesubtitle.usage:n = preamble, + % cd=<german|english> + % CD Language + cd .choice:, + % german + cd / german .code:n = { \uvh@cd@german }, + % english + cd / english .code:n = { \uvh@cd@english }, + % draftmark=<true|false|firstpage> + % Print draftmark + draftmark .choice:, + % true + draftmark / true .code:n = + { \@uvh@draftmarktrue + \@uvh@draftmarkfpfalse + }, + % false + draftmark / false .code:n = + { \@uvh@draftmarkfalse + \@uvh@draftmarkfpfalse + }, + % firstpage + draftmark / firstpage .code:n = + { \@uvh@draftmarktrue + \@uvh@draftmarkfptrue + }, + % no val equals to true + draftmark .default:n = {true}, + % fonts=<ps|otf|none> + % Select font scheme + fonts .choice:, + % ps: use PostScript fonts (classic LaTeX) + fonts / ps .code:n = + { \@uvh@psfontstrue + \@uvh@otffontsfalse + }, + % otf: use OpenType fonts (fontspec) + fonts / otf .code:n = + { \@uvh@psfontsfalse + \@uvh@otffontstrue + }, + % none: Use no font package + fonts / none .code:n = + { \@uvh@psfontsfalse + \@uvh@otffontsfalse + }, } \ExplSyntaxOff @@ -754,9 +756,9 @@ \if@uvh@captionp \RequirePackage[format=plain, - justification=RaggedRight, - singlelinecheck=false - ]{caption} + justification=RaggedRight, + singlelinecheck=false + ]{caption} \fi %% ============================================================= diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls index 34f029b9ed..639c8d0423 100644 --- a/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls +++ b/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls @@ -32,7 +32,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{univie-ling-paper}[2022/10/02 v.2.0 Univie Linguistic Papers (JSp)] +\ProvidesPackage{univie-ling-paper}[2022/10/21 v.2.1 Univie Linguistic Papers (JSp)] %% ============================================================ @@ -59,106 +59,108 @@ \ExplSyntaxOn \keys_define:nn { uvp } { - % all=<true|false> - % Load all (most) packages - all.code:n = - { \bool_if:nTF {#1} { - \@uvp@biblatextrue - \@uvp@captionptrue - \@uvp@refsptrue - \@uvp@covingtontrue - \@uvp@microtypetrue - }{ - \@uvp@biblatexfalse - \@uvp@captionpfalse - \@uvp@refspfalse - \@uvp@covingtonfalse - \@uvp@microtypefalse - } - }, - all.usage:n = preamble, - % apa=<true|false> - % Load APA style - apa.legacy_if_set:n = @uvp@apa, - apa.usage:n = preamble, - % biblatex=<true|false> - % Load biblatex - biblatex.legacy_if_set:n = @uvp@biblatex, - biblatex.usage:n = preamble, - % caption=<true|false> - % Load caption - caption.legacy_if_set:n = @uvp@captionp, - caption.usage:n = preamble, - % covington=<true|false> - % Load covington - covington.legacy_if_set:n = @uvp@covington, - covington.usage:n = preamble, - % fontenc=<value|none> - % customize font encoding - fontenc.code:n = - { \str_if_eq:NNTF { #1 } { none } { - \@uvp@usefontencfalse - }{ - \def\uvp@fontenc{#1} - } - }, - fontenc.usage:n = preamble, - % microtype=<true|false> - % Load microtype - microtype.legacy_if_set:n = @uvp@microtype, - microtype.usage:n = preamble, - % polyglossia=<true|false> - % Load polyglossia - polyglossia.legacy_if_set:n = @uvp@polyglossia, - polyglossia.code:n = - { \bool_if:nT {#1} { - \@uvp@psfontsfalse - \@uvp@otffontstrue - } - }, - polyglossia.usage:n = preamble, - % ref=<true|false> - % Load varioref and prettyref - ref.legacy_if_set:n = @uvp@refsp, - ref.usage:n = preamble, - % draftmark=<true|false|firstpage> - % Print draftmark - draftmark .choice:, - % true - draftmark / true .code:n = - { \@uvp@draftmarktrue - \@uvp@draftmarkfpfalse - }, - % false - draftmark / false .code:n = - { \@uvp@draftmarkfalse - \@uvp@draftmarkfpfalse - }, - % firstpage - draftmark / firstpage .code:n = - { \@uvp@draftmarktrue - \@uvp@draftmarkfptrue - }, - % no val equals to true - draftmark .default:n = {true}, - % fonts=<ps|otf|none> - % Select font scheme - fonts .choice:, - % ps: use PostScript fonts (classic LaTeX) - fonts / ps .code:n = - { \@uvp@psfontstrue - \@uvp@otffontsfalse - }, - % otf: use OpenType fonts (fontspec) - fonts / otf .code:n = - { \@uvp@psfontsfalse - \@uvp@otffontstrue - }, - % none: Use no font package - fonts / none .code:n = - { \@uvp@psfontsfalse - \@uvp@otffontsfalse - }, + % all=<true|false> + % Load all (most) packages + all.code:n = + { \bool_if:nTF {#1} { + \@uvp@biblatextrue + \@uvp@captionptrue + \@uvp@refsptrue + \@uvp@covingtontrue + \@uvp@microtypetrue + }{ + \@uvp@biblatexfalse + \@uvp@captionpfalse + \@uvp@refspfalse + \@uvp@covingtonfalse + \@uvp@microtypefalse + } + }, + all.usage:n = preamble, + % apa=<true|false> + % Load APA style + apa.legacy_if_set:n = @uvp@apa, + apa.usage:n = preamble, + % biblatex=<true|false> + % Load biblatex + biblatex.legacy_if_set:n = @uvp@biblatex, + biblatex.usage:n = preamble, + % caption=<true|false> + % Load caption + caption.legacy_if_set:n = @uvp@captionp, + caption.usage:n = preamble, + % covington=<true|false> + % Load covington + covington.legacy_if_set:n = @uvp@covington, + covington.usage:n = preamble, + % fontenc=<value|none> + % customize font encoding + fontenc.code:n = + { \str_if_eq:NNTF { #1 } { none } { + \@uvp@usefontencfalse + }{ + \def\uvp@fontenc{#1} + } + }, + fontenc.usage:n = preamble, + % microtype=<true|false> + % Load microtype + microtype.legacy_if_set:n = @uvp@microtype, + microtype.usage:n = preamble, + % polyglossia=<true|false> + % Load polyglossia + polyglossia.code:n = + { \bool_if:nTF {#1} { + \@uvp@psfontsfalse + \@uvp@otffontstrue + \@uvp@polyglossiatrue + }{ + \@uvp@polyglossiafalse + } + }, + polyglossia.usage:n = preamble, + % ref=<true|false> + % Load varioref and prettyref + ref.legacy_if_set:n = @uvp@refsp, + ref.usage:n = preamble, + % draftmark=<true|false|firstpage> + % Print draftmark + draftmark .choice:, + % true + draftmark / true .code:n = + { \@uvp@draftmarktrue + \@uvp@draftmarkfpfalse + }, + % false + draftmark / false .code:n = + { \@uvp@draftmarkfalse + \@uvp@draftmarkfpfalse + }, + % firstpage + draftmark / firstpage .code:n = + { \@uvp@draftmarktrue + \@uvp@draftmarkfptrue + }, + % no val equals to true + draftmark .default:n = {true}, + % fonts=<ps|otf|none> + % Select font scheme + fonts .choice:, + % ps: use PostScript fonts (classic LaTeX) + fonts / ps .code:n = + { \@uvp@psfontstrue + \@uvp@otffontsfalse + }, + % otf: use OpenType fonts (fontspec) + fonts / otf .code:n = + { \@uvp@psfontsfalse + \@uvp@otffontstrue + }, + % none: Use no font package + fonts / none .code:n = + { \@uvp@psfontsfalse + \@uvp@otffontsfalse + }, } \ExplSyntaxOff @@ -178,14 +180,14 @@ %% ============================================================ \LoadClass[% - a4paper, - fontsize=12pt, - BCOR=0mm, - captions=tableheading, - listof=totoc, - numbers=noenddot, - titlepage=true, - sectionentrydots=true + a4paper, + fontsize=12pt, + BCOR=0mm, + captions=tableheading, + listof=totoc, + numbers=noenddot, + titlepage=true, + sectionentrydots=true ]{scrartcl}[2003/04/22] @@ -690,9 +692,9 @@ This includes all drawings, sketches, graphics and internet sources.} \if@uvp@captionp \RequirePackage[format=plain, - justification=RaggedRight, - singlelinecheck=false - ]{caption} + justification=RaggedRight, + singlelinecheck=false + ]{caption} \fi %% ============================================================= diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls index 8cc29a83ac..016c21d1be 100644 --- a/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls +++ b/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls @@ -32,7 +32,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{univie-ling-thesis}[2022/10/02 v.2.0 Univie Linguistic Theses (JSp)] +\ProvidesPackage{univie-ling-thesis}[2022/10/21 v.2.1 Univie Linguistic Theses (JSp)] %% ============================================================ @@ -63,114 +63,116 @@ \ExplSyntaxOn \keys_define:nn { uvt } { - % all=<true|false> - % Load all (most) packages - all.code:n = - { \bool_if:nTF {#1} { - \@uvt@biblatextrue - \@uvt@captionptrue - \@uvt@refsptrue - \@uvt@covingtontrue - \@uvt@microtypetrue - }{ - \@uvt@biblatexfalse - \@uvt@captionpfalse - \@uvt@refspfalse - \@uvt@covingtonfalse - \@uvt@microtypefalse - } - }, - all.usage:n = preamble, - % apa=<true|false> - % Load APA style - apa.legacy_if_set:n = @uvt@apa, - apa.usage:n = preamble, - % biblatex=<true|false> - % Load biblatex - biblatex.legacy_if_set:n = @uvt@biblatex, - biblatex.usage:n = preamble, - % caption=<true|false> - % Load caption - caption.legacy_if_set:n = @uvt@captionp, - caption.usage:n = preamble, - % covington=<true|false> - % Load covington - covington.legacy_if_set:n = @uvt@covington, - covington.usage:n = preamble, - % fdegree=<true|false> - % Female degree forms - fdegree.legacy_if_set:n = @uvt@fdegree, - fdegree.usage:n = preamble, - % fontenc=<value|none> - % customize font encoding - fontenc.code:n = - { \str_if_eq:NNTF { #1 } { none } { - \@uvt@usefontencfalse - }{ - \def\uvt@fontenc{#1} - } - }, - fontenc.usage:n = preamble, - % microtype=<true|false> - % Load microtype - microtype.legacy_if_set:n = @uvt@microtype, - microtype.usage:n = preamble, - % pdfa=<true|false> - % PDF/A - pdfa.legacy_if_set:n = @uvt@pdfa, - pdfa.usage:n = preamble, - % polyglossia=<true|false> - % Load polyglossia - polyglossia.legacy_if_set:n = @uvt@polyglossia, - polyglossia.code:n = - { \bool_if:nT {#1} { - \@uvt@psfontsfalse - \@uvt@otffontstrue - } - }, - polyglossia.usage:n = preamble, - % ref=<true|false> - % Load varioref and prettyref - ref.legacy_if_set:n = @uvt@refsp, - ref.usage:n = preamble, - % draftmark=<true|false|firstpage> - % Print draftmark - draftmark .choice:, - % true - draftmark / true .code:n = - { \@uvt@draftmarktrue + % all=<true|false> + % Load all (most) packages + all.code:n = + { \bool_if:nTF {#1} { + \@uvt@biblatextrue + \@uvt@captionptrue + \@uvt@refsptrue + \@uvt@covingtontrue + \@uvt@microtypetrue + }{ + \@uvt@biblatexfalse + \@uvt@captionpfalse + \@uvt@refspfalse + \@uvt@covingtonfalse + \@uvt@microtypefalse + } + }, + all.usage:n = preamble, + % apa=<true|false> + % Load APA style + apa.legacy_if_set:n = @uvt@apa, + apa.usage:n = preamble, + % biblatex=<true|false> + % Load biblatex + biblatex.legacy_if_set:n = @uvt@biblatex, + biblatex.usage:n = preamble, + % caption=<true|false> + % Load caption + caption.legacy_if_set:n = @uvt@captionp, + caption.usage:n = preamble, + % covington=<true|false> + % Load covington + covington.legacy_if_set:n = @uvt@covington, + covington.usage:n = preamble, + % fdegree=<true|false> + % Female degree forms + fdegree.legacy_if_set:n = @uvt@fdegree, + fdegree.usage:n = preamble, + % fontenc=<value|none> + % customize font encoding + fontenc.code:n = + { \str_if_eq:NNTF { #1 } { none } { + \@uvt@usefontencfalse + }{ + \def\uvt@fontenc{#1} + } + }, + fontenc.usage:n = preamble, + % microtype=<true|false> + % Load microtype + microtype.legacy_if_set:n = @uvt@microtype, + microtype.usage:n = preamble, + % pdfa=<true|false> + % PDF/A + pdfa.legacy_if_set:n = @uvt@pdfa, + pdfa.usage:n = preamble, + % polyglossia=<true|false> + % Load polyglossia + polyglossia.code:n = + { \bool_if:nTF {#1} { + \@uvt@psfontsfalse + \@uvt@otffontstrue + \@uvt@polyglossiatrue + }{ + \@uvt@polyglossiafalse + } + }, + polyglossia.usage:n = preamble, + % ref=<true|false> + % Load varioref and prettyref + ref.legacy_if_set:n = @uvt@refsp, + ref.usage:n = preamble, + % draftmark=<true|false|firstpage> + % Print draftmark + draftmark .choice:, + % true + draftmark / true .code:n = + { \@uvt@draftmarktrue + \@uvt@draftmarkfpfalse + }, + % false + draftmark / false .code:n = + { \@uvt@draftmarkfalse \@uvt@draftmarkfpfalse - }, - % false - draftmark / false .code:n = - { \@uvt@draftmarkfalse - \@uvt@draftmarkfpfalse - }, - % firstpage - draftmark / firstpage .code:n = - { \@uvt@draftmarktrue - \@uvt@draftmarkfptrue - }, - % no val equals to true - draftmark .default:n = {true}, - % fonts=<ps|otf|none> - % Select font scheme - fonts .choice:, - % ps: use PostScript fonts (classic LaTeX) - fonts / ps .code:n = - { \@uvt@psfontstrue - \@uvt@otffontsfalse - }, - % otf: use OpenType fonts (fontspec) - fonts / otf .code:n = - { \@uvt@psfontsfalse - \@uvt@otffontstrue - }, - % none: Use no font package - fonts / none .code:n = - { \@uvt@psfontsfalse - \@uvt@otffontsfalse - }, + }, + % firstpage + draftmark / firstpage .code:n = + { \@uvt@draftmarktrue + \@uvt@draftmarkfptrue + }, + % no val equals to true + draftmark .default:n = {true}, + % fonts=<ps|otf|none> + % Select font scheme + fonts .choice:, + % ps: use PostScript fonts (classic LaTeX) + fonts / ps .code:n = + { \@uvt@psfontstrue + \@uvt@otffontsfalse + }, + % otf: use OpenType fonts (fontspec) + fonts / otf .code:n = + { \@uvt@psfontsfalse + \@uvt@otffontstrue + }, + % none: Use no font package + fonts / none .code:n = + { \@uvt@psfontsfalse + \@uvt@otffontsfalse + }, } \ExplSyntaxOff @@ -189,12 +191,12 @@ %% ============================================================ \LoadClass[% - a4paper, - captions=tableheading, - listof=totoc, - numbers=noenddot, - titlepage=true, - chapterentrydots=true + a4paper, + captions=tableheading, + listof=totoc, + numbers=noenddot, + titlepage=true, + chapterentrydots=true ]{scrreprt}[2003/04/22] \RequirePackage{array} @@ -518,8 +520,8 @@ This includes all drawings, sketches, graphics and internet sources.} \end{center} \vspace{2\baselineskip} \begin{center} - {\usekomafont{tpcaption}Titel der \@thesistype\,/\,Title of the \@thesistype@en\par} - {\ifx\@title\@empty\else + {\usekomafont{tpcaption}Titel der \@thesistype\,/\,Title of the \@thesistype@en\par} + {\ifx\@title\@empty\else \usekomafont{title}{\enquote{\@title% \ifx\@subtitle\@empty\else\linebreak\@subtitle\fi}\par}% \fi @@ -539,23 +541,23 @@ This includes all drawings, sketches, graphics and internet sources.} }% }% \vskip 2em - {\usekomafont{tpcaption}angestrebter akademischer Grad\,/\,in partial fulfilment of the requirements for the degree of\par} + {\usekomafont{tpcaption}angestrebter akademischer Grad\,/\,in partial fulfilment of the requirements for the degree of\par} \usekomafont{degree}{\@degree} \end{center}\par \vfill {\usekomafont{date}{Wien, \the\year\,/\,Vienna, \the\year\par}}% \vskip 2em - \usekomafont{codes}{% - \begin{tabular}[t]{@{}>{\raggedright}p{0.4\columnwidth}>{\raggedright}p{0.1\columnwidth}>{\raggedright}p{0.4\columnwidth}} - Studienkennzahl lt. Studienblatt/\newline degree programme code as it appears on the student record sheet: & & \@studienkennzahl\tabularnewline + \usekomafont{codes}{% + \begin{tabular}[t]{@{}>{\raggedright}p{0.4\columnwidth}>{\raggedright}p{0.1\columnwidth}>{\raggedright}p{0.4\columnwidth}} + Studienkennzahl lt. Studienblatt/\newline degree programme code as it appears on the student record sheet: & & \@studienkennzahl\tabularnewline \noalign{\vskip6pt} - \@dirtype\ lt. Studienblatt\slash\newline \@dirtype@en\ as it appears on the student record sheet: & & \@studienrichtung\tabularnewline + \@dirtype\ lt. Studienblatt\slash\newline \@dirtype@en\ as it appears on the student record sheet: & & \@studienrichtung\tabularnewline \noalign{\vskip6pt} Betreut von\,/\,Supervisor: & & \@supervisor\tabularnewline% \noalign{\vskip6pt} \ifx\@cosupervisor\@empty\else Mitbetreut von\,/\,Co-Supervisor: & & \@cosupervisor\fi - \end{tabular}\par - } + \end{tabular}\par + } \par \@thanks\let\@thanks\@empty \null @@ -706,9 +708,9 @@ This includes all drawings, sketches, graphics and internet sources.} \if@uvt@captionp \RequirePackage[format=plain, - justification=RaggedRight, - singlelinecheck=false - ]{caption} + justification=RaggedRight, + singlelinecheck=false + ]{caption} \fi diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls index 1be6bd1ccc..988bb4b588 100644 --- a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls +++ b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls @@ -33,7 +33,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{univie-ling-wlg}[2022/10/02 v.2.0 Univie WLG journal layout (JSp)] +\ProvidesPackage{univie-ling-wlg}[2022/10/21 v.2.1 Univie WLG journal layout (JSp)] %% ============================================================ @@ -42,6 +42,8 @@ \newif\if@wlg@biblatex\@wlg@biblatexfalse \newif\if@wlg@covington\@wlg@covingtontrue +\newif\if@wlg@draftmark\@wlg@draftmarkfalse +\newif\if@wlg@draftmarkfp\@wlg@draftmarkfpfalse \newif\if@wlg@expert\@wlg@expertfalse \newif\if@wlg@titlepage\@wlg@titlepagefalse \newif\if@wlg@specialprint\@wlg@specialprintfalse @@ -51,41 +53,61 @@ \ExplSyntaxOn \keys_define:nn { wlg } { - % biblatex=<true|false> - % Load biblatex - biblatex.legacy_if_set:n = @wlg@biblatex, - biblatex.usage:n = preamble, - % covington=<true|false> - % Load covington - covington.legacy_if_set:n = @wlg@covington, - covington.usage:n = preamble, - % expertfonts=<true|false> - % Load MinionPro - expertfonts.legacy_if_set:n = @wlg@expert, - expertfonts.usage:n = preamble, - % preprint=<true|false> - preprint.legacy_if_set:n = @wlg@preprint, - preprint.usage:n = preamble, - % peerrev=<true|false> - peerrev.legacy_if_set:n = @wlg@peerrev, - peerrev.usage:n = preamble, - % titlepage=<none|specialprint|issue> - titlepage .choice:, - % none - titlepage / none .code:n = - { \@wlg@titlepagefalse - \@wlg@specialprintfalse - }, - % specialprint - titlepage / specialprint .code:n = - { \@wlg@titlepagetrue - \@wlg@specialprinttrue - }, - % issue - titlepage / issue .code:n = - { \@wlg@titlepagetrue - \@wlg@specialprintfalse - }, + % biblatex=<true|false> + % Load biblatex + biblatex.legacy_if_set:n = @wlg@biblatex, + biblatex.usage:n = preamble, + % covington=<true|false> + % Load covington + covington.legacy_if_set:n = @wlg@covington, + covington.usage:n = preamble, + % expertfonts=<true|false> + % Load MinionPro + expertfonts.legacy_if_set:n = @wlg@expert, + expertfonts.usage:n = preamble, + % preprint=<true|false> + preprint.legacy_if_set:n = @wlg@preprint, + preprint.usage:n = preamble, + % peerrev=<true|false> + peerrev.legacy_if_set:n = @wlg@peerrev, + peerrev.usage:n = preamble, + % titlepage=<none|specialprint|issue> + titlepage .choice:, + % none + titlepage / none .code:n = + { \@wlg@titlepagefalse + \@wlg@specialprintfalse + }, + % specialprint + titlepage / specialprint .code:n = + { \@wlg@titlepagetrue + \@wlg@specialprinttrue + }, + % issue + titlepage / issue .code:n = + { \@wlg@titlepagetrue + \@wlg@specialprintfalse + }, + % draftmark=<true|false|firstpage> + % Print draftmark + draftmark .choice:, + % true + draftmark / true .code:n = + { \@wlg@draftmarktrue + \@wlg@draftmarkfpfalse + }, + % false + draftmark / false .code:n = + { \@wlg@draftmarkfalse + \@wlg@draftmarkfpfalse + }, + % firstpage + draftmark / firstpage .code:n = + { \@wlg@draftmarktrue + \@wlg@draftmarkfptrue + }, + % no val equals to true + draftmark .default:n = {true}, } \ExplSyntaxOff @@ -106,17 +128,17 @@ \LoadClass{scrartcl}[2003/04/22] \KOMAoptions{% - footlines=2, - paper=152mm:229mm, - DIV=calc, - fontsize=12pt, - footlines=2, - headings=small, - captions=tableheading, - listof=totoc, - numbers=noenddot, - abstract=on, - twoside=semi + footlines=2, + paper=152mm:229mm, + DIV=calc, + fontsize=12pt, + footlines=2, + headings=small, + captions=tableheading, + listof=totoc, + numbers=noenddot, + abstract=on, + twoside=semi } \recalctypearea @@ -134,21 +156,46 @@ \InputIfFileExists{univie-ling-wlg.cfg} %% ============================================================ +%% HELPERS: +%% ============================================================ + +\newif\if@wlg@inputeencloaded\@wlg@inputeencloadedfalse +\newcommand*\AfterInputencOrAtEndPreamble[1]{% + \AfterPackage*{inputenc}{% + #1% + \@wlg@inputeencloadedtrue + } + \AtEndPreamble{% + \if@wlg@inputeencloaded\else + #1% + \fi% + }% +} + +%% ============================================================ %% FONTS UND MICROTYPOGRAPHY: %% ============================================================ -% Roman Font: + \if@wlg@expert - % Adobe Minion (Expert) + % Roman Font: Adobe Minion (Expert) \RequirePackage[footnotefigures]{MinionPro} + % Sans; Myriad + \RequirePackage[medfamily,scale=0.925]{MyriadPro} + % Mono: DejaVu + \RequirePackage[scaled=0.83]{DejaVuSansMono} \else - % Crimson + % Roman Font: Crimson \RequirePackage[osf]{cochineal} % Enable bold and slanted in IPA \AtBeginDocument{% \@ifpackageloaded{tipa}{% \DeclareFontFamilySubstitution{T3}{Cochineal-TOsF}{cmr}}{} } + % Sans: Alegreya + \RequirePackage[osf,scaled=.9]{sourcesanspro} + % Mono: DejaVu + \RequirePackage[scaled=0.8]{DejaVuSansMono} \fi % Hyperlinks @@ -182,6 +229,8 @@ \languagealias{naustrian}{German} \deftranslation[to=German]{chapter}{Kapitel} \deftranslation[to=English]{chapter}{chapter} +\deftranslation[to=German]{draft}{ENTWURF} +\deftranslation[to=English]{draft}{DRAFT} \deftranslation[to=German]{section}{Abschnitt} \deftranslation[to=English]{section}{section} \deftranslation[to=German]{footnote}{Anm.} @@ -392,13 +441,13 @@ \raggedbottom % Quotation marks -\AfterPackage*{inputenc}{% +\AfterInputencOrAtEndPreamble{% \RequirePackage{csquotes} \ExecuteQuoteOptions{autostyle=try,german=guillemets,austrian=guillemets,maxlevel=3} - \if@wlg@biblatex + \AfterPackage*{biblatex}{% % Change cite command for integrated csquotes env. \SetCiteCommand{\parencite} - \fi + } \renewcommand{\mktextdel}[1]{[\,]} } @@ -432,12 +481,12 @@ \def\@author{} \def\@@author{} \renewcommand*\author[2][]{% - \ifx\\#1\\% - \def\@@author{#2} - \else - \def\@@author{#1} - \fi - \def\@author{#2} + \ifx\\#1\\% + \def\@@author{#2} + \else + \def\@@author{#1} + \fi + \def\@author{#2} } % Author affiliation (starred: corresponding author) @@ -454,25 +503,25 @@ \def\@title{} \def\@@title{} \renewcommand*\title[2][]{% - \ifx\\#1\\% - \def\@@title{#2} - \else - \def\@@title{#1} - \fi - \def\@title{#2} + \ifx\\#1\\% + \def\@@title{#2} + \else + \def\@@title{#1} + \fi + \def\@title{#2} } \def\@issuetitle{} \newcommand*\issuetitle[1]{% - \def\@issuetitle{#1} + \def\@issuetitle{#1} } \def\@issuesubtitle{} \newcommand*\issuesubtitle[1]{% - \def\@issuesubtitle{#1} + \def\@issuesubtitle{#1} } \def\@issueeditors{} \newcommand*\issueeditors[1]{% - \def\@issueeditors{#1} + \def\@issueeditors{#1} } \def\@issue{} @@ -588,58 +637,58 @@ \vskip 3em \fi \if@wlg@specialprint - {\usekomafont{title}{\@title\par}}% - \vskip 1em - {\ifx\@subtitle\@empty\else\usekomafont{subtitle}{\@subtitle\par}\fi}% - \vskip 2em - {% - \usekomafont{author}{% - \@author\par - }% - }% - \vfill - {\usekomafont{date}{\if@wlg@preprint\translate{preprintfrom}% - \else\translate{specialprint}\fi\ \emph{Wiener Linguistische Gazette} - (\versal{WLG}) - \@issue\ (\@pubyear)\if@wlg@preprint\else: \startpageref--\lastpageref\fi\par}} - {\ifx\@issuetitle\@empty\else - \vskip 1em - \usekomafont{date}{\translate{specialissue} \itshape\@issuetitle + {\usekomafont{title}{\@title\par}}% + \vskip 1em + {\ifx\@subtitle\@empty\else\usekomafont{subtitle}{\@subtitle\par}\fi}% + \vskip 2em + {% + \usekomafont{author}{% + \@author\par + }% + }% + \vfill + {\usekomafont{date}{\if@wlg@preprint\translate{preprintfrom}% + \else\translate{specialprint}\fi\ \emph{Wiener Linguistische Gazette} + (\versal{WLG}) + \@issue\ (\@pubyear)\if@wlg@preprint\else: \startpageref--\lastpageref\fi\par}} + {\ifx\@issuetitle\@empty\else + \vskip 1em + \usekomafont{date}{\translate{specialissue} \itshape\@issuetitle \ifx\@issuesubtitle\@empty\else.\ \@issuesubtitle\fi\par}% - \fi}% - \ifx\@issueeditors\@empty\else - \usekomafont{date}{% - \translate{edby}\ \@issueeditors\par - }% + \fi}% + \ifx\@issueeditors\@empty\else + \usekomafont{date}{% + \translate{edby}\ \@issueeditors\par + }% \fi \else - {\ifx\@issuetitle\@empty - \usekomafont{title}{\translate{issue} \@issue\ (\@pubyear)\par} + {\ifx\@issuetitle\@empty + \usekomafont{title}{\translate{issue} \@issue\ (\@pubyear)\par} \etocsettocstyle{\subsubsection*{\contentsname}}{} - \etocsetstyle{chapter} - {} - {\scriptsize\mdseries\rmfamily} - {\scriptsize\etocname{}\dotfill\etocpage\par\vspace{8pt}} - {} + \etocsetstyle{chapter} + {} + {\scriptsize\mdseries\rmfamily} + {\scriptsize\etocname{}\dotfill\etocpage\par\vspace{8pt}} + {} \tableofcontents - \else - \usekomafont{date}{\translate{issue} \@issue\ (\@pubyear)\par} - \fi} - {\ifx\@issuetitle\@empty\else - \vskip 1em - \usekomafont{date}{\translate{specialissue}\par}% - \usekomafont{title}{\@issuetitle\par}% - \vskip 3pt - {\ifx\@issuesubtitle\@empty\else\usekomafont{subtitle}{\@issuesubtitle\par}\fi}% - \vskip 2em - {% - \ifx\@issueeditors\@empty\else - \usekomafont{date}{% - \translate{edby}\ \@issueeditors\par - }% + \else + \usekomafont{date}{\translate{issue} \@issue\ (\@pubyear)\par} + \fi} + {\ifx\@issuetitle\@empty\else + \vskip 1em + \usekomafont{date}{\translate{specialissue}\par}% + \usekomafont{title}{\@issuetitle\par}% + \vskip 3pt + {\ifx\@issuesubtitle\@empty\else\usekomafont{subtitle}{\@issuesubtitle\par}\fi}% + \vskip 2em + {% + \ifx\@issueeditors\@empty\else + \usekomafont{date}{% + \translate{edby}\ \@issueeditors\par + }% \fi }% - \fi}% + \fi}% \fi% \vfill {\usekomafont{publishers}{\translate{univie} $\cdot$ \translate{lingdep} $\cdot$ \@pubyear\par}}% @@ -694,7 +743,7 @@ \renewcommand*{\@maketitle}{% \addcontentsline{toc}{chapter}{\@author\texorpdfstring{\\[5pt]}{: }\@title% - \ifx\@subtitle\empty\else\texorpdfstring{\\}{. }\@subtitle\fi}% + \ifx\@subtitle\empty\else\texorpdfstring{\\}{. }\@subtitle\fi}% \next@tdpage \global\@topnum=\z@ \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative @@ -706,17 +755,17 @@ \null \vskip 2em% \renewcommand*\@@aff[2][]{% - \def\@ccauthor{\translate{corrauthor}}% - \ifx##1f% - \def\@ccauthor{\translate{corrauthorf}}% - \else\ifx##1p% - \def\@ccauthor{\translate{corrauthors}}% - \fi\fi% - \def\@cauthor{##2}% - \thanks{\protect\raggedright ##2 (\@ccauthor).} + \def\@ccauthor{\translate{corrauthor}}% + \ifx##1f% + \def\@ccauthor{\translate{corrauthorf}}% + \else\ifx##1p% + \def\@ccauthor{\translate{corrauthors}}% + \fi\fi% + \def\@cauthor{##2}% + \thanks{\protect\raggedright ##2 (\@ccauthor).} } \renewcommand*\@aff[2][]{% - \thanks{\protect\raggedright ##2.} + \thanks{\protect\raggedright ##2.} } \begin{flushleft}% \renewcommand*\thefootnote{\@fnsymbol\c@footnote}% @@ -820,7 +869,7 @@ \cleardoublepage \phantomsection \addcontentsline{toc}{chapter}{\@iauthor\texorpdfstring{\\[5pt]}{: }\@ititle% - \ifx\@isubtitle\empty\else\texorpdfstring{\\}{. }\@isubtitle\fi}% + \ifx\@isubtitle\empty\else\texorpdfstring{\\}{. }\@isubtitle\fi}% \includepdf[pages=3-]{\@ipaper} } @@ -928,10 +977,10 @@ \setkomafont{captionlabel}{\bfseries} % left aligned captions \RequirePackage[% - format=hang, - justification=RaggedRight, - singlelinecheck=false - ]{caption} + format=hang, + justification=RaggedRight, + singlelinecheck=false + ]{caption} %% Nicer tables with booktabs.sty \RequirePackage{booktabs} @@ -946,11 +995,13 @@ % Biblatex \if@wlg@biblatex - \RequirePackage[% - style=univie-ling, - sorting=nyvt, - autolang=hyphen] - {biblatex} + \AfterInputencOrAtEndPreamble{% + \RequirePackage[% + style=univie-ling, + sorting=nyvt, + autolang=hyphen] + {biblatex} + } \fi \AtBeginDocument{% \@ifundefined{bibhang}{}{% @@ -1008,4 +1059,26 @@ % Main url \def\wlgurl{http://wlg.univie.ac.at} +%% ============================================================= +%% DRAFT: +%% ============================================================= + +\if@wlg@draftmark + +\if@wlg@draftmarkfp + \RequirePackage[firstpageonly]{draftwatermark} +\else + \RequirePackage{draftwatermark} +\fi + +\DraftwatermarkOptions{% + angle=0, + vpos=10pt, + anchor=ct, + fontsize=14pt, + text={\translate{draft} (\today)} +} + +\fi + %% Finis. diff --git a/macros/unicodetex/latex/tipauni/COPYING b/macros/unicodetex/latex/tipauni/COPYING new file mode 100644 index 0000000000..f288702d2f --- /dev/null +++ b/macros/unicodetex/latex/tipauni/COPYING @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<https://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<https://www.gnu.org/licenses/why-not-lgpl.html>. diff --git a/macros/unicodetex/latex/tipauni/README.txt b/macros/unicodetex/latex/tipauni/README.txt index f248dffb93..7eb8a6bd48 100644 --- a/macros/unicodetex/latex/tipauni/README.txt +++ b/macros/unicodetex/latex/tipauni/README.txt @@ -1,7 +1,7 @@ -------------------------------------------------------------------------- Package: tipauni Author: निरंजन -Version: v0.6 (21 February, 2022) +Version: v0.6.1 (22 October, 2022) Description: For producing Unicode characters with TIPA commands. Repository: https://git.gnu.org.ua/tipauni.git Bug tracker: https://puszcza.gnu.org.ua/bugs/?group=tipauni diff --git a/macros/unicodetex/latex/tipauni/tipauni-commands.pdf b/macros/unicodetex/latex/tipauni/tipauni-commands.pdf Binary files differindex f3abc5488e..a69027ff69 100644 --- a/macros/unicodetex/latex/tipauni/tipauni-commands.pdf +++ b/macros/unicodetex/latex/tipauni/tipauni-commands.pdf diff --git a/macros/unicodetex/latex/tipauni/tipauni-example.pdf b/macros/unicodetex/latex/tipauni/tipauni-example.pdf Binary files differindex 5f4fcbfd2f..ba19b1ec88 100644 --- a/macros/unicodetex/latex/tipauni/tipauni-example.pdf +++ b/macros/unicodetex/latex/tipauni/tipauni-example.pdf diff --git a/macros/unicodetex/latex/tipauni/tipauni-example.tex b/macros/unicodetex/latex/tipauni/tipauni-example.tex index 4dabc01173..b78ab5de39 100644 --- a/macros/unicodetex/latex/tipauni/tipauni-example.tex +++ b/macros/unicodetex/latex/tipauni/tipauni-example.tex @@ -1,6 +1,6 @@ % ---------------------------------------------------------- % Example file for LaTeX package `tipauni'. -% Copyright © 2021 निरंजन +% Copyright © 2021, 2022 निरंजन % % This program is free software: you can redistribute it % and/or modify it under the terms of the GNU General Public @@ -26,7 +26,7 @@ \usepackage{longtable} \usepackage{booktabs} \usepackage[backend=biber,style=authoryear]{biblatex} -\usepackage[colorlinks]{hyperref} +\PassOptionsToPackage{hyperref}{colorlinks} \usepackage{tipauni} \begin{filecontents}{\jobname.bib} @mastersthesis{shravani, diff --git a/macros/unicodetex/latex/tipauni/tipauni.dtx b/macros/unicodetex/latex/tipauni/tipauni.dtx index 94bdc36c8a..c9db68206c 100644 --- a/macros/unicodetex/latex/tipauni/tipauni.dtx +++ b/macros/unicodetex/latex/tipauni/tipauni.dtx @@ -4,13 +4,13 @@ % --------------------------------------------------------------------------- % Package: tipauni % Author: निरंजन -% Version: v0.6 (21 February, 2022) +% Version: v0.6.1 (21 October, 2022) % Description: For producing Unicode characters with TIPA commands. % Repository: https://git.gnu.org.ua/tipauni.git % Bug tracker: https://puszcza.gnu.org.ua/bugs/?group=tipauni % License: GPL v3.0+, GFDL v1.3+ % --------------------------------------------------------------------------- -% LaTeX Package tipauni v0.6 +% LaTeX Package tipauni v0.6.1 % Copyright © 2021, 2022 निरंजन % % This program is free software: you can redistribute it and/or modify @@ -40,7 +40,7 @@ -------------------------------------------------------------------------- Package: tipauni Author: निरंजन -Version: v0.6 (21 February, 2022) +Version: v0.6.1 (22 October, 2022) Description: For producing Unicode characters with TIPA commands. Repository: https://git.gnu.org.ua/tipauni.git Bug tracker: https://puszcza.gnu.org.ua/bugs/?group=tipauni @@ -52,8 +52,8 @@ License: GPL v3.0+, GFDL v1.3+ %</internal> %<*driver|package> \def\tipauniname{tipauni} -\def\tipauniversion{0.6} -\def\tipaunidate{2022-02-21} +\def\tipauniversion{0.6.1} +\def\tipaunidate{2022-10-21} \def\tipaunidescription{For producing Unicode characters with TIPA commands} %</driver|package> %<*driver> @@ -75,14 +75,32 @@ Script=Devanagari,% Renderer=Harfbuzz,% Scale=0.8% ]{Shobhika} -\usepackage{hyperref} +\usepackage{fontawesome5} +\usepackage{hyperxmp} \hypersetup{% + unicode,% colorlinks,% + urlcolor=blue!60!black,% linkcolor=red!60!black,% citecolor=green!60!black,% - urlcolor=blue!60!black% + pdftitle={The tipauni package},% + pdfauthor={निरंजन},% + pdfsubject={For producing Unicode characters with TIPA commands.},% + pdfcreator={निरंजन},% + pdfkeywords={Linguistics, Phonetics, IPA, TIPA, LaTeX},% + pdfcopyright={% + The LaTeX package tipauni\textLF + Copyright © 2021, 2022 निरंजन\textLF + Permission is granted to copy, distribute and/or modify + this document under the terms of the GNU Free + Documentation License, Version 1.3 or any later version + published by the Free Software Foundation; with no + Invariant Sections, no Front-Cover Texts, and no + Back-Cover Texts. A copy of the license is included in + the section entitled “GNU Free Documentation License”.% + },% + pdflicenseurl={https://www.gnu.org/licenses/fdl-1.3.txt}% }% -\usepackage{fontawesome5} \renewcommand{\arraystretch}{1.2} \begin{document} @@ -118,6 +136,8 @@ Scale=0.8% % \vfill % {% % \setlength{\parindent}{0pt} +% The \LaTeX\ package tipauni +% % Copyright © 2021, 2022 {\devtext निरंजन} % % Permission is granted to copy, distribute and/or modify this document under @@ -175,6 +195,10 @@ Scale=0.8% % Fix a typo in Input B of Near-close near-front rounded. % \href{https://puszcza.gnu.org.ua/bugs/index.php?542}{(link)} % \end{description} +% +% Anja Hasse pointed a bug in the package with an SE question\footnote{% +% URL: \url{https://tex.stackexchange.com/q/662466}% +% }. It got fixed in v0.6.1 of the package. % % All of these contributions are highly valuable for the development of this % package. @@ -557,7 +581,7 @@ Scale=0.8% % \end{macrocode} % Provide the package with some description \textit{\&} version specifications. % \begin{macrocode} -\ProvidesPackage{tipauni}[2022/02/21 v0.6 +\ProvidesPackage{tipauni}[2022/10/21 v0.6.1 Unicode characters with TIPA commands] % \end{macrocode} % Load necessary packages. @@ -1315,14 +1339,18 @@ Unicode characters with TIPA commands] % \begin{macrocode} %%-- Dependent diacritic marks %%--** Voiceless +\DeclareUnicodeAccent{\textsupring}{TU}{"030A}%% ̊ \DeclareUnicodeAccent{\textsubring}{TU}{"0325}%% ̥ -\DeclareTextCommand{\r}{TU}{\tipaunisubring} -\protected\def\tipaunisubring{\@ifstar{\TipaUniSubRing}{\TipaUniSubRing}} +\DeclareTextCommand{\r}{TU}{\tipauniring} +\protected\def\tipauniring{\@ifstar{\TipaUniSubRing}{\TipaUniSupRing}} +\NewDocumentCommand\TipaUniSupRing{ m }{\textsupring{\textipa{#1}}} \NewDocumentCommand\TipaUniSubRing{ m }{\textsubring{\textipa{#1}}} %%--** Voiced +\DeclareUnicodeAccent{\textsupwedge}{TU}{"030C}%% ̌ \DeclareUnicodeAccent{\textsubwedge}{TU}{"032C}%% ̬ -\DeclareTextCommand{\v}{TU}{\tipaunisubwedge} -\protected\def\tipaunisubwedge{\@ifstar{\TipaUniSubWedge}{\TipaUniSubWedge}} +\DeclareTextCommand{\v}{TU}{\tipauniwedge} +\protected\def\tipauniwedge{\@ifstar{\TipaUniSubWedge}{\TipaUniSupWedge}} +\NewDocumentCommand\TipaUniSupWedge{ m }{\textsupwedge{\textipa{#1}}} \NewDocumentCommand\TipaUniSubWedge{ m }{\textsubwedge{\textipa{#1}}} %%--** More rounded \DeclareUnicodeAccent{\textsubrhalfring}{TU}{"0339}%% ̹ @@ -1334,22 +1362,28 @@ Unicode characters with TIPA commands] \DeclareUnicodeAccent{\textsubplus}{TU}{"031F}%% ̟ \NewDocumentCommand\tipaunisubplus{ m }{\textsubplus{\textipa{#1}}} %%--** Retracted +\DeclareUnicodeAccent{\textsupbar}{TU}{"0304}%% ̄ \DeclareUnicodeAccent{\textsubbar}{TU}{"0320}%% ̠ -\DeclareTextCommand{\=}{TU}{\tipaunisubbar} -\protected\def\tipaunisubbar{\@ifstar{\TipaUniSubBar}{\TipaUniSubBar}} +\DeclareTextCommand{\=}{TU}{\tipaunibar} +\protected\def\tipaunibar{\@ifstar{\TipaUniSubBar}{\TipaUniSupBar}} +\NewDocumentCommand\TipaUniSupBar{ m }{\textsupbar{\textipa{#1}}} \NewDocumentCommand\TipaUniSubBar{ m }{\textsubbar{\textipa{#1}}} %%--** Mid-centralized \DeclareUnicodeAccent{\textovercross}{TU}{"033D}%% ̽ \NewDocumentCommand\tipauniovercross{ m }{\textovercross{\textipa{#1}}} %%--** Breathy voiced +\DeclareUnicodeAccent{\textsupumlaut}{TU}{"0308}%% ̈ \DeclareUnicodeAccent{\textsubumlaut}{TU}{"0324}%% ̤ -\DeclareTextCommand{\"}{TU}{\tipaunisubumlaut} -\protected\def\tipaunisubumlaut{\@ifstar{\TipaUniSubUmlaut}{\TipaUniSubUmlaut}} +\DeclareTextCommand{\"}{TU}{\tipauniumlaut} +\protected\def\tipauniumlaut{\@ifstar{\TipaUniSubUmlaut}{\TipaUniSupUmlaut}} +\NewDocumentCommand\TipaUniSupUmlaut{ m }{\textsupumlaut{\textipa{#1}}} \NewDocumentCommand\TipaUniSubUmlaut{ m }{\textsubumlaut{\textipa{#1}}} %%--** Creaky voiced +\DeclareUnicodeAccent{\textsuptilde}{TU}{"0303}%% ̃ \DeclareUnicodeAccent{\textsubtilde}{TU}{"0330}%% ̰ -\DeclareTextCommand{\~}{TU}{\tipaunisubtilde} -\protected\def\tipaunisubtilde{\@ifstar{\TipaUniSubTilde}{\TipaUniSubTilde}} +\DeclareTextCommand{\~}{TU}{\tipaunitilde} +\protected\def\tipaunitilde{\@ifstar{\TipaUniSubTilde}{\TipaUniSupTilde}} +\NewDocumentCommand\TipaUniSupTilde{ m }{\textsuptilde{\textipa{#1}}} \NewDocumentCommand\TipaUniSubTilde{ m }{\textsubtilde{\textipa{#1}}} %%--** Linguo-labialized \DeclareUnicodeAccent{\textseagull}{TU}{"033C}%% ̼ diff --git a/macros/unicodetex/latex/tipauni/tipauni.ins b/macros/unicodetex/latex/tipauni/tipauni.ins index e3cea4d393..5ea278f225 100644 --- a/macros/unicodetex/latex/tipauni/tipauni.ins +++ b/macros/unicodetex/latex/tipauni/tipauni.ins @@ -15,7 +15,7 @@ Bug tracker: https://puszcza.gnu.org.ua/bugs/?group=tipauni License: GPL v3.0+, GFDL 1.3+ --------------------------------------------------------------------------- -LaTeX Package tipauni v0.6 +LaTeX Package tipauni v0.6.1 Copyright © 2021, 2022 निरंजन This program is free software: you can redistribute it and/or modify @@ -30,12 +30,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. - -The current maintainers of this work are निरंजन. - -This work consists of the files tipauni.dtx - tipauni.ins -and the derived file tipauni.sty. --------------------------------------------------------------------------- \endpreamble diff --git a/macros/unicodetex/latex/tipauni/tipauni.pdf b/macros/unicodetex/latex/tipauni/tipauni.pdf Binary files differindex f70b71bb07..5b1c9735d3 100644 --- a/macros/unicodetex/latex/tipauni/tipauni.pdf +++ b/macros/unicodetex/latex/tipauni/tipauni.pdf diff --git a/macros/xetex/latex/ucharclasses/README b/macros/xetex/latex/ucharclasses/README index e29112c489..d90e8f7d05 100644 --- a/macros/xetex/latex/ucharclasses/README +++ b/macros/xetex/latex/ucharclasses/README @@ -8,7 +8,7 @@ ucharclasses package for XeLaTex -------------------------------------- - Michiel Kamermans, v2.5, March 2022 + Michiel Kamermans, v2.6, October 2022 The brief --------- @@ -58,11 +58,12 @@ So what is it? Unicode Compatibility --------------------- - Current compatibility is Unicode 14.0 + Current compatibility is Unicode 15.0 Changelog --------- + v2.6: Unicode 15 support v2.5: Unicode 14 support v2.4: Unicode 11, 12, and 13 support v2.3: Unicode 10 support @@ -74,7 +75,8 @@ Changelog Contributors ------------ - v2.4-2.5: Werner Lemberg + v2.5-2.6: Werner Lemberg + v2.4: Werner Lemberg, Shreeshrii v2.1-2.3: Qing Lee, Werner Lemberg v2.0: Enrico Gregorio v1.0: Mike "Pomax" Kamermans diff --git a/macros/xetex/latex/ucharclasses/ucharclasses.pdf b/macros/xetex/latex/ucharclasses/ucharclasses.pdf Binary files differindex 76518d2702..1d5066207f 100644 --- a/macros/xetex/latex/ucharclasses/ucharclasses.pdf +++ b/macros/xetex/latex/ucharclasses/ucharclasses.pdf diff --git a/macros/xetex/latex/ucharclasses/ucharclasses.sty b/macros/xetex/latex/ucharclasses/ucharclasses.sty index 59a2daf356..c25515f6f8 100644 --- a/macros/xetex/latex/ucharclasses/ucharclasses.sty +++ b/macros/xetex/latex/ucharclasses/ucharclasses.sty @@ -5,15 +5,17 @@ % automatically when a transition from a character from one unicode block to a % character from another unicode block is encountered by XeTeX % -% Current compatibility should be Unicode 13.0 +% Current compatibility should be Unicode 15.0 % % Credits: -% v2.4-2.5: Werner Lemberg +% v2.5-2.6: Werner Lemberg +% v2.4: Werner Lemberg, Shreeshrii % v2.1-2.3: Qing Lee, Werner Lemberg % v2.0: Enrico Gregorio % v1.0: Mike "Pomax" Kamermans % % Significant updates: +% v2.6: Unicode 15 support % v2.5: Unicode 14 support % v2.4: Unicode 13 support % v2.3: Unicode 10 support @@ -26,7 +28,7 @@ % % ---------------------------------------------------------------------------- -\ProvidesPackage{ucharclasses}[2022/03/01 v2.5.0 Unicode block character classes for XeLaTeX] +\ProvidesPackage{ucharclasses}[2022/10/20 v2.6.0 Unicode block character classes for XeLaTeX] \newif\if@ucharclassverbose \DeclareOption{verbose}{\@ucharclassverbosetrue} @@ -41,9 +43,9 @@ % Starting with XeTeX version 3.14159265-2.6-0.99994, the number of % \XeTeXcharclass registers was extended from 256 to 4096 entries; some not % so important blocks are thus provided only for this and newer versions. -% The boundary of character class was changed from 255 to 4095 correspondingly. -% The primitive \XeTeXinterwordspaceshaping was introduced by XeTeX 0.99994; -% we use it as a flag to identify this version. +% The boundary of character classes was changed from 255 to 4095 +% correspondingly. The primitive \XeTeXinterwordspaceshaping was introduced +% by XeTeX 0.99994; we use it as a flag to identify this version. % % However, earlier version of LaTeX2e (before 2016/04/22 v2.0q) didn't provide % support for 4096 entries; we thus have to override the hard-coded limit. @@ -130,7 +132,7 @@ \do{Georgian}{"010A0}{"010FF} \do{GeorgianSupplement}{"02D00}{"02D2F} \do{Glagolitic}{"02C00}{"02C5F} - \do{Gothic}{"010330}{"01034F} +% Gothic (see below) \do{GreekAndCoptic}{"0370}{"03FF} \do{GreekExtended}{"01F00}{"01FFF} \do{Gujarati}{"0A80}{"0AFF} @@ -150,7 +152,7 @@ \do{Katakana}{"030A0}{"030FF} \do{KatakanaPhoneticExtensions}{"031F0}{"031FF} \do{KayahLi}{"0A900}{"0A92F} - \do{Kharoshthi}{"010A00}{"010A5F} +% Kharoshthi (see below) \do{Khmer}{"01780}{"017FF} \do{KhmerSymbols}{"019E0}{"019FF} \do{Lao}{"0E80}{"0EFF} @@ -165,8 +167,8 @@ \do{Limbu}{"01900}{"0194F} \do{LinearBIdeograms}{"010080}{"0100FF} \do{LinearBSyllabary}{"010000}{"01007F} - \do{Lycian}{"010280}{"01029F} - \do{Lydian}{"010920}{"01093F} +% Lycian (see below) +% Lydian (see below) \do{MahjongTiles}{"01F000}{"01F02F} \do{Malayalam}{"0D00}{"0D7F} \do{MathematicalAlphanumericSymbols}{"01D400}{"01D7FF} @@ -343,10 +345,19 @@ \do{LatinExtendedF}{"010780}{"0107BF} \do{LatinExtendedG}{"01DF00}{"01DFFF} \do{UnifiedCanadianAboriginalSyllabicsExtendedA}{"011AB0}{"011ABF} +% Unicode 15.0 additions needed for classes + \do{ArabicExtendedC}{"010EC0}{"010EFF} + \do{CJKUnifiedIdeographsExtensionH}{"031350}{"0323AF} + \do{CyrillicExtendedD}{"01E030}{"01E08F} + \do{DevanagariExtendedA}{"011B00}{"011B5F} % \ifdefined\XeTeXinterwordspaceshaping % Unicode 5.1 block definitions \do{Carian}{"0102A0}{"0102DF} + \do{Gothic}{"010330}{"01034F} + \do{Kharoshthi}{"010A00}{"010A5F} + \do{Lycian}{"010280}{"01029F} + \do{Lydian}{"010920}{"01093F} \do{OldItalic}{"010300}{"01032F} \do{PhaistosDisc}{"0101D0}{"0101FF} \do{SupplementaryPrivateUseAreaA}{"0F0000}{"0FFFFF} @@ -396,7 +407,8 @@ \do{OldSogdian}{"010F00}{"010F2F} \do{Sogdian}{"010F30}{"010F6F} % Unicode 12.0 additions - \do{EgyptianHieroglyphFormatControls}{"013430}{"01343F} + % The range was extended in Unicode 15.0 + \do{EgyptianHieroglyphFormatControls}{"013430}{"01345F} \do{Elymaic}{"010FE0}{"010FFF} \do{Nandinagari}{"0119A0}{"0119FF} \do{NyiakengPuachueHmong}{"01E100}{"01E14F} @@ -418,12 +430,16 @@ \do{Toto}{"01E290}{"01E2BF} \do{Vithkuqi}{"010570}{"0105BF} \do{ZnamennyMusicalNotation}{"01CF00}{"01CFCF} +% Unicode 15.0 additions + \do{KaktovikNumerals}{"01D2C0}{"01D2DF} + \do{Kawi}{"011F00}{"011F5F} + \do{NagMundari}{"01E4D0}{"01E4FF} \fi } % ---------------------------------------------------------------------------- -% Option handling lets the user turn off "load all" and selectively enable only those blocks -% they are interested in +% Option handling lets the user turn off "load all" and selectively enable +% only those blocks they are interested in % ---------------------------------------------------------------------------- % Each option starts with \overrideClassLoading; so any specified @@ -476,6 +492,7 @@ \do{Arabic} \do{ArabicExtendedA} \do{ArabicExtendedB} + \do{ArabicExtendedC} \do{ArabicPresentationFormsA} \do{ArabicPresentationFormsB} \do{ArabicSupplement} @@ -510,6 +527,7 @@ \do{CJKUnifiedIdeographsExtensionE} \do{CJKUnifiedIdeographsExtensionF} \do{CJKUnifiedIdeographsExtensionG} + \do{CJKUnifiedIdeographsExtensionH} \do{EnclosedCJKLettersAndMonths} \do{EnclosedIdeographicSupplement} \do{IdeographicDescriptionCharacters} @@ -561,6 +579,7 @@ \do{CyrillicExtendedA} \do{CyrillicExtendedB} \do{CyrillicExtendedC} + \do{CyrillicExtendedD} \do{CyrillicSupplement} \do{GlagoliticSupplement} \do{Glagolitic} @@ -571,6 +590,7 @@ \do{DevanagariPostDanDa} \do{DevanagariPostMarks} \do{DevanagariPreMarks} + \do{DevanagariExtendedA} } \def\DiacriticsClasses{ @@ -716,6 +736,9 @@ \do{YiSyllables} } +% While adding scripts defined in more recent Unicode versions it was +% necessary to move some scripts into the block for XeTeX 0.99994 and newer; +% those are tagged with a 'see below' comment. \def\OtherClasses{ \do{AegeanNumbers} % Ahom (see below) @@ -754,7 +777,7 @@ \do{Elbasan} \do{EnclosedAlphanumerics} \do{EnclosedAlphanumericSupplement} - \do{Gothic} +% Gothic (see below) \do{Grantha} \do{Gujarati} \do{Gurmukhi} @@ -768,7 +791,7 @@ \do{Kaithi} \do{Kannada} \do{KayahLi} - \do{Kharoshthi} +% Kharoshthi (see below) \do{Khmer} \do{KhmerSymbols} \do{Khojki} @@ -780,8 +803,8 @@ \do{LinearBIdeograms} \do{LinearBSyllabary} \do{Lisu} - \do{Lycian} - \do{Lydian} +% Lycian (see below) +% Lydian (see below) \do{Mahajani} \do{MahjongTiles} \do{Malayalam} @@ -874,11 +897,17 @@ \do{EgyptianHieroglyphFormatControls} \do{Elymaic} \do{GeorgianExtended} + \do{Gothic} \do{GunjalaGondi} \do{HanifiRohingya} \do{IndicSiyaqNumbers} + \do{KaktovikNumerals} + \do{Kawi} \do{LisuSupplement} + \do{Kharoshthi} \do{KhitanSmallScript} + \do{Lycian} + \do{Lydian} \do{Makasar} \do{Manichaean} \do{Marchen} @@ -887,6 +916,7 @@ \do{Medefaidrin} \do{Multani} \do{Nabataean} + \do{NagMundari} \do{Nandinagari} \do{Newa} \do{Nushu} @@ -1147,7 +1177,8 @@ % ---------------------------------------------------------------------------- % -% based on the previous informal groups, we can define a catch-all transition command +% based on the previous informal groups, we can define a catch-all transition +% command % % ---------------------------------------------------------------------------- diff --git a/macros/xetex/latex/ucharclasses/ucharclasses.tex b/macros/xetex/latex/ucharclasses/ucharclasses.tex index aaa7bc912b..7ba55df970 100644 --- a/macros/xetex/latex/ucharclasses/ucharclasses.tex +++ b/macros/xetex/latex/ucharclasses/ucharclasses.tex @@ -63,7 +63,7 @@ \begin{document} - \title{ucharclasses v2.4} + \title{ucharclasses v2.6} \author{Mike “Pomax” Kamermans} \date{\today} \maketitle @@ -211,12 +211,13 @@ \item Chinese \item CJK \item Cyrillics + \item Devanagari \item Diacritics \item EthiopicFull \item GeorgianFull \item Greek - \item Korean \item Japanese + \item Korean \item Latin \item Mathematics \item MongolianFull @@ -226,6 +227,7 @@ \item SundaneseFull \item Symbols \item SyriacFull + \item VedicMarks \item Yi \end{itemlist} @@ -381,7 +383,7 @@ \section{Package options and Unicode blocks} - The following Unicode blocks are available for use in transition rules (corresponding to Unicode version 14.0), as well as for use as package options when you want ucharclasses to only load those classes that you know are used in your document. + The following Unicode blocks are available for use in transition rules (corresponding to Unicode version 15.0), as well as for use as package options when you want ucharclasses to only load those classes that you know are used in your document. Starting with XeTeX version 0.99994 (available in TeXLive 2016), the number of \textbackslash XeTeXcharclass registers was extended from 256 to 4096; some not so important blocks are thus provided only for this and newer versions; in the list below, those blocks are put into parentheses. @@ -399,6 +401,7 @@ \item Arabic \item ArabicExtendedA \item ArabicExtendedB + \item ArabicExtendedC \item ArabicMathematicalAlphabeticSymbols \item ArabicPresentationFormsA \item ArabicPresentationFormsB @@ -446,6 +449,7 @@ \item CJKUnifiedIdeographsExtensionE \item CJKUnifiedIdeographsExtensionF \item CJKUnifiedIdeographsExtensionG + \item CJKUnifiedIdeographsExtensionH \item CombiningDiacriticalMarks \item CombiningDiacriticalMarksExtended \item CombiningDiacriticalMarksForSymbols @@ -465,10 +469,12 @@ \item CyrillicExtendedA \item CyrillicExtendedB \item CyrillicExtendedC + \item CyrillicExtendedD \item CyrillicSupplement \item Deseret \item Devanagari \item DevanagariExtended + \item DevanagariExtendedA \item Dingbats \item (DivesAkuru) \item (Dogra) @@ -497,7 +503,7 @@ \item GeorgianSupplement \item Glagolitic \item GlagoliticSupplement - \item Gothic + \item (Gothic) \item Grantha \item GreekAndCoptic \item GreekExtended @@ -524,6 +530,7 @@ \item IPAExtensions \item Javanese \item Kaithi + \item (KaktovikNumerals) \item KanaExtendedA \item KanaExtendedB \item KanaSupplement @@ -532,8 +539,9 @@ \item Kannada \item Katakana \item KatakanaPhoneticExtensions + \item (Kawi) \item KayahLi - \item Kharoshthi + \item (Kharoshthi) \item (KhitanSmallScript) \item Khmer \item KhmerSymbols @@ -557,8 +565,8 @@ \item LinearBSyllabary \item Lisu \item (LisuSupplement) - \item Lycian - \item Lydian + \item (Lycian) + \item (Lydian) \item Mahajani \item MahjongTiles \item (Makasar) @@ -594,6 +602,7 @@ \item MyanmarExtendedA \item MyanmarExtendedB \item (Nabataean) + \item (NagMundari) \item (Nandinagari) \item (Newa) \item NewTaiLue @@ -714,12 +723,13 @@ \item Chinese \item CJK \item Cyrillics + \item Devanagari \item Diacritics \item EthiopicFull \item GeorgianFull \item Greek - \item Korean \item Japanese + \item Korean \item Latin \item Mathematics \item MongolianFull @@ -729,6 +739,7 @@ \item SundaneseFull \item Symbols \item SyriacFull + \item VedicMarks \item Yi \end{itemlist} \end{multicols*} |