texlive[42841] Master/texmf-dist: csquotes (28dec16)
commits+karl at tug.org
commits+karl at tug.org
Tue Jan 3 00:50:05 CET 2017
Revision: 42841
http://tug.org/svn/texlive?view=revision&revision=42841
Author: karl
Date: 2017-01-03 00:50:05 +0100 (Tue, 03 Jan 2017)
Log Message:
-----------
csquotes (28dec16)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/csquotes/csquotes.pdf
trunk/Master/texmf-dist/doc/latex/csquotes/csquotes.tex
trunk/Master/texmf-dist/tex/latex/csquotes/csq-compat.def
trunk/Master/texmf-dist/tex/latex/csquotes/csquotes.def
trunk/Master/texmf-dist/tex/latex/csquotes/csquotes.sty
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/latex/csquotes/RELEASE.md
Deleted: trunk/Master/texmf-dist/doc/latex/csquotes/RELEASE.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/csquotes/RELEASE.md 2017-01-02 23:49:51 UTC (rev 42840)
+++ trunk/Master/texmf-dist/doc/latex/csquotes/RELEASE.md 2017-01-02 23:50:05 UTC (rev 42841)
@@ -1,95 +0,0 @@
-# Release notes for version 5.1
-
-## Improved block quotation facilities
-
-The highlight of this release is an extension of the block
-quotation facilities. When measuring the length of a quotation,
-`\blockquote` and related commands can determine either the word
-count or the number of lines. See the pointers in the changelog
-for details.
-
-# Release notes for version 5.0
-
-## Backwards compatibility
-
-This release introduces some changes which are not backwards
-compatible out of the box. In order to ease the transition to the
-new version, I've implemented a 'version' option which emulates
-older versions of `csquotes`.
-
-It is quite possible that you do not need to set this option at
-all, even though you have older documents using `csquotes`. You
-only need the 'version' option in older documents if:
-
- - you are using the `<punct>` argument of `\blockquote` and/or
- - you have redefined any of the old
- `\mk(pre|mid|fin)(text|block|disp)punct` hooks.
-
-If these conditions do not apply and you run 5.0 with the default
-settings, the output will be similar to 4.4. There is absolutely
-no need to set `version=4.4` if you didn't use the old hooks and
-the `<punct>` argument of `\blockquote` anyway.
-
-I've also removed some legacy aliases. This is rather old stuff
-from `csquotes` 3.x and even 2.x which has been marked as
-depreciated for some time. Setting `version=4.4` will restore
-them as well.
-
-## Punctuation look-ahead
-
-This release comes with a new punctuation look-ahead feature,
-i.e., in addition to the `<punct>` argument of advanced quotation
-commands like `\textquote`, these commands can now scan ahead for
-trailing punctuation after their last argument and move it around
-if desired.
-
-This is required by quoting conventions such as the US quotation
-style which 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 quoted text.
-
-The implementation of the look-ahead feature also implies a new
-interpretation of the optional `<punct>` argument supported by
-certain quotation commands. In previous version, the `<punct>`
-argument was intended for terminal punctuation which is NOT part
-of the quoted text. Starting with this release, it is intended
-for punctuation which IS part of the quoted text (but may need to
-be moved around).
-
-The modified syntax is more intuitive to use because terminal
-punctuation which is NOT part of the quoted text is simply placed
-after the last argument of the command, i.e.:
-
- \textquote[citation][.]{quoted text}
-
-becomes:
-
- \textquote[citation]{quoted text}.
-
-All of this is discussed at length in the manual. See the
-changelog in the manual for pointers to the relevant sections.
-
-## Revised quotation hooks
-
-The old quotation hooks:
-
- \mkpretextpunct
- \mkmidtextpunct
- \mkfintextpunct
- \mkpreblockpunct
- \mkmidblockpunct
- \mkfinblockpunct
- \mkpredisppunct
- \mkmiddisppunct
- \mkfindisppunct
-
-have been removed and are replaced by new hooks:
-
- \mktextquote
- \mkblockquote
- \mkbegdispquote
- \mkenddispquote
-
-which are much more powerful while being more intuitive to use.
-If you have been using the old hooks in some documents, set
-`version=4.4` to emulate the old interface.
Modified: trunk/Master/texmf-dist/doc/latex/csquotes/csquotes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/csquotes/csquotes.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/csquotes/csquotes.tex 2017-01-02 23:49:51 UTC (rev 42840)
+++ trunk/Master/texmf-dist/doc/latex/csquotes/csquotes.tex 2017-01-02 23:50:05 UTC (rev 42841)
@@ -18,8 +18,8 @@
url={http://www.ctan.org/pkg/csquotes/},
author={Philipp Lehman, Joseph Wright},
email={joseph.wright at morningstar2.co.uk},
- revision={v5.1h},
- date={2016/07/14}}
+ revision={v5.2},
+ date={2016/12/28}}
\hypersetup{%
pdftitle={The csquotes Package},
@@ -578,7 +578,7 @@
\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:
+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 square brackets or parentheses and, where appropriate, ellipses. Use the following commands to indicate such changes in formal quotations:
\begin{ltxsyntax}
@@ -606,6 +606,16 @@
\textins*{T}ext %= \textins*{T}ext %
\end{ltxcode}
%
+The deletion of individual letters may be indicated with the following command:
+
+\cmditem{textdel}{text}
+
+By default, \cmd{textdel} will output two square brackets. The omitted \prm{text} is not output.
+
+\begin{ltxcode}[escapechar={\%},escapebegin={\rmfamily}]
+ text\textdel{s} %= text\textdel{s} %
+\end{ltxcode}
+%
See \secref{cfg:elp} on how to configure the appearance of ellipses and insertions.
\end{ltxsyntax}
@@ -1010,10 +1020,10 @@
\end{ltxsyntax}
-\subsection{Configuring Ellipses}
+\subsection{Configuring Auxiliary Commands}
\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:
+The appearance of ellipses and insertions formatted with the auxiliary commands from \secref{aux} is controlled by six 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]}
@@ -1028,6 +1038,12 @@
\newcommand{<<\mktextmod>>}[1]{[#1]}
\end{ltxcode}
%
+The \cmd{textdel} command passes its \prm{text} argument to \cmd{mktextdel} for further processing. This is the default definition (note that the argument is not output):
+
+\begin{ltxcode}[showspaces=true]
+\newcommand{<<\mktextdel>>}[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}
@@ -1533,6 +1549,10 @@
\begin{changelog}
+\begin{release}{5.2}{2016-12-28}
+ \item Add \cmd{textdel} auxiliary command.\see{aux}
+\end{release}
+
\begin{release}{5.1h}{2016-07-14}
\item Adapt \cmd{fixligatures} to work correctly with \luatex
\end{release}
Modified: trunk/Master/texmf-dist/tex/latex/csquotes/csq-compat.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/csquotes/csq-compat.def 2017-01-02 23:49:51 UTC (rev 42840)
+++ trunk/Master/texmf-dist/tex/latex/csquotes/csq-compat.def 2017-01-02 23:50:05 UTC (rev 42841)
@@ -1,5 +1,5 @@
\ProvidesFile{csq-compat.def}
- [2016/07/14 v5.1h csquotes backwards compatibility (JAW)]
+ [2016/12/28 v5.2 csquotes backwards compatibility (JAW)]
\def\csq at getversion#1{%
\expandafter\csq at getversion@i
Modified: trunk/Master/texmf-dist/tex/latex/csquotes/csquotes.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/csquotes/csquotes.def 2017-01-02 23:49:51 UTC (rev 42840)
+++ trunk/Master/texmf-dist/tex/latex/csquotes/csquotes.def 2017-01-02 23:50:05 UTC (rev 42841)
@@ -1,5 +1,5 @@
\ProvidesFile{csquotes.def}
- [2016/07/14 v5.1h csquotes generic definitions (JAW)]
+ [2016/12/28 v5.2 csquotes generic definitions (JAW)]
% Set defaults
@@ -39,6 +39,12 @@
[0.025em]
{\quotesinglbase}
{\textquoteright}
+\DeclareQuoteStyle{czech}
+ {\quotedblbase}
+ {\textquotedblleft}
+ [0.025em]
+ {\quotesinglbase}
+ {\fixligatures\textquoteleft}
\DeclareQuoteStyle[quotes]{danish}
{\quotedblbase}
{\textquotedblleft}
@@ -182,6 +188,12 @@
[0.05em]
{\textquoteleft}
{\textquoteright}
+\DeclareQuoteStyle{slovak}
+ {\quotedblbase}
+ {\textquotedblleft}
+ [0.025em]
+ {\quotesinglbase}
+ {\fixligatures\textquoteleft}
\DeclareQuoteStyle[spanish]{spanish}% verified
{\guillemotleft}
[\guillemotright]
Modified: trunk/Master/texmf-dist/tex/latex/csquotes/csquotes.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/csquotes/csquotes.sty 2017-01-02 23:49:51 UTC (rev 42840)
+++ trunk/Master/texmf-dist/tex/latex/csquotes/csquotes.sty 2017-01-02 23:50:05 UTC (rev 42841)
@@ -12,7 +12,7 @@
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{csquotes}
- [2016/07/14 v5.1h context-sensitive quotations (JAW)]
+ [2016/12/28 v5.2 context-sensitive quotations (JAW)]
%% Compatibility and requirements
@@ -25,27 +25,7 @@
{Outdated 'etoolbox' package}
{Upgrade to etoolbox v1.7 (2008/06/28) or later.\MessageBreak
I found: '\csuse{ver at etoolbox.sty}'.\MessageBreak
- This is a fatal error. I'm aborting now.}%\documentclass{article}
-
-\usepackage{amsmath}
-\usepackage{xparse}
-\usepackage{xcolor}
-
-\NewDocumentCommand\MyMacro{k_}{%
- \IfNoValueTF{#1}{%
- \mathbf{A}
- }{%
- A_{\textcolor{red}{#1}}
- }%
-}
-
-\begin{document}
-
-With a subscript: $\MyMacro_{\pi}$
-
-Without any subscript: $\MyMacro$
-
-\end{document}
+ This is a fatal error. I'm aborting now.}
\endinput}
\@ifpackageloaded{inputenc}
@@ -2237,11 +2217,15 @@
\newrobustcmd*{\textins}{%
\@ifstar\mktextmod\mktextins}
+\newrobustcmd*{\textdel}{%
+ \mktextdel}
+
\newcommand{\mktextelp}{[\textellipsis\unkern]}
\newcommand{\mktextelpins}[1]{[\textellipsis\unkern] [#1]}
\newcommand{\mktextinselp}[1]{[#1] [\textellipsis\unkern]}
\newcommand{\mktextins}[1]{[#1]}
\newcommand{\mktextmod}[1]{[#1]}
+\newcommand{\mktextdel}[1]{[]}
%% Auxiliary commands for some styles
@@ -2408,10 +2392,6 @@
{\csq at info{Checking for multilingual support..}%
\@ifpackageloaded{polyglossia}
{\csq at info{... found 'polyglossia' package}%
- \csq at warning
- {Using preliminary 'polyglossia' interface.\MessageBreak
- Some of the multilingual features may not\MessageBreak
- work as expected\@gobble}%
\def\csq at main@language{\xpg at main@language}%
\csq at hook@multilang}
{\@ifpackageloaded{babel}
More information about the tex-live-commits
mailing list