summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/latex/csquotes/csquotes.tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-06-03 00:03:21 +0000
committerKarl Berry <karl@freefriends.org>2010-06-03 00:03:21 +0000
commited4b7e6d104db218c36f82e81edbcf3260befdbf (patch)
treee0fd631dae906579d45a0487e74cae8feedffb08 /Master/texmf-dist/doc/latex/csquotes/csquotes.tex
parent2a2fbc131c15823a6094173b0ae4b08d06500381 (diff)
csquotes 5.0 (2jun10)
git-svn-id: svn://tug.org/texlive/trunk@18701 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/latex/csquotes/csquotes.tex')
-rw-r--r--Master/texmf-dist/doc/latex/csquotes/csquotes.tex976
1 files changed, 715 insertions, 261 deletions
diff --git a/Master/texmf-dist/doc/latex/csquotes/csquotes.tex b/Master/texmf-dist/doc/latex/csquotes/csquotes.tex
index 59eb6d05f50..18cf59f3078 100644
--- a/Master/texmf-dist/doc/latex/csquotes/csquotes.tex
+++ b/Master/texmf-dist/doc/latex/csquotes/csquotes.tex
@@ -1,8 +1,8 @@
-% $Id: csquotes.tex,v 4.4d 2010/02/06 18:19:34 lehman stable $
+% $Id: csquotes.tex,v 5.0 2010/06/02 19:22:07 lehman stable $
\documentclass{ltxdockit}[2009/05/24]
\usepackage[latin9]{inputenc}
\usepackage[american]{babel}
-\usepackage[strict,babel=once]{csquotes}
+\usepackage[strict,autostyle=once]{csquotes}
\usepackage{tabularx}
\usepackage{booktabs}
\usepackage{graphicx}
@@ -12,7 +12,7 @@
\MakeAutoQuote*{<}{>}
\MakeShortVerb{\|}
-\rcsid{$Id: csquotes.tex,v 4.4d 2010/02/06 18:19:34 lehman stable $}
+\rcsid{$Id: csquotes.tex,v 5.0 2010/06/02 19:22:07 lehman stable $}
\titlepage{%
title={The \sty{csquotes} package},
@@ -28,7 +28,7 @@
pdfsubject={Context sensitive quotation facilities},
pdfauthor={Philipp Lehman},
pdfkeywords={tex, e-tex, latex, quote, quotation,
- smart quotes, babel, multilingual typesetting}}
+ smart quotes, babel, polyglossia, multilingual typesetting}}
\AtBeginToc{\setcounter{tocdepth}{1}}
\AtEndToc{\setcounter{tocdepth}{5}}
@@ -38,6 +38,7 @@
\newcolumntype{H}{>{\sffamily\bfseries\spotcolor}l}
\newcolumntype{P}{>{\raggedright}p{120pt}}
\newcolumntype{Q}{>{\raggedright}p{70pt}}
+\newcolumntype{V}{>{\raggedright\displayverbfont}l}
\newcommand*{\vcmd}[1]{\rotatehead{1.5em}{9.5em}{\cmd{#1}}}
\newcommand*{\venv}[1]{\rotatehead{1.5em}{9.5em}{\env{#1}}}
@@ -77,6 +78,24 @@
\hrule height #1 depth 0pt width 0pt
\endgroup}
+\makeatletter
+
+\newcounter{@pseudofootnote}
+\newcommand{\@pseudofootnote}[1]{%
+ \stepcounter{@pseudofootnote}%
+ \textsuperscript{\number\value{@pseudofootnote}}}
+
+\newenvironment{quotesample}[2][]
+ {\setquotestyle[#1]{#2}%
+ \setcounter{@pseudofootnote}{0}%
+ \let\footnote\@pseudofootnote
+ \trivlist
+ \leftskip\parindent
+ \small}
+ {\endtrivlist}
+
+\makeatother
+
% hyphenation
\hyphenation{star-red}
@@ -93,9 +112,6 @@
\section{Introduction}
\label{int}
-This document is a systematic reference manual for the \sty{csquotes} package. It is supplemented by a hands-on tutorial including practical examples.%
-\fnurl{http://www.ctan.org/tex-archive/macros/latex/contrib/csquotes/tutorial.tex}
-
\subsection{About}
This package provides advanced facilities for inline and display quotations. It is designed for a wide range of tasks ranging from the most simple applications to the more complex demands of formal quotations. The facilities include commands, environments, and user"=definable <smart quotes> which dynamically adjust to their context. Quotation marks are switched automatically if quotations are nested and can adjust to the current language. There are additional facilities designed to cope with the more specific demands of academic writing, especially in the humanities and the social sciences. All quote styles as well as the optional active quotes are freely configurable.
@@ -106,13 +122,9 @@ Copyright © 2003--2010 Philipp Lehman. Permission is granted to copy, distribute
%\fnurl{http://www.ctan.org/tex-archive/macros/latex/base/lppl.txt}
This package is author"=maintained.
-\subsection{Acknowledgments}
-
-I am indebted to Donald Arseneau, Mark Wooding, and David Carlisle for valuable hints in the early stages of development. Frank Mittelbach kindly provided hooks in the \sty{inputenc} package. Additional thanks go to Robert Schlicht for his testing.
-
\subsection{Contributions}
-The multilingual support of this package depends on user contributions. If you want to contribute a quote style, please refer to section \ref{cfg:sty} for an overview of the components a quote style is composed of and to table \ref{tab:out} for a list of commands which should be used in the definition of quote styles.
+The multilingual support of this package depends on user contributions. If you want to contribute a quote style, please refer to \secref{cfg:sty} for an overview of the components a quote style is composed of and to \tabref{tab:out} for a list of commands which should be used in the definition of quote styles.
\subsection{Requirements}
\label{int:req}
@@ -124,23 +136,26 @@ This package requires \etex and the \sty{etoolbox} package which is readily avai
All package options are given in \keyval syntax.
+\subsection{Main options}
+\label{opt:opt}
+
\begin{optionlist}
\boolitem[false]{strict}
This option turns all package warnings into error messages. This is useful to ensure that no problem will go unnoticed when finalizing a document. The short form \opt{strict} is equivalent to \kvopt{strict}{true}.
-\optitem[tryonce]{babel}{\opt{true}, \opt{false}, \opt{try}, \opt{once}, \opt{tryonce}}
-
-This option controls multilingual support. \kvopt{babel}{true} continuously adapts the quote style to the language of the \sty{babel} package; \opt{once} will only adapt the style once so that it matches \sty{babel}'s main language. \kvopt{babel}{try} and \opt{tryonce} are similar to \opt{true} and \opt{once} if \sty{babel} is loaded but will not issue any warnings if it is not. The short form \opt{babel} is equivalent to \kvopt{babel}{true}. See also section \ref{bas:set}.
-
\intitem[2]{maxlevel}
This option controls the maximum nesting level of quotations. By default, this package supports two levels of quotations, outer and inner ones, and issues an error if quotations are nested more deeply. Alternatively, it can reuse the outer and inner quotes on further quotation levels. This alternative behavior is enabled implicitly when increasing the value of the \opt{maxlevel} option. The minimum is~\texttt{2}.
\optitem[american]{style}{\prm{style}}
-This option selects a fixed quotation style. The style is used throughout the document unless it is changed manually, see section \ref{bas:set} for details. This option implicitly sets \kvopt{babel}{false}. Please refer to tables \ref{tab:sty} and \ref{tab:als} for a list of available quote styles and aliases. See sections \ref{cfg:sty}, \ref{cfg:als}, and \ref{cfg:spl} for instructions on adding or modifying quote styles.
+This option selects a fixed quotation style. The style is used throughout the document unless it is changed manually, see \secref{bas:set} for details. This option implicitly sets \kvopt{autostyle}{false}. Please refer to \tabref{tab:sty,tab:als} for a list of available quote styles and aliases. See \secref{cfg:sty,cfg:als,use:spl} for instructions on adding or modifying quote styles.
+
+\optitem[tryonce]{autostyle}{\opt{true}, \opt{false}, \opt{try}, \opt{once}, \opt{tryonce}}
+
+This option controls multilingual support. It requires either the \sty{babel} package or the \sty{polyglossia} package.\footnote{Note that \sty{polyglossia} support is currently in a preliminary state because \sty{polyglossia} does not make sufficient information available to other packages. In practice, this means that \sty{csquotes} can detect the language (\eg \texttt{english}) but not the language variant (\eg \texttt{british}).} \kvopt{autostyle}{true} continuously adapts the quote style to the current document language; \opt{once} will only adapt the style once so that it matches the main language of the document. \kvopt{autostyle}{try} and \opt{tryonce} are similar to \opt{true} and \opt{once} if multilingual support is available but will not issue any warnings if not (\ie if neither \sty{babel} nor \sty{polyglossia} have been loaded). The short form \opt{autostyle} is equivalent to \kvopt{autostyle}{true}. See also \secref{bas:set}.
\begin{table}
\tablesetup
@@ -148,6 +163,7 @@ This option selects a fixed quotation style. The style is used throughout the do
\toprule
\multicolumn{1}{@{}H}{Option key} & \multicolumn{1}{@{}H}{Possible values} \\
\cmidrule(r){1-1}\cmidrule{2-2}
+ croatian & quotes, guillemets, guillemets\*\\
danish & quotes, guillemets \\
english & american, british\\
french & quotes, quotes\*, guillemets, guillemets\*\\
@@ -165,21 +181,40 @@ This option selects a fixed quotation style. The style is used throughout the do
\varitem{language}{\prm{variant}}
-Use the language options listed in table \ref{tab:lng} to choose a style variant if there is more than one for a certain language. The first variant in the list is the default for the respective style. In the following example, the \opt{babel} option causes \sty{csquotes} to continuously adapt the quote style to the current language using the default style for that language. The defaults for German and Norwegian are changed:
+Use the language options listed in \tabref{tab:lng} to choose a style variant if there is more than one for a certain language. The first variant in the list is the default for the respective style. In the following example, the \opt{autostyle} option causes \sty{csquotes} to continuously adapt the quote style to the current language using the default style for that language. The defaults for German and Norwegian are changed:
\begin{ltxcode}
\usepackage[english,ngerman]{babel}
-\usepackage[babel,german=guillemets,norwegian=quotes]{csquotes}
+\usepackage[autostyle,german=guillemets,norwegian=quotes]{csquotes}
\end{ltxcode}
%
-Note that \sty{babel}'s language name is \opt{ngerman} here whereas \sty{csquotes} uses \opt{german}. When selecting a quote style automatically, this package will essentially normalize the language names first, using a list of aliases which map languages to quote styles. See table \ref{tab:als} for details. Table \ref{tab:lng} indicates the language options defined by default. Additional options may be defined in the configuration file. See sections \ref{cfg:opt} and \ref{cfg:spl} for details. Also see section \ref{hnt:pre} for some additional notes concerning the predefined styles.
+Note that \sty{babel}'s language name is \opt{ngerman} here whereas \sty{csquotes} uses \opt{german}. When selecting a quote style automatically, this package will essentially normalize the language names first, using a list of aliases which map languages to quote styles. See \tabref{tab:als} for details. \Tabref{tab:lng} indicates the language options defined by default. Additional options may be defined in the configuration file. See \secref{cfg:opt,use:spl} for details. Also see \secref{hnt:pre} for some additional notes concerning the predefined styles.
+
+\boolitem[true]{autopunct}
+
+This option controls whether quotation commands scan ahead for trailing punctuation marks. See \secref{bas:txt:reg,bas:blk:reg,int:txt:reg,int:blk:reg} for details. Also see \cmd{DeclareAutoPunct} in \secref{cfg:dap} and \secref{cfg:aux} on how to configure and use the punctuation look-ahead feature.
+
+\end{optionlist}
+
+\subsection{Compatibility options}
+\label{opt:leg}
+
+\begin{optionlist}
+
+\optitem{version}{\prm{version}, \opt{4.4}, \opt{3.6}, \opt{3.0}}
+
+This option is an attempt at making \sty{csquotes} backwards compatible with earlier versions, at least to some extent. Currently, it supports backwards compatibility with version 4.4, which covers 3.7--4.4, version 3.6, which covers 3.1--3.6, and version 3.0. Older versions are not supported. It is possible to specify any arbitrary \prm{version}, even if it is not explicitly listed above. In this case, the package will keep increasing the \prm{version} number until it either finds a suitable compatibility mode or hits the current version number. For example, when specifying \kvopt{version}{4.0}, \sty{csquotes} will increase the version number until it hits 4.4, and activate the v4.4 compatibility mode because this is the highest version still compatible with the requested 4.0 release. This implies that \sty{csquotes} may be invoked in a, to some extent, <future proof> way by making the version which is current at the time of writing sticky. If future versions break backwards compatibility, they will automatically activate the best compatibility mode. If not, the \opt{version} option will simply not have any effect.
+
+\optitem{babel}{\opt{true}, \opt{false}, \opt{try}, \opt{once}, \opt{tryonce}}
+
+A legacy alias for the \opt{autostyle} option. This option is depreciated.
\end{optionlist}
\section{Basic interface}
\label{bas}
-This package supports two ways to tag quotations: built-in commands and active quotes defined in the document preamble or the configuration file. This section will introduce the basic commands, active quotes are discussed in section \ref{act}. When working with automated citations, you might also want to learn about the integrated quotation facilities presented in section \ref{cit}.
+This package supports two ways to tag quotations: built-in commands and active quotes defined in the document preamble or the configuration file. This section will introduce the basic commands, active quotes are discussed in \secref{act}. When working with automated citations, you might also want to learn about the integrated quotation facilities presented in \secref{cit}.
\subsection{Quoting regular text}
\label{bas:reg}
@@ -198,14 +233,14 @@ Like all quotation facilities, this command is context sensitive. Depending on t
\subsection{Quoting text in a foreign language}
\label{bas:bbl}
-To facilitate typesetting quotations in a foreign language, there are two commands which combine \cmd{enquote} with \sty{babel}'s language switches:
+To facilitate typesetting quotations in a foreign language, \sty{csquotes} provides two commands which combine \cmd{enquote} with the language switches of the \sty{babel} or the \sty{polyglossia} package:
\begin{ltxsyntax}
\cmditem{foreignquote}{lang}{text}
\cmditem*{foreignquote*}{lang}{text}
-This command combines \cmd{enquote} with \cmd{foreignlanguage}. It switches hyphenation patterns and enables the extra definitions provided by the \sty{babel} package for \prm{lang}, which must be a language name known to \sty{babel}. The quotation marks will match the language of the quoted piece of text.
+This command combines \cmd{enquote} with \cmd{foreignlanguage}. It switches hyphenation patterns and enables the extra definitions provided by \sty{babel}\slash\sty{polyglossia} for \prm{lang}, which must be a language name known to the respective package. The quotation marks will match the language of the quoted piece of text.
\cmditem{hyphenquote}{lang}{text}
\cmditem*{hyphenquote*}{lang}{text}
@@ -217,40 +252,40 @@ This command combines \cmd{enquote} with the \env{hyphenrules} environment, that
\subsection{Formal quoting of regular text}
\label{bas:txt:reg}
-Formal quotations are always accompanied by a citation indicating the source of the quoted text. The following command is an extended version of \cmd{enquote} which encloses the quoted piece of text in quotation marks and adds a citation after the quotation:
+Formal quotations are typically accompanied by a citation indicating the source of the quoted text. The following command is an extended version of \cmd{enquote} which encloses the quoted piece of text in quotation marks and adds a citation after the quotation:
\begin{ltxsyntax}
-\cmditem{textquote}[cite][punct]{text}
-\cmditem*{textquote*}[cite][punct]{text}
+\cmditem{textquote}[cite][punct]{text}<tpunct>
+\cmditem*{textquote*}[cite][punct]{text}<tpunct>
-The argument \prm{text} may be any arbitrary piece of text to be enclosed in quotation marks. The optional arguments \prm{cite} and \prm{punct} specify the citation and any terminal punctuation which is not part of \prm{text}. See section \ref{cfg:aux} on how to change the way these arguments are handled. The starred version of this command skips directly to the inner quotation level. Here are some usage examples:
+The \prm{text} may be any arbitrary piece of text to be enclosed in quotation marks. The optional arguments \prm{cite} and \prm{punct} specify the citation and any terminal punctuation of \prm{text}. \prm{tpunct} denotes trailing punctuation after the command. If the \opt{autopunct} option is enabled, the quotation commands will scan ahead for punctuation marks immediately following their last argument and can move them around if required. See \secref{cfg:aux} on how to change the way these arguments are handled and \secref{use:hok} for reasons why you may want to specify the punctuation as a separate argument. The starred version of this command skips directly to the inner quotation level. Here are some usage examples:
\begin{ltxcode}
\textquote{...}
-\textquote[][?]{...}
+\textquote[][.]{...}
\textquote[Doe 1990, 67]{...}
\textquote[{\cite[67]{doe90}}]{...}
\end{ltxcode}
%
-Note the use of the optional arguments in the examples above. As shown in the second example, \prm{cite} has to be given whenever \prm{punct} is used, even if it is empty. Also keep in mind that an optional argument containing square brackets must be wrapped in an additional pair of curly braces as shown in the last example. When working with automated citations, you might also want to learn about the integrated quotation facilities presented in section \ref{cit}.
+Note the use of the optional arguments in the examples above. As seen in the second example, \prm{cite} is required whenever \prm{punct} is used, even if it is empty. Also keep in mind that an optional argument containing square brackets must be wrapped in an additional pair of curly braces as shown in the last example. When working with automated citations, you might also want to learn about the integrated quotation facilities presented in \secref{cit}.
\end{ltxsyntax}
\subsection{Formal quoting of text in a foreign language}
\label{bas:txt:bbl}
-There are two additional commands which combine \cmd{textquote} with \sty{babel}'s language switches:
+There are two additional commands which combine \cmd{textquote} with the language switches of the \sty{babel} or the \sty{polyglossia} package:
\begin{ltxsyntax}
-\cmditem{foreigntextquote}{lang}[cite][punct]{text}
-\cmditem*{foreigntextquote*}{lang}[cite][punct]{text}
+\cmditem{foreigntextquote}{lang}[cite][punct]{text}<tpunct>
+\cmditem*{foreigntextquote*}{lang}[cite][punct]{text}<tpunct>
This command combines \cmd{textquote} with \cmd{foreignlanguage}. Apart from the language, the arguments are handled as with \cmd{textquote}.
-\cmditem{hyphentextquote}{lang}[cite][punct]{text}
-\cmditem*{hyphentextquote*}{lang}[cite][punct]{text}
+\cmditem{hyphentextquote}{lang}[cite][punct]{text}<tpunct>
+\cmditem*{hyphentextquote*}{lang}[cite][punct]{text}<tpunct>
This command combines \cmd{textquote} with the \env{hyphenrules} environment. Apart from the language, the arguments are handled as with \cmd{textquote}.
@@ -263,26 +298,30 @@ A common requirement in academic writing demands that quotations be embedded in
\begin{ltxsyntax}
-\cmditem{blockquote}[cite][punct]{text}
+\cmditem{blockquote}[cite][punct]{text}<tpunct>
-This command determines the number of lines required to typeset \prm{text}. If \prm{text} is longer than a given number of lines or if it spans more than one paragraph, it is wrapped in a block quotation environment. Otherwise \cmd{blockquote} behaves like \cmd{textquote}. Quotations in footnotes, parboxes, minipages, and floats are always set inline. By default, the threshold is three lines and the environment used for long quotations is the \env{quote} environment. See section \ref{cfg:blk} on how to change these parameters. The optional arguments \prm{cite} and \prm{punct} specify the citation and any terminal punctuation which is not part of \prm{text}. See section \ref{cfg:aux} on how to change the way these arguments are handled.
+This command determines the number of lines required to typeset \prm{text}. If \prm{text} is longer than a given number of lines or if it spans more than one paragraph, it is wrapped in a block quotation environment. Otherwise \cmd{blockquote} behaves like \cmd{textquote}. Quotations in footnotes, parboxes, minipages, and floats are always set inline. By default, the threshold is three lines and the environment used for long quotations is the \env{quote} environment. See \secref{cfg:blk} on how to change these parameters. The optional arguments \prm{cite} and \prm{punct} specify the citation and any terminal punctuation of \prm{text}. \prm{tpunct} denotes trailing punctuation after the command. If the \opt{autopunct} option is enabled, the quotation commands will scan ahead for punctuation marks immediately following their last argument and can move them around if required. See \secref{cfg:aux} on how to change the way these arguments are handled and \secref{use:hok} for reasons why you may want to specify the punctuation as a separate argument.
\end{ltxsyntax}
\subsection{Block quoting of text in a foreign language}
\label{bas:blk:bbl}
-There are two additional commands which combine \cmd{blockquote} with \sty{babel}'s language switches:
+The following commands combine \cmd{blockquote} with the language switches of the \sty{babel} or the \sty{polyglossia} package:
\begin{ltxsyntax}
-\cmditem{foreignblockquote}{lang}[cite][punct]{text}
+\cmditem{foreignblockquote}{lang}[cite][punct]{text}<tpunct>
-This command behaves the same as \cmd{foreignquote} if the quotation is short. If it exceeds the threshold or spans several paragraphs, it will be wrapped in an \env{otherlanguage*} environment which is in turn wrapped in a block quotation environment. The arguments are handled as with \cmd{blockquote}.
+This command behaves like \cmd{foreignquote} if the quotation is short. If it exceeds the threshold, it will be wrapped in an \env{otherlanguage*} environment which is in turn wrapped in a block quotation environment. The arguments are handled as with \cmd{blockquote}.
-\cmditem{hyphenblockquote}{lang}[cite][punct]{text}
+\cmditem{hyphenblockquote}{lang}[cite][punct]{text}<tpunct>
-This command works like \cmd{hyphenquote} if the quotation is short. If it exceeds the threshold or spans several paragraphs, it will be wrapped in an \env{hyphenrules} environment which is in turn wrapped in a block quotation environment. The arguments are handled as with \cmd{blockquote}.
+This command behaves like \cmd{hyphenquote} if the quotation is short. If it exceeds the threshold, it will be wrapped in a \env{hyphenrules} environment which is in turn wrapped in a block quotation environment. The arguments are handled as with \cmd{blockquote}.
+
+\cmditem{hybridblockquote}{lang}[cite][punct]{text}<tpunct>
+
+This command behaves like \cmd{hyphenquote} if the quotation is short. If it exceeds the threshold, the command behaves like \cmd{foreignblockquote}. In other words, it combines features of \cmd{foreignblockquote} and \cmd{hyphenblockquote}. The arguments are handled as with \cmd{blockquote}.
\end{ltxsyntax}
@@ -297,14 +336,14 @@ Quote styles may be selected manually at any point in the document body by way o
\cmditem*{setquotestyle}{alias}
\cmditem*{setquotestyle}*
-The regular form of this command selects a quote style and disables multilingual support. Its mandatory argument may be a quote style or an alias. If it is a quote style, the optional argument indicates the style variant. The starred version, which takes no arguments, enables multilingual support. Please refer to tables \ref{tab:sty} and \ref{tab:als} for a list of available styles, style variants, and language aliases.
+The regular form of this command selects a quote style and disables multilingual support. Its mandatory argument may be a quote style or an alias. If it is a quote style, the optional argument indicates the style variant. The starred version, which takes no arguments, enables multilingual support. Please refer to \tabref{tab:sty,tab:als} for a list of available styles, style variants, and language aliases.
\end{ltxsyntax}
\section{Active quotes}
\label{act}
-This package also supports active characters corresponding to the commands presented in section \ref{bas}. Roughly speaking, an active character is a single character which functions as a command. Like the corresponding control sequences, active quotes are fully"=fledged markup elements which verify the nesting level and issue an error if quotations are nested in an invalid way. If multilingual support is enabled, the style of all quotation marks will be adapted to the current language. The commands presented in the following allocate such active quotes. They may be used in the configuration file, the preamble, or the document body. Note that all characters are automatically checked for validity as they are allocated. This package will reject characters which are unsuitable as active quotes. See section \ref{hnt:val} for details on the characters which may be used as active quotes.
+This package also supports active characters corresponding to the commands presented in \secref{bas}. Roughly speaking, an active character is a single character which functions as a command. Like the corresponding control sequences, active quotes are fully"=fledged markup elements which verify the nesting level and issue an error if quotations are nested in an invalid way. If multilingual support is enabled, the style of all quotation marks will be adapted to the current language. The commands presented in the following allocate such active quotes. They may be used in the configuration file, the preamble, or the document body. Note that all characters are automatically checked for validity as they are allocated. This package will reject characters which are unsuitable as active quotes. See \secref{hnt:val} for details on the characters which may be used as active quotes.
\subsection{Quoting regular text}
\label{act:reg}
@@ -328,16 +367,19 @@ All active quotes defined with \cmd{MakeAutoQuote} work like \cmd{enquote}. Thos
\subsection{Quoting text in a foreign language}
\label{act:bbl}
-These commands combine \cmd{MakeAutoQuote} with \sty{babel}'s language switches:
+These commands combine \cmd{MakeAutoQuote} with the language switches of the \sty{babel} or the \sty{polyglossia} package:
\begin{ltxsyntax}
\cmditem{MakeForeignQuote}{lang}{character 1}{character 2}
\cmditem*{MakeForeignQuote*}{lang}{character 1}{character 2}
+
+The active quotes defined with the above commands are similar in concept and function to \cmd{foreignquote} and \cmd{foreignquote*}, respectively.
+
\cmditem{MakeHyphenQuote}{lang}{character 1}{character 2}
\cmditem*{MakeHyphenQuote*}{lang}{character 1}{character 2}
-The active quotes defined with the above commands are similar in function to \cmd{foreignquote} and \cmd{hyphenquote}, respectively. The starred variants correspond to \cmd{foreignquote*} and \cmd{hyphenquote*}.
+The active quotes defined with the above commands are similar in concept and function to \cmd{hyphenquote} and \cmd{hyphenquote*}, respectively.
\end{ltxsyntax}
@@ -350,7 +392,7 @@ The active quotes defined with the above commands are similar in function to \cm
\cmditem{MakeBlockQuote}{character 1}{delimiter}{character 2}
-The arguments are automatically checked for validity, see section \ref{hnt:val} for details. All active quotes defined with \cmd{MakeBlockQuote} behave essentially the same as \cmd{blockquote}, but the handling of the citation is slightly different. \prm{character 1} will serve as the opening mark in the source file, \prm{character 2} as the closing one. The character indicated by the middle argument \prm{delimiter} will serve as a delimiter separating the quoted text from the citation which is given last as the active quotes are used:
+The arguments are checked for validity, see \secref{hnt:val} for details. All active quotes defined with \cmd{MakeBlockQuote} behave essentially the same as \cmd{blockquote}, but the handling of the citation is slightly different. \prm{character 1} will serve as the opening mark in the source file, \prm{character 2} as the closing one. The character indicated by the middle argument \prm{delimiter} will serve as a delimiter separating the quoted text from the citation which is given last as the active quotes are used:
\begin{ltxcode}
\MakeBlockQuote{<}{|}{>}
@@ -358,21 +400,28 @@ The arguments are automatically checked for validity, see section \ref{hnt:val}
<text|citation>
\end{ltxcode}
%
-If the delimiter is omitted, the entire text between the opening and the closing mark will be treated as quotation text. See the tutorial for more usage examples.
+If the delimiter is omitted, the entire text between the opening and the closing mark will be treated as quotation text.
\end{ltxsyntax}
\subsection{Block quoting of text in a foreign language}
\label{act:blk:bbl}
-These commands combine \cmd{MakeBlockQuote} with \sty{babel}'s language switches:
+These commands combine \cmd{MakeBlockQuote} with the language switches of the \sty{babel} or the \sty{polyglossia} package:
\begin{ltxsyntax}
\cmditem{MakeForeignBlockQuote}{lang}{character 1}{delimiter}{character 2}
+
+The active quotes defined with this command are similar in concept and function to \cmd{foreignblockquote}. The behavior of the delimiter character is similar to \cmd{MakeBlockQuote}.
+
\cmditem{MakeHyphenBlockQuote}{lang}{character 1}{delimiter}{character 2}
-The active quotes defined with \cmd{MakeForeignBlockQuote} behave essentially the same as \cmd{foreignblockquote}. Those defined with \cmd{MakeHyphenBlockQuote} work like \cmd{hyphenblockquote}. The behavior of the delimiter character is similar to \cmd{MakeBlockQuote}.
+The active quotes defined with this command are similar in concept and function to \cmd{hyphenblockquote}. The behavior of the delimiter character is similar to \cmd{MakeBlockQuote}.
+
+\cmditem{MakeHybridBlockQuote}{lang}{character 1}{delimiter}{character 2}
+
+The active quotes defined with this command are similar in concept and function to \cmd{hybridblockquote}. The behavior of the delimiter character is similar to \cmd{MakeBlockQuote}.
\end{ltxsyntax}
@@ -400,75 +449,79 @@ Disables and deallocates all active quotes, i.e. performs a complete reset of al
\section{Integrated interface}
\label{cit}
-The commands presented in this section are extended versions of some of those discussed in section \ref{bas}. They differ from their counterparts in that they integrate automated citations into their syntax. Instead of adding \cmd{cite} manually, you pass the citation arguments to the respective quotation command. See section \ref{cfg:blk} on how to use a command other than \cmd{cite} to handle the citations.
+The commands presented in this section are extended versions of some of those discussed in \secref{bas}. They differ from their counterparts in that they integrate automated citations into their syntax. Instead of adding \cmd{cite} manually, you pass the citation arguments to the respective quotation command. See \secref{cfg:blk} on how to use a command other than \cmd{cite} to handle the citations.
\subsection{Formal quoting of regular text}
-\label{cit:txt:reg}
+\label{int:txt:reg}
-The most basic integrated command is an extended version of \cmd{textquote}:
+The basic integrated command is an extended version of \cmd{textquote}:
\begin{ltxsyntax}
-\cmditem{textcquote}[prenote][postnote]{key}[punct]{text}
-\cmditem*{textcquote*}[prenote][postnote]{key}[punct]{text}
+\cmditem{textcquote}[prenote][postnote]{key}[punct]{text}<tpunct>
+\cmditem*{textcquote*}[prenote][postnote]{key}[punct]{text}<tpunct>
-\prm{text} may be any arbitrary piece of text. The optional argument \prm{punct} specifies any terminal punctuation which is not part of \prm{text}. See section \ref{cfg:aux} on how to change the way this argument is handled. The starred version of this command skips directly to the inner quotation level. The remaining arguments are handed over to \cmd{cite}. Note that \cmd{cite} normally supports one optional argument only. \prm{prenote} is only available in conjunction with the \sty{natbib}, \sty{jurabib}, and \sty{biblatex} packages. How these arguments are handled depends on the citation command. With \sty{natbib} and \sty{biblatex}, \prm{prenote} is in fact a notice such as <see>. With jurabib, this argument has a different function by default. The argument \prm{postnote}, which is always available, indicates the citation postnote. This is usually a page number. \prm{key} is the citation key. See sections \ref{cfg:blk} and \ref{cfg:aux} on how to customize the citation. Also see the tutorial for usage examples.
+The \prm{text} may be any arbitrary piece of text to be enclosed in quotation marks. The optional arguments \prm{cite} and \prm{punct} specify the citation and any terminal punctuation of \prm{text}. \prm{tpunct} denotes trailing punctuation after the command. If the \opt{autopunct} option is enabled, the quotation commands will scan ahead for punctuation marks immediately following their last argument and can move them around if required. See \secref{cfg:aux} on how to change the way these arguments are handled and \secref{use:hok} for reasons why you may want to specify the punctuation as a separate argument. The starred version of this command skips directly to the inner quotation level. The remaining arguments are handed over to \cmd{cite}. Note that \cmd{cite} normally supports one optional argument only. \prm{prenote} is only available in conjunction with the \sty{natbib}, \sty{jurabib}, and \sty{biblatex} packages. How these arguments are handled depends on the citation command. With \sty{natbib} and \sty{biblatex}, \prm{prenote} is in fact a notice such as <see>. With jurabib, this argument has a different function by default. The argument \prm{postnote}, which is always available, indicates the citation postnote. This is usually a page number. \prm{key} is the citation key. See \secref{cfg:blk,cfg:aux} on how to customize the citation.
\end{ltxsyntax}
\subsection{Formal quoting of text in a foreign language}
-\label{cit:txt:bbl}
+\label{int:txt:bbl}
-These commands combine \cmd{textcquote} with \sty{babel}'s language switches:
+The following commands combine \cmd{textcquote} with the language switches of the \sty{babel} or the \sty{polyglossia} package:
\begin{ltxsyntax}
-\cmditem{foreigntextcquote}{lang}[prenote][postnote]{key}[punct]{text}
-\cmditem*{foreigntextcquote*}{lang}[prenote][postnote]{key}[punct]{text}
+\cmditem{foreigntextcquote}{lang}[prenote][postnote]{key}[punct]{text}<tpunct>
+\cmditem*{foreigntextcquote*}{lang}[prenote][postnote]{key}[punct]{text}<tpunct>
This command combines \cmd{textcquote} with \cmd{foreignlanguage}. The handling of the arguments is similar to \cmd{textcquote}.
-\cmditem{hyphentextcquote}{lang}[prenote][postnote]{key}[punct]{text}
-\cmditem*{hyphentextcquote*}{lang}[prenote][postnote]{key}[punct]{text}
+\cmditem{hyphentextcquote}{lang}[prenote][postnote]{key}[punct]{text}<tpunct>
+\cmditem*{hyphentextcquote*}{lang}[prenote][postnote]{key}[punct]{text}<tpunct>
This command combines \cmd{textcquote} with the \env{hyphenrules} environment. The handling of the arguments is similar to \cmd{textcquote}.
\end{ltxsyntax}
\subsection{Block quoting of regular text}
-\label{cit:blk:reg}
+\label{int:blk:reg}
-Block quotations may be combined with automated citations as well. The core of the integrated block quotation facilities is an extended version of \cmd{blockquote}:
+Block quotations may be combined with automated citations as well by using the extended version of \cmd{blockquote}:
\begin{ltxsyntax}
-\cmditem{blockcquote}[prenote][postnote]{key}[punct]{text}
+\cmditem{blockcquote}[prenote][postnote]{key}[punct]{text}<tpunct>
-The difference between \cmd{blockcquote} and \cmd{blockquote} is that there are three citation arguments instead of one. The handling of these citation arguments is similar to \cmd{textcquote}; see section \ref{cit:txt:reg} for details. Also see sections \ref{cfg:blk} and \ref{cfg:aux} on how to customize block quotations.
+The difference between \cmd{blockcquote} and \cmd{blockquote} is that there are three citation arguments instead of one. The handling of these citation arguments is similar to \cmd{textcquote}; see \secref{int:txt:reg} for details. Also see \secref{cfg:blk,cfg:aux,use:hok} on how to customize block quotations.
\end{ltxsyntax}
\subsection{Block quoting of text in a foreign language}
-\label{cit:blk:bbl}
+\label{int:blk:bbl}
-These commands combine \cmd{blockcquote} with \sty{babel}'s language switches:
+The following commands combine \cmd{blockcquote} with the language switches of the \sty{babel} or the \sty{polyglossia} package:
\begin{ltxsyntax}
-\cmditem{foreignblockcquote}{lang}[prenote][postnote]{key}[punct]{text}
+\cmditem{foreignblockcquote}{lang}[prenote][postnote]{key}[punct]{text}<tpunct>
This command combines \cmd{blockcquote} with \cmd{foreignlanguage}. Long quotations will be wrapped in an \env{otherlanguage*} environment. The handling of the citation arguments is similar to \cmd{textcquote}.
-\cmditem{hyphenblockcquote}{lang}[prenote][postnote]{key}[punct]{text}
+\cmditem{hyphenblockcquote}{lang}[prenote][postnote]{key}[punct]{text}<tpunct>
This command combines \cmd{blockcquote} with the \env{hyphenrules} environment. The handling of the citation arguments is similar to \cmd{textcquote}.
+\cmditem{hybridblockcquote}{lang}[prenote][postnote]{key}[punct]{text}<tpunct>
+
+This command behaves like \cmd{hyphenblockcquote} if the quotation is short, and like \cmd{foreignblockquote} if it is long. The handling of the citation arguments is similar to \cmd{textcquote}.
+
\end{ltxsyntax}
\section{Display environments}
\label{env}
-The environments introduced in this section will typeset quotations as a separate paragraph which looks exactly like a long quotation set by means of the block quotation facilities. Use them for quotations which are to be presented as a separate paragraph regardless of their length. Note that these environments are not replacements for the standard \env{quote} environment in the strict sense. They function as an additional layer on top of the latter, just like the block quotation facilities. The advantage of using these environments instead of resorting to the standard \env{quote} environment is that they are configurable, support citations, and will always be in sync with the block quotation facilities with respect to the configuration options discussed in sections \ref{cfg:blk} and \ref{cfg:aux}.
+The environments introduced in this section will typeset quotations as a separate paragraph which looks exactly like a long quotation set by means of the block quotation facilities. Use them for quotations which are to be presented as a separate paragraph regardless of their length. Note that these environments are not replacements for the standard \env{quote} environment in the strict sense. They function as an additional layer on top of the latter, just like the block quotation facilities. The advantage of using these environments instead of resorting to the standard \env{quote} environment is that they are configurable, support citations, and will always be in sync with the block quotation facilities with respect to the configuration options discussed in \secref{cfg:blk,cfg:aux}.
\subsection{Basic display environments}
\label{env:bas}
@@ -479,7 +532,7 @@ The arguments of all display environments are generally appended to the \cmd{beg
\envitem{displayquote}[cite][punct]
-The two optional arguments of this environment specify the citation and any terminal punctuation which is not part of the quoted text. The citation will be inserted at the end of the environment. Trailing horizontal white space at the end of the environment is removed automatically. See sections \ref{cfg:blk} and \ref{cfg:aux} on how to customize the display environments. There are two additional environments which combine \env{displayquote} with \sty{babel}'s language switches:
+The optional arguments \prm{cite} and \prm{punct} specify the citation and any terminal punctuation of the quotation. See \secref{cfg:blk,cfg:aux} on how to customize this environment. Also see \secref{cfg:aux} on how to change the way the optional arguments are handled and \secref{use:hok} for reasons why you may want to specify the punctuation as a separate argument. Trailing white space at the end of the environment is removed automatically. There are two additional environments which combine \env{displayquote} with the language switches of the \sty{babel} or the \sty{polyglossia} package:
\envitem{foreigndisplayquote}{lang}[cite][punct]
@@ -491,8 +544,10 @@ This environment combines \env{displayquote} with \env{hyphenrules}. Apart from
\end{ltxsyntax}
+\clearpage
+
\subsection{Integrated display environments}
-\label{env:int}
+\label{env:cit}
The following environment is an extended version of \env{displayquote}:
@@ -500,7 +555,7 @@ The following environment is an extended version of \env{displayquote}:
\envitem{displaycquote}[prenote][postnote]{key}[punct]
-The difference is that there are three citation arguments instead of one in this case. The placement of the citation is similar to \env{displayquote}. The citation arguments are handled as with \cmd{textcquote}; see section \ref{cit:txt:reg} for details. Also see sections \ref{cfg:blk} and \ref{cfg:aux} on how to customize this environment. There are two environments which combine \env{displaycquote} with \sty{babel}'s language switches:
+The difference between \env{displaycquote} and its more basic counterpart is that there are three citation arguments instead of one. The placement of the citation is similar to \env{displayquote}. The handling of the citation arguments is similar to \cmd{textcquote}, see \secref{int:txt:reg} for details. See \secref{cfg:blk,cfg:aux} on how to customize this environment. Also see \secref{cfg:aux} on how to change the way the optional arguments are handled and \secref{use:hok} for reasons why you may want to specify the punctuation as a separate argument. There are two environments which combine \env{displaycquote} with the language switches of the \sty{babel} or the \sty{polyglossia} package:
\envitem{foreigndisplaycquote}{lang}[prenote][postnote]{key}[punct]
@@ -512,7 +567,40 @@ This environment combines \env{displaycquote} with \env{hyphenrules}. Apart from
\end{ltxsyntax}
-\clearpage
+\section{Auxiliary commands}
+\label{aux}
+
+When quoting text in a formal way, any changes applied to the quoted material, such as omissions, insertions, or alterations, are typically marked as such by using the ellipsis mark and square brackets or parentheses. Use the following commands to indicate such changes in formal quotations:
+
+\begin{ltxsyntax}
+
+\cmditem{textelp}{}
+\cmditem*{textelp}{text}
+\cmditem*{textelp}*{text}
+
+When used with an empty \prm{text} argument, this command prints an ellipsis symbol to indicate the omission of material from the quoted material. When used with a non-empty argument, the ellipsis symbol is followed by the \prm{text} enclosed in square brackets to indicate that the \prm{text} has been added after the omitted material. The starred version reverts the order, \ie it prints the \prm{text} followed by an ellipsis symbol to indicate that the \prm{text} has been added before the omitted material. In sum, there are three ways to use this command:
+
+\begin{ltxcode}[escapechar={\%},escapebegin={\rmfamily}]
+\textelp{} %= \textelp{} %
+\textelp{text} %= \textelp{text} %
+\textelp*{text} %= \textelp*{text} %
+\end{ltxcode}
+%
+The insertion of text or individual letters may be indicated with the following command:
+
+\cmditem{textins}{text}
+\cmditem*{textins}*{text}
+
+By default, \cmd{textins} will enclose the \prm{text} added to the quoted material in square brackets. The starred version is intended for minor changes, such as the capitalization of a word, which are required to adapt the quoted material to the new context in which it is quoted.
+
+\begin{ltxcode}[escapechar={\%},escapebegin={\rmfamily}]
+\textins{text} %= \textins{text} %
+\textins*{T}ext %= \textins*{T}ext %
+\end{ltxcode}
+%
+See \secref{cfg:elp} on how to configure the appearance of ellipses and insertions.
+
+\end{ltxsyntax}
\section{Configuration}
\label{cfg}
@@ -525,6 +613,7 @@ If available, this package will load the configuration file \path{csquotes.cfg}.
\toprule
\multicolumn{1}{@{}H}{Quote style} & \multicolumn{1}{@{}H}{Style variants} \\
\cmidrule(r){1-1}\cmidrule{2-2}
+ croatian & quotes, guillemets, guillemets\*\\
danish & quotes, guillemets \\
dutch & -- \\
english & american, british\\
@@ -555,7 +644,7 @@ Use the following command to define quote styles and style variants:
{opening outer mark}[middle outer mark]{closing outer mark}[kern]\\
{opening inner mark}[middle inner mark]{closing inner mark}
-This command may be used in the configuration file or in the document preamble. The term <outer> refers to the first quotation level, <inner> means quotations within another quotation. A <middle mark> is a quotation mark inserted at the beginning of every paragraph within a quotation spanning multiple paragraphs. In most cases, the arguments defining the quotation marks will simply contain one of the commands listed in table \ref{tab:out}. If both an outer and an inner quotation begin or end simultaneously, the kerning specified by the value \prm{kern} will be inserted between the adjoining quotation marks. While this value can be given in any unit known to \tex, it is advisable to use the relative, font"=dependent unit <em> instead of absolute units such as points, inches, or millimeters. Note that \prm{kern} is used as a fallback value only. If the font provides kerning data for the respective pair of quotation marks the font's kerning takes precedence. \prm{outer init} and \prm{inner init} are all"=purpose hooks initializing the quote style. Selecting a quote style will make these hooks available to all quotation commands without expanding them. The execution of \prm{outer init} will take place immediately before the opening outer quote is inserted, but inside the group formed by the quotation. \prm{inner init} is executed before the opening inner quote is inserted. It is advisable to avoid any global assignments in this context to prevent interference with other styles. Whenever \prm{inner init} is used \prm{outer init} has to be given as well, even if the argument is empty. Refer to table \ref{tab:sty} for a list of all predefined quote styles and their variants. These are the backend styles only, see also table \ref{tab:als} for a list of language aliases. See section \ref{cfg:spl} for some examples as well as an illustration of how quote styles, aliases, and package options interact.
+This command may be used in the configuration file or in the document preamble. The term <outer> refers to the first quotation level, <inner> means quotations within another quotation. A <middle mark> is a quotation mark inserted at the beginning of every paragraph within a quotation spanning multiple paragraphs. In most cases, the arguments defining the quotation marks will simply contain one of the commands listed in \tabref{tab:out}. If both an outer and an inner quotation begin or end simultaneously, the kerning specified by the value \prm{kern} will be inserted between the adjoining quotation marks. While this value can be given in any unit known to \tex, it is advisable to use the relative, font"=dependent unit <em> instead of absolute units such as points, inches, or millimeters. Note that \prm{kern} is used as a fallback value only. If the font provides kerning data for the respective pair of quotation marks the font's kerning takes precedence. \prm{outer init} and \prm{inner init} are all"=purpose hooks initializing the quote style. Selecting a quote style will make these hooks available to all quotation commands without expanding them. The execution of \prm{outer init} will take place immediately before the opening outer quote is inserted, but inside the group formed by the quotation. \prm{inner init} is executed before the opening inner quote is inserted. It is advisable to avoid any global assignments in this context to prevent interference with other styles. Whenever \prm{inner init} is used \prm{outer init} has to be given as well, even if the argument is empty. Refer to \tabref{tab:sty} for a list of all predefined quote styles and their variants. These are the backend styles only, see also \tabref{tab:als} for a list of language aliases. See \secref{use:spl} for some examples as well as an illustration of how quote styles, aliases, and package options interact.
\end{ltxsyntax}
@@ -569,7 +658,7 @@ The following command defines quote aliases:
\cmditem{DeclareQuoteAlias}[variant]{style}{alias}
\cmditem*{DeclareQuoteAlias}{first-level alias}{second-level alias}
-This command may be used in the configuration file or in the document preamble. The alias may point to a backend style or to another alias. Most language aliases refer to a backend style, but some point to an intermediate alias instead. If the alias is defined for the sake of the \sty{babel} package, its name must be identical to the language name used by \sty{babel}, i.e. the expansion of \cmd{languagename}. See section \ref{cfg:spl} for an illustration of how quote styles, aliases, and package options interact. A list of all aliases defined by default is given in table \ref{tab:als}.
+This command may be used in the configuration file or in the document preamble. The alias may point to a backend style or to another alias. Most language aliases refer to a backend style, but some point to an intermediate alias instead. If the alias is defined for the sake of the \sty{babel} or the \sty{polyglossia} package, its name must be identical to the language name used by \sty{babel}\slash\sty{polyglossia}, \ie the expansion of \cmd{languagename}. See \secref{use:spl} for an illustration of how quote styles, aliases, and package options interact. A list of all aliases defined by default is given in \tabref{tab:als}.
\end{ltxsyntax}
@@ -594,18 +683,20 @@ This command may be used in the configuration file or in the document preamble.
nynorsk & norwegian \\
canadian & english/american &
portuges & portuguese \\
- danish & danish/quotes &
+ croatian & croatian/quotes &
portuguese & portuguese/portuguese \\
- english & english/american &
+ danish & danish/quotes &
spanish & spanish/spanish \\
- french & french/quotes &
+ english & english/american &
swedish & swedish/quotes \\
- german & german/quotes &
+ french & french/quotes &
swiss & german/swiss \\
- italian & italian/quotes &
+ german & german/quotes &
UKenglish & british \\
- mexican & spanish/mexican &
+ italian & italian/quotes &
USenglish & american \\
+ mexican & spanish/mexican &
+ \\
\bottomrule
\end{tabularx}
\caption[Language aliases]{Language aliases defined by default}
@@ -621,7 +712,7 @@ The following command creates a new package option based on a key\slash value sy
\cmditem{DeclareQuoteOption}{style}
-When using the new option, the name of the quote style will serve as the key. The value may be any style variant defined for the respective style. The package option will select a variant by defining an alias pointing to the desired backend style. This command is available in the configuration file only. See section \ref{cfg:spl} for an illustration of how quote styles, aliases, and package options interact.
+When using the new option, the name of the quote style will serve as the key. The value may be any style variant defined for the respective style. The package option will select a variant by defining an alias pointing to the desired backend style. This command is available in the configuration file only. See \secref{use:spl} for an illustration of how quote styles, aliases, and package options interact.
\end{ltxsyntax}
@@ -638,68 +729,6 @@ This command permits presetting package options in the configuration file. It ma
\end{ltxsyntax}
-\subsection{Adding a new quote style}
-\label{cfg:spl}
-
-This section will give some comprehensive examples of how to define new quote styles. The examples presented here will only make use of the most basic components a quote style can be composed of. The main point is to illustrate the interaction of quote styles, variants, aliases, and package options. To get started, consider a simple house style which may be selected by way of the package option \opt{style} or the command \cmd{setquotestyle}:
-
-\begin{ltxcode}
-\DeclareQuoteStyle{house}
- {\textquotedblleft}{\textquotedblright}
- {\textquoteleft}{\textquoteright}
-\end{ltxcode}
-%
-Now suppose that we wanted to add a quote style for an imaginary language called Newspeak and that there were two quote styles commonly used in Newspeak, an official one and an unofficial one. In this case, we need two backend styles implemented as variants of the \opt{newspeak} style, \opt{newspeak/official} and \opt{newspeak/unofficial}:
-
-\begin{ltxcode}
-\DeclareQuoteStyle[official]{newspeak}
- {\textquotedblleft}{\textquotedblright}
- {\textquoteleft}{\textquoteright}
-\DeclareQuoteStyle[unofficial]{newspeak}
- {\textquotedblright}{\textquotedblleft}
- {\textquoteright}{\textquoteleft}
-\end{ltxcode}
-%
-The official variant should be the default for this style. There is no need to copy the definition of the \opt{official} variant to accomplish that. We simply define an alias labeled \opt{newspeak} which points to the desired variant:
-
-\begin{ltxcode}
-\DeclareQuoteAlias[official]{newspeak}{newspeak}
-\end{ltxcode}
-%
-The reason why we are using variants and aliases instead of two independent styles will become clear in a moment. Suppose that the \sty{babel} package offered support for Newspeak, but this language was known to \sty{babel} as \opt{otherspeak}:
-
-\begin{ltxcode}
-\DeclareQuoteAlias{newspeak}{otherspeak}
-\end{ltxcode}
-%
-This is an example of a second"=level alias pointing to a first"=level alias. If the current language is \opt{otherspeak}, the above aliases will be expanded as follows:
-
-\begin{lstlisting}[style=plain]{}
-otherspeak = newspeak = newspeak/official
-\end{lstlisting}
-%
-We also define a new package option to choose a style variant:
-
-\begin{ltxcode}
-\DeclareQuoteOption{newspeak}
-\end{ltxcode}
-%
-This will add a new package option with a key called \opt{newspeak}. The value of this option may be any variant of the \opt{newspeak} style defined in the configuration file. In this example, there are two possible values: \opt{official} and \opt{unofficial}. To select the default or the alternative style for the entire document we use:
-
-\begin{ltxcode}
-\usepackage[style=newspeak]{csquotes}
-\usepackage[style=newspeak,newspeak=unofficial]{csquotes}
-\end{ltxcode}
-%
-To select the default or the alternative style with multilingual support we use:
-
-\begin{ltxcode}
-\usepackage[babel]{csquotes}
-\usepackage[babel,newspeak=unofficial]{csquotes}
-\end{ltxcode}
-%
-The base style must be implemented as an alias in this case since the \opt{newspeak} option will select a variant by redefining and thus overwriting the \opt{newspeak} alias. Since the \opt{otherspeak} alias points to \opt{newspeak} and not directly to any backend style, using the \opt{newspeak} option will also have the desired effect if multilingual support is enabled. Note that there are some style names which have a special meaning. See section \ref{hnt:pre} for details.
-
\subsection{Defining quotes for \pdf strings}
\label{cfg:pdf}
@@ -710,24 +739,14 @@ The following command specifies the quotation marks for \pdf strings:
\cmditem{DeclarePlainStyle}{opening outer mark}{closing outer mark}\\
{opening inner mark}{closing inner mark}
-This command may be used in the configuration file or in the document preamble. By default, outer quotations get straight double quotes and inner quotations straight single quotes. See section \ref{hnt:pdf} for additional hints concerning \pdf strings.
+This command may be used in the configuration file or in the document preamble. By default, outer quotations get straight double quotes and inner quotations straight single quotes. See \secref{hnt:pdf} for additional hints concerning \pdf strings.
\end{ltxsyntax}
\subsection{Configuring quotations and citations}
\label{cfg:blk}
-The following commands change the default values used by various quotation facilities of this package:
-
-\begin{ltxsyntax}
-
-\cmditem{SetBlockThreshold}{integer}
-\cmditem{SetBlockEnvironment}{environment}
-\cmditem{SetCiteCommand}{command}
-
-\cmd{SetBlockThreshold} changes the number of lines the block quotation facilities use as a threshold when deciding whether a quotation should be set inline or as a block quotation. The default is three lines. \cmd{SetBlockEnvironment} specifies the environment used for block and display quotations. It takes the name of an existing environment as its argument. The default is the \env{quote} environment provided by most document classes. The argument to \cmd{SetCiteCommand} specifies a replacement for \cmd{cite} which will be used by all integrated quotation facilities to handle citations. It must be a single command which takes one or two optional arguments followed by a mandatory one, the citation key. The default is \cmd{cite}. The commands affected by these parameters are indicated in table \ref{tab:blk}.
-
-\end{ltxsyntax}
+The following commands change the default values used by various quotation facilities of this package. The commands affected by these parameters are indicated in \tabref{tab:blk}.
\begin{table}
\tablesetup
@@ -768,14 +787,20 @@ The following commands change the default values used by various quotation facil
\label{tab:blk}
\end{table}
-\subsection{Hooks for quotations and citations}
-\label{cfg:aux}
+\begin{ltxsyntax}
-Apart from the environment specified with \cmd{SetBlockEnvironment}, which envelops both the quoted text and the citation, the quoted text (excluding the citation) of all long quotations is enclosed in an environment called \env{quoteblock}. This environment does nothing by default but it may be redefined to format the quoted text. In a similar manner, the text block (excluding the quotation marks) of inline quotations is enclosed in an environment called \env{quotetext}. Like \env{quoteblock}, this environment does nothing by default but it may be redefined if additional hooks are required to format the quoted text.
+\cmditem{SetBlockThreshold}{integer}
+\cmditem{SetBlockEnvironment}{environment}
+\cmditem{SetCiteCommand}{command}
+
+\cmd{SetBlockThreshold} changes the number of lines the block quotation facilities use as a threshold when deciding whether a quotation should be set inline or as a block quotation. The default is three lines. \cmd{SetBlockEnvironment} specifies the environment used for block and display quotations. It takes the name of an existing environment as its argument. The default is the \env{quote} environment provided by most document classes. The argument to \cmd{SetCiteCommand} specifies a replacement for \cmd{cite} which will be used by all integrated quotation facilities to handle citations. It must be a single command which takes one or two optional arguments followed by a mandatory one, the citation key. The default is \cmd{cite}. The citation commands of the \sty{natbib}, \sty{jurabib}, and \sty{biblatex} packages, which take two optional arguments, are supported.
+
+\end{ltxsyntax}
-Other aspects of the behavior of the quotation facilities may also be customized at a lower level. All facilities which take a \prm{cite} argument will not insert it directly. They pass it to an auxiliary command called \cmd{mkcitation} which may be redefined to format the citation. When doing so, keep in mind that it must take exactly one mandatory argument. \cmd{mkcitation} will only be executed if there is a citation. The default behavior is to separate the citation from the preceding text by an interword space and enclose it in parentheses.
+\subsection{Hooks for quotations and citations}
+\label{cfg:aux}
-The integrated quotation facilities have slightly different requirements since the \cmd{cite} command may enclose the citation in parentheses or brackets. Therefore, they use \cmd{mkccitation} instead of \cmd{mkcitation}. The default behavior of this command is to separate the citation from the preceding text by an interword space. The default settings are equivalent to the following definitions:
+The appearance of quotes may be configured at a low level by redefining the hooks introduced below. This section will give an overview of their syntax. See \secref{use:hok} for practical examples. The quotation facilities which are responsive to these hooks are indicated in \tabref{tab:aux}. Also see \secref{cfg:tst} for tests which may be useful when redefining the hooks.
\begin{table}
\tablesetup
@@ -807,99 +832,463 @@ The integrated quotation facilities have slightly different requirements since t
& \venv{foreigndisplaycquote}
& \venv{hyphendisplaycquote} \\
\cmidrule(r){1-1}\cmidrule{2-22}
+ \cmd{mktextquote} &\_&\_&\_&\+&\+&\+&\+&\+&\+&\+&\+&\+&\+&\+&\+&\_&\_&\_&\_&\_&\_\\
+ \cmd{mkblockquote} &\_&\_&\_&\_&\_&\_&\_&\_&\_&\+&\+&\+&\+&\+&\+&\_&\_&\_&\_&\_&\_\\
+ \cmd{mkbegdispquote} &\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\+&\+&\+&\+&\+&\+\\
+ \cmd{mkenddispquote} &\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\+&\+&\+&\+&\+&\+\\
\cmd{mkcitation} &\_&\_&\_&\+&\+&\+&\_&\_&\_&\+&\+&\+&\_&\_&\_&\+&\+&\+&\_&\_&\_\\
\cmd{mkccitation} &\_&\_&\_&\_&\_&\_&\+&\+&\+&\_&\_&\_&\+&\+&\+&\_&\_&\_&\+&\+&\+\\
- \cmd{mkpretextpunct} &\_&\_&\_&\+&\+&\+&\+&\+&\+&\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\_\\
- \cmd{mkmidtextpunct} &\_&\_&\_&\+&\+&\+&\+&\+&\+&\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\_\\
- \cmd{mkfintextpunct} &\_&\_&\_&\+&\+&\+&\+&\+&\+&\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\_\\
- \cmd{mkpreblockpunct} &\_&\_&\_&\_&\_&\_&\_&\_&\_&\+&\+&\+&\+&\+&\+&\_&\_&\_&\_&\_&\_\\
- \cmd{mkmidblockpunct} &\_&\_&\_&\_&\_&\_&\_&\_&\_&\+&\+&\+&\+&\+&\+&\_&\_&\_&\_&\_&\_\\
- \cmd{mkfinblockpunct} &\_&\_&\_&\_&\_&\_&\_&\_&\_&\+&\+&\+&\+&\+&\+&\_&\_&\_&\_&\_&\_\\
- \cmd{mkpredisppunct} &\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\+&\+&\+&\+&\+&\+\\
- \cmd{mkmiddisppunct} &\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\+&\+&\+&\+&\+&\+\\
- \cmd{mkfindisppunct} &\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\_&\+&\+&\+&\+&\+&\+\\
- \env{quotetext} &\_&\_&\_&\+&\+&\+&\+&\+&\+&\+&\+&\+&\+&\+&\+&\_&\_&\_&\_&\_&\_\\
- \env{quoteblock} &\_&\_&\_&\_&\_&\_&\_&\_&\_&\+&\+&\+&\+&\+&\+&\+&\+&\+&\+&\+&\+\\
\bottomrule
\end{tabularx}
\caption[Auxiliary hooks]{Availability of auxiliary hooks}
\label{tab:aux}
\end{table}
+\begin{ltxsyntax}
+
+\cmditem{mkcitation}{cite}
+
+All facilities which take a \prm{cite} argument will pass it to the \cmd{mkcitation} hook, which may be redefined to format the citation. \cmd{mkcitation} will only be executed if there is a citation. The default behavior is to separate the citation from the preceding text by an interword space and enclose it in parentheses. This is equivalent to the following definition:
+
\begin{ltxcode}[showspaces=true]
\newcommand*{<<\mkcitation>>}[1]{ (#1)}
+\end{ltxcode}
+
+\cmditem{mkccitation}{cite code}
+
+The integrated quotation facilities use \cmd{mkccitation} instead of \cmd{mkcitation}. The default behavior of this command is to separate the citation from the preceding text by an interword space. This is equivalent to the following definition:
+
+\begin{ltxcode}[showspaces=true]
\newcommand*{<<\mkccitation>>}[1]{ #1}
\end{ltxcode}
+
+\cmditem{mktextquote}{open}{text}{close}{punct}{tpunct}{cite}
+
+The \cmd{mktextquote} hook controls the layout of all text quotations. This hook is used by \cmd{textquote} and related commands from \secref{bas:txt:reg,bas:txt:bbl,int:txt:reg,int:txt:bbl}. \cmd{blockquote} and related commands from \secref{bas:blk:reg,bas:blk:bbl,int:blk:reg,int:blk:bbl} use this hook for short quotations. It takes six arguments which may be arranged according to the desired output:
+
+\begin{argumentlist}{00}
+\item[\#1] The opening quotation mark.
+\item[\#2] The \prm{text} argument of the command.
+\item[\#3] The closing quotation mark.
+\item[\#4] The optional \prm{punct} argument of the command. If there is no \prm{punct} argument, this parameter is empty.
+\item[\#5] Trailing \prm{tpunct} punctuation immediately after the command. If there is no such punctuation or if the \opt{autopunct} feature is disabled, this parameter is empty.
+\item[\#6] The optional \prm{cite} argument of the command, wrapped in \cmd{mkcitation}. If there is no \prm{cite} argument, this parameter is empty. With integrated quotation commands, this parameter is the citation code, wrapped in \cmd{mkccitation}.
+\end{argumentlist}
%
-As the block quotation facilities switch between inline and display quotations, changes to the terminal punctuation may be required. The punctuation is controlled by three hooks: \cmd{mkpreblockpunct} is executed before the closing quotation mark. \cmd{mkmidblockpunct} is executed after the closing quotation mark, between the quotation and the citation. \cmd{mkfinblockpunct} is executed after the citation. These hooks serve two purposes. They control the placement of the \prm{punct} argument and they may also be used to insert additional punctuation. Like the \prm{cite} argument, \prm{punct} is not inserted directly. It is passed to all three hooks. When redefining these commands, keep in mind that all of them must take one mandatory argument, but only one of them should insert it. By default, the punctuation is inserted after the citation. This is equivalent to the following definitions:
+By default, \cmd{mktextquote} encloses the \prm{punct} argument in the quotation marks along with the \prm{text} and inserts the \prm{cite} argument or the citation code before any trailing \prm{tpunct} punctuation. This is equivalent to the following definition:
\begin{ltxcode}
-\newcommand*{<<\mkpreblockpunct>>}[1]{}
-\newcommand*{<<\mkmidblockpunct>>}[1]{}
-\newcommand*{<<\mkfinblockpunct>>}[1]{#1}
+\newcommand{<<\mktextquote>>}[6]{#1#2#4#3#6#5}
\end{ltxcode}
%
-The text quotation facilities also take a \prm{punct} argument whose placement is controlled by \cmd{mkpretextpunct}, \cmd{mkmidtextpunct}, and \cmd{mkfintextpunct}. These commands work like their counterparts for block quotations. Their default behavior is equivalent to the following definitions:
+The way in which \cmd{mktextquote} hooks into the formatting process is best seen when looking at an example. The commands
\begin{ltxcode}
-\newcommand*{<<\mkpretextpunct>>}[1]{}
-\newcommand*{<<\mkmidtextpunct>>}[1]{}
-\newcommand*{<<\mkfintextpunct>>}[1]{#1}
+\textquote[<<cite>>]{<<short quote>>}
+\textcquote[<<55>>]{<<key1>>}[<<.>>]{<<short quote>>}
+\blockcquote[<<87>>]{<<key2>>}{<<short quote>>}<<.>>
\end{ltxcode}
%
-The hooks \cmd{mkpredisppunct}, \cmd{mkmiddisppunct}, and \cmd{mkfindisppunct} handle the placement of the punctuation argument passed to the display environments. The default behavior is equivalent to the following definitions:
+would execute \cmd{mktextquote} with the following arguments:
\begin{ltxcode}
-\newcommand*{<<\mkpredisppunct>>}[1]{}
-\newcommand*{<<\mkmiddisppunct>>}[1]{}
-\newcommand*{<<\mkfindisppunct>>}[1]{#1}
+\mktextquote{open}{<<short quote>>}{close}{}{}{\mkcitation{<<cite>>}}
+\mktextquote{open}{<<short quote>>}{close}{<<.>>}{}{\mkccitation{\cite[<<55>>]{<<key1>>}}}
+\mktextquote{open}{<<short quote>>}{close}{}{<<.>>}{\mkccitation{\cite[<<87>>]{<<key2>>}}}
\end{ltxcode}
%
-The difference between \cmd{mkpredisppunct} is \cmd{mkmiddisppunct} is subtle because there are no closing quotation marks in display quotations. The two hooks differ in that \cmd{mkpredisppunct} is executed before the \env{quoteblock} environment is closed whereas \cmd{mkmiddisppunct} is executed after this environment. This also applies to \cmd{mkpreblockpunct} and \cmd{mkmidblockpunct} in display mode. Table \ref{tab:aux} gives an overview of the facilities affected by a redefinition of the above hooks. See the tutorial for usage examples. Also see section \ref{cfg:tst} for tests which may be useful when redefining the above hooks.
+where \cmd{cite} is the command selected with \cmd{SetCiteCommand} and \texttt{open}\slash\texttt{close} are internal macros which print the opening and closing quotation marks. Note that these internal macros are fully"=fledged markup elements with grouping and nesting control. They must be placed in the correct order, otherwise \sty{csquotes} will report errors about unbalanced groups or invalidly nested quotations. Since the \prm{text} should obviously be enclosed in the quotation marks, the parameter order |#1#2#3| is effectively fixed. The parameters |#4|, |#5|, |#6| may be placed freely.
+
+\cmditem{mkblockquote}{text}{punct}{tpunct}{cite}
+
+The \cmd{mkblockquote} hook controls the layout of all block quotations. This hook is used by \cmd{blockquote} and related commands from \secref{bas:blk:reg,bas:blk:bbl,int:blk:reg,int:blk:bbl} for long quotations. It takes four arguments which may be arranged according to the desired output:
+
+\begin{argumentlist}{00}
+\item[\#1] The \prm{text} argument of the command.
+\item[\#2] The optional \prm{punct} argument of the command. If there is no \prm{punct} argument, this parameter is empty.
+\item[\#3] Trailing \prm{tpunct} punctuation immediately after the command. If there is no such punctuation or if the \opt{autopunct} feature is disabled, this parameter is empty.
+\item[\#4] The optional \prm{cite} argument of the command, wrapped in \cmd{mkcitation}. If there is no \prm{cite} argument, this parameter is empty. With integrated quotation commands, this parameter is the citation code, wrapped in \cmd{mkccitation}.
+\end{argumentlist}
+%
+By default, \cmd{mkblockquote} inserts the \prm{cite} argument or the citation code immediately after the \prm{text} and adds any trailing \prm{tpunct} punctuation at the very end. This is equivalent to the following definition:
+
+\begin{ltxcode}
+\newcommand{<<\mkblockquote>>}[4]{#1#2#4#3}
+\end{ltxcode}
+
+\cmditem{mkbegdispquote}{punct}{cite}
+\cmditem{mkenddispquote}{punct}{cite}
+
+The \cmd{mkbegdispquote} and \cmd{mkenddispquote} hooks are used by \env{displayquote} and related environments from \secref{env:bas,env:cit}. These hooks take two arguments:
+
+\begin{argumentlist}{00}
+\item[\#1] The \prm{punct} argument passed to the \cmd{begin} line of the environment. If there is no \prm{punct} argument, this parameter is empty.
+\item[\#2] The \prm{cite} argument passed to the environment, wrapped in \cmd{mkcitation}. If there is no \prm{cite} argument, this parameter is empty. With integrated quotation environments, this parameter is the citation code, wrapped in \cmd{mkccitation}.
+\end{argumentlist}
+%
+By default, \cmd{mkenddispquote} adds the \prm{punct} argument as well as the \prm{cite} argument or the citation code at the very end of the quotation. \cmd{mkbegdispquote} does not insert anything be default. This is equivalent to the following definition:
+
+\begin{ltxcode}
+\newcommand{<<\mkbegdispquote>>}[2]{}
+\newcommand{<<\mkenddispquote>>}[2]{#1#2}
+\end{ltxcode}
+%
+See \secref{use:hok} for practical examples.
+
+\end{ltxsyntax}
\subsection{Additional tests in quotation hooks}
\label{cfg:tst}
-The commands in this section increase the flexibility of the hooks discussed in section \ref{cfg:aux}. For example, it may be desirable to adjust the format of a citation depending on the way the corresponding quotation is typeset. The following command will test whether the quotation is set inline or as a separate paragraph:
+The commands in this section increase the flexibility of the hooks discussed in \secref{cfg:aux}. For example, it may be desirable to adjust the format of a citation depending on the way the corresponding quotation is typeset. It may also be useful to known if the quotation ends with a punctuation mark.
\begin{ltxsyntax}
+\cmditem{ifpunctmark}{character}{true}{false}
+
+Expands to \prm{true} if preceeded by the punctuation mark \prm{character}, and to \prm{false} otherwise. The \prm{character} may be a period, a comma, a semicolon, a colon, an exclamation mark, or a question mark. Note that this test is only available in the definition of the hooks from \secref{cfg:aux}.
+
+\cmditem{ifpunct}{true}{false}
+
+Expands to \prm{true} if preceeded by any punctuation mark, and to \prm{false} otherwise. Note that this test is only available in the definition of the hooks from \secref{cfg:aux}.
+
+\cmditem{ifterm}{true}{false}
+
+Expands to \prm{true} if preceeded by a terminal punctuation mark (period, exclamation mark, or question mark), and to \prm{false} otherwise. Note that this test is only available in the definition of the hooks from \secref{cfg:aux}.
+
+\cmditem{iftextpunctmark}{text}{character}{true}{false}
+
+Executes \prm{true} if the \prm{text} ends with the punctuation mark \prm{character}, and to \prm{false} otherwise. The \prm{character} may be a period, a comma, a semicolon, a colon, an exclamation mark, or a question mark. This command is robust.
+
+\cmditem{iftextpunct}{text}{true}{false}
+
+Executes \prm{true} if the \prm{text} ends with any punctuation mark, and to \prm{false} otherwise. This command is robust.
+
+\cmditem{iftextterm}{text}{true}{false}
+
+Executes \prm{true} if the \prm{text} ends with a terminal punctuation mark (period, exclamation mark, or question mark), and to \prm{false} otherwise. This command is robust.
+
\cmditem{ifblockquote}{true}{false}
-This command expands to \prm{true} with block and display quotations, and to \prm{false} otherwise. It may also be useful to known if the quotation ends with a punctuation mark, especially in the definition of the \cmd{mk...punct} hooks. The following tests provide information about the terminal punctuation:
+Expands to \prm{true} in all block and display quotations, and to \prm{false} otherwise.
+
+\cmditem{ifblank}{string}{true}{false}
+
+This generic command, which is provided by the \sty{etoolbox} package, expands to \prm{true} if the \prm{string} is blank (empty or spaces), and to \prm{false} otherwise. This is useful to test for an empty argument in the definition of the \cmd{mk...quote} commands. Note that this test is redundant in the definition of the citation hooks because they are only executed if there is a citation.
-\cmditem{ifquotepunct}{true}{false}
-\cmditem{ifquoteterm}{true}{false}
+\csitem{unspace}
-The first command expands to \prm{true} if the quotation ends with any punctuation mark, and to \prm{false} otherwise. The second one will only expand to \prm{true} if the quotation ends with a terminal punctuation mark (period, exclamation mark, or question mark). The following commands allow for more specific tests:
+Removes preceding whitespace, \ie removes all skips and penalties from the end of the current horizontal list.
-\cmditem{ifquotecolon}{true}{false}
-\cmditem{ifquotecomma}{true}{false}
-\cmditem{ifquoteexclam}{true}{false}
-\cmditem{ifquoteperiod}{true}{false}
-\cmditem{ifquotequestion}{true}{false}
-\cmditem{ifquotesemicolon}{true}{false}
+\end{ltxsyntax}
+
+\subsection{Configuring punctuation look-ahead}
+\label{cfg:dap}
+
+\begin{ltxsyntax}
-Note that all of the above tests are designed for use in the definition of the hooks from section \ref{cfg:aux}. They will not yield meaningful results when used anywhere else. There is also a stand-alone test which may be used anywhere:
+\cmditem{DeclareAutoPunct}{characters}
-\cmditem{ifstringblank}{string}{true}{false}
+This command defines the punctuation marks to be considered by the quotation commands as they scan ahead for punctuation. Note that \prm{characters} is an undelimited list of characters. Valid \prm{characters} are period, comma, semicolon, colon, exclamation and question mark. The default setting is:
-This command expands to \prm{true} if \prm{string} is blank (empty or spaces), and to \prm{false} otherwise. This is useful to test for an empty argument in the definition of the \cmd{mk...punct} commands. Note that this test is redundant in the definition of the citation hooks because they are only executed if there is a citation.
+\begin{lstlisting}[style=latex]{}
+\DeclareAutoPunct{.,;:!?}
+\end{lstlisting}
+%
+This definition is restored automatically whenever the \opt{autopunct} package option is set to \texttt{true}. Executing |\DeclareAutoPunctuation{}| is equivalent to setting \kvopt{autopunct}{false}, \ie it disables this feature.
\end{ltxsyntax}
+\subsection{Configuring ellipses}
+\label{cfg:elp}
+
+The appearance of ellipses and insertions formatted with the auxiliary commands from \secref{aux} is controlled by five hooks. When \cmd{textelp} is used with an empty argument (ellipsis only), it will execute \cmd{mktextelp}. When used with a non-empty \prm{text} argument (ellipsis and insertion), the \prm{text} will be passed as an argument to \cmd{mktextelpins}. The starred form will pass the \prm{text} to \cmd{mktextinselp} instead. These are the default definitions:
+
+\begin{ltxcode}[showspaces=true]
+\newcommand{<<\mktextelp>>}{[\textellipsis\unkern]}
+\newcommand{<<\mktextelpins>>}[1]{[\textellipsis\unkern] [#1]}
+\newcommand{<<\mktextinselp>>}[1]{[#1] [\textellipsis\unkern]}
+\end{ltxcode}
+%
+The \cmd{textins} command passes its \prm{text} argument to \cmd{mktextins} for further processing. The starred variant of \cmd{textins} uses \cmd{mktextmod} instead. These are the default definitions:
+
+\begin{ltxcode}[showspaces=true]
+\newcommand{<<\mktextins>>}[1]{[#1]}
+\newcommand{<<\mktextmod>>}[1]{[#1]}
+\end{ltxcode}
+%
+You may redefine the above hooks to change the format of the printed output. For example, if you prefer replacements to be indicated by «[\textellipsis text]» rather than «[\textellipsis\unkern] [text]», redefine \cmd{mktextelpins} accordingly:
+
+\begin{ltxcode}
+\newcommand{<<\mktextelpins>>}[1]{[\textellipsis #1]}
+\end{ltxcode}
+%
+The \cmd{unkern} in the default definitions is required because \cmd{textellipsis} adds asymmetric kerning by default. The kerning after the final dot is similar to the spacing between the dots, which is fine if \cmd{textellipsis} is followed by any text, but undesirable if it is enclosed in brackets.
+
+\section{Usage notes}
+\label{use}
+
+\subsection{Adding a new quote style}
+\label{use:spl}
+
+This section will give some comprehensive examples of how to define new quote styles. The examples presented here will only make use of the most basic components a quote style can be composed of. The main point is to illustrate the interaction of quote styles, variants, aliases, and package options. To get started, consider a simple house style which may be selected by way of the package option \opt{style} or the command \cmd{setquotestyle}:
+
+\begin{ltxcode}
+\DeclareQuoteStyle{house}
+ {\textquotedblleft}{\textquotedblright}
+ {\textquoteleft}{\textquoteright}
+\end{ltxcode}
+%
+Now suppose that we wanted to add a quote style for an imaginary language called Newspeak and that there were two quote styles commonly used in Newspeak, an official one and an unofficial one. In this case, we need two backend styles implemented as variants of the \opt{newspeak} style, \opt{newspeak/official} and \opt{newspeak/unofficial}:
+
+\begin{ltxcode}
+\DeclareQuoteStyle[official]{newspeak}
+ {\textquotedblleft}{\textquotedblright}
+ {\textquoteleft}{\textquoteright}
+\DeclareQuoteStyle[unofficial]{newspeak}
+ {\textquotedblright}{\textquotedblleft}
+ {\textquoteright}{\textquoteleft}
+\end{ltxcode}
+%
+The official variant should be the default for this style. There is no need to copy the definition of the \opt{official} variant to accomplish that. We simply define an alias labeled \opt{newspeak} which points to the desired variant:
+
+\begin{ltxcode}
+\DeclareQuoteAlias[official]{newspeak}{newspeak}
+\end{ltxcode}
+%
+The reason why we are using variants and aliases instead of two independent styles will become clear in a moment. Suppose that the \sty{babel} package offered support for Newspeak, but this language was known to \sty{babel} as \opt{otherspeak}:
+
+\begin{ltxcode}
+\DeclareQuoteAlias{newspeak}{otherspeak}
+\end{ltxcode}
+%
+This is an example of a second"=level alias pointing to a first"=level alias. If the current language is \opt{otherspeak}, the above aliases will be expanded as follows:
+
+\begin{lstlisting}[style=plain]{}
+otherspeak = newspeak = newspeak/official
+\end{lstlisting}
+%
+We also define a new package option to choose a style variant:
+
+\begin{ltxcode}
+\DeclareQuoteOption{newspeak}
+\end{ltxcode}
+%
+This will add a new package option with a key called \opt{newspeak}. The value of this option may be any variant of the \opt{newspeak} style defined in the configuration file. In this example, there are two possible values: \opt{official} and \opt{unofficial}. To select the default or the alternative style for the entire document we use:
+
+\begin{ltxcode}
+\usepackage[style=newspeak]{csquotes}
+\usepackage[style=newspeak,newspeak=unofficial]{csquotes}
+\end{ltxcode}
+%
+To select the default or the alternative style with multilingual support we use:
+
+\begin{ltxcode}
+\usepackage[babel]{csquotes}
+\usepackage[babel,newspeak=unofficial]{csquotes}
+\end{ltxcode}
+%
+The base style must be implemented as an alias in this case since the \opt{newspeak} option will select a variant by redefining and thus overwriting the \opt{newspeak} alias. Since the \opt{otherspeak} alias points to \opt{newspeak} and not directly to any backend style, using the \opt{newspeak} option will also have the desired effect if multilingual support is enabled. Note that there are some style names which have a special meaning. See \secref{hnt:pre} for details.
+
+\subsection{Using quotation and citation hooks}
+\label{use:hok}
+
+Style guides for writers usually make detailed provisions concerning the formatting of quotations and citations, including rules dealing with punctuation placement. This section will discuss some typical usage scenarios, using hooks and other facilities introduced in \secref{cfg:aux,cfg:tst,cfg:dap}. In the examples below, we assume the following input:
+
+\begin{ltxcode}
+\textquote[citation][.]{This is a complete sentence}
+\textquote[citation][]{This is an incomplete sentence}.
+\end{ltxcode}
+%
+We start off with semantically strict punctuation placement, \ie terminal punctuation is enclosed in the quotation marks if it in fact is part of the quotation, and printed after the closing mark if it is not. Our first sample cases will use German quotation marks, but the formatting convention, as far as punctuation placement is concerned, is very common. We assume citations in footnotes in the first example, hence the desired output is as follows:
+
+\begin{quotesample}{german}
+\renewcommand{\mkcitation}[1]{\footnote{#1}}
+\renewcommand{\mktextquote}[6]{#1#2#4#3#5#6}
+
+\item \textquote[citation][.]{This is a complete sentence}
+\item \textquote[citation][]{This is an incomplete sentence}.
+\end{quotesample}
+%
+This is accomplished by the following definitions:
+
+\begin{ltxcode}
+\renewcommand{\mkcitation}[1]{\footnote{#1}}
+\renewcommand{\mktextquote}[6]{#1#2#4#3#5#6}
+\end{ltxcode}
+%
+In some cases, slightly different placement of the punctuation in the second line is requested:
+
+\begin{quotesample}{german}
+\renewcommand{\mkcitation}[1]{\footnote{#1}}
+\renewcommand{\mktextquote}[6]{#1#2#4#3#6#5}
+
+\item \textquote[citation][.]{This is a complete sentence}
+\item \textquote[citation][]{This is an incomplete sentence}.
+\end{quotesample}
+%
+This is accomplished by the following definitions:
+
+\begin{ltxcode}
+\renewcommand{\mkcitation}[1]{\footnote{#1}}
+\renewcommand{\mktextquote}[6]{#1#2#4#3#6#5}
+\end{ltxcode}
+%
+Let's switch to American quotation marks in the next examples. When using parenthetical citations, the terminal punctuation mark is typically placed at the very end of the entire sentence, after the closing quotation mark and the citation, even if it is part of the original quotation:
+
+\begin{quotesample}{american}
+\renewcommand{\mkcitation}[1]{ (#1)}
+\renewcommand{\mktextquote}[6]{#1#2#3#6#4#5}
+
+\item \textquote[citation][.]{This is a complete sentence}
+\item \textquote[citation][]{This is an incomplete sentence}.
+\end{quotesample}
+%
+This is accomplished by the following definitions:
+
+\begin{ltxcode}
+\renewcommand{\mkcitation}[1]{ (#1)}
+\renewcommand{\mktextquote}[6]{#1#2#3#6#4#5}
+\end{ltxcode}
+%
+The American quotation style is special in that it requires that a period or a comma immediately after a closing quotation mark be moved inside the quotes, even if it is not part of the original quotation. Given the above input (and assuming citations in footnotes in the next example), we need the same output in both cases:
+
+\begin{quotesample}{american}
+\DeclareAutoPunct{.,}
+\renewcommand{\mkcitation}[1]{\footnote{#1}}
+\renewcommand{\mktextquote}[6]{#1#2#4#5#3#6}
+
+\item \textquote[citation][.]{This is a complete sentence}
+\item \textquote[citation][]{This is an incomplete sentence}.
+\end{quotesample}
+%
+This is accomplished by the following definitions:
+
+\begin{ltxcode}
+\DeclareAutoPunct{.,}
+\renewcommand{\mkcitation}[1]{\footnote{#1}}
+\renewcommand{\mktextquote}[6]{#1#2#4#5#3#6}
+\end{ltxcode}
+%
+The style commonly seen in French books uses semantically strict punctuation placement. The unusual aspect of this style is the footnote mark, which is placed inside the quotes, before the terminal punctuation mark. Given the above input, we need the following output:
+
+\begin{quotesample}{french}
+\renewcommand{\mkcitation}[1]{\footnote{#1}}
+\renewcommand{\mktextquote}[6]{#1#2#6#4#3#5}
+
+\item \textquote[citation][.]{This is a complete sentence}
+\item \textquote[citation][]{This is an incomplete sentence}.
+\end{quotesample}
+%
+This is accomplished by the following definitions:
+
+\begin{ltxcode}
+\renewcommand{\mkcitation}[1]{\footnote{#1}}
+\renewcommand{\mktextquote}[6]{#1#2#6#4#3#5}
+\end{ltxcode}
+%
+Note that the spacing of the quotation marks, as is common in French typography, is handled automatically by the quote style, as defined with \cmd{DeclareQuoteStyle}. There is no need to deal with these details when redefining \cmd{mktextquote} and similar hooks. \cmd{mktextquote} will get the quotation marks plus spacing as parameters |#1| and |#3|.
+
+In addition to language and style specific adaptions, the formatting hooks discussed in this section may be used to further automate the quoting process. For example, they can be configured to automatically insert an ellipsis mark when quoting a sentence truncated at the end. In the following examples, we assume these lines of input:
+
+\begin{ltxcode}
+\textquote[citation]{This is an incomplete sentence}.
+\textquote[citation][.]{This is a complete sentence}
+\textquote[citation]{This is a complete sentence.}
+\end{ltxcode}
+%
+Let's assume American-style quotes combined with citations in footnotes. Our previous definition for that was:
+
+\begin{ltxcode}
+\renewcommand{\mktextquote}[6]{#1#2#4#5#3#6}
+\end{ltxcode}
+%
+We need to insert an ellipsis mark if the \prm{punct} argument of the citation command is empty, or if it was omitted. Parameter |#4| will be blank in both cases:
+
+\begin{ltxcode}
+\renewcommand{\mktextquote}[6]{%
+ #1#2<<\ifblank{#4}{ \textelp{}}{#4}>>#5#3#6}
+\end{ltxcode}
+%
+Given the above input, this definition will yield the following output:
+
+\begin{quotesample}{american}
+\renewcommand{\mkcitation}[1]{\footnote{#1}}
+\renewcommand{\mktextquote}[6]{#1#2\ifblank{#4}{ \textelp{}}{#4}#5#3#6}
+
+\item \textquote[citation]{This is an incomplete sentence}.
+\item \textquote[citation][.]{This is a complete sentence}
+\item \textquote[citation]{This is a complete sentence.}
+\end{quotesample}
+%
+The first two cases are handled correctly but the third one needs more tuning: there is a spurious
+ellipsis because the final period is not passed to \cmd{textquote} as a separate \prm{punct} argument, but included in the quotation. To fix that, we add an additional \cmd{ifpunct} test to check if the quoted text ends with a punctuation mark, and omit the ellipsis if this is the case:
+
+\begin{ltxcode}
+\renewcommand{\mktextquote}[6]{%
+ #1#2<<\ifblank{#4}{\ifpunct{}{ \textelp{}}}{#4}>>#5#3#6}
+\end{ltxcode}
+%
+The \cmd{ifpunct} test will check the last character in |#2| and omit the ellipsis when detecting a punctuation mark. This yields the desired output:
+
+\begin{quotesample}{american}
+\renewcommand{\mkcitation}[1]{\footnote{#1}}
+\renewcommand{\mktextquote}[6]{#1#2\ifpunct{}{\ifblank{#4}{ \textelp{}}}{#4}#5#3#6}
+
+\item \textquote[citation]{This is an incomplete sentence}.
+\item \textquote[citation][.]{This is a complete sentence}
+\item \textquote[citation]{This is a complete sentence.}
+\end{quotesample}
+%
+If you are using automated citations, it is convenient to employ the integrated quotations commands from \secref{cit}. For example, instead of this:
+
+\begin{ltxcode}
+\textquote[citation][.]{This is a complete sentence}
+\textquote[citation][]{This is an incomplete sentence}.
+\end{ltxcode}
+%
+you might use \cmd{textcquote} instead of \cmd{textquote}:
+
+\begin{ltxcode}
+\textcquote[55]{key}[.]{This is a complete sentence}
+\textcquote[55]{key}{This is an incomplete sentence}.
+\end{ltxcode}
+%
+The definition of the punctuation hooks is the same in both cases, but citations are set up in a slightly different way in the second case, using \cmd{mkccitation} instead of \cmd{mkcitation}. The first line in the example below is intended for parenthetical citations, the second one for citations in footnotes:
+
+\begin{ltxcode}
+\renewcommand{\mkccitation}[1]{ (#1)}
+\renewcommand{\mkccitation}[1]{\footnote{#1}}
+\end{ltxcode}
+%
+Some citation packages, such as \sty{natbib} and \sty{biblatex}, provide dedicated commands for various types of citations. It is advisable to use the appropriate citation command and hand control of citations to that command, \ie \cmd{mkccitation} is used only to insert an interword space where required, but will leave the rest to the citation command. In the case of \sty{biblatex}, this boils down to:
+
+\begin{ltxcode}
+\SetCiteCommand{\parencite}
+\renewcommand{\mkccitation}[1]{ #1}
+\end{ltxcode}
+%
+for parenthetical citations and
+
+\begin{ltxcode}
+\SetCiteCommand{\footcite}
+\renewcommand{\mkccitation}[1]{#1}
+\end{ltxcode}
+%
+for citations in footnotes.
+
\section{Hints and caveats}
\label{hnt}
\subsection{Input encodings}
\label{hnt:inc}
-The active quotes provided by this package may depend on or benefit from the \sty{inputenc} package under certain circumstances. As long as the active quotes are in the range 0--127, there is no benefit in loading \sty{inputenc}. If you are using an 8-bit input encoding such as \opt{latin1}, \sty{inputenc} is required for the quotes to function properly in a verbatim context. It should therefore be loaded before any active quotes are allocated (not necessarily before this package is loaded). The \acr{UTF-8} support of this package builds on the \path{utf8} module of the inputenc package. When using this encoding, ensure that inputenc is loaded with the \opt{utf8} option. Do not use the \opt{utf8x} option as this would implicitly load the \sty{ucs} package which is not supported by \sty{csquotes}. \acr{UTF-8} encoding will be detected automatically. All commands discussed in section \ref{act} work as usual with this encoding. See also section~\ref{hnt:mod}.
+The active quotes provided by this package may depend on or benefit from the \sty{inputenc} package under certain circumstances. As long as the active quotes are in the range 0--127, there is no benefit in loading \sty{inputenc}. If you are using an 8-bit input encoding such as \opt{latin1}, \sty{inputenc} is required for the quotes to function properly in a verbatim context. It should therefore be loaded before any active quotes are allocated (not necessarily before this package is loaded). The \utf support of this package builds on the \path{utf8} module of the inputenc package. When using this encoding, ensure that inputenc is loaded with the \opt{utf8} option. Do not use the \opt{utf8x} option as this would implicitly load the \sty{ucs} package which is not supported by \sty{csquotes}. \utf encoding will be detected automatically. All commands discussed in \secref{act} work as usual with this encoding. See also \secref{hnt:mod}.
\subsection{Output encodings}
\label{hnt:onc}
-The \acr{OT1} font encoding, the default output encoding of \latex, merely includes the quotation marks used in English. You will need to switch to an encoding like \acr{T1} or \acr{LY1} in order to get guillemets or baseline quotation marks. This package deliberately refrains from providing any workarounds for the \acr{OT1} legacy encoding. If you need \acr{T1} encoding for some of the quotation marks, you will most likely need it anyway to get proper hyphenation for the respective language. See table \ref{tab:out} for a list of common quotation marks included in both \acr{T1} and \acr{LY1} encoding.
+The \acr{OT1} font encoding, the default output encoding of \latex, merely includes the quotation marks used in English. You will need to switch to an encoding like \acr{T1} or \acr{LY1} in order to get guillemets or baseline quotation marks. This package deliberately refrains from providing any workarounds for the \acr{OT1} legacy encoding. If you need \acr{T1} encoding for some of the quotation marks, you will most likely need it anyway to get proper hyphenation for the respective language. See \tabref{tab:out} for a list of common quotation marks included in both \acr{T1} and \acr{LY1} encoding.
\begin{table}
\tablesetup
@@ -929,7 +1318,7 @@ The \acr{OT1} font encoding, the default output encoding of \latex, merely inclu
\subsection{Valid active quotes}
\label{hnt:val}
-In general, an active quote may be any single character with category code 12 or 13, or any multibyte \acr{UTF-8} sequence representing a single character. However, there are a few exceptions: numbers, punctuation marks, the apostrophe, the hyphen, and all characters which are part of the \latex syntax are rejected. In sum, the following characters will be considered as reserved by this package: \texttt{A--Z a--z 0--9 . , ; : ! ? \textquotesingle\ - \# \$ \% \& \textasciicircum\ \textunderscore\ \textasciigrave\, \textasciitilde\ \textbackslash\ @ \textasteriskcentered\ \{ \} [ ]}
+In general, an active quote may be any single character with category code 12 or 13, or any multibyte \utf sequence representing a single character. However, there are a few exceptions: numbers, punctuation marks, the apostrophe, the hyphen, and all characters which are part of the \latex syntax are rejected. In sum, the following characters will be considered as reserved by this package: \texttt{A--Z a--z 0--9 . , ; : ! ? \textquotesingle\ - \# \$ \% \& \textasciicircum\ \textunderscore\ \textasciigrave\, \textasciitilde\ \textbackslash\ @ \textasteriskcentered\ \{ \} [ ]}
\subsection{Invalid nesting and unbalanced active quotes}
\label{hnt:grp}
@@ -941,24 +1330,24 @@ Every quotation forms a group which includes both the quoted piece of text and t
The commands provided by this package are designed for use in text mode. If you inadvertently use them in math mode, they will issue an error message. Note that all active quotes retain their original function in math mode. It is perfectly possible to use a character like the greater-than symbol as an active quote without interfering with math mode.
-In a verbatim context, the active quotes will normally be disabled. If a character is in the range 128--255, however, its original function is restored so that the \sty{inputenc} package may handle it in verbatim environments. This implies that \sty{inputenc} must be loaded before any active quotes are allocated. This feature is available with the standard verbatim environments as well as those provided by (or defined via) the packages \sty{verbatim}, \sty{fancyvrb}, \sty{moreverb}, and \sty{alltt}. This also applies to the \cmd{verb} command and the \sty{shortvrb} package. The \sty{listings} package provides dedicated support for extended input encodings. When using this package, activate its <extended characters> option and specify the input encoding. As of this writing, the \sty{listings} package does not support \acr{UTF-8} encoding.
+In a verbatim context, the active quotes will normally be disabled. If a character is in the range 128--255, however, its original function is restored so that the \sty{inputenc} package may handle it in verbatim environments. This implies that \sty{inputenc} must be loaded before any active quotes are allocated. This feature is available with the standard verbatim environments as well as those provided by (or defined via) the packages \sty{verbatim}, \sty{fancyvrb}, \sty{moreverb}, and \sty{alltt}. This also applies to the \cmd{verb} command and the \sty{shortvrb} package. The \sty{listings} package provides dedicated support for extended input encodings. When using this package, activate its <extended characters> option and specify the input encoding. As of this writing, the \sty{listings} package does not support \utf encoding.
Some care is still required when choosing active quotes. Note that you normally cannot use active characters in the argument to commands expecting a string of characters, such as \cmd{input}, \cmd{label}, or \cmd{cite}. There are two packages which try to remedy this situation: the \sty{babel} package and the \sty{underscore} package (when loaded with the \opt{strings} option). Both packages redefine several standard commands affected by this general problem. If any one of these packages is loaded, \sty{csquotes} will take advantage of all improvements automatically. Unfortunately, both packages patch a different set of commands and neither one covers all possibly vulnerable commands.
\subsection{\pdf strings and \sty{hyperref} support}
\label{hnt:pdf}
-This package interfaces with the \sty{hyperref} package as \pdf strings such as bookmarks are generated. See section \ref{cfg:pdf} on how to configure the quotation marks used in \pdf strings. Support for \pdf strings is only available with the basic facilities presented in sections \ref{bas:reg} and \ref{bas:bbl} as well as \ref{act:reg} and \ref{act:bbl}. Be advised that the way \sty{hyperref} builds \pdf strings imposes severe limitations on the capabilities of all commands. Most notably, the nesting level of quotations cannot be tracked in this context. Nested quotations will generally get outer marks, but you may use starred commands or active inner quotes to request inner marks explicitly. If quotation marks are to be included in the document properties of a \pdf file, you must use \cmd{hypersetup} to specify the strings. The replacement mechanism will not function within the optional argument to \cmd{usepackage}. For information about \pdf strings see the \sty{hyperref} documentation.
+This package interfaces with the \sty{hyperref} package as \pdf strings such as bookmarks are generated. See \secref{cfg:pdf} on how to configure the quotation marks used in \pdf strings. Support for \pdf strings is only available with the basic facilities presented in \secref{bas:reg,bas:bbl} as well as \secref{act:reg,act:bbl}. Be advised that the way \sty{hyperref} builds \pdf strings imposes severe limitations on the capabilities of all commands. Most notably, the nesting level of quotations cannot be tracked in this context. Nested quotations will generally get outer marks, but you may use starred commands or active inner quotes to request inner marks explicitly. If quotation marks are to be included in the document properties of a \pdf file, you must use \cmd{hypersetup} to specify the strings. The replacement mechanism will not function within the optional argument to \cmd{usepackage}. For information about \pdf strings see the \sty{hyperref} documentation.
\subsection{Footnotes inside quotations}
\label{hnt:ftn}
-This package will automatically reset the nesting level within any footnote included in a quotation. If the \sty{babel} package has been loaded, it will also reset the language. The language of the footnote text including the hyphenation patterns will match the language of the text surrounding the quotation. This applies to parboxes, minipages, and floats as well.
+This package will automatically reset the nesting level within any footnote included in a quotation. If the \sty{babel} or the \sty{polyglossia} package has been loaded, it will also reset the language. The language of the footnote text including the hyphenation patterns will match the language of the text surrounding the quotation. This applies to parboxes, minipages, and floats as well.
\subsection{Using \sty{csquotes} with \sty{babel}'s shorthands}
\label{hnt:bbl}
-The commands discussed in section \ref{aut:amk} may be combined with the shorthands of the \sty{babel} package such that \sty{babel} provides the user interface and \sty{csquotes} the backend. For example, the German module of the \sty{babel} package defines, amongst other things, the shorthands |"`| and |"'|. Such shorthands are input aids, \ie physical markup elements with a fixed definition. Typing |"`| is a short way of saying |\quotedblbase| but it is not different in concept. These shorthands can be transformed into <smart quotes> which behave like \cmd{enquote}. Here is a simple ad~hoc solution suitable for documents with only one language:
+The commands discussed in \secref{aut:amk} may be combined with the shorthands of the \sty{babel} package such that \sty{babel} provides the user interface and \sty{csquotes} the backend.\footnote{This also applies to the \sty{polyglossia} package if the \opt{babelshorthands} option of \sty{polyglossia} has been enabled.} For example, the German module of the \sty{babel} package defines, amongst other things, the shorthands |"`| and |"'|. Such shorthands are input aids, \ie physical markup elements with a fixed definition. Typing |"`| is a short way of saying |\quotedblbase| but it is not different in concept. These shorthands can be transformed into <smart quotes> which behave like \cmd{enquote}. Here is a simple ad~hoc solution suitable for documents with only one language:
\begin{ltxexample}[upquote]
\documentclass{...}
@@ -980,15 +1369,15 @@ It is possible to move such definitions to \path{csquotes.cfg}. In this case, th
{}}
\end{ltxcode}
%
-This code redefines the shorthands only if the \sty{babel} package has been loaded and the main language is \texttt{german}. Note that \sty{babel}'s shorthands are language"=specific. The way they are configured and handled is technically and conceptually different from the active quotes discussed in section \ref{act}. Active quotes are defined globally and automatically adapt to the current language. With \sty{babel}, each language has its own set of shorthands. Also note that \sty{babel} uses \cmd{AtBeginDocument} to initialize the main document language, including the corresponding shorthands. We use \cmd{AtEndPreamble} to defer the code until the end of the preamble. This way, we can be sure that \sty{babel} has been loaded but that the main document language has not been initialized yet. See the \sty{babel} manual for further details. The \cmd{AtEndPreamble} command is provided by the \sty{etoolbox} package.
+This code redefines the shorthands only if the \sty{babel} package has been loaded and the main language is \texttt{german}. Note that \sty{babel}'s shorthands are language"=specific. The way they are configured and handled is technically and conceptually different from the active quotes discussed in \secref{act}. Active quotes are defined globally and automatically adapt to the current language. With \sty{babel}, each language has its own set of shorthands. Also note that \sty{babel} uses \cmd{AtBeginDocument} to initialize the main document language, including the corresponding shorthands. We use \cmd{AtEndPreamble} to defer the code until the end of the preamble. This way, we can be sure that \sty{babel} has been loaded but that the main document language has not been initialized yet. See the \sty{babel} manual for further details. The \cmd{AtEndPreamble} command is provided by the \sty{etoolbox} package.
\subsection{Miscellaneous notes about the predefined styles}
\label{hnt:pre}
-All variants of the \opt{french} style use spaced out guillemets as outer marks. The style variant \opt{quotes} uses double quotes as inner marks. The starred variant \opt{quotes*} is similar to its regular counterpart except that it will also space out the inner marks. The \opt{guillemets} variant employs spaced out guillemets on all levels. It will also insert guillemets at the beginning of every paragraph inside a quotation spanning multiple paragraphs. In addition to that, two adjoining marks at the end of a quotation are replaced by a single one; if two nested quotations end simultaneously, the second closing mark is omitted automatically. The starred variant \opt{guillemets*} is similar to its regular counterpart, differing only in the middle mark inserted at the beginning of every paragraph. The regular variant uses a left"=pointing guillemet whereas the starred one uses a right"=pointing one.
-
There are three styles which serve a special purpose: \opt{default}, \opt{fallback}, and \opt{debug}. The \opt{default} style is a dynamic alias pointing to the default quote style used if the multilingual interface is not enabled. The package option \opt{style} and the command \cmd{setquotestyle} will redefine this alias. The \opt{fallback} style is a backend style used as a fallback whenever the multilingual interface is enabled but there is no matching quote style for the current language. It will print bold question marks by default. The \opt{debug} style will not print quotation marks but the current quote level as a bold number. This style may be selected using the \opt{style} option or the \cmd{setquotestyle} command. It is intended for debugging only.
+All variants of the \opt{french} style use spaced out guillemets as outer marks. The style variant \opt{quotes} uses double quotes as inner marks. The starred variant \opt{quotes*} is similar to its regular counterpart except that it will also space out the inner marks. The \opt{guillemets} variant employs spaced out guillemets on all levels. It will also insert guillemets at the beginning of every paragraph inside a quotation spanning multiple paragraphs. In addition to that, two adjoining marks at the end of a quotation are replaced by a single one; if two nested quotations end simultaneously, the second closing mark is omitted automatically. The starred variant \opt{guillemets*} is similar to its regular counterpart, differing only in the middle mark inserted at the beginning of every paragraph. The regular variant uses a left"=pointing guillemet whereas the starred one uses a right"=pointing one.
+
\section{Author interface}
\label{aut}
@@ -997,23 +1386,23 @@ The following sections discuss the programmer interface to the \sty{csquotes} pa
\subsection{Controlling active quotes}
\label{aut:ctl}
-The author commands in this section behave essentially like the corresponding user commands discussed in section \ref{act:ctl}. The only difference is that they work quietly behind the scenes without writing any notices to the transcript file. The scope of these commands is local so that all changes may be confined to a group. Note that the active quotes are enabled at the beginning of the document body. Under no circumstances will this package make any characters active in the document preamble. You will only need the following commands when dealing with active quotes at the beginning of or in the document body.
+The author commands in this section behave essentially like the corresponding user commands discussed in \secref{act:ctl}. The only difference is that they work quietly behind the scenes without writing any notices to the transcript file. The scope of these commands is local so that all changes may be confined to a group. Note that the active quotes are enabled at the beginning of the document body. Under no circumstances will this package make any characters active in the document preamble. You will only need the following commands when dealing with active quotes at the beginning of or in the document body.
\begin{ltxsyntax}
\csitem{@enablequotes}
-This command enables all characters allocated as active quotes. It also restores their definitions if they were disabled or accidentally overwritten. With single-byte encodings, this command (re)defines all allocated characters and makes them active. With \acr{UTF-8} encoding, it redefines the internal macro used by the \sty{inputenc} package to typeset the respective \acr{UTF-8} sequence (\cmd{u8:}\prm{character}). \acr{UTF-8} characters in the range 0--127 are handled as with single-byte encodings.
+This command enables all characters allocated as active quotes. It also restores their definitions if they were disabled or accidentally overwritten. With single-byte encodings, this command (re)defines all allocated characters and makes them active. With \utf encoding, it redefines the internal macro used by the \sty{inputenc} package to typeset the respective \utf sequence (\cmd{u8:}\prm{character}). \utf characters in the range 0--127 are handled as with single-byte encodings. When using a \tex engine with native \utf support, such as \xetex, all characters are handled as with single-byte encodings.
\csitem{@disablequotes}
-This command restores the \emph{status quo ante} of all active quotes. With single-byte encodings, there are two possible cases. (1) If a character had already been active when it was allocated as active quote, its former definition is restored. (2) If a character had not been active when it was allocated, its former category code is restored. With \acr{UTF-8} encoding, this command restores the former definition of the internal macro used by the \sty{inputenc} package to typeset the respective \acr{UTF-8} sequence. \acr{UTF-8} characters in the range 0--127 are handled as with single-byte encodings.
+This command restores the \emph{status quo ante} of all active quotes. With single-byte encodings, there are two possible cases. (1) If a character had already been active when it was allocated as active quote, its former definition is restored. (2) If a character had not been active when it was allocated, its former category code is restored. With \utf encoding, this command restores the former definition of the internal macro used by the \sty{inputenc} package to typeset the respective \utf sequence. \utf characters in the range 0--127 are handled as with single-byte encodings. When using a \tex engine with native \utf support, such as \xetex, all characters are handled as with single-byte encodings.
\csitem{@verbatimquotes}
For verbatim environments and similar applications, use this command rather than \cmd{@disablequotes}. It redefines the active quotes in a way that is better suited for verbatim typesetting. With single-byte encodings, it will do one of the following things. (1) If a character is in the range 0--127, it is redefined such that it expands to itself with category code 12. (2) If a character is in the range 128--255, there are two possibilities. (a) If it had already been active when it was allocated, its former definition is restored. (b) If it had not been active before, it is redefined such that it expands to itself with its former category code.
-Characters in the range 0--127 are added to the \cmd{dospecials} list. Characters in the range 128--255 remain active, permitting the \sty{inputenc} package to typeset them verbatim (due to case 2a, which implies that you must load \sty{inputenc} before allocating active quotes). Case 2b is usually undesirable in verbatim environments. If \sty{inputenc} is loaded, however, this should not happen. With \acr{UTF-8} encoding, this command restores the former definition of the internal macro used by the \sty{inputenc} package to typeset the respective \acr{UTF-8} sequence. \acr{UTF-8} characters in the range 0--127 are handled as with single-byte encodings.
+Characters in the range 0--127 are added to the \cmd{dospecials} list. Characters in the range 128--255 remain active, permitting the \sty{inputenc} package to typeset them verbatim (due to case 2a, which implies that you must load \sty{inputenc} before allocating active quotes). Case 2b is usually undesirable in verbatim environments. If \sty{inputenc} is loaded, however, this should not happen. With \utf encoding, this command restores the former definition of the internal macro used by the \sty{inputenc} package to typeset the respective \utf sequence. \utf characters in the range 0--127 are handled as with single-byte encodings. When using a \tex engine with native \utf support, such as \xetex, all characters are handled as with single-byte encodings.
Due to case 1, \cmd{@verbatimquotes} itself is independent of any \cmd{dospecials} processing. You may typeset all active quotes verbatim by using this command exclusively. The advantage of this approach is that it does not require any category code changes, hence this command may also be used to modify an argument after it has been read. Also note that the standard \latex verbatim environments as well as all environments provided by or defined via the packages \sty{verbatim}, \sty{fancyvrb}, \sty{moreverb}, and \sty{alltt} are catered for automatically. This also applies to the \cmd{verb} command and the \sty{shortvrb} package.
@@ -1039,11 +1428,10 @@ When writing a package which may have to process user"=supplied arguments in a s
This is best done in a group. If grouping is not feasible, you must ensure that the switch is properly restored. In contrast to using \cmd{@safe@activestrue}, this approach works even if \sty{babel} is not loaded. However, note that you must take three states into account when restoring the switch in this case: true, false, and undefined. Taking the approach of the \sty{underscore} package, you may also do the following:
\begin{ltxcode}
-\let\@@protect\protect
-\let\protect\string
+\let\@@protect\protect \let\protect\string
\end{ltxcode}
%
-This could either be done in a group or without any grouping, but followed by \cmd{restore@protect}. The first approach works with the active characters of the \sty{babel} and the \sty{underscore} packages. The second one works with the \sty{underscore} and the \sty{at} packages. Unfortunately, the active characters of the \sty{inputenc} package support neither of the above"=mentioned techniques. As far as \sty{csquotes} is concerned, it does not matter which approach you take. In both cases all active quotes expand to themselves with category code 12. \acr{UTF-8} encoded active quotes expand to a string of characters with category code 12. This string will be valid \acr{UTF-8}. In a verbatim \cmd{write} operation, you should employ one of the techniques discussed in this section rather than \cmd{@verbatimquotes}, which is geared to verbatim typesetting.
+This could either be done in a group or without any grouping, but followed by \cmd{restore@protect}. The first approach works with the active characters of the \sty{babel} and the \sty{underscore} packages. The second one works with the \sty{underscore} and the \sty{at} packages. Unfortunately, the active characters of the \sty{inputenc} package support neither of the above"=mentioned techniques. As far as \sty{csquotes} is concerned, it does not matter which approach you take. In both cases all active quotes expand to themselves with category code 12. With macro-level \utf support, \utf encoded active quotes expand to a string of characters with category code 12. This string will be valid \utf. In a verbatim \cmd{write} operation, you should employ one of the techniques discussed in this section rather than \cmd{@verbatimquotes}, which is geared to verbatim typesetting.
\subsection{Block quotations}
\label{aut:blk}
@@ -1061,7 +1449,7 @@ The \prm{code} may be arbitrary \latex code which redefines vulnerable commands
\subsection{Registering quotation marks}
\label{aut:sfc}
-In order to track punctuation marks inside quotations, this package requires that all quotation marks be transparent to the space factor, \ie that they have a space factor code of zero. This setting is specific to the output encoding. Settings for the encodings \acr{OT1}, \acr{OT2}, \acr{OT4}, \acr{T1}, \acr{LY1}, \acr{LGR}, \acr{T2A}, \acr{T2B}, \acr{T2C}, \acr{LCY}, \acr{X2}, and \acr{EU1} are provided by default. Other encodings may be set up in the configuration file using the following command:
+In order to track punctuation marks inside quotations, this package requires that all quotation marks be transparent to the space factor, \ie that they have a space factor code of zero. This setting is specific to the output encoding. Settings for the encodings \acr{OT1}, \acr{OT2}, \acr{OT4}, \acr{T1}, \acr{LY1}, \acr{LGR}, \acr{T2A}, \acr{T2B}, \acr{T2C}, \acr{LCY}, \acr{X2}, \acr{EU1}, and \acr{EU2} are provided by default. Other encodings may be set up in the configuration file using the following command:
\begin{ltxsyntax}
\cmditem{DeclareQuoteGlyph}{encoding}{position}
@@ -1081,7 +1469,7 @@ The \prm{position} argument may use any notation accepted by \tex in integer ass
\subsection{Automatic quotation marks}
\label{aut:amk}
-The commands in this section provide access to the automatic quotation facilities at a slightly lower level than the user commands in sections \ref{bas:reg} and \ref{act:reg}. In contrast to the commands discussed in section \ref{aut:imk}, the facilities in this section are fully"=fledged markup elements which verify the nesting level and issue an error if quotations are nested in an invalid way. They form groups and must always be balanced, see section \ref{hnt:grp} for details. In other words, the facilities in this section are semantic markup elements, the ones in section \ref{aut:imk} are physical markup elements.
+The commands in this section provide access to the automatic quotation facilities at a slightly lower level than the user commands in \secref{bas:reg,act:reg}. In contrast to the commands discussed in \secref{aut:imk}, the facilities in this section are fully"=fledged markup elements which verify the nesting level and issue an error if quotations are nested in an invalid way. They form groups and must always be balanced, see \secref{hnt:grp} for details. In other words, the facilities in this section are semantic markup elements, the ones in \secref{aut:imk} are physical markup elements.
\begin{ltxsyntax}
@@ -1099,7 +1487,7 @@ In terms of their function, the above commands correspond to the regular version
\end{ltxsyntax}
-The above commands may be used to implement an alternative user interface. For example, you can combine them with the shorthands of the \sty{babel} package such that \sty{babel} provides the user interface and \sty{csquotes} the backend. See section \ref{hnt:bbl} and the \sty{babel} manual for details.
+The above commands may be used to implement an alternative user interface. For example, you can combine them with the shorthands of the \sty{babel} package such that \sty{babel} provides the user interface and \sty{csquotes} the backend. See \secref{hnt:bbl} and the \sty{babel} manual for details.
\subsection{Internal quotation marks}
\label{aut:imk}
@@ -1131,15 +1519,81 @@ The scope of these hooks must always be confined to a group.
\section{Revision history}
-This revision history is a list of changes relevant to users of this package. Changes of a more technical nature which do not affect the user interface or the behavior of the package are not included in the list. If an entry in the revision history states that a feature has been \emph{extended}, this indicates a syntactically backwards compatible modification, such as the addition of an optional argument to an existing command. Entries stating that a feature has been \emph{modified} demand attention. They indicate a modification which may require changes to existing documents in some, hopefully rare, cases. The numbers on the right indicate the relevant section of this manual.
+This revision history is a list of changes relevant to users of this package. Changes of a more technical nature which do not affect the user interface or the behavior of the package are not included in the list. If an entry in the revision history states that a feature has been \emph{extended}, this indicates a syntactically backwards compatible modification, such as the addition of an optional argument to an existing command. Entries stating that a feature has been \emph{modified}, \emph{renamed}, or \emph{removed} demand attention. They indicate a modification which may require changes to existing documents in some, hopefully rare, cases. The \opt{version} option from \secref{opt:opt} may be helpful in this case. The numbers on the right indicate the relevant section of this manual.
\begin{changelog}
+\begin{release}{5.0}{2010-06-02}
+
+\item Renamed package option \opt{babel} to \opt{autostyle}\see{opt:opt}
+\item Added compatibility option \opt{babel}\see{opt:leg}
+\item Added preliminary \sty{polyglossia} interface\see{opt:opt}
+\item Added package option \opt{autopunct}\see{opt:opt}
+\item Added package option \opt{version}\see{opt:leg}
+\item Added \cmd{hybridblockquote}\see{bas:blk:bbl}
+\item Added \cmd{hybridblockcquote}\see{int:blk:bbl}
+\item Added \cmd{MakeHybridBlockQuote}\see{act:blk:bbl}
+\item Added \cmd{DeclareAutoPunct}\see{cfg:dap}
+\item Extended \cmd{textquote}\see{bas:txt:reg}
+\item Extended \cmd{foreigntextquote}\see{bas:txt:bbl}
+\item Extended \cmd{hyphentextquote}\see{bas:txt:bbl}
+\item Extended \cmd{blockquote}\see{bas:blk:reg}
+\item Extended \cmd{foreignblockquote}\see{bas:blk:bbl}
+\item Extended \cmd{hyphenblockquote}\see{bas:blk:bbl}
+\item Extended \cmd{textcquote}\see{int:txt:reg}
+\item Extended \cmd{foreigntextcquote}\see{int:txt:bbl}
+\item Extended \cmd{hyphentextcquote}\see{int:txt:bbl}
+\item Extended \cmd{blockcquote}\see{int:blk:reg}
+\item Extended \cmd{foreignblockcquote}\see{int:blk:bbl}
+\item Extended \cmd{hyphenblockcquote}\see{int:blk:bbl}
+\item Added \cmd{mktextquote}\see{cfg:aux}
+\item Added \cmd{mkblockquote}\see{cfg:aux}
+\item Added \cmd{mkbegdispquote}\see{cfg:aux}
+\item Added \cmd{mkenddispquote}\see{cfg:aux}
+\item Removed \cmd{mkpretextpunct}\see{cfg:aux}
+\item Removed \cmd{mkmidtextpunct}\see{cfg:aux}
+\item Removed \cmd{mkfintextpunct}\see{cfg:aux}
+\item Removed \cmd{mkpreblockpunct}\see{cfg:aux}
+\item Removed \cmd{mkmidblockpunct}\see{cfg:aux}
+\item Removed \cmd{mkfinblockpunct}\see{cfg:aux}
+\item Removed \cmd{mkpredisppunct}\see{cfg:aux}
+\item Removed \cmd{mkmiddisppunct}\see{cfg:aux}
+\item Removed \cmd{mkfindisppunct}\see{cfg:aux}
+\item Removed \cmd{quotetext}\see{cfg:aux}
+\item Removed \cmd{quoteblock}\see{cfg:aux}
+\item Renamed \cmd{ifquotepunct} to \cmd{ifpunct}\see{cfg:tst}
+\item Renamed \cmd{ifquoteterm} to \cmd{ifterm}\see{cfg:tst}
+\item Added \cmd{ifpunctmark}\see{cfg:tst}
+\item Removed \cmd{ifquotecolon}\see{cfg:tst}
+\item Removed \cmd{ifquotecomma}\see{cfg:tst}
+\item Removed \cmd{ifquoteexclam}\see{cfg:tst}
+\item Removed \cmd{ifquoteperiod}\see{cfg:tst}
+\item Removed \cmd{ifquotequestion}\see{cfg:tst}
+\item Removed \cmd{ifquotesemicolon}\see{cfg:tst}
+\item Renamed \cmd{ifstringblank} to \cmd{ifblank}\see{cfg:tst}
+\item Added \cmd{unspace}\see{cfg:tst}
+\item Added \cmd{textelp}\see{aux}
+\item Added \cmd{textins}\see{aux}
+\item Added \cmd{mktextelp}\see{cfg:elp}
+\item Added \cmd{mktextelpins}\see{cfg:elp}
+\item Added \cmd{mktextinselp}\see{cfg:elp}
+\item Added \cmd{mktextins}\see{cfg:elp}
+\item Added \cmd{mktextmod}\see{cfg:elp}
+\item Expanded documentation\see{use:hok}
+\item Removed \cmd{cquote} legacy alias (use \cmd{textcquote} instead)\see{int:txt:reg}
+\item Removed \cmd{foreigncquote} legacy alias (use \cmd{foreigntextcquote})\see{int:txt:bbl}
+\item Removed \cmd{hyphencquote} legacy alias (use \cmd{hyphentextcquote})\see{int:txt:bbl}
+\item Removed \cmd{RestoreQuotes} legacy alias (use \cmd{EnableQuotes})\see{act:ctl}
+\item Removed \cmd{@restorequotes} legacy alias (use \cmd{@enablequotes})\see{aut:ctl}
+\item Added support for \acr{EU2} encoding\see{aut:sfc}
+\item Added quote style for Croatian
+\end{release}
+
\begin{release}{4.4d}{2010-02-06}
\item Added quote style for Dutch
\item Added quote style for Finnish
\item Added quote style for Greek
-\item Added support for \acr{LGR} encoding
+\item Added support for \acr{LGR} encoding\see{aut:sfc}
\end{release}
\begin{release}{4.4c}{2009-09-23}
@@ -1147,27 +1601,27 @@ This revision history is a list of changes relevant to users of this package. Ch
\end{release}
\begin{release}{4.4b}{2009-07-24}
-\item Fixed bug in glyph declarations for \acr{EU1} encoding
+\item Fixed bug in glyph declarations for \acr{EU1} encoding\see{aut:sfc}
\end{release}
\begin{release}{4.4a}{2009-07-04}
-\item Added support for \acr{EU1} encoding
+\item Added support for \acr{EU1} encoding\see{aut:sfc}
\item Added quote style for Brazilian
\item Added preliminary quote style for Portuguese
\end{release}
\begin{release}{4.4}{2009-05-30}
-\item Added package option \opt{maxlevel}\see{opt}
+\item Added package option \opt{maxlevel}\see{opt:opt}
\item Added special quote style \opt{debug}\see{hnt:pre}
\item Added \cmd{DeclareQuoteGlyph}\see{aut:sfc}
-\item Added support for \acr{OT2} and \acr{OT4} encodings
-\item Added support for \acr{T2A}, \acr{T2B}, \acr{T2C}, \acr{X2} encodings
-\item Added support for \acr{LCY} encoding
+\item Added support for \acr{OT2} and \acr{OT4} encodings\see{aut:sfc}
+\item Added support for \acr{T2A}, \acr{T2B}, \acr{T2C}, \acr{X2} encodings\see{aut:sfc}
+\item Added support for \acr{LCY} encoding\see{aut:sfc}
\item Added quote style for Russian
\end{release}
\begin{release}{4.3}{2008-11-23}
-\item Made package option \kvopt{babel}{tryonce} the default setting\see{opt}
+\item Made package option \kvopt{babel}{tryonce} the default setting\see{opt:opt}
\item Internal updates for \path{biblatex} package
\end{release}
@@ -1182,11 +1636,11 @@ This revision history is a list of changes relevant to users of this package. Ch
\begin{release}{4.0}{2008-03-02}
\item \etex now mandatory requirement\see{int:req}
\item New dependency on \sty{etoolbox} package\see{int:req}
-\item Added package option \opt{spanish}\see{opt}
-\item Added variant \opt{mexican} to style \opt{spanish}\see{opt}
-\item Removed variant \opt{oldstyle} from \opt{english} style\see{opt}
-\item Removed variant \opt{oldstyle} from \opt{french} style\see{opt}
-\item Removed variant \opt{imprimerie} from \opt{french} style\see{opt}
+\item Added package option \opt{spanish}\see{opt:opt}
+\item Added variant \opt{mexican} to style \opt{spanish}\see{opt:opt}
+\item Removed variant \opt{oldstyle} from \opt{english} style\see{opt:opt}
+\item Removed variant \opt{oldstyle} from \opt{french} style\see{opt:opt}
+\item Removed variant \opt{imprimerie} from \opt{french} style\see{opt:opt}
\item Expanded documentation\see{hnt:bbl}
\item Added \cmd{openautoquote} and \cmd{closeautoquote}\see{aut:amk}
\item Added \cmd{openinnerquote} and \cmd{closeinnerquote}\see{aut:amk}
@@ -1196,22 +1650,22 @@ This revision history is a list of changes relevant to users of this package. Ch
\end{release}
\begin{release}{3.8}{2008-01-05}
-\item Added variant \opt{guillemets*} to style \opt{swedish}\see{opt}
+\item Added variant \opt{guillemets*} to style \opt{swedish}\see{opt:opt}
\item Added language alias \opt{australian}\see{cfg:als}
\item Added language alias \opt{newzealand}\see{cfg:als}
\item Internal improvements
\end{release}
\begin{release}{3.7}{2007-03-25}
-\item Added package option \kvopt{babel}{try}\see{opt}
-\item Added package option \kvopt{babel}{tryonce}\see{opt}
+\item Added package option \kvopt{babel}{try}\see{opt:opt}
+\item Added package option \kvopt{babel}{tryonce}\see{opt:opt}
\item Added \cmd{MakeAutoQuote*}\see{act:reg}
\item Added \cmd{MakeForeignQuote*}\see{act:bbl}
\item Added \cmd{MakeHyphenQuote*}\see{act:bbl}
\item Added \cmd{mkpretextpunct}\see{cfg:aux}
\item Added \cmd{mkpreblockpunct}\see{cfg:aux}
\item Added \cmd{mkpredisppunct}\see{cfg:aux}
-\item Dropped compatibility code for \cmd{blockcite} legacy command
+\item Removed compatibility code for \cmd{blockcite} legacy command
\item Internal updates for \path{biblatex} package
\end{release}
@@ -1239,7 +1693,7 @@ This revision history is a list of changes relevant to users of this package. Ch
\end{release}
\begin{release}{3.3}{2006-02-27}
-\item Added support for \acr{UTF-8} encoded active quotes\see{hnt:inc}
+\item Added support for \utf encoded active quotes\see{hnt:inc}
\item Modified active quotes, category codes 7, 8 no longer valid\see{hnt:val}
\item Modified delimiters, category codes 3, 4, 7, 8 no longer valid\see{hnt:val}
\item Active quotes may now be defined in the document body\see{act:ctl}
@@ -1247,7 +1701,7 @@ This revision history is a list of changes relevant to users of this package. Ch
\item Added \cmd{DeleteQuotes}\see{act:ctl}
\item Added \cmd{VerbatimQuotes}\see{act:ctl}
\item Added \cmd{ExecuteQuoteOptions}\see{cfg:exe}
-\item Added package option \kvopt{babel}{once}\see{opt}
+\item Added package option \kvopt{babel}{once}\see{opt:opt}
\item Added new style variant for French\see{hnt:pre}
\item Improved nesting control of active block quotes
\item Made active block quotes robust
@@ -1262,18 +1716,18 @@ This revision history is a list of changes relevant to users of this package. Ch
\item Added \cmd{textquote}\see{bas:txt:reg}
\item Added \cmd{foreigntextquote}\see{bas:txt:bbl}
\item Added \cmd{hyphentextquote}\see{bas:txt:bbl}
-\item Renamed \cmd{cquote} to \cmd{textcquote}\see{cit:txt:reg}
-\item Renamed \cmd{foreigncquote} to \cmd{foreigntextcquote}\see{cit:txt:bbl}
-\item Renamed \cmd{hyphencquote} to \cmd{hyphentextcquote}\see{cit:txt:bbl}
-\item Extended \cmd{textcquote}\see{cit:txt:reg}
-\item Extended \cmd{foreigntextcquote}\see{cit:txt:bbl}
-\item Extended \cmd{hyphentextcquote}\see{cit:txt:bbl}
+\item Renamed \cmd{cquote} to \cmd{textcquote}\see{int:txt:reg}
+\item Renamed \cmd{foreigncquote} to \cmd{foreigntextcquote}\see{int:txt:bbl}
+\item Renamed \cmd{hyphencquote} to \cmd{hyphentextcquote}\see{int:txt:bbl}
+\item Extended \cmd{textcquote}\see{int:txt:reg}
+\item Extended \cmd{foreigntextcquote}\see{int:txt:bbl}
+\item Extended \cmd{hyphentextcquote}\see{int:txt:bbl}
\item Modified environment \env{displayquote}\see{env:bas}
\item Modified environment \env{foreigndisplayquote}\see{env:bas}
\item Modified environment \env{hyphendisplayquote}\see{env:bas}
-\item Extended environment \env{displaycquote}\see{env:int}
-\item Extended environment \env{foreigndisplaycquote}\see{env:int}
-\item Extended environment \env{hyphendisplaycquote}\see{env:int}
+\item Extended environment \env{displaycquote}\see{env:cit}
+\item Extended environment \env{foreigndisplaycquote}\see{env:cit}
+\item Extended environment \env{hyphendisplaycquote}\see{env:cit}
\item Added \cmd{mkmidtextpunct}\see{cfg:aux}
\item Added \cmd{mkfintextpunct}\see{cfg:aux}
\item Added \cmd{mkmiddisppunct}\see{cfg:aux}
@@ -1282,7 +1736,7 @@ This revision history is a list of changes relevant to users of this package. Ch
\item Added detection of paragraphs to all block quotation facilities\see{bas:blk:reg}
\item \cmd{ifquote...} now usable in \cmd{mkcitation} and \cmd{mkccitation}\see{cfg:tst}
\item Terminal punctuation now evaluated by all quotation facilities
-\item Prevent undesirable ?{}` and !{}` ligatures in \acr{T1} encoding
+\item Prevent undesirable |?`| and |!`| ligatures in \acr{T1} encoding
\item Always adjust space factor codes of backend quotes
\end{release}
@@ -1291,18 +1745,18 @@ This revision history is a list of changes relevant to users of this package. Ch
\item Extended \cmd{foreignblockquote}\see{bas:blk:bbl}
\item Extended \cmd{hyphenblockquote}\see{bas:blk:bbl}
\item Extended \cmd{setquotestyle}\see{bas:set}
-\item Added \cmd{cquote}\see{cit:txt:reg}
-\item Added \cmd{foreigncquote}\see{cit:txt:bbl}
-\item Added \cmd{hyphencquote}\see{cit:txt:bbl}
-\item Added \cmd{blockcquote}\see{cit:blk:reg}
-\item Added \cmd{foreignblockcquote}\see{cit:blk:bbl}
-\item Added \cmd{hyphenblockcquote}\see{cit:blk:bbl}
+\item Added \cmd{cquote}\see{int:txt:reg}
+\item Added \cmd{foreigncquote}\see{int:txt:bbl}
+\item Added \cmd{hyphencquote}\see{int:txt:bbl}
+\item Added \cmd{blockcquote}\see{int:blk:reg}
+\item Added \cmd{foreignblockcquote}\see{int:blk:bbl}
+\item Added \cmd{hyphenblockcquote}\see{int:blk:bbl}
\item Added environment \env{displayquote}\see{env:bas}
\item Added environment \env{foreigndisplayquote}\see{env:bas}
\item Added environment \env{hyphendisplayquote}\see{env:bas}
-\item Added environment \env{displaycquote}\see{env:int}
-\item Added environment \env{foreigndisplaycquote}\see{env:int}
-\item Added environment \env{hyphendisplaycquote}\see{env:int}
+\item Added environment \env{displaycquote}\see{env:cit}
+\item Added environment \env{foreigndisplaycquote}\see{env:cit}
+\item Added environment \env{hyphendisplaycquote}\see{env:cit}
\item Modified \cmd{DeclarePlainStyle}\see{cfg:pdf}
\item Added \cmd{SetCiteCommand}\see{cfg:blk}
\item Renamed \cmd{blockcite} to \cmd{mkcitation}\see{cfg:aux}
@@ -1407,8 +1861,8 @@ This revision history is a list of changes relevant to users of this package. Ch
\item Added support for middle outer quotes\see{cfg:sty}
\item Added support for kerning between adjoining quotes\see{cfg:sty}
\item Disable active characters in math and display math mode\see{hnt:mod}
-\item Revised and improved error recovery\see{opt}
-\item Added package option \opt{strict}\see{opt}
+\item Revised and improved error recovery\see{opt:opt}
+\item Added package option \opt{strict}\see{opt:opt}
\item Added package option and new style variants for French
\item Added package option and new style variant for Italian
\item Added new style variant for English