dtxdescribe (22mar19)

git-svn-id: svn://tug.org/texlive/trunk@50532 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 68 insertions, 9 deletions

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
 }
 {