From 86ce10d3a5965218b1ca952e8ad39ba2421ebaed Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 1 Feb 2016 23:01:46 +0000 Subject: csquotes (1feb16) git-svn-id: svn://tug.org/texlive/trunk@39538 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/csquotes/README | 114 --------------------- Master/texmf-dist/doc/latex/csquotes/README.md | 114 +++++++++++++++++++++ Master/texmf-dist/doc/latex/csquotes/RELEASE | 95 ----------------- Master/texmf-dist/doc/latex/csquotes/RELEASE.md | 95 +++++++++++++++++ Master/texmf-dist/doc/latex/csquotes/csquotes.pdf | Bin 289589 -> 284785 bytes Master/texmf-dist/doc/latex/csquotes/csquotes.tex | 16 +-- .../texmf-dist/tex/latex/csquotes/csq-compat.def | 2 +- Master/texmf-dist/tex/latex/csquotes/csquotes.def | 19 +++- Master/texmf-dist/tex/latex/csquotes/csquotes.sty | 4 +- 9 files changed, 240 insertions(+), 219 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/csquotes/README create mode 100644 Master/texmf-dist/doc/latex/csquotes/README.md delete mode 100644 Master/texmf-dist/doc/latex/csquotes/RELEASE create mode 100644 Master/texmf-dist/doc/latex/csquotes/RELEASE.md diff --git a/Master/texmf-dist/doc/latex/csquotes/README b/Master/texmf-dist/doc/latex/csquotes/README deleted file mode 100644 index f0ed6e1d5fa..00000000000 --- a/Master/texmf-dist/doc/latex/csquotes/README +++ /dev/null @@ -1,114 +0,0 @@ -# `csquotes`: Context sensitive quotation facilities - -## 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 they can be adjusted 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. - -## License - -Copyright (c) 2003-2011 Philipp Lehman, 2015 Joseph Wright. -Permission is granted to copy, distribute and/or modify this -software under the terms of the LaTeX Project Public License (LPPL), -version 1.3c or any later version. - -This software is provided 'as is', without warranty of any kind, -either expressed or implied, including, but not limited to, the -implied warranties of merchantability and fitness for a particular -purpose. - -## Requirements - -- e-TeX -- `etoolbox` 1.7 or later -- `keyval` - -AUTOMATIC INSTALLATION - -TeX Live: The `csquotes` package is included in TeX Live. - Use the TeX Live package manager to install it. - -MiKTeX: The `csquotes` package is included in MiKTeX. - Use the MiKTeX package manager to install it. - -## Semi-automatic installation - -1. Download the file - - http://mirror.ctan.org/install/macros/latex/contrib/csquotes.tds.zip - -2. Unpack the archive in the root directory of the local TeX - installation tree, for example - - /usr/local/share/texmf/ - - or - - /usr/share/texmf-local/ - - or - - C:\Local TeX Files\ - -3. Update the file hash tables (also known as the file name - database). - - On teTeX and TeX Live systems, run `texhash` as root (`sudo - texhash`). On MiKTeX, run `initexmf --update-fndb` in a command - window or use the 'Refresh FNDB' button of the MiKTeX Options - window. - -## Manual installation - -1. Copy the files `csquotes.sty`, `csquotes.def`, `csq-compat.def`, - and `csquotes.cfg` to - - /tex/latex/csquotes/ - - where `` denotes the root of the local TeX installation - tree, for example - - /usr/local/share/texmf/ - - or - - /usr/share/texmf-local/ - - or - - C:\Local TeX Files\ - -2. The file `csquotes.pdf` goes to - - /doc/latex/csquotes/ - -3. Update the file hash tables (also known as the file name - database). - - On teTeX and TeX Live systems, run `texhash` as root (`sudo - texhash`). On MiKTeX, run `initexmf --update-fndb` in a command - window or use the 'Refresh FNDB' button of the MiKTeX Options - window. - -Note that you may have to create some or all of the above -directories if this is the first package you're installing locally -(as opposed to via a package manager). - -## Usage - -Refer to `csquotes.pdf` for a systematic reference manual. - -## Changes - -A list of changes relevant to users of this package is included at -the end of `csquotes.pdf`. Skimming the respective section of the -manual is highly recommended. diff --git a/Master/texmf-dist/doc/latex/csquotes/README.md b/Master/texmf-dist/doc/latex/csquotes/README.md new file mode 100644 index 00000000000..f0ed6e1d5fa --- /dev/null +++ b/Master/texmf-dist/doc/latex/csquotes/README.md @@ -0,0 +1,114 @@ +# `csquotes`: Context sensitive quotation facilities + +## 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 they can be adjusted 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. + +## License + +Copyright (c) 2003-2011 Philipp Lehman, 2015 Joseph Wright. +Permission is granted to copy, distribute and/or modify this +software under the terms of the LaTeX Project Public License (LPPL), +version 1.3c or any later version. + +This software is provided 'as is', without warranty of any kind, +either expressed or implied, including, but not limited to, the +implied warranties of merchantability and fitness for a particular +purpose. + +## Requirements + +- e-TeX +- `etoolbox` 1.7 or later +- `keyval` + +AUTOMATIC INSTALLATION + +TeX Live: The `csquotes` package is included in TeX Live. + Use the TeX Live package manager to install it. + +MiKTeX: The `csquotes` package is included in MiKTeX. + Use the MiKTeX package manager to install it. + +## Semi-automatic installation + +1. Download the file + + http://mirror.ctan.org/install/macros/latex/contrib/csquotes.tds.zip + +2. Unpack the archive in the root directory of the local TeX + installation tree, for example + + /usr/local/share/texmf/ + + or + + /usr/share/texmf-local/ + + or + + C:\Local TeX Files\ + +3. Update the file hash tables (also known as the file name + database). + + On teTeX and TeX Live systems, run `texhash` as root (`sudo + texhash`). On MiKTeX, run `initexmf --update-fndb` in a command + window or use the 'Refresh FNDB' button of the MiKTeX Options + window. + +## Manual installation + +1. Copy the files `csquotes.sty`, `csquotes.def`, `csq-compat.def`, + and `csquotes.cfg` to + + /tex/latex/csquotes/ + + where `` denotes the root of the local TeX installation + tree, for example + + /usr/local/share/texmf/ + + or + + /usr/share/texmf-local/ + + or + + C:\Local TeX Files\ + +2. The file `csquotes.pdf` goes to + + /doc/latex/csquotes/ + +3. Update the file hash tables (also known as the file name + database). + + On teTeX and TeX Live systems, run `texhash` as root (`sudo + texhash`). On MiKTeX, run `initexmf --update-fndb` in a command + window or use the 'Refresh FNDB' button of the MiKTeX Options + window. + +Note that you may have to create some or all of the above +directories if this is the first package you're installing locally +(as opposed to via a package manager). + +## Usage + +Refer to `csquotes.pdf` for a systematic reference manual. + +## Changes + +A list of changes relevant to users of this package is included at +the end of `csquotes.pdf`. Skimming the respective section of the +manual is highly recommended. diff --git a/Master/texmf-dist/doc/latex/csquotes/RELEASE b/Master/texmf-dist/doc/latex/csquotes/RELEASE deleted file mode 100644 index 0d78aeb454d..00000000000 --- a/Master/texmf-dist/doc/latex/csquotes/RELEASE +++ /dev/null @@ -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 `` 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 `` 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 `` 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 `` argument supported by -certain quotation commands. In previous version, the `` -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. diff --git a/Master/texmf-dist/doc/latex/csquotes/RELEASE.md b/Master/texmf-dist/doc/latex/csquotes/RELEASE.md new file mode 100644 index 00000000000..0d78aeb454d --- /dev/null +++ b/Master/texmf-dist/doc/latex/csquotes/RELEASE.md @@ -0,0 +1,95 @@ +# 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 `` 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 `` 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 `` 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 `` argument supported by +certain quotation commands. In previous version, the `` +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. diff --git a/Master/texmf-dist/doc/latex/csquotes/csquotes.pdf b/Master/texmf-dist/doc/latex/csquotes/csquotes.pdf index deb5ccbdb27..a4c799732cf 100644 Binary files a/Master/texmf-dist/doc/latex/csquotes/csquotes.pdf and b/Master/texmf-dist/doc/latex/csquotes/csquotes.pdf differ diff --git a/Master/texmf-dist/doc/latex/csquotes/csquotes.tex b/Master/texmf-dist/doc/latex/csquotes/csquotes.tex index 18932372077..b3efaf45579 100644 --- a/Master/texmf-dist/doc/latex/csquotes/csquotes.tex +++ b/Master/texmf-dist/doc/latex/csquotes/csquotes.tex @@ -18,8 +18,8 @@ url={http://www.ctan.org/pkg/csquotes/}, author={Philipp Lehman, Joseph Wright}, email={joseph.wright@morningstar2.co.uk}, - revision={v5.1f}, - date={2015/07/18}} + revision={v5.1g}, + date={2016/01/31}} \hypersetup{% pdftitle={The csquotes Package}, @@ -110,7 +110,7 @@ This package provides advanced facilities for inline and display quotations. It \subsection{License} -Copyright © 2003--2011 Philipp Lehman, 2015 Joseph Wright. Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3c or any later version.\fnurl{http://www.latex-project.org/lppl/} +Copyright © 2003--2011 Philipp Lehman, 2015--2016 Joseph Wright. Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3c or any later version.\fnurl{http://www.latex-project.org/lppl/} \subsection{Contributions} @@ -1300,7 +1300,7 @@ The active quotes provided by this package may depend on or benefit from the \st \subsection{Output Encodings} \label{hnt:onc} -The \acr{OT1} font encoding, which is the default output encoding of \latex, merely includes the quotation marks used in English. You will need an encoding like \acr{T1}, \acr{LY1}, or, with \xetex or \luatex, \acr{EU1}\slash \acr{EU2}, 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} or some other extended 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 \acr{T1}, \acr{LY1}, and \acr{EU1}\slash \acr{EU2}. +The \acr{OT1} font encoding, which is the default output encoding of \latex, merely includes the quotation marks used in English. You will need an encoding like \acr{T1}, \acr{LY1}, or, with \xetex or \luatex, \acr{TU}, 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} or some other extended 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 \acr{T1}, \acr{LY1}, and \acr{TU}. \begin{table} \tablesetup @@ -1323,7 +1323,7 @@ The \acr{OT1} font encoding, which is the default output encoding of \latex, mer \cmd{guilsinglright} & \mksample[60]{\guilsinglright} \\ \bottomrule \end{tabularx} -\caption[Quotation Marks]{Quotation Marks Provided by Encodings \acr{T1}, \acr{LY1}, \acr{EU1}\slash \acr{EU2}} +\caption[Quotation Marks]{Quotation Marks Provided by Encodings \acr{T1}, \acr{LY1}, \acr{ETU}} \label{tab:out} \end{table} @@ -1459,7 +1459,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}\slash \acr{EU2} 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}, and \acr{ETU} are provided by default. Other encodings may be set up in the configuration file using the following command: \begin{ltxsyntax} \cmditem{DeclareQuoteGlyph}{encoding}{position} @@ -1533,6 +1533,10 @@ This revision history is a list of changes relevant to users of this package. Ch \begin{changelog} +\begin{release}{5.1g}{2016-01-31} +\item Update for new \acr{TU} Unicode encoding +\end{release} + \begin{release}{5.1f}{2015-07-18} \item Update \opt{(n)swissgerman} and \opt{(n)austrian} quote styles \end{release} diff --git a/Master/texmf-dist/tex/latex/csquotes/csq-compat.def b/Master/texmf-dist/tex/latex/csquotes/csq-compat.def index 3e10f96255a..6ff6a54e2e6 100644 --- a/Master/texmf-dist/tex/latex/csquotes/csq-compat.def +++ b/Master/texmf-dist/tex/latex/csquotes/csq-compat.def @@ -1,5 +1,5 @@ \ProvidesFile{csq-compat.def} - [2015/07/18 v5.1f csquotes backwards compatibility (JAW)] + [2016/01/31 v5.1g csquotes backwards compatibility (JAW)] \def\csq@getversion#1{% \expandafter\csq@getversion@i diff --git a/Master/texmf-dist/tex/latex/csquotes/csquotes.def b/Master/texmf-dist/tex/latex/csquotes/csquotes.def index b06aaebad24..4d85ba55996 100644 --- a/Master/texmf-dist/tex/latex/csquotes/csquotes.def +++ b/Master/texmf-dist/tex/latex/csquotes/csquotes.def @@ -1,5 +1,5 @@ \ProvidesFile{csquotes.def} - [2015/07/18 v5.1f csquotes generic definitions (JAW)] + [2016/01/31 v5.1g csquotes generic definitions (JAW)] % Set defaults @@ -401,6 +401,23 @@ \DeclareQuoteGlyph{EU2}{"2039}% = angle quot. mark, left-pointing single = \guilsinglleft \DeclareQuoteGlyph{EU2}{"203A}% = angle quot. mark, right-pointing single = \guilsinglright +% Unicode (2016/02/01 ownards) +\DeclareQuoteGlyph{TU}{"0022}% = neutral quot. mark, double = \textquotedbl +\DeclareQuoteGlyph{TU}{"0027}% = neutral quot. mark, single = \textquotesingle +\DeclareQuoteGlyph{TU}{"00AB}% = angle quot. mark, left-pointing double = \guillemotleft +\DeclareQuoteGlyph{TU}{"00BB}% = angle quot. mark, right-pointing double = \guillemotright +\DeclareQuoteGlyph{TU}{"2018}% = comma quot. mark, single turned = \textquoteleft +\DeclareQuoteGlyph{TU}{"2019}% = comma quot. mark, single = \textquoteright +\DeclareQuoteGlyph{TU}{"201A}% = comma quot. mark, low single = \quotesinglbase +\DeclareQuoteGlyph{TU}{"201B}% = comma quot. mark, single reversed = n/a +\DeclareQuoteGlyph{TU}{"201C}% = comma quot. mark, double turned = \textquotedblleft +\DeclareQuoteGlyph{TU}{"201D}% = comma quot. mark, double = \textquotedblright +\DeclareQuoteGlyph{TU}{"201E}% = comma quot. mark, low double = \quotedblbase +\DeclareQuoteGlyph{TU}{"201F}% = comma quot. mark, double reversed = n/a +\DeclareQuoteGlyph{TU}{"2039}% = angle quot. mark, left-pointing single = \guilsinglleft +\DeclareQuoteGlyph{TU}{"203A}% = angle quot. mark, right-pointing single = \guilsinglright + + \endinput % Auxiliary commands for some styles diff --git a/Master/texmf-dist/tex/latex/csquotes/csquotes.sty b/Master/texmf-dist/tex/latex/csquotes/csquotes.sty index efa9ffb0373..dead738f966 100644 --- a/Master/texmf-dist/tex/latex/csquotes/csquotes.sty +++ b/Master/texmf-dist/tex/latex/csquotes/csquotes.sty @@ -1,5 +1,5 @@ % Copyright (c) 2003-2011 Philipp Lehman. -% (c) 2015 Joseph Wright. +% (c) 2015-2016 Joseph Wright. % % Permission is granted to copy, distribute and/or modify this % software under the terms of the LaTeX Project Public License @@ -12,7 +12,7 @@ \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesPackage{csquotes} - [2015/07/18 v5.1f context-sensitive quotations (JAW)] + [2016/01/31 v5.1g context-sensitive quotations (JAW)] %% Compatibility and requirements -- cgit v1.2.3