From 300a47794120fb8337724ab100edb9ce9f793088 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 23 Jan 2020 17:53:38 +0000 Subject: dashundergaps (22jan20) git-svn-id: svn://tug.org/texlive/trunk@53501 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/latex/dashundergaps/dashundergaps.dtx | 41 +++++++++++++++------- .../source/latex/dashundergaps/dashundergaps.ins | 6 ++-- 2 files changed, 32 insertions(+), 15 deletions(-) (limited to 'Master/texmf-dist/source/latex') diff --git a/Master/texmf-dist/source/latex/dashundergaps/dashundergaps.dtx b/Master/texmf-dist/source/latex/dashundergaps/dashundergaps.dtx index f26f362baac..9b5fbcc1fd1 100644 --- a/Master/texmf-dist/source/latex/dashundergaps/dashundergaps.dtx +++ b/Master/texmf-dist/source/latex/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/Master/texmf-dist/source/latex/dashundergaps/dashundergaps.ins b/Master/texmf-dist/source/latex/dashundergaps/dashundergaps.ins index 20ebf84d7a4..935cdce4886 100644 --- a/Master/texmf-dist/source/latex/dashundergaps/dashundergaps.ins +++ b/Master/texmf-dist/source/latex/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'. -------------------------------------------------------------------------- -- cgit v1.2.3