notes2bib 1.dc (26feb08)

git-svn-id: svn://tug.org/texlive/trunk@6758 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 31 insertions, 60 deletions

diff --git a/Master/texmf-dist/tex/latex/notes2bib/jawltxdoc.sty b/Master/texmf-dist/tex/latex/notes2bib/jawltxdoc.sty
index de0948ae76f..fe5e23cc8bd 100644
--- a/Master/texmf-dist/tex/latex/notes2bib/jawltxdoc.sty
+++ b/Master/texmf-dist/tex/latex/notes2bib/jawltxdoc.sty
@@ -22,7 +22,9 @@
 \usepackage[final]{microtype}
 \usepackage[osf]{mathpazo}
 \usepackage{booktabs,array,url,graphicx,courier,xspace}
-\usepackage{upgreek,ifpdf,listings}
+\usepackage{upgreek,ifpdf,listings,float,caption,longtable}
+\floatstyle{plaintop}
+\restylefloat{table}
 \ifpdf
   \usepackage{embedfile}
   \embedfile[%
@@ -101,12 +103,9 @@
   \let\typesetexample#1
   \global\let\lst@intname\@empty
   \setbox\lst@samplebox=\hbox\bgroup
-  \setkeys{lst}{language=[LaTeX]{TeX},tabsize=4,gobble=3,%
-    breakindent=0pt,basicstyle=\small\ttfamily,basewidth=0.51em,%
-    keywordstyle=\color{blue},%
-    morekeywords={% notes2bib
-      niibsetup,bibnote,bibnotetext,bibnotemark,thebibnote,%
-      flushnotestack,citenote,printbibnotes}}
+  \setkeys{lst}{tabsize=4,gobble=3,breakindent=0pt,%
+    basicstyle=\small\ttfamily,basewidth=0.51em,%
+    keywordstyle=\color{blue}}
   \lst@BeginAlsoWriteFile{\LaTeXexamplefile}
 }{%
   \lst@EndWriteFile\egroup
diff --git a/Master/texmf-dist/tex/latex/notes2bib/notes2bib.sty b/Master/texmf-dist/tex/latex/notes2bib/notes2bib.sty
index 6ec80a119a7..793d3bd29d4 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/01/16 v1.3b Integrating notes into the bibliography]
+  [2008/02/26 v1.3c Integrating notes into the bibliography]
 \begingroup
   \@ifundefined{eTeXversion}
     {\PackageError{notes2bib}
@@ -25,7 +25,7 @@
         pdfTeX, try `pdfelatex'\MessageBreak instead of `pdflatex'}
      \endgroup\endinput}
     {\endgroup}
-\RequirePackage{xkeyval,etoolbox}
+\RequirePackage{xkeyval}
 \@ifpackagelater{xkeyval}{2005/05/07}
   {}
   {\PackageError{notes2bib}
@@ -35,15 +35,6 @@
        `\@nameuse{ver@etoolbox.sty}'.\MessageBreak
         This is a fatal error; the package will abort.}%
    \endinput}
-\@ifpackagelater{etoolbox}{2007/10/08}
-  {}
-  {\PackageError{notes2bib}
-     {etoolbox >= 1.3 required}
-     {notes2bib requires the `etoolbox' package, version 1.3 or
-       later.\MessageBreak The version loaded is:
-       `\@nameuse{ver@etoolbox.sty}'.\MessageBreak
-        This is a fatal error; the package will abort.}%
-   \endinput}
 \newcommand*{\niib@tempa}{}
 \newcommand*{\niib@tempb}{}
 \newif\ifniib@debug
@@ -166,52 +157,33 @@
   keyhead=aaa,
   keynone={},
   keytail=zzz}
+\let\niib@org@footnote\footnote
+\let\niib@org@footnotemark\footnotemark
+\let\niib@org@footnotetext\footnotetext
 \AtBeginDocument{%
-  \let\niib@org@footnote\footnote
-  \let\niib@org@footnotemark\footnotemark
-  \let\niib@org@footnotetext\footnotetext
-  \let\niib@org@thanks\thanks
   \@ifpackageloaded{endnotes}
     {\let\niib@org@endnote\endnote
      \let\niib@org@endnotemark\endnotemark
      \let\niib@org@endnotetext\endnotetext
-     \let\niib@org@theendnotes\theendnotes}}
-\AtBeginDocument{%
-  \let\niib@thanks\thanks
-  \let\niib@footnotetext\footnotetext
-  \let\niib@footnotemark\footnotemark
-  \patchcmd{\niib@thanks}{\footnotetext}{\niib@org@footnotetext}
-    {\patchcmd{\niib@thanks}{\footnotemark}
-      {\niib@org@footnotemark}
-      {\let\thanks\niib@thanks
-       \let\niib@footnotetext\bibnotetext
-       \let\niib@footnotemark\bibnotemark
-       \niib@log@debug{Successfully patched \noexpand\thanks}}
-      {\niib@log@warn{Failed to patch \noexpand\thanks\MessageBreak
-         \noexpand\footnotemark\space and
-         \noexpand\footnotetext\MessageBreak are unmodified}%
-       \niib@log@debug{Could not substitute
-         \noexpand\footnotemark\MessageBreak in \noexpand\thanks}}}
-    {\niib@log@warn{Failed to patch \noexpand\thanks\MessageBreak
-       \noexpand\footnotemark\space and
-       \noexpand\footnotetext\MessageBreak are unmodified}%
-     \niib@log@debug{Could not substitute
-       \noexpand\footnotetext\MessageBreak in \noexpand\thanks}}}
-\newcommand*{\niib@swapfoot}{}
-\AtBeginDocument{%
-  \renewcommand*{\niib@swapfoot}{%
-    \ifniib@footnotes
-      \let\footnote\bibnote
-      \let\footnotemark\niib@footnotemark
-      \let\footnotetext\niib@footnotetext
-      \niib@log@debug{Converting footnotes to bibnotes}%
-    \else
-      \let\footnote\niib@org@footnote
-      \let\footnotemark\niib@org@footnotemark
-      \let\footnotetext\niib@org@footnotetext
-      \niib@log@debug{Using kernel definition of footnotes}%
+     \let\niib@org@theendnotes\theendnotes}{}}
+\@ifundefined{thanks}{}
+  {\renewcommand*{\thanks}[1]{%
+     \niib@org@footnotemark
+     \protected@xdef\@thanks{\@thanks
+     \protect\niib@org@footnotetext[\the\c@footnote]{#1}}}}
+\newcommand*{\niib@swapfoot}{%
+  \ifniib@footnotes
+    \let\footnote\bibnote
+    \let\footnotemark\bibnotetext
+    \let\footnotetext\bibnotemark
+    \niib@log@debug{Converting footnotes to bibnotes}%
+  \else
+    \let\footnote\niib@org@footnote
+    \let\footnotemark\niib@org@footnotemark
+    \let\footnotetext\niib@org@footnotetext
+    \niib@log@debug{Using kernel definition of footnotes}%
     \fi}
-  \niib@swapfoot}
+\AtBeginDocument{\niib@swapfoot}
 \newcommand*{\niib@swapend}{}
 \AtBeginDocument{%
   \@ifpackageloaded{endnotes}
@@ -421,13 +393,13 @@
      \fi}}
 \newcommand*{\niib@auxhook}{}
 \let\niib@auxhook\relax
-\AtEndPreamble{%
+\AtBeginDocument{%
   \@ifpackageloaded{biblatex}%
     {\expandafter\gappto\expandafter\blx@bibfiles\expandafter%
        {,\niib@prefix\jobname}
      \niib@log@debug{Added bibnotes database to biblatex file list}}%
     {\let\niib@org@bib\bibliography
-     \renewcommand{\bibliography}[1]{%
+     \renewcommand*{\bibliography}[1]{%
        \ifnum\the\value{bibnote} > \z@
          \niib@org@bib{\niib@prefix\jobname,#1}%
        \else