parnotes (16aug16)

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

4 files changed, 18 insertions, 52 deletions

diff --git a/Master/texmf-dist/doc/latex/parnotes/README.md b/Master/texmf-dist/doc/latex/parnotes/README.md
index 01fbad502bb..a5680c236d2 100644
--- a/Master/texmf-dist/doc/latex/parnotes/README.md
+++ b/Master/texmf-dist/doc/latex/parnotes/README.md
@@ -1,5 +1,6 @@
 parnotes
 ========
+rev.3
 
 The parnotes package adds a new note type, `\parnote`. Parnotes are set as normal, running paragraphs and may be placed two ways: (1) automatically, at the end of the paragraph, or (2) manually, using the `\parnotes` command.
 
@@ -7,7 +8,7 @@ To place parnotes automatically after every paragraph, use the `autopn` environm
 
     \begin{autopn}
     Text\parnote{parnote}
-
+    
     Text
     \end{autopn}
     
@@ -15,17 +16,17 @@ If environments are used within `autopn`, another `autopn` environment must be n
 
 For more details, read the project documentation in `parnotes.pdf`.
 
-Bugs and Source
----------------
-The development repository and the bug tracker for this package are hosted at https://github.com/chelh/LaTeX-parnotes
+Contributing
+------------
+The development repository and the bug tracker for this package are hosted [on GitHub](https://github.com/chelh/LaTeX-parnotes).
 
 License
 -------
-Copyright (c) 2016 Chelsea Hughes
+Copyright © 2012, 2016 Chelsea Hughes
 
 This work is distributed under the LaTeX Project Public License, version 1.3 or later, available at http://www.latex-project.org/lppl.txt
 
-I currently maintain this project (comprising `parnotes.sty`, `parnotes.tex`, `README.md`, and the derived file `parnotes.pdf`) and will receive error reports at the project GitHub page (see **Bugs and Source** above).
+I currently maintain this project (comprising `parnotes.sty`, `parnotes.tex`, `README.md`, and the derived file `parnotes.pdf`) and will receive error reports at the project GitHub page (see **Contributing** above).
 
 This package was started due to a question at the TeX Stack Exchange: http://tex.stackexchange.com/questions/34746/
 
diff --git a/Master/texmf-dist/doc/latex/parnotes/parnotes.pdf b/Master/texmf-dist/doc/latex/parnotes/parnotes.pdf
index 7ae2b0a0043..5f48460e215 100644
--- a/Master/texmf-dist/doc/latex/parnotes/parnotes.pdf
+++ b/Master/texmf-dist/doc/latex/parnotes/parnotes.pdf
diff --git a/Master/texmf-dist/doc/latex/parnotes/parnotes.tex b/Master/texmf-dist/doc/latex/parnotes/parnotes.tex
index 9617a873d34..4d7964ac759 100644
--- a/Master/texmf-dist/doc/latex/parnotes/parnotes.tex
+++ b/Master/texmf-dist/doc/latex/parnotes/parnotes.tex
@@ -38,10 +38,11 @@
 \usepackage{listings}
 \lstset{numbers=left,basicstyle={\small\ttfamily},numberstyle={\squelchstyle\color{gray}}}
 \usepackage{booktabs}
+\usepackage{microtype}
 
-\title{The \textsf{parnotes} package\parnote{This is rev.~2, last modified 7/26/2016.}}
+\title{The \textsf{parnotes} package\parnote{This is rev.~3, last modified 8/15/2016.}}
 \author{Chelsea Hughes\parnote{See \texttt{parnotes.sty} for copyright and contact details.}}
-\date{July 26, 2016}
+\date{August 15, 2016}
 
 \renewcommand{\parnotefmt}[1]{\centerline{\colorbox{black!10}{\parbox{0.82\textwidth}{\footnotesize\sffamily\noindent #1}}}}
 
@@ -119,7 +120,7 @@ The following options change the font used within parnotes:\\[1ex]
 Five internal macros control formatting for parnotes and parnote marks:
 
 \medskip\fbox{\begin{varwidth}{\textwidth}\texttt{\textbackslash{}parnotefmt\{}$\langle$\textit{text}$\rangle$\texttt{\}\\
-\textbackslash{}theparnotemark\{}$\langle$\textit{counter}$\rangle$\texttt{\}\\
+\textbackslash{}theparnotemark\\
 \textbackslash{}parnotevskip\\
 \textbackslash{}parnoteintercmd\\
 \textbackslash{}parnotecusmarkfmt\{}$\langle$\textit{mark}$\rangle$\texttt{\}}\end{varwidth}}
@@ -188,6 +189,10 @@ instead, \verb+\narrower+ must be placed manually within the new definition for
 
 \section{Changelog}
 {\raggedright
+\noindent\textbf{Revision 3, released on Aug 15, 2016}
+\begin{itemize}
+\item Bug fix: Use \verb+\protected@edef+ to expand the parnote counter (fixes incompatibility with \textsf{BiocStyle})
+\end{itemize}
 \noindent\textbf{Revision 2, released on Jul 26, 2016}
 \begin{itemize}
 \item \textbf{Breaking change:} You can no longer redefine \verb+\parnotemarkfmt+. Use \verb+\theparnotemark+ and \verb+\parnotecusmarkfmt+ instead. See section~2.2 for details.
@@ -323,36 +328,3 @@ p.~\pageref{pn:special}), allowing you to re-use parnote marks%
 \end{document}
 \end{lstlisting}
 \end{document}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Master/texmf-dist/tex/latex/parnotes/parnotes.sty b/Master/texmf-dist/tex/latex/parnotes/parnotes.sty
index 5d394b7b92e..e5c3f68f5b6 100644
--- a/Master/texmf-dist/tex/latex/parnotes/parnotes.sty
+++ b/Master/texmf-dist/tex/latex/parnotes/parnotes.sty
@@ -15,7 +15,7 @@
 % Thanks to Stack Exchange users Ahmed Musa, Bruno Le Floch, and David Carlisle.
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{parnotes}[2016/07/26 rev. 2 Notes after every paragraph, or elsewhere]
+\ProvidesPackage{parnotes}[2016/08/15 rev. 3 Notes after every paragraph, or elsewhere]
 
 %
 % These are the user-modifiable format commands
@@ -147,8 +147,8 @@
 \def\PN@parnote@twoargs[#1]#2{\PN@parnote@real{#1}{#2}}
 \def\PN@parnote@onearg#1{%
     % Fully expand the new counter value, as text
-    \begingroup\edef\@x{\endgroup\noexpand\PN@parnote@real%
-                        {\theparnotemark}}\@x{#1}%
+    \begingroup\protected@edef\@x{\endgroup\noexpand\PN@parnote@real%
+                                  {\theparnotemark}}\@x{#1}%
     \global\advance\c@parnotemark\@ne
 }
 \def\PN@gobble@opt@@[#1]#2{}
@@ -167,13 +167,6 @@
     \g@addto@macro\PN@text{\parnotemark{#1}\nolinebreak\thinspace#2}%
 }
 
-\long\def\PN@parnote@compat#1{%
-    \parnotemarkfmt{parnotemark}
-    \unless\ifx\PN@text\@empty\g@addto@macro\PN@text{\parnoteintercmd}\fi
-    \g@addto@macro\PN@text{\phantomsection\def\@currentlabel{\arabic{parnotemark}}}%
-    \g@addto@macro\PN@text{\parnotemarkfmt{parnotemark}\nolinebreak\thinspace#1}%
-}
-
 %
 % Definitions to get multiple consecutive parnotes/footnotes working, as
 % in footmisc and manyfoot; this is cribbed directly from footmisc