summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-07-23 21:58:15 +0000
committerKarl Berry <karl@freefriends.org>2008-07-23 21:58:15 +0000
commit286bd513b7334270cf07920eab4fd9c606a4970c (patch)
tree5e22b4f65377a1b264259f7c2eb8224f99a47f79
parent90b73a5ab3c59005dbeb8df00715344586c3a569 (diff)
chemstyle 1.4a (23jul08)
git-svn-id: svn://tug.org/texlive/trunk@9728 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/notes2bib/notes2bib-manual.pdfbin167656 -> 167730 bytes
-rw-r--r--Master/texmf-dist/doc/latex/notes2bib/notes2bib.pdfbin239723 -> 239940 bytes
-rw-r--r--Master/texmf-dist/source/latex/notes2bib/notes2bib.dtx84
-rw-r--r--Master/texmf-dist/tex/latex/notes2bib/notes2bib.sty34
4 files changed, 64 insertions, 54 deletions
diff --git a/Master/texmf-dist/doc/latex/notes2bib/notes2bib-manual.pdf b/Master/texmf-dist/doc/latex/notes2bib/notes2bib-manual.pdf
index febda698e00..1271254ca1e 100644
--- a/Master/texmf-dist/doc/latex/notes2bib/notes2bib-manual.pdf
+++ b/Master/texmf-dist/doc/latex/notes2bib/notes2bib-manual.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/notes2bib/notes2bib.pdf b/Master/texmf-dist/doc/latex/notes2bib/notes2bib.pdf
index 26479e9b762..aa061929b8e 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 2cbb0cafc5e..6b7358304da 100644
--- a/Master/texmf-dist/source/latex/notes2bib/notes2bib.dtx
+++ b/Master/texmf-dist/source/latex/notes2bib/notes2bib.dtx
@@ -16,10 +16,11 @@
% The current maintainer of this work is Joseph Wright.
%
% This work consists of the source file notes2bib.dtx
-% and the derived files notes2bb.ins,
+% and the derived files notes2bib.ins,
% notes2bib.sty,
-% notes2bib.pdf,
-% jawltxdoc.sty and
+% jawltxdoc.sty,
+% notes2bib-manual.pdf,
+% notes2bib.pdf and
% README
%
% TDS-ready files:
@@ -559,9 +560,9 @@ unsorted bibliography styles are supported.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\def\niib@id$#1: #2.#3 #4 #5-#6-#7 #8 #9${%
- #5/#6/#7\space v1.4\space}
+ #5/#6/#7\space v1.4a\space}
\ProvidesPackage{notes2bib}
- [\niib@id$Id: notes2bib.dtx 11 2008-06-21 16:00:05Z joseph $
+ [\niib@id$Id: notes2bib.dtx 13 2008-07-22 20:06:39Z joseph $
Integrating notes into the bibliography]
\RequirePackage{xkeyval}[2005/05/07]
% \end{macrocode}
@@ -830,21 +831,6 @@ unsorted bibliography styles are supported.
{}
{\global\niib@etextrue}
\endgroup
-\ProcessOptionsX[niib]<opt>
-\AtEndOfPackage{
- \define@key[niib]{opt}{etex}
- {\niib@log@warn{Option `etex' only available
- \MessageBreak when loading notes2bib}}}
-\begingroup
- \@ifundefined{eTeXversion}
- {\ifniib@etex
- \niib@log@warn{e-TeX unavailable}%
- \global\niib@etexfalse
- \fi}
- {\ifniib@etex\else
- \niib@log@inf{Use of e-TeX disabled}%
- \fi}
-\endgroup
% \end{macrocode}
%\end{macro}
%
@@ -977,6 +963,24 @@ unsorted bibliography styles are supported.
%\end{macro}
%\end{macro}
%\end{macro}
+% Options can now be processed.
+% \begin{macrocode}
+\ProcessOptionsX[niib]<opt>
+\AtEndOfPackage{
+ \define@key[niib]{opt}{etex}
+ {\niib@log@warn{Option `etex' only available
+ \MessageBreak when loading notes2bib}}}
+\begingroup
+ \@ifundefined{eTeXversion}
+ {\ifniib@etex
+ \niib@log@warn{e-TeX unavailable}%
+ \global\niib@etexfalse
+ \fi}
+ {\ifniib@etex\else
+ \niib@log@inf{Use of e-TeX disabled}%
+ \fi}
+\endgroup
+% \end{macrocode}
%
%\subsection{User macros}
%\begin{macro}{\thebibnote}
@@ -1649,8 +1653,14 @@ unsorted bibliography styles are supported.
\usepackage[scaled=0.95]{helvet}
\usepackage[version=3]{mhchem}
\usepackage[osf]{mathpazo}
-\usepackage{booktabs,array,url,courier,xspace,etoolbox,varioref}
+\usepackage{booktabs,array,url,courier,xspace,varioref}
\usepackage{upgreek,ifpdf,float,caption,longtable,babel}
+\begingroup
+ \@ifundefined{eTeXversion}
+ {\aftergroup\@gobble}
+ {\aftergroup\@firstofone}
+\endgroup
+{\usepackage{etoolbox}}
\floatstyle{plaintop}
\restylefloat{table}
\labelformat{figure}{\figurename~#1}
@@ -1714,24 +1724,13 @@ unsorted bibliography styles are supported.
\hbox to\linewidth{\box\lst@samplebox\hss}%
\end{minipage}%
\end{list}}
-\let\LaTeXcodenoexample\LaTeXcodeexample
-\newcommand*{\LaTeXcodenoexampleend}{%
- \egroup
- \setlength\LaTeXwidth{\wd\lst@samplebox}%
- \begin{list}{}{%
- \setlength\itemindent{0pt}
- \setlength\leftmargin{0pt}
- \setlength\rightmargin{0pt}}%
- \item
- \begin{minipage}[c]{\LaTeXwidth}
- \hbox to\linewidth{\box\lst@samplebox\hss}%
- \end{minipage}%
- \end{list}}
\newcommand*{\LaTeXcodefloat}{%
\setkeys{lst}{tabsize=4,gobble=3,breakindent=0pt,
basicstyle=\small\ttfamily,basewidth=0.51em,
keywordstyle=\color{blue}}%
\lst@BeginAlsoWriteFile{\LaTeXexamplefile}}
+\let\LaTeXcodenoexample\LaTeXcodefloat
+\let\LaTeXcodenoexampleend\@empty
\newcommand*{\LaTeXcodefloatend}{%
\MakePercentComment\catcode`\^^M=10\relax
\small
@@ -1806,8 +1805,19 @@ unsorted bibliography styles are supported.
\DeclareRobustCommand*{\XeTeX}
{X\kern-.125em\lower.5ex\hbox{\reflectbox{E}}\kern-.1667em\TeX}
\providecommand*{\CTAN}{\textsc{ctan}}
-\patchcmd{\@addmarginpar}
- {\@latex@warning@no@line {Marginpar on page \thepage\space moved}}
- {\relax}{}{}
+\@ifpackageloaded{etoolbox}
+ {\patchcmd{\@addmarginpar}
+ {\@latex@warning@no@line {Marginpar on page \thepage\space moved}}
+ {\relax}{}{}}
+ {}
+\newcounter{argument}
+\g@addto@macro\endmacro{\setcounter{argument}{0}}
+\newcommand*\darg[1]{%
+ \stepcounter{argument}%
+ {\ttfamily\char`\#\theargument~:~}#1\par\noindent\ignorespaces}
+\newcommand*\doarg[1]{%
+ \stepcounter{argument}%
+ {\ttfamily\makebox[0pt][r]{[}%
+ \char`\#\theargument]:~}#1\par\noindent\ignorespaces}
%</jawltxdoc>
%\fi
diff --git a/Master/texmf-dist/tex/latex/notes2bib/notes2bib.sty b/Master/texmf-dist/tex/latex/notes2bib/notes2bib.sty
index c24a2950549..874d625ca3b 100644
--- a/Master/texmf-dist/tex/latex/notes2bib/notes2bib.sty
+++ b/Master/texmf-dist/tex/latex/notes2bib/notes2bib.sty
@@ -15,9 +15,9 @@
%%
\NeedsTeXFormat{LaTeX2e}
\def\niib@id$#1: #2.#3 #4 #5-#6-#7 #8 #9${%
- #5/#6/#7\space v1.4\space}
+ #5/#6/#7\space v1.4a\space}
\ProvidesPackage{notes2bib}
- [\niib@id$Id: notes2bib.dtx 11 2008-06-21 16:00:05Z joseph $
+ [\niib@id$Id: notes2bib.dtx 13 2008-07-22 20:06:39Z joseph $
Integrating notes into the bibliography]
\RequirePackage{xkeyval}[2005/05/07]
\newcommand*{\niib@tempa}{}
@@ -146,21 +146,6 @@
{}
{\global\niib@etextrue}
\endgroup
-\ProcessOptionsX[niib]<opt>
-\AtEndOfPackage{
- \define@key[niib]{opt}{etex}
- {\niib@log@warn{Option `etex' only available
- \MessageBreak when loading notes2bib}}}
-\begingroup
- \@ifundefined{eTeXversion}
- {\ifniib@etex
- \niib@log@warn{e-TeX unavailable}%
- \global\niib@etexfalse
- \fi}
- {\ifniib@etex\else
- \niib@log@inf{Use of e-TeX disabled}%
- \fi}
-\endgroup
\let\niib@org@footnote\footnote
\let\niib@org@footnotemark\footnotemark
\let\niib@org@footnotetext\footnotetext
@@ -225,6 +210,21 @@
\niib@log@inf{endnotes package not loaded\MessageBreak
endnotes=false ignored}%
\fi}}}
+\ProcessOptionsX[niib]<opt>
+\AtEndOfPackage{
+ \define@key[niib]{opt}{etex}
+ {\niib@log@warn{Option `etex' only available
+ \MessageBreak when loading notes2bib}}}
+\begingroup
+ \@ifundefined{eTeXversion}
+ {\ifniib@etex
+ \niib@log@warn{e-TeX unavailable}%
+ \global\niib@etexfalse
+ \fi}
+ {\ifniib@etex\else
+ \niib@log@inf{Use of e-TeX disabled}%
+ \fi}
+\endgroup
\newcounter{bibnote}
\renewcommand*{\thebibnote}{\niib@name\the\value{bibnote}}
\DeclareRobustCommand*{\bibnote}{%