summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/notes2bib/README51
-rw-r--r--Master/texmf-dist/doc/latex/notes2bib/notes2bib.pdfbin197849 -> 197896 bytes
-rw-r--r--Master/texmf-dist/source/latex/notes2bib/notes2bib.dtx63
-rw-r--r--Master/texmf-dist/source/latex/notes2bib/notes2bib.ins75
-rw-r--r--Master/texmf-dist/tex/latex/notes2bib/notes2bib.sty11
5 files changed, 63 insertions, 137 deletions
diff --git a/Master/texmf-dist/doc/latex/notes2bib/README b/Master/texmf-dist/doc/latex/notes2bib/README
index 8573bd7f31e..be328819d83 100644
--- a/Master/texmf-dist/doc/latex/notes2bib/README
+++ b/Master/texmf-dist/doc/latex/notes2bib/README
@@ -1,43 +1,38 @@
----------------------------------------------------------------
-notes2bib --- Integrating notes into the bibliography
-Maintained by Joseph Wright
-E-mail: joseph.wright@morningstar2.co.uk
-Released under the LaTeX Project Public License v1.3c or later
-See http://www.latex-project.org/lppl.txt
----------------------------------------------------------------
+notes2bib - Integrating notes into the bibliography
+===================================================
-The notes2bib package defines a new type of note, bibnote,
-which will always be added to the bibliography. The package
+The `notes2bib` package defines a new type of note, bibnote,
+which will always be added to the bibliography. The package
allows footnotes and endnotes to be moved into the bibliography
-in the same way. The package can be used with natbib and
+in the same way. The package can be used with natbib and
biblatex as well as plain LaTeX citations. Both sorted and
unsorted bibliography styles are supported.
Installation
------------
-The package is supplied in dtx format and as a pre-extracted zip
-file, notes2bib.tds.zip. The later is most convenient for most
-users: simply unzip this in your local texmf directory and run
-texhash to update the database of file locations. If you want to
-unpack the dtx yourself, running 'tex notes2bib.dtx' will
-extract the package whereas 'latex notes2bib.dtx will extract
-it and also typeset the documentation.
+The package is supplied in `.dtx` format and as a pre-extracted
+`.zip` file, `notes2bib.tds.zip`. The later is most convenient
+for most users: simply unzip this in your local `texmf`
+directory. If you want to unpack the `.dtx` yourself, running
+`tex notes2bib.dtx` will extract the package whereas `latex
+notes2bib.dtx` will extract it and also typeset the
+documentation.
-The package requires LaTeX3 support as provided in the l3kernel
-and l3packages bundles. Both of these are available on CTAN
-(http://www.ctan.org/) as ready-to-install zip files. Suitable
-versions are available in MiKTeX 2.9 and TeX Live 2011
-(updating the relevant packages online may be necessary).
-LaTeX3, and so notes2bib, requires the e-TeX extensions: these
-are available on all modern TeX systems.
+The package requires LaTeX3 support as provided in the
+`l3kernel` and `l3packages` bundles. Both of these are available
+on [CTAN](http://www.ctan.org/) as ready-to-install `.zip`
+files. Suitable versions are available in MiKTeX 2.9 and TeX
+Live 2012 (updating the relevant packages online may be
+necessary). LaTeX3, and so `notes2bib`, requires the e-TeX
+extensions: these are available on all modern TeX systems.
Typesetting the documentation requires a number of packages in
addition to those needed to use the package. This is mainly
because of the number of demonstration items included in the
text. To compile the documentation without error, you will
need the packages:
- - csquotes
- - helvet
- - mathpazo
- - listings
+ - `csquotes`
+ - `helvet`
+ - `mathpazo`
+ - `listings`
diff --git a/Master/texmf-dist/doc/latex/notes2bib/notes2bib.pdf b/Master/texmf-dist/doc/latex/notes2bib/notes2bib.pdf
index 3290813d905..bfa4086e4f1 100644
--- a/Master/texmf-dist/doc/latex/notes2bib/notes2bib.pdf
+++ b/Master/texmf-dist/doc/latex/notes2bib/notes2bib.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/notes2bib/notes2bib.dtx b/Master/texmf-dist/source/latex/notes2bib/notes2bib.dtx
index 0857e41482a..b3979b548d6 100644
--- a/Master/texmf-dist/source/latex/notes2bib/notes2bib.dtx
+++ b/Master/texmf-dist/source/latex/notes2bib/notes2bib.dtx
@@ -3,49 +3,44 @@
\iffalse
%</internal>
%<*readme>
----------------------------------------------------------------
-notes2bib --- Integrating notes into the bibliography
-Maintained by Joseph Wright
-E-mail: joseph.wright@morningstar2.co.uk
-Released under the LaTeX Project Public License v1.3c or later
-See http://www.latex-project.org/lppl.txt
----------------------------------------------------------------
+notes2bib - Integrating notes into the bibliography
+===================================================
-The notes2bib package defines a new type of note, bibnote,
-which will always be added to the bibliography. The package
+The `notes2bib` package defines a new type of note, bibnote,
+which will always be added to the bibliography. The package
allows footnotes and endnotes to be moved into the bibliography
-in the same way. The package can be used with natbib and
+in the same way. The package can be used with natbib and
biblatex as well as plain LaTeX citations. Both sorted and
unsorted bibliography styles are supported.
Installation
------------
-The package is supplied in dtx format and as a pre-extracted zip
-file, notes2bib.tds.zip. The later is most convenient for most
-users: simply unzip this in your local texmf directory and run
-texhash to update the database of file locations. If you want to
-unpack the dtx yourself, running 'tex notes2bib.dtx' will
-extract the package whereas 'latex notes2bib.dtx will extract
-it and also typeset the documentation.
+The package is supplied in `.dtx` format and as a pre-extracted
+`.zip` file, `notes2bib.tds.zip`. The later is most convenient
+for most users: simply unzip this in your local `texmf`
+directory. If you want to unpack the `.dtx` yourself, running
+`tex notes2bib.dtx` will extract the package whereas `latex
+notes2bib.dtx` will extract it and also typeset the
+documentation.
-The package requires LaTeX3 support as provided in the l3kernel
-and l3packages bundles. Both of these are available on CTAN
-(http://www.ctan.org/) as ready-to-install zip files. Suitable
-versions are available in MiKTeX 2.9 and TeX Live 2011
-(updating the relevant packages online may be necessary).
-LaTeX3, and so notes2bib, requires the e-TeX extensions: these
-are available on all modern TeX systems.
+The package requires LaTeX3 support as provided in the
+`l3kernel` and `l3packages` bundles. Both of these are available
+on [CTAN](http://www.ctan.org/) as ready-to-install `.zip`
+files. Suitable versions are available in MiKTeX 2.9 and TeX
+Live 2012 (updating the relevant packages online may be
+necessary). LaTeX3, and so `notes2bib`, requires the e-TeX
+extensions: these are available on all modern TeX systems.
Typesetting the documentation requires a number of packages in
addition to those needed to use the package. This is mainly
because of the number of demonstration items included in the
text. To compile the documentation without error, you will
need the packages:
- - csquotes
- - helvet
- - mathpazo
- - listings
+ - `csquotes`
+ - `helvet`
+ - `mathpazo`
+ - `listings`
%</readme>
%<*internal>
\fi
@@ -70,7 +65,8 @@ See http://www.latex-project.org/lppl.txt
\endpreamble
\postamble
-Copyright (C) 2007-2011 by
+Copyright (C) 2007-2011,2013 by
+Copyright (C) 2007-2013 by
Joseph Wright <joseph.wright@morningstar2.co.uk>
It may be distributed and/or modified under the conditions of
@@ -633,7 +629,7 @@ This work consists of the file notes2bib.dtx
% Version data to start with.
% \begin{macrocode}
\ProvidesExplPackage
- {notes2bib} {2012/11/07} {2.0j}
+ {notes2bib} {2013/07/11} {2.0k}
{Integrating notes into the bibliography}
\RequirePackage{l3keys2e}
% \end{macrocode}
@@ -941,11 +937,16 @@ This work consists of the file notes2bib.dtx
%
%\subsection{Options from version one}
%
+%\changes{v2.0k}{2013/07/11}{Drop use of \texttt{.meta:x} key property}
% The new option names are preferred, but the old ones still need to
% work correctly.
% \begin{macrocode}
\keys_define:nn { notes2bib } {
- cite .meta:x = { cite-function = \exp_not:c {#1} } ,
+ cite .code:n =
+ {
+ \use:x
+ { \keys_set:nn { notes2bib } { cite-function = \exp_not:c {#1} } }
+ } ,
debug .code:n = { } ,
endnotes .meta:n = { convert-footnotes = #1 } ,
etex .code:n = { } ,
diff --git a/Master/texmf-dist/source/latex/notes2bib/notes2bib.ins b/Master/texmf-dist/source/latex/notes2bib/notes2bib.ins
deleted file mode 100644
index 0d5c6e535e3..00000000000
--- a/Master/texmf-dist/source/latex/notes2bib/notes2bib.ins
+++ /dev/null
@@ -1,75 +0,0 @@
-%%
-%% This is file `notes2bib.ins',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% notes2bib.dtx (with options: `install')
-%% ---------------------------------------------------------------
-%% notes2bib --- Integrating notes into the bibliography
-%% Maintained by Joseph Wright
-%% E-mail: joseph.wright@morningstar2.co.uk
-%% Released under the LaTeX Project Public License v1.3c or later
-%% See http://www.latex-project.org/lppl.txt
-%% ---------------------------------------------------------------
-%%
-\input l3docstrip.tex
-\keepsilent
-\askforoverwritefalse
-\preamble
----------------------------------------------------------------
-notes2bib --- Integrating notes into the bibliography
-Maintained by Joseph Wright
-E-mail: joseph.wright@morningstar2.co.uk
-Released under the LaTeX Project Public License v1.3c or later
-See http://www.latex-project.org/lppl.txt
----------------------------------------------------------------
-
-\endpreamble
-\postamble
-
-Copyright (C) 2007-2011 by
- Joseph Wright <joseph.wright@morningstar2.co.uk>
-
-It may be distributed and/or modified under the conditions of
-the LaTeX Project Public License (LPPL), either version 1.3c of
-this license or (at your option) any later version. The latest
-version of this license is in the file:
-
- http://www.latex-project.org/lppl.txt
-
-This work is "maintained" (as per LPPL maintenance status) by
- Joseph Wright.
-
-This work consists of the file notes2bib.dtx
- and the derived files notes2bib.ins,
- notes2bib.pdf and
- notes2bib.sty.
-
-\endpostamble
-\usedir{tex/latex/notes2bib}
-\generate{
- \file{\jobname.sty}{\from{\jobname.dtx}{package}}
-}
-\endbatchfile
-%%
-%% Copyright (C) 2007-2011 by
-%% Joseph Wright <joseph.wright@morningstar2.co.uk>
-%%
-%% It may be distributed and/or modified under the conditions of
-%% the LaTeX Project Public License (LPPL), either version 1.3c of
-%% this license or (at your option) any later version. The latest
-%% version of this license is in the file:
-%%
-%% http://www.latex-project.org/lppl.txt
-%%
-%% This work is "maintained" (as per LPPL maintenance status) by
-%% Joseph Wright.
-%%
-%% This work consists of the file notes2bib.dtx
-%% and the derived files notes2bib.ins,
-%% notes2bib.pdf and
-%% notes2bib.sty.
-%%
-%%
-%% End of file `notes2bib.ins'.
diff --git a/Master/texmf-dist/tex/latex/notes2bib/notes2bib.sty b/Master/texmf-dist/tex/latex/notes2bib/notes2bib.sty
index e3674e8b038..ddad30ecf0b 100644
--- a/Master/texmf-dist/tex/latex/notes2bib/notes2bib.sty
+++ b/Master/texmf-dist/tex/latex/notes2bib/notes2bib.sty
@@ -15,7 +15,7 @@
%%
\RequirePackage{xparse}
\ProvidesExplPackage
- {notes2bib} {2012/11/07} {2.0j}
+ {notes2bib} {2013/07/11} {2.0k}
{Integrating notes into the bibliography}
\RequirePackage{l3keys2e}
\tl_new:N \c__notestobib_file_message_tl
@@ -169,7 +169,11 @@
{ }
}
\keys_define:nn { notes2bib } {
- cite .meta:x = { cite-function = \exp_not:c {#1} } ,
+ cite .code:n =
+ {
+ \use:x
+ { \keys_set:nn { notes2bib } { cite-function = \exp_not:c {#1} } }
+ } ,
debug .code:n = { } ,
endnotes .meta:n = { convert-footnotes = #1 } ,
etex .code:n = { } ,
@@ -507,7 +511,8 @@
\keys_set:nn { notes2bib } { placement = mixed }
\ProcessKeysOptions { notes2bib }
%%
-%% Copyright (C) 2007-2011 by
+%% Copyright (C) 2007-2011,2013 by
+%% Copyright (C) 2007-2013 by
%% Joseph Wright <joseph.wright@morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-05 15:46:40 +0000