From 711a39a7aa83092298b6f72bd1664ce156a15ce5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 8 Jan 2011 00:46:29 +0000 Subject: notes2bib (6jan11) git-svn-id: svn://tug.org/texlive/trunk@20971 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/notes2bib/notes2bib.sty | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'Master/texmf-dist/tex/latex/notes2bib') 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 %% %% It may be distributed and/or modified under the conditions of -- cgit v1.2.3