summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/dtxdescribe/README.txt2
-rw-r--r--Master/texmf-dist/doc/latex/dtxdescribe/dtxdescribe.pdfbin349681 -> 351354 bytes
-rw-r--r--Master/texmf-dist/source/latex/dtxdescribe/dtxdescribe.dtx114
-rw-r--r--Master/texmf-dist/tex/latex/dtxdescribe/dtxdescribe.sty77
4 files changed, 155 insertions, 38 deletions
diff --git a/Master/texmf-dist/doc/latex/dtxdescribe/README.txt b/Master/texmf-dist/doc/latex/dtxdescribe/README.txt
index ea6c2406d04..60d788aa994 100644
--- a/Master/texmf-dist/doc/latex/dtxdescribe/README.txt
+++ b/Master/texmf-dist/doc/latex/dtxdescribe/README.txt
@@ -1,7 +1,7 @@
The LaTeX dtxdescribe package
Describe additional object types in dtx source files.
-v1.00 — 2019/01/11
+v1.01 — 2019/03/22
Copyright 2016–2019 Brian Dunn — www.BDTechConcepts.com
LaTeX Project Public License, version 1.3
diff --git a/Master/texmf-dist/doc/latex/dtxdescribe/dtxdescribe.pdf b/Master/texmf-dist/doc/latex/dtxdescribe/dtxdescribe.pdf
index 3e39d9b1330..e8a659a0004 100644
--- a/Master/texmf-dist/doc/latex/dtxdescribe/dtxdescribe.pdf
+++ b/Master/texmf-dist/doc/latex/dtxdescribe/dtxdescribe.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/dtxdescribe/dtxdescribe.dtx b/Master/texmf-dist/source/latex/dtxdescribe/dtxdescribe.dtx
index a4d54e98fe0..d73ecf95392 100644
--- a/Master/texmf-dist/source/latex/dtxdescribe/dtxdescribe.dtx
+++ b/Master/texmf-dist/source/latex/dtxdescribe/dtxdescribe.dtx
@@ -12,12 +12,12 @@
% version 2005/12/01 or later.
%
% \fi
-
+%
%
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}
%<package>\ProvidesPackage{dtxdescribe}
-%<package> [2019/01/11 v1.00 Describe additional object types in dtx source files.]
+%<package> [2019/03/22 v1.01 Describe additional object types in dtx source files.]
%
%<*driver>
\documentclass{ltxdoc}
@@ -132,24 +132,6 @@ Subject={Describe additional object types in dtx source files.]},%
Keywords={LaTeX, dtx, source, DescribeMacro}%
}}
-\pdfstringdefDisableCommands{
-\def\quad{ }
-\def\\{ }
-\def\pkg#1{#1}
-\def\cs#1{\textbackslash#1}
-\def\env#1{#1}
-\def\,{ }
-\def\prog#1{#1}
-\def\LuaLaTeX{LuaLaTeX}
-\def\XeLaTeX{XeLaTeX}
-\def\TeX{TeX}
-\def\LaTeX{LaTeX}
-\def\Dash{ --- }
-\def\dash{ -- }
-\def\element#1{#1}
-\def\attribute#1{#1}
-}
-
\usepackage{cleveref}
@@ -171,7 +153,7 @@ Keywords={LaTeX, dtx, source, DescribeMacro}%
%<*package>
% \fi
%
-% \CheckSum{0}
+% \CheckSum{978}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -192,6 +174,7 @@ Keywords={LaTeX, dtx, source, DescribeMacro}%
% \changes{v0.10}{2016/12/08}{\ 2016/12/08 Initial ver}
% \changes{v0.11}{2018/03/30}{\ 2018/03/30}
% \changes{v1.00}{2019/01/11}{\ 2019/01/11}
+% \changes{v1.01}{2019/03/22}{\ 2019/03/22}
@@ -1285,6 +1268,65 @@ Keywords={LaTeX, dtx, source, DescribeMacro}%
% \end{macrocode}
+% \DescribePackage{hyperref}
+% If \pkg{hyperref} is loaded, disable some macros in \PDF\ bookmarks:
+% \margintag{\PDF\ bookmarks}
+% \changes{v1.01}{2019/01/20}{Sanitize \PDF\ bookmarks.}
+% \begin{macrocode}
+\AtBeginDocument{
+\pdfstringdefDisableCommands{
+\def\quad{ }
+\def\\{ }
+\def\pkg#1{#1}
+\def\ctr#1{#1}
+\def\bool#1{#1}
+\def\optn#1{#1}
+\def\env#1{#1}
+\def\cs#1{\textbackslash#1}
+\def\,{ }
+\def\LuaLaTeX{LuaLaTeX}
+\def\XeLaTeX{XeLaTeX}
+\def\TeX{TeX}
+\def\LaTeX{LaTeX}
+\def\LaTeXe{LaTeX2e}
+\def\LuaTeX{LuaTeX}
+\def\LuaLaTeX{LuaLaTeX}
+\def\XeTeX{XeTeX}
+\def\AmS{AMS}
+\def\Dash{ --- }
+\def\dash{ -- }
+\def\Slash{/}
+\def\prog#1{\detokenize{#1}}
+\def\progcode#1{#1}
+\def\filenm#1{\detokenize{#1}}
+\def\brand#1{#1}
+\def\acro#1{#1}
+\def\HTML{HTML}
+\def\ODT{ODT}
+\def\SVG{SVG}
+\def\PNG{PNG}
+\def\GIF{GIF}
+\def\JPG{JPG}
+\def\EPS{EPS}
+\def\PDF{PDF}
+\def\DVI{DVI}
+\def\UTF{UTF}
+\def\URL{URL}
+\def\element#1{#1}
+\def\attribute#1{#1}
+\def\HTML{HTML}
+\def\HTMLfive{HTML5}
+\def\CSS{CSS}
+\def\CSSthree{CSS3}
+\def\EPUB{EPUB}
+\def\TOC{TOC}
+\def\LOF{LOF}
+\def\LOT{LOT}
+}
+}
+% \end{macrocode}
+
+
% ^^A Several versions of the \warningsign symbol:
@@ -1387,6 +1429,7 @@ Keywords={LaTeX, dtx, source, DescribeMacro}%
%
% The |class| is used to sub-categories keys into their key/value groups.
%
+% \changes{v1.01}{2019/01/20}{Put margin tag class in brackets.}
% \begin{macrocode}
\newcommand*{\DTXD@margintag}[3]{%
\@ifundefined{@captype}{% not float?
@@ -1394,7 +1437,7 @@ Keywords={LaTeX, dtx, source, DescribeMacro}%
\marginpar{%
\DTXD@printtype{%
#3% margintag
-\ifblank{#1}{}{ #1}% class
+\ifblank{#1}{}{ [#1]}% class
}% Desc@Type
\texttt{#2}% name
}% marginpar
@@ -1532,6 +1575,7 @@ Keywords={LaTeX, dtx, source, DescribeMacro}%
% Creates the margin tag and index entries where name is a \cs{macro}.
%
% \changes{v1.00}{2019/01/09}{Sans tag font.}
+% \changes{v1.01}{2019/01/20}{Put margin tag class in brackets.}
% \begin{macrocode}
\newcommand*{\DTXD@cmdmargintagindex}[5]{%
\@bsphack%
@@ -1543,7 +1587,7 @@ Keywords={LaTeX, dtx, source, DescribeMacro}%
\marginpar{%
\DTXD@printtype{%
#3% margin tag
-\ifblank{#1}{}{ #1}% class
+\ifblank{#1}{}{ [#1]}% class
}% Desc@Type
\cmd{#2}% name
}% marginpar
@@ -1590,6 +1634,7 @@ Keywords={LaTeX, dtx, source, DescribeMacro}%
% Redefined to allow hyperlinked index entries and an optional class:
%
% \changes{v1.00}{2019/01/09}{Sans tag font.}
+% \changes{v1.01}{2019/01/20}{Put margin tag class in brackets.}
% \begin{macrocode}
\renewcommand*{\DescribeMacro}[2][]{%
\@bsphack%
@@ -1600,7 +1645,7 @@ Keywords={LaTeX, dtx, source, DescribeMacro}%
\leavevmode%
\marginpar{%
\raggedleft%
-\ifblank{#1}{}{{\scriptsize\textsf{#1}} }% class
+\ifblank{#1}{}{{\scriptsize\textsf{[#1]}} }% class
\cmd{#2}% name
}% marginpar
}{}% not float?
@@ -1868,11 +1913,17 @@ Keywords={LaTeX, dtx, source, DescribeMacro}%
%
% May be used to describe an arbitrary piece of code.
% Creates a margin tag and index entries with \cs{ttfamily}.
+%
+% \changes{v1.01}{2019/01/20}{Put margin tag class in brackets.}
% \begin{macrocode}
\newcommand*{\DescribeObject}[2][]{%
\@ifundefined{@captype}{% not float?
\@bsphack%
-\leavevmode\marginpar{\raggedleft{\scriptsize#1} \texttt{#2}}%
+\leavevmode%
+\marginpar{%
+ \ifblank{#1}{}{\raggedleft{\scriptsize[#1]} }
+ \texttt{#2}%
+}%
}{}% not float?
\ifblank{#1}%
{\begingroup%
@@ -1903,11 +1954,16 @@ Keywords={LaTeX, dtx, source, DescribeMacro}%
%
% May be used to describe an arbitrary non-programming object.
% Creates a margin tag and index entries with roman type.
+% \changes{v1.01}{2019/01/20}{Put margin tag class in brackets.}
% \begin{macrocode}
\newcommand*{\DescribeOther}[2][]{%
\@ifundefined{@captype}{% not float?
\@bsphack%
-\leavevmode\marginpar{\raggedleft{\scriptsize#1} #2}%
+\leavevmode%
+\marginpar{%
+ \ifblank{#1}{}{\raggedleft{\scriptsize[#1]} }%
+ #2%
+}%
}{}% not float?
\ifblank{#1}%
{%
@@ -2447,12 +2503,13 @@ position=top,
% To typeset a block of source code, allowing direct formatting.
%
% \changes{v1.00}{2019/01/09}{Added.}
+% \changes{v1.01}{2019/01/20}{Reduced width.}
% \begin{macrocode}
\newenvironment{sourcedisplay}
{
\leavevmode
\par
- \fqquad\minipage{\linewidth-2em}
+ \fqquad\minipage{\linewidth-4em}
\ttfamily
}
{%
@@ -2467,12 +2524,13 @@ position=top,
% To typeset a user interface display.
%
% \changes{v1.00}{2019/01/09}{Added.}
+% \changes{v1.01}{2019/01/20}{Reduced width.}
% \begin{macrocode}
\newenvironment{UIdisplay}
{
\leavevmode
\par
- \fqquad\minipage{\linewidth-2em}
+ \fqquad\minipage{\linewidth-4em}
\sffamily\bfseries
}
{
diff --git a/Master/texmf-dist/tex/latex/dtxdescribe/dtxdescribe.sty b/Master/texmf-dist/tex/latex/dtxdescribe/dtxdescribe.sty
index 06933159d97..5c1d41e1ff2 100644
--- a/Master/texmf-dist/tex/latex/dtxdescribe/dtxdescribe.sty
+++ b/Master/texmf-dist/tex/latex/dtxdescribe/dtxdescribe.sty
@@ -16,10 +16,9 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
-
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{dtxdescribe}
- [2019/01/11 v1.00 Describe additional object types in dtx source files.]
+ [2019/03/22 v1.01 Describe additional object types in dtx source files.]
@@ -112,6 +111,58 @@
\RequirePackage{xstring}
+\AtBeginDocument{
+\pdfstringdefDisableCommands{
+\def\quad{ }
+\def\\{ }
+\def\pkg#1{#1}
+\def\ctr#1{#1}
+\def\bool#1{#1}
+\def\optn#1{#1}
+\def\env#1{#1}
+\def\cs#1{\textbackslash#1}
+\def\,{ }
+\def\LuaLaTeX{LuaLaTeX}
+\def\XeLaTeX{XeLaTeX}
+\def\TeX{TeX}
+\def\LaTeX{LaTeX}
+\def\LaTeXe{LaTeX2e}
+\def\LuaTeX{LuaTeX}
+\def\LuaLaTeX{LuaLaTeX}
+\def\XeTeX{XeTeX}
+\def\AmS{AMS}
+\def\Dash{ --- }
+\def\dash{ -- }
+\def\Slash{/}
+\def\prog#1{\detokenize{#1}}
+\def\progcode#1{#1}
+\def\filenm#1{\detokenize{#1}}
+\def\brand#1{#1}
+\def\acro#1{#1}
+\def\HTML{HTML}
+\def\ODT{ODT}
+\def\SVG{SVG}
+\def\PNG{PNG}
+\def\GIF{GIF}
+\def\JPG{JPG}
+\def\EPS{EPS}
+\def\PDF{PDF}
+\def\DVI{DVI}
+\def\UTF{UTF}
+\def\URL{URL}
+\def\element#1{#1}
+\def\attribute#1{#1}
+\def\HTML{HTML}
+\def\HTMLfive{HTML5}
+\def\CSS{CSS}
+\def\CSSthree{CSS3}
+\def\EPUB{EPUB}
+\def\TOC{TOC}
+\def\LOF{LOF}
+\def\LOT{LOT}
+}
+}
+
@@ -152,7 +203,7 @@
\marginpar{%
\DTXD@printtype{%
#3% margintag
-\ifblank{#1}{}{ #1}% class
+\ifblank{#1}{}{ [#1]}% class
}% Desc@Type
\texttt{#2}% name
}% marginpar
@@ -204,7 +255,7 @@
\marginpar{%
\DTXD@printtype{%
#3% margin tag
-\ifblank{#1}{}{ #1}% class
+\ifblank{#1}{}{ [#1]}% class
}% Desc@Type
\cmd{#2}% name
}% marginpar
@@ -232,7 +283,7 @@
\leavevmode%
\marginpar{%
\raggedleft%
-\ifblank{#1}{}{{\scriptsize\textsf{#1}} }% class
+\ifblank{#1}{}{{\scriptsize\textsf{[#1]}} }% class
\cmd{#2}% name
}% marginpar
}{}% not float?
@@ -318,7 +369,11 @@
\newcommand*{\DescribeObject}[2][]{%
\@ifundefined{@captype}{% not float?
\@bsphack%
-\leavevmode\marginpar{\raggedleft{\scriptsize#1} \texttt{#2}}%
+\leavevmode%
+\marginpar{%
+ \ifblank{#1}{}{\raggedleft{\scriptsize[#1]} }
+ \texttt{#2}%
+}%
}{}% not float?
\ifblank{#1}%
{\begingroup%
@@ -344,7 +399,11 @@
\newcommand*{\DescribeOther}[2][]{%
\@ifundefined{@captype}{% not float?
\@bsphack%
-\leavevmode\marginpar{\raggedleft{\scriptsize#1} #2}%
+\leavevmode%
+\marginpar{%
+ \ifblank{#1}{}{\raggedleft{\scriptsize[#1]} }%
+ #2%
+}%
}{}% not float?
\ifblank{#1}%
{%
@@ -597,7 +656,7 @@ position=top,
{
\leavevmode
\par
- \fqquad\minipage{\linewidth-2em}
+ \fqquad\minipage{\linewidth-4em}
\ttfamily
}
{%
@@ -609,7 +668,7 @@ position=top,
{
\leavevmode
\par
- \fqquad\minipage{\linewidth-2em}
+ \fqquad\minipage{\linewidth-4em}
\sffamily\bfseries
}
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-31 15:41:06 +0000