From 71672704bcab050f2e52fc04c103bb4a9e92b586 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 1 Nov 2008 00:35:42 +0000 Subject: notes2bib update (31oct08) git-svn-id: svn://tug.org/texlive/trunk@11144 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/notes2bib/README | 19 --------------- .../texmf-dist/doc/latex/notes2bib/notes2bib.pdf | Bin 178908 -> 178894 bytes .../texmf-dist/doc/latex/notes2bib/xnotes2bib.pdf | Bin 348575 -> 348574 bytes .../source/latex/notes2bib/notes2bib.dtx | 2 +- .../source/latex/notes2bib/xnotes2bib.dtx | 26 ++++++++++----------- .../texmf-dist/tex/latex/notes2bib/notes2bib.sty | 2 +- .../texmf-dist/tex/latex/notes2bib/xnotes2bib.sty | 26 ++++++++++----------- 7 files changed, 28 insertions(+), 47 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/notes2bib/README diff --git a/Master/texmf-dist/doc/latex/notes2bib/README b/Master/texmf-dist/doc/latex/notes2bib/README deleted file mode 100644 index beaaf32388b..00000000000 --- a/Master/texmf-dist/doc/latex/notes2bib/README +++ /dev/null @@ -1,19 +0,0 @@ ---------------------------------------------------------------- -The notes2bib bundle --- 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 ---------------------------------------------------------------- - -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 -biblatex as well as plain LaTeX citations. Both sorted and -unsorted bibliography styles are supported. - -The bundle includes both a current release version of the -package (notes2bib.sty) and an experimental re-implementation -using LaTeX3 syntax where possible (xnotes2bib.sty). diff --git a/Master/texmf-dist/doc/latex/notes2bib/notes2bib.pdf b/Master/texmf-dist/doc/latex/notes2bib/notes2bib.pdf index 5c3f54bcb76..d350c705997 100644 Binary files a/Master/texmf-dist/doc/latex/notes2bib/notes2bib.pdf and b/Master/texmf-dist/doc/latex/notes2bib/notes2bib.pdf differ diff --git a/Master/texmf-dist/doc/latex/notes2bib/xnotes2bib.pdf b/Master/texmf-dist/doc/latex/notes2bib/xnotes2bib.pdf index add81714df8..f93696df514 100644 Binary files a/Master/texmf-dist/doc/latex/notes2bib/xnotes2bib.pdf and b/Master/texmf-dist/doc/latex/notes2bib/xnotes2bib.pdf differ diff --git a/Master/texmf-dist/source/latex/notes2bib/notes2bib.dtx b/Master/texmf-dist/source/latex/notes2bib/notes2bib.dtx index c5b2d6f5b9d..9f4f9dd5646 100644 --- a/Master/texmf-dist/source/latex/notes2bib/notes2bib.dtx +++ b/Master/texmf-dist/source/latex/notes2bib/notes2bib.dtx @@ -621,7 +621,7 @@ unsorted bibliography styles are supported. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{notes2bib} - [2008/10/22 v1.6 Integrating notes into the bibliography] + [2008/10/31 v1.6a Integrating notes into the bibliography] \RequirePackage{xkeyval}[2005/05/07] % \end{macrocode} %\begin{macro}{\niib@tempa} diff --git a/Master/texmf-dist/source/latex/notes2bib/xnotes2bib.dtx b/Master/texmf-dist/source/latex/notes2bib/xnotes2bib.dtx index 6cd5acce8c2..74d2aefcc2c 100644 --- a/Master/texmf-dist/source/latex/notes2bib/xnotes2bib.dtx +++ b/Master/texmf-dist/source/latex/notes2bib/xnotes2bib.dtx @@ -95,7 +95,7 @@ This work consists of the file notes2bib.dtx % %<*package> \RequirePackage{l3names} -\GetIdInfo$Id: xnotes2bib.dtx 5 2008-10-22 21:00:00Z joseph $ +\GetIdInfo$Id: xnotes2bib.dtx 6 2008-10-31 21:00:00Z joseph $ {Integrating notes into the bibliography (expl3 version)} % %<*driver> @@ -430,7 +430,7 @@ This work consists of the file notes2bib.dtx % \begin{macrocode} \keys_manage_quick:n { niib/.cd:, - cite/.set:N = \niib_cite:n, + cite/.store~in~tlp:N = \niib_cite:n, % \end{macrocode} %\end{macro} %\begin{macro}{\niib_debug:n} @@ -475,12 +475,12 @@ This work consists of the file notes2bib.dtx % Some storage macros. % \begin{macrocode} /keys/current~module:n = niib, - field/.set:c = field, - key~after/.set:c = key_after, - key~before/.set:c = key_before, - key~mixed/.set:c = key_mixed, - keyword/.set:c = keyword, - name/.set:c = name, + field/.store~in~tlp:c = field, + key~after/.store~in~tlp:c = key_after, + key~before/.store~in~tlp:c = key_before, + key~mixed/.store~in~tlp:c = key_mixed, + keyword/.store~in~tlp:c = keyword, + name/.store~in~tlp:c = name, % \end{macrocode} %\end{macro} %\end{macro} @@ -518,11 +518,11 @@ This work consists of the file notes2bib.dtx % \cs{niib_KV_string:n}} % \begin{macrocode} /keys/current~module:n = niib, - prefix/.set:c = prefix, - presort~after/.set:c = presort_after, - presort~before/.set:c = presort_before, - presort~mixed/.set:c = presort_mixed, - record/.set:c = record, + prefix/.store~in~tlp:c = prefix, + presort~after/.store~in~tlp:c = presort_after, + presort~before/.store~in~tlp:c = presort_before, + presort~mixed/.store~in~tlp:c = presort_mixed, + record/.store~in~tlp:c = record, % \end{macrocode} %\end{macro} %\end{macro} diff --git a/Master/texmf-dist/tex/latex/notes2bib/notes2bib.sty b/Master/texmf-dist/tex/latex/notes2bib/notes2bib.sty index 6c2275b4e9b..b65120709d2 100644 --- a/Master/texmf-dist/tex/latex/notes2bib/notes2bib.sty +++ b/Master/texmf-dist/tex/latex/notes2bib/notes2bib.sty @@ -15,7 +15,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{notes2bib} - [2008/10/22 v1.6 Integrating notes into the bibliography] + [2008/10/31 v1.6a Integrating notes into the bibliography] \RequirePackage{xkeyval}[2005/05/07] \newcommand*{\niib@tempa}{} \newcommand*{\niib@tempb}{} diff --git a/Master/texmf-dist/tex/latex/notes2bib/xnotes2bib.sty b/Master/texmf-dist/tex/latex/notes2bib/xnotes2bib.sty index 0778d46cd6f..5fd25767f80 100644 --- a/Master/texmf-dist/tex/latex/notes2bib/xnotes2bib.sty +++ b/Master/texmf-dist/tex/latex/notes2bib/xnotes2bib.sty @@ -15,7 +15,7 @@ %% --------------------------------------------------------------- %% \RequirePackage{l3names} -\GetIdInfo$Id: xnotes2bib.dtx 5 2008-10-22 21:00:00Z joseph $ +\GetIdInfo$Id: xnotes2bib.dtx 6 2008-10-31 21:00:00Z joseph $ {Integrating notes into the bibliography (expl3 version)} \ProvidesExplPackage {\filename}{\filedate}{\fileversion}{\filedescription} @@ -48,7 +48,7 @@ \let_new:NN \niib_convert_footnotes: \scan_stop: \keys_manage_quick:n { niib/.cd:, - cite/.set:N = \niib_cite:n, + cite/.store~in~tlp:N = \niib_cite:n, debug/.choice:, debug/.default:n = true, debug/true/.code:n = { @@ -70,12 +70,12 @@ }, convert~footnotes/.default:n = true, /keys/current~module:n = niib, - field/.set:c = field, - key~after/.set:c = key_after, - key~before/.set:c = key_before, - key~mixed/.set:c = key_mixed, - keyword/.set:c = keyword, - name/.set:c = name, + field/.store~in~tlp:c = field, + key~after/.store~in~tlp:c = key_after, + key~before/.store~in~tlp:c = key_before, + key~mixed/.store~in~tlp:c = key_mixed, + keyword/.store~in~tlp:c = keyword, + name/.store~in~tlp:c = name, placement/.choice: = \l_niib_placement_tlp, placement/.default:n = mixed, placement/after/.code:n = { @@ -91,11 +91,11 @@ \bool_set_false:N \l_niib_before_cite_bool }, /keys/current~module:n = niib, - prefix/.set:c = prefix, - presort~after/.set:c = presort_after, - presort~before/.set:c = presort_before, - presort~mixed/.set:c = presort_mixed, - record/.set:c = record, + prefix/.store~in~tlp:c = prefix, + presort~after/.store~in~tlp:c = presort_after, + presort~before/.store~in~tlp:c = presort_before, + presort~mixed/.store~in~tlp:c = presort_mixed, + record/.store~in~tlp:c = record, write~key~field/.boolean:c = write_key } \keys_manage_quick:n{ -- cgit v1.2.3