changes (17dec18)

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

1 files changed, 148 insertions, 40 deletions

diff --git a/Master/texmf-dist/source/latex/changes/changes.drv b/Master/texmf-dist/source/latex/changes/changes.drv
index cfd116554cc..3fdbe3a5228 100644
--- a/Master/texmf-dist/source/latex/changes/changes.drv
+++ b/Master/texmf-dist/source/latex/changes/changes.drv
@@ -19,7 +19,7 @@
 	identifierstyle=\color{DimGrey},
 	morekeywords={
 	},
-	keywordstyle=\color{LightSlateBlue},
+	keywordstyle=\color{SteelBlue},
 	commentstyle=\itshape\color{Thistle},
 	backgroundcolor=\color{PapayaWhip},
 	columns=fixed,
@@ -43,39 +43,117 @@
 		changes,
 		color,
 		comment,
-		compactsummary,
 		deleted,
 		definechangesauthor,
 		highlight,
-		id,
 		listofchanges,
-		name,
 		replaced,
-		setsummarywidth,
-		setsummarytowidth,
-		settruncatewidth,
 		style,
+%
+		draft,
+		final,
+		markup,
+		addedmarkup,
+		deletedmarkup,
+		highlightmarkup,
+		commentmarkup,
+		authormarkup,
+		authormarkupposition,
+		authormarkuptext,
+		todonotes,
+		truncate,
+		ulem,
 		xcolor,
+%
+		default,
+		underlined,
+		bfit,
+		nocolor,
+%
+		colored,
+		uline,
+		uuline,
+		uwave,
+		dashuline,
+		dotuline,
+		bf,
+		it,
+		sl,
+		em,
+%
+		sout,
+		xout,
+%
+		background,
+%
+		todo,
+		margin,
+		footnote,
+%
+		superscript,
+		subscript,
+		brackets,
+		none,
+%
+		right,
+		left,
+%
+		id,
+		name,
+%
+		title,
+		show,
+%
+		list,
+		summary,
+		compactsummary,
+%
+		setaddedmarkup,
+		setdeletedmarkup,
+		sethighlightmarkup,
+		setcommentmarkup,
+		setauthormarkup,
+		setauthormarkupposition,
+		setauthormarkuptext,
+		settruncatewidth,
+		setsummarywidth,
+		setsummarytowidth,
+		setsocextension,
 	},
-	keywordstyle=\color{Chocolate},
+	keywordstyle=\color{Peru},
 	moredelim=[s][\color{SlateGrey}]{<}{>},
-	classoffset=0
+	classoffset=0,
+	escapechar=!
 }
 
-% todo notes
-\usepackage{todonotes}
+% minitocs
+\usepackage{etoc}
+\etocsettocstyle{}{}
 
 % language selection
 \selectlanguage{english}
 
 % use change management ;)
-\usepackage[commentmarkup=uwave]{changes}
-%\usepackage{changes}
-\definechangesauthor[name={Ekkart Kleinod}, color=orange]{EK}
-
-% improve list layout
-\usepackage{enumitem}
-\setlist{noitemsep}
+\usepackage{changes}
+\definechangesauthor[name={Ekkart Kleinod}, color=Sienna]{EK}
+\setcommentmarkup{%
+	\ifthenelse{\isColored}%
+		{%
+			\ifthenelse{\isAnonymous{#2}}%
+				{%
+					\todo[color=authorcolor!10, bordercolor=authorcolor, linecolor=authorcolor!70, nolist]{\footnotesize\textbf{[\arabic{authorcommentcount}]} #1}%
+				}{%
+					\todo[color=authorcolor!10, bordercolor=authorcolor, linecolor=authorcolor!70, nolist]{\footnotesize\textbf{[#3~\arabic{authorcommentcount}]} #1}%
+				}%
+		}{%
+			\ifthenelse{\isAnonymous{#2}}%
+				{%
+					\todo[color=black!0, bordercolor=black, linecolor=black!70, nolist]{\footnotesize\textbf{[\arabic{authorcommentcount}]} #1}%
+				}{%
+					\todo[color=black!0, bordercolor=black, linecolor=black!70, nolist]{\footnotesize\textbf{[#3~\arabic{authorcommentcount}]:} #1}%
+				}%
+		}%
+}%
 
 % full index
 \EnableCrossrefs
@@ -89,19 +167,10 @@
 \newcommand{\chfile}[1]{\texttt{#1}}
 \newcommand{\chcommand}[1]{\texttt{\textbackslash{}#1}}
 
-% makro headings
-\makeatletter
-\def\Describe@Macro#1{%
- \endgroup%
- \fbox{\PrintDescribeMacro{#1}}\par%
- \SpecialUsageIndex{#1}\@esphack\ignorespaces%
-}
-\def\Describe@Env#1{%
- \endgroup%
- \fbox{\PrintDescribeEnv{#1}}\par%
- \SpecialEnvIndex{#1}\@esphack\ignorespaces
-}
-\makeatother
+% additional description list formatting
+\newlength{\mylabelwidth}
+\settowidth{\mylabelwidth}{\texttt{compactsummarym}}
+\setlist[description]{style=nextline, font=\normalfont, leftmargin=\mylabelwidth}
 
 % catchall - english
 \newif\ifENGLISH
@@ -113,17 +182,42 @@
 \iflanguage{ngerman}{\GERMANtrue\ENGLISHfalse}{}
 \iflanguage{german}{\GERMANtrue\ENGLISHfalse}{}
 
-% new language example: french
-% \newif\ifFRENCH
-% \FRENCHfalse
-% \iflanguage{french}{\FRENCHtrue\ENGLISHfalse}{}
-
 % example environment
+\newcommand{\chinputlisting}[2]{%
+	\lstinputlisting[%
+		backgroundcolor=\color{white},%
+		xleftmargin=.5em,%
+		xrightmargin=.5em,%
+		frame=none,%
+		belowskip=0pt%
+		#1%
+	]{#2}%
+}
+\newcommand{\chinline}[2][]{%
+	\chinputlisting{#1}{userdoc/in_#2}%
+}
 \newcommand{\chexample}[1]{
-	\input{userdoc/in_#1}
-
+	\ifENGLISH
+		\minisec{Examples}
+	\fi
+	\ifGERMAN
+		\minisec{Beispiele}
+	\fi
 	\lstinputlisting{userdoc/ex_#1}
 }
+\newcommand{\chresult}[1]{
+	\ifENGLISH
+		\minisec{Result}
+	\fi
+	\ifGERMAN
+		\minisec{Resultat}
+	\fi
+	\begin{quote}
+		\input{userdoc/ex_#1}
+	\end{quote}
+}
+
+
 \newenvironment{chusage}{
 	\small
 	\begin{tabbing}
@@ -149,14 +243,28 @@
 	\fi
 }
 
+% important things
+\newcommand{\chimportant}[1]{%
+	\begin{quote}%
+		\color{Teal}%
+		#1%
+	\end{quote}%
+}
+
+% new commands
+\newcommand{\chnewcmd}[1]{
+	\subsubsection{\chcommand{#1}}
+	\label{sec:ui:cmd:#1}
+}
+
 % document title
 \ifENGLISH
 	\title{The \chpackage{changes}-package}
-	\subtitle{Manual change markup --- version 3.0.0}
+	\subtitle{Manual change markup --- version 3.1.0}
 \fi
 \ifGERMAN
 	\title{Das \chpackage{changes}-Paket}
-	\subtitle{Manuelle Änderungsmarkierung -- Version 3.0.0}
+	\subtitle{Manuelle Änderungsmarkierung -- Version 3.1.0}
 \fi
 
 \author{Ekkart Kleinod}