quoting (29jan14)

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

4 files changed, 46 insertions, 16 deletions

diff --git a/Master/texmf-dist/doc/latex/quoting/README b/Master/texmf-dist/doc/latex/quoting/README
index b3bcb5c6c7b..c0868c6fd65 100644
--- a/Master/texmf-dist/doc/latex/quoting/README
+++ b/Master/texmf-dist/doc/latex/quoting/README
@@ -1,6 +1,6 @@
 The quoting package
 Thomas Titz
-2012/02/21
+2014/01/28
 
 __________________
 Overview
@@ -15,6 +15,12 @@ after the environment.
 __________________
 Change history
 
+Version 0.1c (2014/01/28)
+- "quoting" is now permitted to close with a list environment plus a
+  blank line
+- Options "font" and "font+" now work if a class (e.g. "scrbook",
+  "scrreprt") or another package uses \let\do\relax
+
 Version 0.1b (2012/02/21)
 - Improved syntax of options "font" and "font+"
 - New options "begintext" and "endtext"
@@ -28,7 +34,7 @@ Version 0.1 (2011/08/08)
 __________________
 License
 
-Copyright (C) 2011--2012 by Thomas Titz <thomas.titz@chello.at>
+Copyright (C) 2011--2014 by Thomas Titz <thomas.titz@chello.at>
 
 Permission is granted to distribute and/or modify this work under the
 terms of the LaTeX Project Public License (LPPL), version 1.3c or
diff --git a/Master/texmf-dist/doc/latex/quoting/quoting.pdf b/Master/texmf-dist/doc/latex/quoting/quoting.pdf
index 8442d3498de..a276766bc8b 100644
--- a/Master/texmf-dist/doc/latex/quoting/quoting.pdf
+++ b/Master/texmf-dist/doc/latex/quoting/quoting.pdf
diff --git a/Master/texmf-dist/source/latex/quoting/quoting.dtx b/Master/texmf-dist/source/latex/quoting/quoting.dtx
index e96027cd215..8ea2c69696e 100644
--- a/Master/texmf-dist/source/latex/quoting/quoting.dtx
+++ b/Master/texmf-dist/source/latex/quoting/quoting.dtx
@@ -2,7 +2,7 @@
 %
 % This is file `quoting.dtx'.
 %
-% Copyright (C) 2011--2012 by Thomas Titz <thomas.titz@chello.at>
+% Copyright (C) 2011--2014 by Thomas Titz <thomas.titz@chello.at>
 %
 % Permission is granted to distribute and/or modify this work under the
 % terms of the LaTeX Project Public License (LPPL), version 1.3c or
@@ -50,7 +50,7 @@
 %
 % \fi
 %
-% \CheckSum{168}
+% \CheckSum{169}
 %
 % \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
@@ -76,7 +76,7 @@
 % \DoNotIndex{\ifbool,\item,\@M,\NeedsTeXFormat,\newbool,\newcommand}
 % \DoNotIndex{\newenvironment,\newlength,\par,\ProvidesPackage,\relax}
 % \DoNotIndex{\RequirePackage,\setlength,\z@}
-% \DoNotIndex{\else,\fi,\ifcase,\ifcsname,\or}
+% \DoNotIndex{\do,\else,\fi,\ifcase,\ifcsname,\or}
 %
 % \title{The \quo/ package\thanks{This document corresponds to
 % \quo/~\fileversion, dated \filedate.}}
@@ -337,7 +337,7 @@
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{quoting}
-    [2012/02/21 v0.1b Consolidated environment for displayed text]
+    [2014/01/28 v0.1c Consolidated environment for displayed text]
 %    \end{macrocode}
 % We require the packages \textsf{kvoptions} (to conveniently specify
 % options as key--value pairs) and \textsf{etoolbox} (e.g. for length
@@ -369,21 +369,29 @@
 \setkeys{quo}{indentfirst=auto}
 %    \end{macrocode}
 % \end{macro}
+%
+% \changes{v0.1c}{2014/01/28}{Options \textsf{font} and \textsf{font+}
+% now work if a class (e.g. \textsf{scrbook}, \textsf{scrreprt}) or
+% another package uses \texttt{\textbackslash let\textbackslash
+% do\textbackslash relax}}
+%
 % \begin{macro}{\quotingfont}
 % The \textsf{keyval} command |\define@key| is used to define the keys
 % \textsf{font} and \textsf{font+}. With the help of |\docsvlist|
 % (provided by \textsf{etoolbox}), we convert their comma-separated list
 % of values to commands and use these commands to define |\quotingfont|
-% resp. to append its definition. 
+% resp. to append its definition. We use |\def\do| so that the options
+% will also work if a class (e.g. \textsf{scrbook}, \textsf{scrreprt})
+% or another package uses |\let\do\relax|.
 %    \begin{macrocode}
 \newcommand*{\quotingfont}{}
 \define@key{quo}{font}{%
   \def\quotingfont{}%
-  \renewcommand*{\do}[1]{\appto{\quotingfont}{\csname ##1\endcsname}}%
+  \def\do##1{\appto{\quotingfont}{\csname ##1\endcsname}}%
   \docsvlist{#1}%
 }
 \define@key{quo}{font+}{%
-  \renewcommand*{\do}[1]{\appto{\quotingfont}{\csname ##1\endcsname}}%
+  \def\do##1{\appto{\quotingfont}{\csname ##1\endcsname}}%
   \docsvlist{#1}%
 }
 %    \end{macrocode}
@@ -592,8 +600,16 @@
   \quotingfont
   \quo@begintext\ignorespaces
 %    \end{macrocode}
-% At the end of \quo/ (and having typeset the replacement text of
-% \textsf{endtext}), the following actions are taken:
+%
+% \changes{v0.1c}{2014/01/28}{\quo/ is now permitted to close with a
+% list environment plus a blank line}
+%
+% At the end of \quo/, we typeset the replacement text of
+% \textsf{endtext}. (We also remove any preceding space if we are in
+% horizontal mode; this does not apply if, e.g., the \quo/ environment
+% closes with a list environment like \textsf{itemize} or
+% \textsf{enumerate} plus a blank line.) After that, the following
+% actions are taken:
 % \begin{itemize}
 %
 % \item The \LaTeX\ kernel switch |@endpe| is set to false (so that
@@ -609,7 +625,11 @@
 % \end{itemize}
 %    \begin{macrocode}
 }{%
-  \unskip\quo@endtext
+  \ifbool{hmode}{%
+    \unskip
+  }{%
+  }%
+  \quo@endtext
   \endlist
   \boolfalse{@endpe}%
   \ifbool{quo@noorphanafter}{%
diff --git a/Master/texmf-dist/tex/latex/quoting/quoting.sty b/Master/texmf-dist/tex/latex/quoting/quoting.sty
index 120ed1fed5b..a3d38f94837 100644
--- a/Master/texmf-dist/tex/latex/quoting/quoting.sty
+++ b/Master/texmf-dist/tex/latex/quoting/quoting.sty
@@ -19,7 +19,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{quoting}
-    [2012/02/21 v0.1b Consolidated environment for displayed text]
+    [2014/01/28 v0.1c Consolidated environment for displayed text]
 \RequirePackage{etoolbox,kvoptions}
 \SetupKeyvalOptions{family=quo,prefix=quo@}
 \def\quo@in@false{\def\quo@indentfirsttype{0}}
@@ -36,11 +36,11 @@
 \newcommand*{\quotingfont}{}
 \define@key{quo}{font}{%
   \def\quotingfont{}%
-  \renewcommand*{\do}[1]{\appto{\quotingfont}{\csname ##1\endcsname}}%
+  \def\do##1{\appto{\quotingfont}{\csname ##1\endcsname}}%
   \docsvlist{#1}%
 }
 \define@key{quo}{font+}{%
-  \renewcommand*{\do}[1]{\appto{\quotingfont}{\csname ##1\endcsname}}%
+  \def\do##1{\appto{\quotingfont}{\csname ##1\endcsname}}%
   \docsvlist{#1}%
 }
 \DeclareStringOption{begintext}
@@ -132,7 +132,11 @@
   \quotingfont
   \quo@begintext\ignorespaces
 }{%
-  \unskip\quo@endtext
+  \ifbool{hmode}{%
+    \unskip
+  }{%
+  }%
+  \quo@endtext
   \endlist
   \boolfalse{@endpe}%
   \ifbool{quo@noorphanafter}{%