diff options
| author | Norbert Preining <norbert@preining.info> | 2021-11-04 03:01:01 +0000 |
|---|---|---|
| committer | Norbert Preining <norbert@preining.info> | 2021-11-04 03:01:01 +0000 |
| commit | e9894be38f76d67f7c8b8e5d16f16e8b14b96f40 (patch) | |
| tree | d72663aac6223211507c56cdebcde4abfea4e3d3 /macros/latex | |
| parent | 6c5c4d12f5c136357ca758e5e9cb85ee7c4513a4 (diff) | |
CTAN sync 202111040301
Diffstat (limited to 'macros/latex')
77 files changed, 343 insertions, 23 deletions
diff --git a/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf Binary files differindex b92b60e47b..ac81f1244b 100644 --- a/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf +++ b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf Binary files differindex 4766e38d38..1c27a15fb5 100644 --- a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf +++ b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf Binary files differindex f669ce30c9..9d518bf0eb 100644 --- a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf +++ b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf Binary files differindex fe9826bcf5..4ab0e81ca9 100644 --- a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf +++ b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-tabular.pdf b/macros/latex/contrib/reledmac/examples/1-tabular.pdf Binary files differindex abb3976b59..2eef17f864 100644 --- a/macros/latex/contrib/reledmac/examples/1-tabular.pdf +++ b/macros/latex/contrib/reledmac/examples/1-tabular.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf Binary files differindex ac76fd9f8b..e915eec0ac 100644 --- a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf +++ b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-verses.pdf b/macros/latex/contrib/reledmac/examples/1-verses.pdf Binary files differindex 8a975fac9f..80f79e5faf 100644 --- a/macros/latex/contrib/reledmac/examples/1-verses.pdf +++ b/macros/latex/contrib/reledmac/examples/1-verses.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-antilabe.pdf b/macros/latex/contrib/reledmac/examples/2-antilabe.pdf Binary files differindex e295f0204d..437a76d767 100644 --- a/macros/latex/contrib/reledmac/examples/2-antilabe.pdf +++ b/macros/latex/contrib/reledmac/examples/2-antilabe.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf Binary files differindex 55fb7476ee..083daf183c 100644 --- a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf +++ b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf Binary files differindex 81a3764006..11452f7fe6 100644 --- a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf +++ b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf Binary files differindex 4f21057ba8..d537e33993 100644 --- a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf +++ b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-indexing.pdf b/macros/latex/contrib/reledmac/examples/2-indexing.pdf Binary files differindex 99ce6fe10b..101dc1dc01 100644 --- a/macros/latex/contrib/reledmac/examples/2-indexing.pdf +++ b/macros/latex/contrib/reledmac/examples/2-indexing.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf Binary files differindex 2a1b3ebdf4..fff138ef30 100644 --- a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf +++ b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf Binary files differindex 56789481bf..a1f158edad 100644 --- a/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf +++ b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf Binary files differindex bf49a6826b..bda461167c 100644 --- a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf +++ b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf Binary files differindex 274f719ce6..f48f393c6f 100644 --- a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf +++ b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf Binary files differindex 028329e06b..24a3360652 100644 --- a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf +++ b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf Binary files differindex d4ac5f3c64..9d7dd0d291 100644 --- a/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf +++ b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-performances.pdf b/macros/latex/contrib/reledmac/examples/2-performances.pdf Binary files differindex 482b1ed01b..8a2e7b80f8 100644 --- a/macros/latex/contrib/reledmac/examples/2-performances.pdf +++ b/macros/latex/contrib/reledmac/examples/2-performances.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf Binary files differindex 5ae176bc27..fbf973b071 100644 --- a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf +++ b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf Binary files differindex 3d7988bcde..f3918f390f 100644 --- a/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf +++ b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf Binary files differindex 0fa1eda97d..6acdf77eca 100644 --- a/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf +++ b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf Binary files differindex 784b4f5e91..cd52cce08a 100644 --- a/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf +++ b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf Binary files differindex 5a2396d8fa..4249605dad 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf Binary files differindex a5ac937d4b..2d696d17f8 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf Binary files differindex 297ddc4672..a70b8c1ab2 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf Binary files differindex 222c139845..2776b2e757 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf Binary files differindex 04a751bd9e..ab06401ba7 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf Binary files differindex 957720ca6f..fd7ec93d6c 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf Binary files differindex 3338e9124c..d7e1015109 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf Binary files differindex 67756d6ad9..0fa157c478 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf Binary files differindex d292d76db0..f8ac927068 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf Binary files differindex b378e9dec8..569af736b2 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf Binary files differindex 497ecc61f5..b0ab8eadc0 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf Binary files differindex bb47c504a1..1513bf993a 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf Binary files differindex 70aa4ce555..d2e296556d 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf Binary files differindex 612f63e28b..46c962e509 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf Binary files differindex a901f4b4d6..c352f2fe80 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf Binary files differindex 4e610657b4..7307550374 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf Binary files differindex 9195e3c8a4..a8332eb40a 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf Binary files differindex 3232142908..1d1bc1103e 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf Binary files differindex 8d323b82b5..a7e45281a0 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf Binary files differindex 7b169a2f9c..63fc6fb5ae 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf Binary files differindex 95ee47081d..3d38bbc50e 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf Binary files differindex b8eb7dabec..d8a06425c2 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf Binary files differindex 205c3bc2f9..2444d467dc 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf diff --git a/macros/latex/contrib/reledmac/migration.pdf b/macros/latex/contrib/reledmac/migration.pdf Binary files differindex 6363914c61..31cc703837 100644 --- a/macros/latex/contrib/reledmac/migration.pdf +++ b/macros/latex/contrib/reledmac/migration.pdf diff --git a/macros/latex/contrib/reledmac/reledmac.dtx b/macros/latex/contrib/reledmac/reledmac.dtx index 996dc98008..9009f1a2ae 100644 --- a/macros/latex/contrib/reledmac/reledmac.dtx +++ b/macros/latex/contrib/reledmac/reledmac.dtx @@ -587,6 +587,8 @@ % \changes{v2.38.0}{2021/05/30}{Add \protect\cs{Xnopagenumberifcurrent} hook.} % \changes{v2.38.0}{2021/05/30}{Add \protect\cs{Xbeforepagenumber} hook.} % \changes{v2.38.1}{2021/09/27}{Fix incompatibility between \protect\parpackage's option \protect\option{continuousnumberingwithcolumns} and lineation by page.} +% \changes{v2.38.2}{2021/11/03}{Fix bug when using \protect\cs{applabel} in conjunction with \protect\package{hyperref} package.} +% \changes{v2.38.2}{2021/11/03}{Fix some trouble in indentation in stanza, when switching to some language with \protect\package{polyglossia}.} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % @@ -4476,7 +4478,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2021/09/27 v2.38.1 typesetting critical editions]% +\ProvidesPackage{reledmac}[2021/11/03 v2.38.2 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -8318,6 +8320,18 @@ \showlemma{#1}% }% % \end{macrocode} +% If using \package{hyperref} package, we put the final hypertarget for \cs{applabel}. +% \begin{macrocode} + \ifdef{\hypertarget}% + {% + \def\do##1{\Hy@raisedlink{\hypertarget{##1:end}{}}}% + \ifcsdef{applabel@thisedtext@\the\@edtext@level}{% + \dolistcsloop{applabel@thisedtext@\the\@edtext@level}% + \global\cslet{applabel@thisedtext@\the\@edtext@level}{\empty}% + }{}% + }% + {}% +% \end{macrocode} % % Finally, we add any insertions that are % associated with the \emph{end} of @@ -9039,7 +9053,9 @@ \global\setbox\raw@text=\vbox\bgroup% \if@nobreak% \if@afterindent\else% - \noindent% + \unless\ifinstanza% + \noindent% + \fi% \global\@afterindenttrue% \fi% \fi% @@ -16951,6 +16967,15 @@ % \begin{macrocode} \@esphack% % \end{macrocode} +% If using \package{hyperref}, store the label in a list for the current edtext, to call later an hypertarget for the end of the lemma. +% \begin{macrocode} + \ifdef{\hypertarget}% + {% + \ifcsundef{applabel@thisedtext@\the\@edtext@level}{\global\cslet{applabel@thisedtext@\the\@edtext@level}{\relax}}{}% + \listcsgadd{applabel@thisedtext@\the\@edtext@level}{#1}% + }% + {}% +% \end{macrocode} % Warning if \protect\cs{applabel} is called outside of \protect\cs{edtext}. % \begin{macrocode} \else% diff --git a/macros/latex/contrib/reledmac/reledmac.pdf b/macros/latex/contrib/reledmac/reledmac.pdf Binary files differindex a0bae5136c..e484cbdcd3 100644 --- a/macros/latex/contrib/reledmac/reledmac.pdf +++ b/macros/latex/contrib/reledmac/reledmac.pdf diff --git a/macros/latex/contrib/reledmac/reledpar.pdf b/macros/latex/contrib/reledmac/reledpar.pdf Binary files differindex 01117f6c19..df842ae7ec 100644 --- a/macros/latex/contrib/reledmac/reledpar.pdf +++ b/macros/latex/contrib/reledmac/reledpar.pdf diff --git a/macros/latex/contrib/siunitx/CHANGELOG.md b/macros/latex/contrib/siunitx/CHANGELOG.md index 4db74bbc00..3aebf9976f 100644 --- a/macros/latex/contrib/siunitx/CHANGELOG.md +++ b/macros/latex/contrib/siunitx/CHANGELOG.md @@ -7,6 +7,15 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to ## [Unreleased] +## [v3.0.35] + +### Changed +- Delay loading of `color` package to `begindocument` hook + +### Fixed +- Text mode replacement of `\mathrm` in super/subscripts (see issue + [#556](https://github.com/josephwright/siunitx/issues/556)) + ## [v3.0.34] ### Fixed @@ -1613,7 +1622,8 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to ### Added - First public testing release (as `si`) -[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.34...HEAD +[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.35...HEAD +[v3.0.35]: https://github.com/josephwright/siunitx/compare/v3.0.34...v3.0.35 [v3.0.34]: https://github.com/josephwright/siunitx/compare/v3.0.33...v3.0.34 [v3.0.33]: https://github.com/josephwright/siunitx/compare/v3.0.32...v3.0.33 [v3.0.32]: https://github.com/josephwright/siunitx/compare/v3.0.31...v3.0.32 diff --git a/macros/latex/contrib/siunitx/siunitx-code.pdf b/macros/latex/contrib/siunitx/siunitx-code.pdf Binary files differindex 5ea13cc569..64dae8774b 100644 --- a/macros/latex/contrib/siunitx/siunitx-code.pdf +++ b/macros/latex/contrib/siunitx/siunitx-code.pdf diff --git a/macros/latex/contrib/siunitx/siunitx-print.dtx b/macros/latex/contrib/siunitx/siunitx-print.dtx index 4f107b5cbb..5bcc08f65b 100644 --- a/macros/latex/contrib/siunitx/siunitx-print.dtx +++ b/macros/latex/contrib/siunitx/siunitx-print.dtx @@ -313,9 +313,10 @@ % \end{macrocode} % \end{macro} % -% Color support is always required. +% Color support is always required; to avoid a potential clash we delay to +% the start of the document. % \begin{macrocode} -\RequirePackage { color } +\AtBeginDocument { \RequirePackage { color } } % \end{macrocode} % % \begin{macro}{\tl_replace_all:NVn} @@ -816,7 +817,8 @@ { \@@_text_replace:Nnnnn #1 } { \tl_set:Nn \l_@@_tmp_tl {#1} - \@@_replace_font:N \l_@@_tmp_tl + \tl_if_empty:NF \l_siunitx_unit_font_tl + { \exp_after:wN \cs_set_eq:NN \l_siunitx_unit_font_tl \use:n } \cs_set:Npn \mathord ##1 {##1} \cs_set:Npn \pm { \exp_not:N \textpm } \tl_map_inline:nn diff --git a/macros/latex/contrib/siunitx/siunitx.dtx b/macros/latex/contrib/siunitx/siunitx.dtx index cdf49b261c..6fd0040427 100644 --- a/macros/latex/contrib/siunitx/siunitx.dtx +++ b/macros/latex/contrib/siunitx/siunitx.dtx @@ -121,7 +121,7 @@ % % Identify the package and give the over all version information. % \begin{macrocode} -\ProvidesExplPackage {siunitx} {2021-10-26} {3.0.34} +\ProvidesExplPackage {siunitx} {2021-11-03} {3.0.35} {A comprehensive (SI) units package} % \end{macrocode} % diff --git a/macros/latex/contrib/siunitx/siunitx.pdf b/macros/latex/contrib/siunitx/siunitx.pdf Binary files differindex d1dadd2e95..bb59f34127 100644 --- a/macros/latex/contrib/siunitx/siunitx.pdf +++ b/macros/latex/contrib/siunitx/siunitx.pdf diff --git a/macros/latex/contrib/univie-ling/README b/macros/latex/contrib/univie-ling/README index b11a83f845..1c366d3da1 100644 --- a/macros/latex/contrib/univie-ling/README +++ b/macros/latex/contrib/univie-ling/README @@ -80,6 +80,20 @@ also have a look at the example files. == CHANGES == +V. 1.16 (2021-11-03): + - univie-ling-paper: + * Adjust font size and margins to dept. standards. + * Add option "draftmark". + * Fix grouping in \maketitle + - univie-ling-thesis: + * Add \makedeclaration (for BA theses) + * Adjust font size and margins of BA thesis to dept. standards. + * Add option "draftmark". + * Fix grouping in \maketitle + - univie-ling-expose: + * Add option "draftmark". + * Fix grouping in \maketitle + V. 1.15 (2021-10-19) - univie-ling.bbx: * Output url date only if url is given (not with DOI). 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 80f31592f5..7b378e5c1e 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 @@ -36,7 +36,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesFile{univie-ling.bbx}[2021/10/13 v1.15dev biblatex bibliography style] +\ProvidesFile{univie-ling.bbx}[2021/11/03 v1.16 biblatex bibliography style] % Load base style (authoryear) \RequireBibliographyStyle{authoryear} 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 6939d0adaa..a6c94afa82 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 @@ -34,7 +34,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesFile{univie-ling.cbx}[2021/09/01 v1.14 biblatex citation style] +\ProvidesFile{univie-ling.cbx}[2021/11/03 v1.16 biblatex citation style] \RequireCitationStyle{authoryear} 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 4177418424..f5bb410014 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-paper-deutsch.pdf b/macros/latex/contrib/univie-ling/doc/templates/template-paper-deutsch.pdf Binary files differindex 497435e7ff..2d6e8e8b44 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 bd4dfe4715..87a9785ff2 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 c1de8f5eb8..9569ba5659 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-deutsch.tex b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.tex index ec96559ba7..7b01c0a88f 100644 --- a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.tex +++ b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.tex @@ -40,6 +40,9 @@ % Die Titelseite \maketitle +% Selbständigkeitserklärung (für BA-Arbeiten) +% \makedeclaration + \tableofcontents \chapter{Ein paar Tipps}\label{cha:hinweise} diff --git a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.tex b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.tex index 4fea4ea8b4..0be7edb600 100644 --- a/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.tex +++ b/macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.tex @@ -40,6 +40,9 @@ % The title page \maketitle +% Declaration of good practice (BA theses) +% \makedeclaration + \tableofcontents \chapter{General hints}\label{cha:hints} 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 7963775007..5e0dc5db2c 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 b905cb673e..0f5a089f73 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 a563962d7e..69dcc75dce 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{Jürgen Spitzmüller% \thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}} -\date{Version 1.15, 2021/10/19} +\date{Version 1.16, 2021/11/03} \maketitle @@ -126,6 +126,7 @@ The following package is required for an optional feature (not used by default): \begin{itemize} \setlength\itemsep{0pt} \item \textsf{biblatex-apa}: APA style for \textsf{biblatex}. + \item \textsf{draftwatermark}: Create a draft mark. \item \textsf{fontspec}: Load OpenType fonts (with LuaTeX or XeTeX). \item \textsf{polyglossia}: Multi-language and script support. \end{itemize} @@ -197,6 +198,12 @@ option (e.\,g., \joption{all=false,microtype=true} will switch off all packages of the class (concerning verbose cross references) are omitted. \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 your supervisor. +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. + \subsection{Further options} The class builds on \textsf{scrartcl} (KOMA article), which provides many more options to tweak the appearance of your document. You can use @@ -319,6 +326,11 @@ Templates are provided as well: \section{Release History} \begin{description} + \item 2021/11/03 (v.\,1.16) + \begin{itemize} + \item Add option \joption{draftmark}. See sec.~\ref{draft}. + \item Fix grouping in \jcsmacro{maketitle}. + \end{itemize} \item 2021/10/19 (v.\,1.15) No change to this class. \item 2021/09/01 (v.\,1.14) No change to this class. \item 2020/11/11 (v.\,1.13) No change to this class. 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 324d3672f6..d663dae870 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 6af218292c..94c1edb891 100644 --- a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex +++ b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex @@ -59,7 +59,7 @@ \author{\texorpdfstring{Jürgen Spitzmüller% \thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}} -\date{Version 1.15, 2021/10/19} +\date{Version 1.16, 2021/11/03} \maketitle @@ -118,8 +118,9 @@ The following packages are required for specific features and loaded by default. The following package is required for an optional feature (not used by default): \begin{itemize} \setlength\itemsep{0pt} - \item \textsf{fontspec}: Load OpenType fonts (with LuaTeX or XeTeX). \item \textsf{biblatex-apa}: APA style for \textsf{biblatex}. + \item \textsf{draftwatermark}: Create a draft mark. + \item \textsf{fontspec}: Load OpenType fonts (with LuaTeX or XeTeX). \item \textsf{polyglossia}: Multi-language and script support. \end{itemize} @@ -211,6 +212,11 @@ option (e.\,g., \joption{all=false,microtype=true} will switch off all packages of the class (concerning verbose cross references) are omitted. \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 your supervisor. +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. + \subsection{Further options} The class builds on \textsf{scrartcl} (KOMA article), which provides many more options to tweak the appearance of your document. You can use @@ -343,6 +349,12 @@ Templates are provided as well: \section{Release History} \begin{itemize} + \item 2021/11/03 (v.\,1.16) + \begin{itemize} + \item Adjust font size and margins to dept. standards. + \item Add option \joption{draftmark}. See sec.~\ref{draft}. + \item Fix grouping in \jcsmacro{maketitle}. + \end{itemize} \item 2021/10/19 (v.\,1.15) No change to this class. \item 2021/09/01 (v.\,1.14) Do not overwrite \jmacro{texttype} set by user with default value. \item 2020/11/11 (v.\,1.13) No change to this class. 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 aa5b23ee90..76ef6f22f5 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 247ac26797..94e29acbc0 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{Jürgen Spitzmüller% \thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}} -\date{Version 1.15, 2021/10/19} +\date{Version 1.16, 2021/11/03} \maketitle @@ -122,6 +122,7 @@ The following package is required for an optional feature (not used by default): \begin{itemize} \setlength\itemsep{0pt} \item \textsf{biblatex-apa}: APA style for \textsf{biblatex}. + \item \textsf{draftwatermark}: Create a draft mark. \item \textsf{fontspec}: Load OpenType fonts (with LuaTeX or XeTeX). \item \textsf{polyglossia}: Multi-language and script support. \item \textsf{pdfa}: Create PDF/A compliant files. @@ -215,6 +216,12 @@ option (e.\,g., \joption{all=false,microtype=true} will switch off all packages of the class (concerning verbose cross references) are omitted. \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 your supervisor. +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. + \subsection{Further options} \begin{description} @@ -258,6 +265,18 @@ the following data in the preamble. The suitable degree (\emph{Angestrebter akademischer Grad}) is automatically set by the \jcsmacro{thesistype} command, but you can override it with the optional command \jcsmacro{degree\{<custom degree>\}}. Note that female forms of degrees, where appropriate, are used if you use the class option \joption{fdegree=true} (see sec.~\ref{coptions}). + +\section{Declaration}\label{decl} + +It is possible to automatically generate a page with a declaration where you declare and sign that you follow research ethics\slash anti-plagiarism rules +(\emph{Selbst\"andigkeitserkl\"arung}) by means of the command + +\begin{lstlisting}[language={[LaTeX]TeX},basicstyle={\small\ttfamily},frame=single,morekeywords={makedeclaration}] + \makedeclaration +\end{lstlisting} +% +Such a declaration is needed for BA theses. + \section{Semantic markup}\label{markup} The class defines some basic semantic markup common in linguistics: @@ -367,11 +386,19 @@ Templates are provided as well: \section{Release History} \begin{itemize} + \item 2021/11/03 (v.\,1.16) + \begin{itemize} + \item Add \jcsmacro{makedeclaration} (for BA theses). See sec.~\ref{decl}. + \item Adjust font size and margins of BA thesis to dept. standards. + \item Add option \joption{draftmark}. See sec.~\ref{draft}. + \item Fix grouping in \jcsmacro{maketitle}. + \end{itemize} \item 2021/10/19 (v.\,1.15) No change to this class. \item 2021/09/01 (v.\,1.14) No change to this class. \item 2020/11/11 (v.\,1.13) No change to this class. \item 2020/06/25 (v.\,1.12) No change to this class. - \item 2020/05/05 (v.\,1.11)\begin{itemize} + \item 2020/05/05 (v.\,1.11) + \begin{itemize} \item New option \joption{polyglossia}. \item New option \joption{pdfa}. \end{itemize} 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 9a63ce24f0..ab3e009ac4 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 fabc1db69c..9380a29f8c 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{Jürgen Spitzmüller% \thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}} -\date{Version 1.15, 2021/10/19} +\date{Version 1.16, 2021/11/03} \maketitle @@ -232,6 +232,7 @@ A template is provided as well: \url{https://github.com/jspitz/univie-ling/raw/m \raggedright \begin{itemize} + \item 2021/11/03 (v.\,1.16) No change to this class. \item 2021/10/19 (v.\,1.15) Allow for slanted/bold IPA. \item 2021/09/01 (v.\,1.14) Update editorial board. \item 2020/11/11 (v.\,1.13) 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 83353bfbe3..da8d92a1bf 100644 --- a/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls +++ b/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls @@ -31,13 +31,15 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{univie-ling-expose}[2021/10/19 v1.15 Univie Linguistic Exposes (JSp)] +\ProvidesPackage{univie-ling-expose}[2021/11/03 v1.16 Univie Linguistic Exposes (JSp)] \RequirePackage{xkeyval} \newif\ifbiblatex\biblatextrue \newif\ifapa\apafalse \newif\ifcaptionp\captionptrue +\newif\ifdraftmark\draftmarkfalse +\newif\ifdraftmarkfp\draftmarkfpfalse \newif\ifrefsp\refsptrue \newif\ifcovington\covingtontrue \newif\ifmicrotype\microtypetrue @@ -132,6 +134,24 @@ } \DeclareOptionX{covington}[true]{\setkeys{uvt}{covington=#1}} +% draftmark=<true|false> +% Print draftmark +\define@choicekey*+{uvt}{draftmark}[\val\nr]{true,false,firstpage}{% + \ifcase\nr\relax% true: + \draftmarktrue + \draftmarkfpfalse + \or% false: + \draftmarkfalse + \draftmarkfpfalse + \or% firstpage: + \draftmarktrue + \draftmarkfptrue + \fi +}{% + \ClassWarning{univie-ling-paper}{unknown draft value}% +} +\DeclareOptionX{draftmark}[true]{\setkeys{uvt}{draftmark=#1}} + % microtype=<true|false> % Load microtype \define@boolkey+{uvt}{microtype}[true]{% @@ -200,6 +220,8 @@ %% ============================================================ \RequirePackage{translations} +\DeclareTranslation{German}{draft}{ENTWURF} +\DeclareTranslation{English}{draft}{DRAFT} \DeclareTranslation{German}{section}{Abschnitt} \DeclareTranslation{English}{section}{section} \DeclareTranslation{German}{footnote}{Anm.} @@ -432,7 +454,7 @@ \end{flushright} \vspace{2\baselineskip} \begin{center} - \bgroup\usekomafont{thesistype}{\GetTranslation{expo}}\egroup + {\usekomafont{thesistype}\GetTranslation{expo}} \end{center} \vspace{2\baselineskip} \begin{center} @@ -713,4 +735,28 @@ \fi + +%% ============================================================= +%% DRAFT: +%% ============================================================= + +\ifdraftmark + +\ifdraftmarkfp + \RequirePackage[firstpageonly]{draftwatermark} +\else + \RequirePackage{draftwatermark} +\fi + +\DraftwatermarkOptions{% + angle=0, + vpos=10pt, + anchor=ct, + fontsize=14pt, + text={\GetTranslation{draft} (\today)} +} + +\fi + + %% Finis. 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 7deb27f764..3c06667d6e 100644 --- a/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls +++ b/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls @@ -31,13 +31,15 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{univie-ling-paper}[2021/10/19 v1.15 Univie Linguistic Papers (JSp)] +\ProvidesPackage{univie-ling-paper}[2021/11/03 v1.16 Univie Linguistic Papers (JSp)] \RequirePackage{xkeyval} \newif\ifbiblatex\biblatextrue \newif\ifapa\apafalse \newif\ifcaptionp\captionptrue +\newif\ifdraftmark\draftmarkfalse +\newif\ifdraftmarkfp\draftmarkfpfalse \newif\ifrefsp\refsptrue \newif\ifcovington\covingtontrue \newif\ifmicrotype\microtypetrue @@ -107,6 +109,24 @@ } \DeclareOptionX{caption}[true]{\setkeys{uvt}{caption=#1}} +% draftmark=<true|false> +% Print draftmark +\define@choicekey*+{uvt}{draftmark}[\val\nr]{true,false,firstpage}{% + \ifcase\nr\relax% true: + \draftmarktrue + \draftmarkfpfalse + \or% false: + \draftmarkfalse + \draftmarkfpfalse + \or% firstpage: + \draftmarktrue + \draftmarkfptrue + \fi +}{% + \ClassWarning{univie-ling-paper}{unknown draft value}% +} +\DeclareOptionX{draftmark}[true]{\setkeys{uvt}{draftmark=#1}} + % ref=<true|false> % Load varioref and prettyref \define@boolkey+{uvt}{ref}[true]{% @@ -186,6 +206,8 @@ \LoadClass[% a4paper, + fontsize=12pt, + BCOR=0mm, captions=tableheading, listof=totoc, numbers=noenddot, @@ -199,6 +221,8 @@ %% ============================================================ \RequirePackage{translations} +\DeclareTranslation{German}{draft}{ENTWURF} +\DeclareTranslation{English}{draft}{DRAFT} \DeclareTranslation{German}{subm}{Abgegeben am} \DeclareTranslation{English}{subm}{Submission date:} \DeclareTranslation{German}{submto}{bei} @@ -387,6 +411,10 @@ This includes all drawings, sketches, graphics and internet sources.} \RequirePackage{scrlayer-scrpage} \pagestyle{scrplain} +% Margins +\RequirePackage{geometry} +\geometry{tmargin=3cm, bmargin=3cm, lmargin=3cm, rmargin=3cm, footskip=1.5cm} + % No widows and orphans % No overfull lines \tolerance 1414 @@ -472,7 +500,7 @@ This includes all drawings, sketches, graphics and internet sources.} \end{flushright} \vspace{2\baselineskip} \begin{center} - \bgroup\usekomafont{texttype}{\MakeUppercase{\@texttype}\par}\egroup + {\usekomafont{texttype}\MakeUppercase{\@texttype}\par} \end{center} \vspace{2\baselineskip} \begin{center} @@ -816,4 +844,27 @@ This includes all drawings, sketches, graphics and internet sources.} \fi + +%% ============================================================= +%% DRAFT: +%% ============================================================= + +\ifdraftmark + +\ifdraftmarkfp + \RequirePackage[firstpageonly]{draftwatermark} +\else + \RequirePackage{draftwatermark} +\fi + +\DraftwatermarkOptions{% + angle=0, + vpos=10pt, + anchor=ct, + fontsize=14pt, + text={\GetTranslation{draft} (\today)} +} + +\fi + %% Finis. 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 5449db234a..ce9906f50d 100644 --- a/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls +++ b/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls @@ -31,16 +31,19 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{univie-ling-thesis}[2021/10/19 v1.15 Univie Linguistic Theses (JSp)] +\ProvidesPackage{univie-ling-thesis}[2021/11/03 v1.16 Univie Linguistic Theses (JSp)] \RequirePackage{xkeyval} \newif\ifbiblatex\biblatextrue \newif\ifapa\apafalse \newif\ifcaptionp\captionptrue +\newif\ifdraftmark\draftmarkfalse +\newif\ifdraftmarkfp\draftmarkfpfalse \newif\ifrefsp\refsptrue \newif\ifcovington\covingtontrue \newif\ifmicrotype\microtypetrue +\newif\ifmultiauthors\multiauthorsfalse \newif\ifpolyglossia\polyglossiafalse \newif\ifpsfonts\psfontstrue \newif\ifotffonts\otffontsfalse @@ -160,6 +163,24 @@ } \DeclareOptionX{fdegree}[true]{\setkeys{uvt}{fdegree=#1}} +% draftmark=<true|false> +% Print draftmark +\define@choicekey*+{uvt}{draftmark}[\val\nr]{true,false,firstpage}{% + \ifcase\nr\relax% true: + \draftmarktrue + \draftmarkfpfalse + \or% false: + \draftmarkfalse + \draftmarkfpfalse + \or% firstpage: + \draftmarktrue + \draftmarkfptrue + \fi +}{% + \ClassWarning{univie-ling-paper}{unknown draft value}% +} +\DeclareOptionX{draftmark}[true]{\setkeys{uvt}{draftmark=#1}} + % polyglossia=<true|false> % Load polyglossia \define@boolkey+{uvt}{polyglossia}[true]{% @@ -227,6 +248,8 @@ %% ============================================================ \RequirePackage{translations} +\DeclareTranslation{German}{draft}{ENTWURF} +\DeclareTranslation{English}{draft}{DRAFT} \DeclareTranslation{German}{section}{Abschnitt} \DeclareTranslation{English}{section}{section} \DeclareTranslation{German}{footnote}{Anm.} @@ -235,7 +258,26 @@ \DeclareTranslation{English}{footnote}{example} \DeclareTranslation{German}{stkz}{Studienkennzahl} \DeclareTranslation{English}{stkz}{Studienkennzahl} - +\DeclareTranslation{German}{erkl}{Erkl\"arung} +\DeclareTranslation{English}{erkl}{Declaration} +\DeclareTranslation{German}{selbst1s}{Hiermit versichere ich, dass ich die vorliegende Arbeit selbst\"andig verfasst +und keine anderen als die angegebenen Hilfsmittel benutzt habe.} +\DeclareTranslation{German}{selbst1p}{Hiermit versichern wir, dass wir die vorliegende Arbeit selbst\"andig verfasst +und keine anderen als die angegebenen Hilfsmittel benutzt haben.} +\DeclareTranslation{German}{selbst2}{Die Stellen der Arbeit, die anderen Quellen im Wortlaut oder dem Sinn nach entnommen wurden, sind durch Herkunftsangaben kenntlich gemacht. +Dies gilt auch f\"ur Zeichnungen, Skizzen, bildliche Darstellungen sowie f\"ur Quellen aus dem Internet.} +\DeclareTranslation{German}{selbst3s}{Ich versichere ferner, dass ich die vorliegende Arbeit weder ganz noch in Teilen bereits als +Pr\"ufungsleistung vorgelegt habe.} +\DeclareTranslation{German}{selbst3p}{Wir versichern ferner, dass wir die vorliegende Arbeit weder ganz noch in Teilen bereits als +Pr\"ufungsleistung vorgelegt haben.} +\DeclareTranslation{English}{selbst1s}{I hereby declare that this paper is entirely my own work and that I used no source material or aids other than those stipulated.} +\DeclareTranslation{English}{selbst1p}{We hereby declare that this paper is entirely our own work and that we used no source material or aids other than those stipulated.} +\DeclareTranslation{English}{selbst2}{No part of it has been copied from any work produced by any other person or copied from any other source without reference to the source. +This includes all drawings, sketches, graphics and internet sources.} +\DeclareTranslation{English}{selbst3s}{Furthermore, I declare that this paper has not been submitted as an examination already, neither as a whole nor in parts.} +\DeclareTranslation{English}{selbst3p}{Furthermore, we declare that this paper has not been submitted as an examination already, neither as a whole nor in parts.} +\DeclareTranslation{German}{wien}{Wien} +\DeclareTranslation{English}{wien}{Vienna} %% ============================================================ %% FONTS AND EMPHASIZING: @@ -309,6 +351,11 @@ \else \def\@degree{\csuse{degree@#1}} \fi + \Ifstr{#1}{bachelor}{% + \KOMAoptions{fontsize=12pt}% + \RequirePackage{geometry} + \geometry{tmargin=3cm, bmargin=3cm, lmargin=3cm, rmargin=3cm, footskip=1.5cm} + } }% } @@ -451,6 +498,7 @@ \else \def\and{% \end{tabular}% + \global\multiauthorstrue% \hskip 1em \@plus.17fil% \begin{tabular}[t]{c}% }% @@ -501,7 +549,7 @@ \end{flushright} \vspace{2\baselineskip} \begin{center} - \bgroup\usekomafont{thesistype}{\MakeUppercase{\@thesistype\,/\,\hskip\z@skip\mbox{\@thesistype@en}}\par}\egroup + {\usekomafont{thesistype}\MakeUppercase{\@thesistype\,/\,\hskip\z@skip\mbox{\@thesistype@en}}\par} \end{center} \vspace{2\baselineskip} \begin{center} @@ -588,6 +636,48 @@ \restoregeometry }% +\newcommand\makedeclaration{% +\def\and{% + \end{tabular}% + \hskip 1em \@plus.17fil% + \begin{tabular}[t]{c}% + \hline + }% +\clearpage +\thispagestyle{plain}% +\section*{\GetTranslation{erkl}} + +\ifmultiauthors +\GetTranslation{selbst1p} +\else +\GetTranslation{selbst1s} +\fi + +\GetTranslation{selbst2} + +\ifmultiauthors +\GetTranslation{selbst3p} +\else +\GetTranslation{selbst3s} +\fi + +\bigskip +\bgroup +\raggedleft +\GetTranslation{wien}, \today + +\vspace{15mm} + +\begin{tabular}[t]{c} + \hline + \@author +\end{tabular}\par +\egroup +\clearpage +\global\let\and\relax +} + + %% ============================================================= %% FOOTNOTES: @@ -794,4 +884,28 @@ \fi + +%% ============================================================= +%% DRAFT: +%% ============================================================= + +\ifdraftmark + +\ifdraftmarkfp + \RequirePackage[firstpageonly]{draftwatermark} +\else + \RequirePackage{draftwatermark} +\fi + +\DraftwatermarkOptions{% + angle=0, + vpos=10pt, + anchor=ct, + fontsize=14pt, + text={\GetTranslation{draft} (\today)} +} + +\fi + + %% Finis. 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 5b789ac810..e95c3507f5 100644 --- a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls +++ b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls @@ -32,7 +32,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{univie-ling-wlg}[2021/10/19 v1.15 WLG journal layout (JSp)] +\ProvidesPackage{univie-ling-wlg}[2021/11/03 v1.16 WLG journal layout (JSp)] %% ============================================================ |