From 7b7553d4d572a2b1e59ef2020d0c0a850513ca91 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 12 Jan 2020 11:11:08 +0900 Subject: aeb-mlink --- texmf-dist/doc/latex/aeb-mlink/README.md | 7 ++- texmf-dist/doc/latex/aeb-mlink/aeb_mlink.pdf | Bin 0 -> 160605 bytes texmf-dist/doc/latex/aeb-mlink/aebmlink_man.pdf | Bin 309586 -> 335247 bytes texmf-dist/doc/latex/aeb-mlink/aebmlink_man.tex | 7 ++- .../doc/latex/aeb-mlink/examples/mlink_tst.pdf | Bin 62931 -> 66970 bytes texmf-dist/source/latex/aeb-mlink/aeb_mlink.dtx | 50 ++++++++++++++++----- texmf-dist/tex/latex/aeb-mlink/aeb-mlink.sty | 2 +- texmf-dist/tex/latex/aeb-mlink/aeb_mlink.sty | 20 ++++++--- 8 files changed, 63 insertions(+), 23 deletions(-) create mode 100644 texmf-dist/doc/latex/aeb-mlink/aeb_mlink.pdf diff --git a/texmf-dist/doc/latex/aeb-mlink/README.md b/texmf-dist/doc/latex/aeb-mlink/README.md index 5903461b..47fdf787 100644 --- a/texmf-dist/doc/latex/aeb-mlink/README.md +++ b/texmf-dist/doc/latex/aeb-mlink/README.md @@ -1,6 +1,6 @@ Package: aeb_mlink Author: D. P. Story -Dated: 2018/08/18 +Dated: 2020-01-06 The aeb_mlink package defines new link commands to create multi-line links. The new commands are \mlhypertext, \mlhyperlink, \mlhyperref, \mlnameref, @@ -8,6 +8,11 @@ The new commands are \mlhypertext, \mlhyperlink, \mlhyperref, \mlnameref, PDF Creators: Adobe Distiller or ps2pdf +What's New (2020-01-06) This package reads web.cfg (web package, +if available). The web.cfg has changed format slightly, this +update now conforms to that format. Defined new option urlOpts to +pass options to the url package. + What's New (2018/08/18): Created \turnSyllbCntOn (\turnSyllbCntOff) to turn on (resp., off) the viewing of syllable numbers. Reorganize core program to accommodate the use of \mlhypertext command within the program code of diff --git a/texmf-dist/doc/latex/aeb-mlink/aeb_mlink.pdf b/texmf-dist/doc/latex/aeb-mlink/aeb_mlink.pdf new file mode 100644 index 00000000..755abb2e Binary files /dev/null and b/texmf-dist/doc/latex/aeb-mlink/aeb_mlink.pdf differ diff --git a/texmf-dist/doc/latex/aeb-mlink/aebmlink_man.pdf b/texmf-dist/doc/latex/aeb-mlink/aebmlink_man.pdf index b672ae4a..94c613d8 100644 Binary files a/texmf-dist/doc/latex/aeb-mlink/aebmlink_man.pdf and b/texmf-dist/doc/latex/aeb-mlink/aebmlink_man.pdf differ diff --git a/texmf-dist/doc/latex/aeb-mlink/aebmlink_man.tex b/texmf-dist/doc/latex/aeb-mlink/aebmlink_man.tex index 6957dcf2..db47d32e 100644 --- a/texmf-dist/doc/latex/aeb-mlink/aebmlink_man.tex +++ b/texmf-dist/doc/latex/aeb-mlink/aebmlink_man.tex @@ -33,7 +33,7 @@ subject={Wrapping links around to the next line}, keywords={multi-line links, quad points, latex, pdf, aeb}, talksite={\url{www.acrotex.net}}, - version={2.3.4, 2018/08/18}, + version={2.3.5, 2020/01/06}, copyrightStatus={True}, copyrightNotice={Copyright (C) 2006-\the\year, D. P. Story}, copyrightInfoURL={http://www.acrotex.net} @@ -244,7 +244,7 @@ of the Y\&Y {\TeX} System, no longer available, but is used by this author.} The comes last. \end{itemize} -\paragraph*{Options of \pkg{aeb\_mlinks}.} These are, +\paragraph*{Options of \pkg{aeb\_mlinks}.} The following are the options of this package. \begin{description} \item[\normalfont\texttt{dvips}] Use this option when the \textsf{dvips} application is used to create the Postscript file. @@ -252,6 +252,9 @@ of the Y\&Y {\TeX} System, no longer available, but is used by this author.} The to create the Post\-script file. (Only a few people worldwide use this option.) \item[\normalfont\texttt{dblevel=\ameta{\upshape{0|1|2}}}] To obtain information on the multi-line links being created. Each value gives more information about what is going on. Used for development. + \item[\normalfont\texttt{urlOpts=\ameta{url-options}}] Use the key \opt{urlOpts} to pass options to the + \pkg{url} package; for example \opt{urlOpts=hyphens} enables URLs to be broken at hyphens. See the + \pkg{url} documentation for a list of options. \item[\normalfont\ameta{eforms-options}] Any options other than the ones listed above are passed to the \pkg{eforms} package. \end{description} diff --git a/texmf-dist/doc/latex/aeb-mlink/examples/mlink_tst.pdf b/texmf-dist/doc/latex/aeb-mlink/examples/mlink_tst.pdf index 02be88e9..cafe43e4 100644 Binary files a/texmf-dist/doc/latex/aeb-mlink/examples/mlink_tst.pdf and b/texmf-dist/doc/latex/aeb-mlink/examples/mlink_tst.pdf differ diff --git a/texmf-dist/source/latex/aeb-mlink/aeb_mlink.dtx b/texmf-dist/source/latex/aeb-mlink/aeb_mlink.dtx index 5a8b97fe..2061df66 100644 --- a/texmf-dist/source/latex/aeb-mlink/aeb_mlink.dtx +++ b/texmf-dist/source/latex/aeb-mlink/aeb_mlink.dtx @@ -2,7 +2,7 @@ %<*copyright> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% aeb_mlink.sty package, %% -%% Copyright (C) 2006--2018 D. P. Story %% +%% Copyright (C) 2006--2020 D. P. Story %% %% dpstory@acrotex.net %% %% %% %% This program can redistributed and/or modified under %% @@ -14,7 +14,7 @@ % %\NeedsTeXFormat{LaTeX2e} %\ProvidesPackage{aeb_mlink} -% [2018/08/18 v2.3.4 AeB MLink (dps)] +% [2020/01/06 v2.3.5 AeB MLink (dps)] %<*driver> \documentclass{ltxdoc} \usepackage{xcolor} @@ -130,7 +130,7 @@ \newif\if@ml@dvips \@ml@dvipstrue \def\mlcsarg#1#2{\expandafter#1\csname#2\endcsname} % \end{macrocode} -% \begin{macro}{dvipsone} +% \leavevmode\IndexOpt{dvipsone}^^A % Set the driver for \texttt{dvipsone} % \begin{macrocode} \DeclareOptionX{dvipsone}{\def\eq@drivernum{0}\@ml@dvipsfalse @@ -138,25 +138,42 @@ \PassOptionsToPackage{dvipsone}{hyperref} } % \end{macrocode} -% \end{macro} -% \begin{macro}{dvips} -% Set the driver for \texttt{dvips} +% \leavevmode\IndexOpt{dvips}^^A +% Set the driver for \texttt{dvips}% % \begin{macrocode} \DeclareOptionX{dvips}{\def\eq@drivernum{0}\@ml@dvipstrue \PassOptionsToPackage{dvips}{eforms} \PassOptionsToPackage{dvips}{hyperref} } +% \end{macrocode} +% \leavevmode\IndexOpt{urlOpts}^^A +% The options of the \pkg{url} package may be passed through the value of this key; +% for example, |urlOpts={hyphens}|. +% \changes{v2.3.5}{2020/01/06}{Added \string\opt{urlOpts}} +% \begin{macrocode} +\define@key{aeb_mlink.sty}{urlOpts}[]{\def\url@Opts{[#1]}} +\let\url@Opts\@empty +% \end{macrocode} +% Undefined options are passed to \pkg{eforms}. +% \begin{macrocode} \DeclareOptionX*{\PassOptionsToPackage{\CurrentOption}{eforms}} % \end{macrocode} -% \end{macro} +% \leavevmode\IndexOpt{dblevel}^^A +% Sets the debug level. % \begin{macrocode} -\@ifundefined{mldblevel}{\newcount\mldblevel - \mldblevel=0 }{} +\@ifundefined{mldblevel}{\newcount\mldblevel\mldblevel=0 }{} \define@key{aeb_mlink.sty}{dblevel}[0]{\mldblevel=#1 } % \end{macrocode} +% Package error message when not dvips (or dvispone) % \begin{macrocode} \def\ml@err@msg{This package requires the driver dvips and\MessageBreak Adobe Distiller as the PDF creator} +% \end{macrocode} +% (2020/01/06) Conform to the new \texttt{web.cfg} format. +% \changes{v2.3.5}{2020/01/06}{Conform to the new \string\texttt{web.cfg} format} +% \begin{macrocode} +\let\bWebCustomize\endinput +\let\eWebCustomize\relax \ifpdf\PackageError{aeb_mlink}{\ml@err@msg}\else \ifxetex\PackageError{aeb_mlink}{\ml@err@msg}\else \let\ExecuteOptions@SAVE\ExecuteOptions @@ -166,7 +183,14 @@ {\ExecuteOptionsX{dvipsone}}}% \let\ExecuteOptions\ExecuteOptions@SAVE \fi\fi +% \end{macrocode} +% (2020/01/06) Now require \pkg{url} package and pass +% options to \pkg{url} through \opt{urlOpts}. +% \changes{v2.3.5}{2020/01/06}{Now require \string\pkg{url} package and pass +% options to \string\pkg{url} through \string\opt{urlOpts}} +% \begin{macrocode} \ProcessOptionsX +\expandafter\RequirePackage\url@Opts{url} % \end{macrocode} % We require hyperref, eforms and soul. For eforms, a recent version is needed, % \texttt{2008/03/14} or later. @@ -736,8 +760,9 @@ yMin 20 string cvs pf(]\string\n)pf^^J}% \def\MrkLnkLtr{L} \def\ml@MrkLnk#1{\ifmlmarks\bgroup\ifdim\baselineskip=0pt \setbox\z@\hbox{T}\gdef\ml@raiseamt{\ht\z@+.4pt}\else - \gdef\ml@raiseamt{.6\baselineskip}\fi\smash{\rlap{\normalfont\normalcolor\bfseries - \raisebox{\ml@raiseamt}{\tiny\strut{\MrkLnkLtr#1}}}}\egroup\fi} + \gdef\ml@raiseamt{.6\baselineskip}\fi\smash{\rlap{\normalfont + \normalcolor\bfseries + \raisebox{\ml@raiseamt}{\tiny\strut{\MrkLnkLtr#1}}}}\egroup\fi} \newif\iflinknotformed \linknotformedfalse \newif\ifcr@ckit \cr@ckitfalse \def\ml@underlinded{U} @@ -1262,7 +1287,8 @@ yMin 20 string cvs pf(]\string\n)pf^^J}% \ifx#3\ml@urlbuildii \advance\@tempcntb by \eq@mlcrackat\relax\fi \global\setbox#3=\hbox{% \mlh@setQuadSyllable{\@indx}{#2}{#1}{\unhcopy\@ne}% - \hbox{\unhcopy\@ne}\relax\ml@typeset@@syl{\@tempcntb}\penalty0\unhcopy#3}%hbox + \hbox{\unhcopy\@ne}\relax + \ml@typeset@@syl{\@tempcntb}\penalty0\unhcopy#3}%hbox }} % \end{macrocode} % After the above preliminaries, we finally define \DescribeMacro{\mlurl}\cmd{\mlurl}. diff --git a/texmf-dist/tex/latex/aeb-mlink/aeb-mlink.sty b/texmf-dist/tex/latex/aeb-mlink/aeb-mlink.sty index e827b392..741affef 100644 --- a/texmf-dist/tex/latex/aeb-mlink/aeb-mlink.sty +++ b/texmf-dist/tex/latex/aeb-mlink/aeb-mlink.sty @@ -8,7 +8,7 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% aeb_mlink.sty package, %% -%% Copyright (C) 2006--2018 D. P. Story %% +%% Copyright (C) 2006--2020 D. P. Story %% %% dpstory@acrotex.net %% %% %% %% This program can redistributed and/or modified under %% diff --git a/texmf-dist/tex/latex/aeb-mlink/aeb_mlink.sty b/texmf-dist/tex/latex/aeb-mlink/aeb_mlink.sty index 73f8c6b2..81ee7b21 100644 --- a/texmf-dist/tex/latex/aeb-mlink/aeb_mlink.sty +++ b/texmf-dist/tex/latex/aeb-mlink/aeb_mlink.sty @@ -8,7 +8,7 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% aeb_mlink.sty package, %% -%% Copyright (C) 2006--2018 D. P. Story %% +%% Copyright (C) 2006--2020 D. P. Story %% %% dpstory@acrotex.net %% %% %% %% This program can redistributed and/or modified under %% @@ -19,7 +19,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{aeb_mlink} - [2018/08/18 v2.3.4 AeB MLink (dps)] + [2020/01/06 v2.3.5 AeB MLink (dps)] \RequirePackage{xkeyval} \RequirePackage{ifpdf}[2006/02/20] \RequirePackage{ifxetex}[2006/08/21] @@ -33,12 +33,15 @@ \PassOptionsToPackage{dvips}{eforms} \PassOptionsToPackage{dvips}{hyperref} } +\define@key{aeb_mlink.sty}{urlOpts}[]{\def\url@Opts{[#1]}} +\let\url@Opts\@empty \DeclareOptionX*{\PassOptionsToPackage{\CurrentOption}{eforms}} -\@ifundefined{mldblevel}{\newcount\mldblevel - \mldblevel=0 }{} +\@ifundefined{mldblevel}{\newcount\mldblevel\mldblevel=0 }{} \define@key{aeb_mlink.sty}{dblevel}[0]{\mldblevel=#1 } \def\ml@err@msg{This package requires the driver dvips and\MessageBreak Adobe Distiller as the PDF creator} +\let\bWebCustomize\endinput +\let\eWebCustomize\relax \ifpdf\PackageError{aeb_mlink}{\ml@err@msg}\else \ifxetex\PackageError{aeb_mlink}{\ml@err@msg}\else \let\ExecuteOptions@SAVE\ExecuteOptions @@ -49,6 +52,7 @@ \let\ExecuteOptions\ExecuteOptions@SAVE \fi\fi \ProcessOptionsX +\expandafter\RequirePackage\url@Opts{url} \RequirePackage{hyperref} \RequirePackage{refcount} \RequirePackage{eforms}[2018/08/16] @@ -401,8 +405,9 @@ yMin 20 string cvs pf(]\string\n)pf^^J}% \def\MrkLnkLtr{L} \def\ml@MrkLnk#1{\ifmlmarks\bgroup\ifdim\baselineskip=0pt \setbox\z@\hbox{T}\gdef\ml@raiseamt{\ht\z@+.4pt}\else - \gdef\ml@raiseamt{.6\baselineskip}\fi\smash{\rlap{\normalfont\normalcolor\bfseries - \raisebox{\ml@raiseamt}{\tiny\strut{\MrkLnkLtr#1}}}}\egroup\fi} + \gdef\ml@raiseamt{.6\baselineskip}\fi\smash{\rlap{\normalfont + \normalcolor\bfseries + \raisebox{\ml@raiseamt}{\tiny\strut{\MrkLnkLtr#1}}}}\egroup\fi} \newif\iflinknotformed \linknotformedfalse \newif\ifcr@ckit \cr@ckitfalse \def\ml@underlinded{U} @@ -705,7 +710,8 @@ yMin 20 string cvs pf(]\string\n)pf^^J}% \ifx#3\ml@urlbuildii \advance\@tempcntb by \eq@mlcrackat\relax\fi \global\setbox#3=\hbox{% \mlh@setQuadSyllable{\@indx}{#2}{#1}{\unhcopy\@ne}% - \hbox{\unhcopy\@ne}\relax\ml@typeset@@syl{\@tempcntb}\penalty0\unhcopy#3}%hbox + \hbox{\unhcopy\@ne}\relax + \ml@typeset@@syl{\@tempcntb}\penalty0\unhcopy#3}%hbox }} \newcommand{\mlurl}{\begingroup\@makeother\~\relax% \def~{\string~}% \ef@sanitize@toks\mlurl@} -- cgit v1.2.3