summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-01-08 00:46:29 +0000
committerKarl Berry <karl@freefriends.org>2011-01-08 00:46:29 +0000
commit711a39a7aa83092298b6f72bd1664ce156a15ce5 (patch)
tree6fcbb71348c46719e54914138d994470f3479c40 /Master
parentabd5bdf3fcf83a33374db38d5d1851e59eab3796 (diff)
notes2bib (6jan11)
git-svn-id: svn://tug.org/texlive/trunk@20971 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/notes2bib/notes2bib.pdfbin230912 -> 186004 bytes
-rw-r--r--Master/texmf-dist/source/latex/notes2bib/notes2bib.dtx43
-rw-r--r--Master/texmf-dist/source/latex/notes2bib/notes2bib.ins75
-rw-r--r--Master/texmf-dist/tex/latex/notes2bib/notes2bib.sty21
4 files changed, 21 insertions, 118 deletions
diff --git a/Master/texmf-dist/doc/latex/notes2bib/notes2bib.pdf b/Master/texmf-dist/doc/latex/notes2bib/notes2bib.pdf
index b41516cadd3..e2f846cc340 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 62d58149685..a4c207cf6ff 100644
--- a/Master/texmf-dist/source/latex/notes2bib/notes2bib.dtx
+++ b/Master/texmf-dist/source/latex/notes2bib/notes2bib.dtx
@@ -1,5 +1,4 @@
% \iffalse meta-comment
-% !TeX program = pdflatex
%<*internal>
\iffalse
%</internal>
@@ -71,7 +70,7 @@ See http://www.latex-project.org/lppl.txt
\endpreamble
\postamble
-Copyright (C) 2007-2010 by
+Copyright (C) 2007-2011 by
Joseph Wright <joseph.wright@morningstar2.co.uk>
It may be distributed and/or modified under the conditions of
@@ -531,23 +530,6 @@ This work consists of the file notes2bib.dtx
% use-sort-key = false
% }
%\end{LaTeXdemo}
-%
-%\subsection{Information for \pkg{biblatex} users}
-%
-%\changes{v2.0b}{2010/01/08}{New documentation section concerning
-% \pkg{biblatex}-specific information}
-% \pkg{biblatex} will issue a warning for each bibliography note in
-% a document since the notes do not have a title:
-%\begin{lstlisting}[basicstyle = \small\ttfamily,gobble = 3]
-% Package biblatex Warning: BibTeX reported the following issues
-% (biblatex) with the entry 'Note1':
-% (biblatex) * Missing field 'title'.
-%\end{lstlisting}
-% This does not affect the appearance of the notes in the output.
-% Currently, \pkg{biblatex} does not include a database entry type
-% which does not issue an error if no title is given. At the same time,
-% the standard styles always print the title if given, and so it is not
-% possible to give a dummy value.
%
%\section{Data written to the \texttt{aux} file}
%
@@ -922,7 +904,7 @@ This work consists of the file notes2bib.dtx
% Version data to start with.
% \begin{macrocode}
\ProvidesExplPackage
- {notes2bib} {2010/03/30} {2.0c}
+ {notes2bib} {2011/01/06} {2.0d}
{Integrating notes into the bibliography}
\RequirePackage{l3keys2e}
% \end{macrocode}
@@ -936,10 +918,13 @@ This work consists of the file notes2bib.dtx
% \begin{macrocode}
\tl_new:N \c_niib_file_message_tl
\tl_set:Nn \c_niib_file_message_tl {
+ \iow_char:N \% ~
This~is~an~auxiliary~file~used~by~the~'notes2bib'~package.
\iow_newline:
+ \iow_char:N \% ~
This~file~may~safely~be~deleted.
\iow_newline:
+ \iow_char:N \% ~
It~will~be~recreated~as~required.
\iow_newline:
}
@@ -1455,9 +1440,11 @@ This work consists of the file notes2bib.dtx
%\end{macro}
%\end{macro}
%
-%\begin{macro}{\niib_attach_bibliography:}
+%\changes{v2.0d}{2011/01/06}{Tweak \cs{bibliography} code to reduce
+% complexity}
%\begin{macro}{\bibliography}
%\begin{macro}{\niib_bibliography:n}
+%\begin{macro}{\niib_attach_bibliography:}
% Getting the database created here to be scanned by \BibTeX\ is
% dependant on whether \pkg{biblatex} is being used. If it is, and it is
% already loaded, then the data can be added now. On the other hand, if
@@ -1465,7 +1452,7 @@ This work consists of the file notes2bib.dtx
% The \cs{bibliography} function has to be patched if \pkg{biblatex} is
% not in use.
% \begin{macrocode}
-\cs_new_nopar:Npn \niib_attach_bibliography: {
+\AtBeginDocument {
\@ifpackageloaded { biblatex }
{ \exp_args:NV \bibliography \g_niib_filename_tl }
{
@@ -1473,13 +1460,13 @@ This work consists of the file notes2bib.dtx
\RenewDocumentCommand \bibliography { m }
{
\intexpr_compare:nTF { \g_niib_total_notes_int = \c_zero }
- { \niib_bibliography:n {##1} }
+ { \niib_bibliography:n {#1} }
{
- \cs_set_nopar:Npx \niib_attach_bibliography:
+ \cs_new_nopar:Npx \niib_attach_bibliography:
{
\exp_not:N \niib_bibliography:n
{
- \exp_not:n {##1} , \exp_not:V \g_niib_filename_tl
+ \exp_not:n {#1} , \exp_not:V \g_niib_filename_tl
}
}
\niib_attach_bibliography:
@@ -1487,12 +1474,6 @@ This work consists of the file notes2bib.dtx
}
}
}
-\@ifpackageloaded { biblatex }
- {
- \exp_args:NV \bibliography \g_niib_filename_tl
- \cs_gundefine:N \niib_attach_bibliography:
- }
- { \AtBeginDocument { \niib_attach_bibliography: } }
% \end{macrocode}
%\end{macro}
%\end{macro}
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 a6e1c2c97ed..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 docstrip.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-2010 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-2010 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 e6da38ee40a..c041d732325 100644
--- a/Master/texmf-dist/tex/latex/notes2bib/notes2bib.sty
+++ b/Master/texmf-dist/tex/latex/notes2bib/notes2bib.sty
@@ -15,15 +15,18 @@
%%
\RequirePackage{xparse}
\ProvidesExplPackage
- {notes2bib} {2010/03/30} {2.0c}
+ {notes2bib} {2011/01/06} {2.0d}
{Integrating notes into the bibliography}
\RequirePackage{l3keys2e}
\tl_new:N \c_niib_file_message_tl
\tl_set:Nn \c_niib_file_message_tl {
+ \iow_char:N \% ~
This~is~an~auxiliary~file~used~by~the~'notes2bib'~package.
\iow_newline:
+ \iow_char:N \% ~
This~file~may~safely~be~deleted.
\iow_newline:
+ \iow_char:N \% ~
It~will~be~recreated~as~required.
\iow_newline:
}
@@ -260,7 +263,7 @@
}
}
\cs_new_nopar:Npn \niib_create_print_notes: { }
-\cs_new_nopar:Npn \niib_attach_bibliography: {
+\AtBeginDocument {
\@ifpackageloaded { biblatex }
{ \exp_args:NV \bibliography \g_niib_filename_tl }
{
@@ -268,13 +271,13 @@
\RenewDocumentCommand \bibliography { m }
{
\intexpr_compare:nTF { \g_niib_total_notes_int = \c_zero }
- { \niib_bibliography:n {##1} }
+ { \niib_bibliography:n {#1} }
{
- \cs_set_nopar:Npx \niib_attach_bibliography:
+ \cs_new_nopar:Npx \niib_attach_bibliography:
{
\exp_not:N \niib_bibliography:n
{
- \exp_not:n {##1} , \exp_not:V \g_niib_filename_tl
+ \exp_not:n {#1} , \exp_not:V \g_niib_filename_tl
}
}
\niib_attach_bibliography:
@@ -282,12 +285,6 @@
}
}
}
-\@ifpackageloaded { biblatex }
- {
- \exp_args:NV \bibliography \g_niib_filename_tl
- \cs_gundefine:N \niib_attach_bibliography:
- }
- { \AtBeginDocument { \niib_attach_bibliography: } }
\AtBeginDocument {
\@ifpackageloaded { biblatex }
{ \tl_set:Nn \l_niib_sortkey_field_tl { sortkey } }
@@ -437,7 +434,7 @@
\keys_set:nn { notes2bib } { placement = mixed }
\ProcessKeysOptions { notes2bib }
%%
-%% Copyright (C) 2007-2010 by
+%% Copyright (C) 2007-2011 by
%% Joseph Wright <joseph.wright@morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of