From f7e5d81fe9880913485f7f8c541eeca7adf4c195 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 23 Jan 2020 03:01:31 +0000 Subject: CTAN sync 202001230301 --- macros/latex/contrib/dashundergaps/README.md | 4 +- macros/latex/contrib/dashundergaps/changes.txt | 13 +++++++ .../contrib/dashundergaps/dashundergaps-code.pdf | Bin 567877 -> 597014 bytes .../contrib/dashundergaps/dashundergaps-doc.pdf | Bin 438978 -> 466392 bytes .../latex/contrib/dashundergaps/dashundergaps.dtx | 41 +++++++++++++++------ .../latex/contrib/dashundergaps/dashundergaps.ins | 6 +-- macros/latex/contrib/dashundergaps/l3doc-TUB.cls | 6 +-- 7 files changed, 50 insertions(+), 20 deletions(-) (limited to 'macros/latex/contrib/dashundergaps') diff --git a/macros/latex/contrib/dashundergaps/README.md b/macros/latex/contrib/dashundergaps/README.md index 62bcbe1618..aa95e95f5a 100644 --- a/macros/latex/contrib/dashundergaps/README.md +++ b/macros/latex/contrib/dashundergaps/README.md @@ -12,11 +12,11 @@ Package source can be found below: https://github.com/FrankMittelbach/fmitex/ -The license is LPPL. +The license is LPPL 1.3c. ----- -Copyright (C) 2018 Frank Mittelbach
+Copyright (C) 2018-2020 Frank Mittelbach

All rights reserved. diff --git a/macros/latex/contrib/dashundergaps/changes.txt b/macros/latex/contrib/dashundergaps/changes.txt index ddb4ee6293..74ad759760 100644 --- a/macros/latex/contrib/dashundergaps/changes.txt +++ b/macros/latex/contrib/dashundergaps/changes.txt @@ -1,3 +1,16 @@ +2020-01-22 Frank Mittelbach + + * dashundergaps.dtx (subsection{Loading and fixing/changing \pkg{ulem}}): + Adjusted definition to new ulem release + + * Some release cleanup. + +2019-07-14 Frank Mittelbach + + * dashundergaps.dtx (subsection{The main implementation part}): + As the code doesn't run with expl3 versions prior to mid 2018, we + check against that (github/7). + 2018-11-09 Frank Mittelbach * dashundergaps.dtx v2.0d diff --git a/macros/latex/contrib/dashundergaps/dashundergaps-code.pdf b/macros/latex/contrib/dashundergaps/dashundergaps-code.pdf index 81d6122575..f200ad1d9c 100644 Binary files a/macros/latex/contrib/dashundergaps/dashundergaps-code.pdf and b/macros/latex/contrib/dashundergaps/dashundergaps-code.pdf differ diff --git a/macros/latex/contrib/dashundergaps/dashundergaps-doc.pdf b/macros/latex/contrib/dashundergaps/dashundergaps-doc.pdf index 047685d56d..fc1a592034 100644 Binary files a/macros/latex/contrib/dashundergaps/dashundergaps-doc.pdf and b/macros/latex/contrib/dashundergaps/dashundergaps-doc.pdf differ diff --git a/macros/latex/contrib/dashundergaps/dashundergaps.dtx b/macros/latex/contrib/dashundergaps/dashundergaps.dtx index f26f362baa..9b5fbcc1fd 100644 --- a/macros/latex/contrib/dashundergaps/dashundergaps.dtx +++ b/macros/latex/contrib/dashundergaps/dashundergaps.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -%% File: dashundergaps.dtx (C) Copyright 2018 Frank Mittelbach +%% File: dashundergaps.dtx (C) Copyright 2018-2020 Frank Mittelbach % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -17,8 +17,8 @@ % for those people who are interested or want to report an issue. % -\def\dashundergapsdate {2018/11/18} -\def\dashundergapsversion{v2.0d} +\def\dashundergapsdate {2020-01-22} % don't forget to also adjust build.lua! +\def\dashundergapsversion{v2.0f} %<*driver> \let\fmipagebreak\pagebreak @@ -29,7 +29,6 @@ [final] {l3doc-TUB} - \setcounter{page}{1} % fix for _TF undefined, @@ -533,19 +532,20 @@ % % \begin{macro}{\dotuline} % The dots produced by \cs{dotuline} depend on the current font, -% which is a somewhat questionable design\Dash if you underline a text %part +% which is a somewhat questionable design\Dash if you underline a text % with a single bold word somewhere inside it will change the % shape of the dot line. So we always use the \cs{normalfont} % dot (this is not done in the original definition). +% \changes{v2.0f}{2020/01/22}{Adjusted definition to new ulem release} % \begin{macrocode} -\def\dotuline{\bgroup +\protected\def\dotuline{\leavevmode\bgroup \UL@setULdepth + \ifx\UL@on\UL@onin \advance\ULdepth2\p@\fi \markoverwith{\begingroup - \advance\ULdepth0.08ex +% \advance\ULdepth0.08ex \lower\ULdepth\hbox{\normalfont \kern.1em .\kern.04em}% \endgroup}% \ULon} -\MakeRobust\dotuline % \end{macrocode} % \end{macro} % @@ -556,12 +556,12 @@ % the lowering. We change that to be based on the current % value of \cs{ULdepth} so that the user (or this package here) % can change the placement. +% \changes{v2.0f}{2020/01/22}{Adjusted definition to new ulem release} % \begin{macrocode} -\def\uwave{\bgroup +\protected\def\uwave{\leavevmode\bgroup \UL@setULdepth \advance\ULdepth 0.6\p@ \markoverwith{\lower\ULdepth\hbox{\sixly \char58}}\ULon} -\MakeRobust\uwave % \end{macrocode} % \end{macro} % @@ -635,6 +635,24 @@ \RequirePackage{xparse,l3keys2e} % \end{macrocode} % +% As the code uses some functions from \pkg{expl3} that got +% introduced sometime in 2018 we need to require a fairly recent +% version (the date is somewhat arbitrarily picked). +% \begin{macrocode} +\@ifpackagelater{expl3}{2018-06-24} + {} + {% + \PackageError{dashundergaps}{Support package l3kernel too old} + {% + Please install an up to date version of l3kernel\MessageBreak + using your TeX package manager or from CTAN.\MessageBreak + \MessageBreak + Loading dashundergaps will abort!% + }% + \endinput + } +% \end{macrocode} +% % Here we introduce the package and specify its version number: % \begin{macrocode} \ProvidesExplPackage{dashundergaps} @@ -698,7 +716,6 @@ % number of gaps, it makes little sense to modify it at the % document level. However, there may be use cases even for that and % more importantly, by making it a user-level counter it is -%\fmipagebreak % possible to refer to the total number of gaps easily, e.g., via % \cs{thetotalgapnumber}. % ^^A\makeatletter\@endparpenalty=10000\makeatother @@ -1050,7 +1067,7 @@ % package via \cs{usepackage}. % \begin{macrocode} \ProcessKeysPackageOptions{fmdug} -%<*package> +% % \end{macrocode} % % \Finale diff --git a/macros/latex/contrib/dashundergaps/dashundergaps.ins b/macros/latex/contrib/dashundergaps/dashundergaps.ins index 20ebf84d7a..935cdce488 100644 --- a/macros/latex/contrib/dashundergaps/dashundergaps.ins +++ b/macros/latex/contrib/dashundergaps/dashundergaps.ins @@ -3,7 +3,7 @@ %% driver files from the dtx file(s) in this package when run through %% LaTeX or TeX. %% -%% Copyright 2018 Frank Mittelbach +%% Copyright 2018-2020 Frank Mittelbach %% %% %% This file is part of the dashundergaps Bundle for LaTeX. @@ -15,7 +15,7 @@ %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt %% and version 1.3c or later is part of all distributions of LaTeX -%% version 2005/12/01 or later. +%% version 2008 or later. %% %% In particular, NO PERMISSION is granted to modify the contents of this %% file since it contains the legal notices that are placed in the files @@ -35,7 +35,7 @@ This is a generated file. -Copyright 2018 Frank Mittelbach +Copyright 2018-2020 Frank Mittelbach This file was generated from file(s) of the LaTeX `dashundergaps Bundle'. -------------------------------------------------------------------------- diff --git a/macros/latex/contrib/dashundergaps/l3doc-TUB.cls b/macros/latex/contrib/dashundergaps/l3doc-TUB.cls index 4db508e93c..e3f9138d73 100644 --- a/macros/latex/contrib/dashundergaps/l3doc-TUB.cls +++ b/macros/latex/contrib/dashundergaps/l3doc-TUB.cls @@ -891,7 +891,7 @@ \tl_greplace_all:Nno \g__codedoc_base_name_tl { ~ } { \c_catcode_other_space_tl } \seq_get:NN #1 \l__codedoc_tmpa_tl - \str_if_eq_x:nnTF { \l__codedoc_tmpa_tl } { \scan_stop: } + \str_if_eq:eeTF { \l__codedoc_tmpa_tl } { \scan_stop: } { \seq_gclear:N \g__codedoc_variants_seq \__codedoc_names_typeset_auxii:x { \g__codedoc_base_name_tl } @@ -954,7 +954,7 @@ #1 { \l__codedoc_tmpa_tl - \str_if_eq_x:nnF { \l__codedoc_tmpb_tl } { \scan_stop: } + \str_if_eq:eeF { \l__codedoc_tmpb_tl } { \scan_stop: } { : \l__codedoc_tmpb_tl } \bool_if:NT \l__codedoc_macro_TF_bool { TF } } @@ -2098,7 +2098,7 @@ \tl_if_empty:nTF {#3} { { } { } { } } { - \str_if_eq_x:nnTF {#3} { TeX } + \str_if_eq:eeTF {#3} { TeX } { { TeX~and~LaTeX2e } { \string\TeX{}~and~\string\LaTeXe{} } -- cgit v1.2.3