sidenotes (4mar15)

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

6 files changed, 34 insertions, 7 deletions

diff --git a/Master/texmf-dist/doc/latex/sidenotes/README b/Master/texmf-dist/doc/latex/sidenotes/README
index cf32662b3c6..53e3eb0d53b 100644
--- a/Master/texmf-dist/doc/latex/sidenotes/README
+++ b/Master/texmf-dist/doc/latex/sidenotes/README
@@ -1,3 +1,3 @@
-This package allows the typesetting of manuscripts with notes, figures, citations, captions and tables in the margin, which is common e.g. in science textbooks or theses. 
+This package allows the typesetting of manuscripts with notes, figures, citations, captions and tables in the margin, which is common e.g. in science textbooks or theses. A reference implementation, i.e. the caesar_book class as well as its documentation are included.
 
-This material is subject to the LaTeX Project Public License. See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for the details of that license.
\ No newline at end of file
+This material is subject to the LaTeX Project Public License. See http://latex-project.org/lppl/lppl-1-3c.html for the details of that license.
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/sidenotes/caesar_example.pdf b/Master/texmf-dist/doc/latex/sidenotes/caesar_example.pdf
index 9e14e369b94..6e8f0bf147a 100644
--- a/Master/texmf-dist/doc/latex/sidenotes/caesar_example.pdf
+++ b/Master/texmf-dist/doc/latex/sidenotes/caesar_example.pdf
diff --git a/Master/texmf-dist/doc/latex/sidenotes/sidenotes.pdf b/Master/texmf-dist/doc/latex/sidenotes/sidenotes.pdf
index 1c5f3cf32de..7f1c2e60e8a 100644
--- a/Master/texmf-dist/doc/latex/sidenotes/sidenotes.pdf
+++ b/Master/texmf-dist/doc/latex/sidenotes/sidenotes.pdf
diff --git a/Master/texmf-dist/source/latex/sidenotes/sidenotes.dtx b/Master/texmf-dist/source/latex/sidenotes/sidenotes.dtx
index 5aef80beab6..79995fb5a15 100644
--- a/Master/texmf-dist/source/latex/sidenotes/sidenotes.dtx
+++ b/Master/texmf-dist/source/latex/sidenotes/sidenotes.dtx
@@ -15,10 +15,10 @@
 % The author of this work is Andy Thomas
 %
 %<*driver>
-\ProvidesFile{sidenotes.dtx}[2014/06/05 v0.97e rich text in the margin for LaTeX]%
+\ProvidesFile{sidenotes.dtx}[2015/03/04 v0.98 rich text in the margin for LaTeX]%
 %</driver>
 %<package>\RequirePackage{l3keys2e}%
-%<package>\ProvidesExplPackage{sidenotes}{2014/06/05}{0.97e}{rich text in the margin for LaTeX}
+%<package>\ProvidesExplPackage{sidenotes}{2015/03/04}{0.98}{rich text in the margin for LaTeX}
 %<package>\RequirePackage{marginnote} % provides an offset option for the marginals instead of a float
 %<package>\RequirePackage{caption} % handles the captions (in the margin)
 %<package>\RequirePackage{xparse} % new LaTeX3 syntax to define macros and environments
@@ -69,6 +69,7 @@
 % \changes{v0.95}{2014/01/23}{cleaned up the documentation.}
 % \changes{v0.97}{2014/06/05}{make it a expl package}
 % \changes{v0.97}{2014/06/05}{introduce package option oneside }
+% \changes{v0.98}{2015/03/04}{compatible with new mhchem version}
 %
 % \begin{abstract}
 % \noindent This package allows the typesetting of rich content in the margin. 
@@ -227,6 +228,7 @@
 %
 % \changes{v0.93}{2012/04/17}{regular ifnextchar gobbles trailing whitespaces, introduce a new one that does not.}
 % \changes{v0.97}{2014/05/29}{New mechanism to detect subsequent sidenotemarks}
+% \changes{v0.97}{2014/06/05}{New macro to place the superscript mark}
 %
 % \noindent Put a marker in the horizontal list to detect subsequent sidenotemarks.
 %
diff --git a/Master/texmf-dist/tex/latex/sidenotes/caesar_book.cls b/Master/texmf-dist/tex/latex/sidenotes/caesar_book.cls
index b1812381a5e..8b892f6c691 100644
--- a/Master/texmf-dist/tex/latex/sidenotes/caesar_book.cls
+++ b/Master/texmf-dist/tex/latex/sidenotes/caesar_book.cls
@@ -1,5 +1,5 @@
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesFile{caesar_book.cls}[2014/02/14 v0.96 Caesar book]
+\ProvidesFile{caesar_book.cls}[2015/03/04 v0.98 Caesar book]
 % Load the amsmath and the mhchem package before loading microtype
 \RequirePackage{amsmath}% better math handling
 \RequirePackage[version=3]{mhchem}% chemical formulas
@@ -135,4 +135,29 @@
    \addvspace{1.0\baselineskip plus 0.5ex minus 0.2ex}%
    \noindent\textsc{#1}%
 }%
-\newcommandtwoopt{\sidecite}[3][][]{\sidenote{\fullcite[#1][#2]{#3}}}
+\ExplSyntaxOn
+\NewDocumentCommand \sidecite { o o m }
+{ 
+  \IfNoValueOrEmptyTF{#1}
+  {
+    \IfNoValueOrEmptyTF{#2}
+    {
+      \sidenote{\fullcite{#3}}
+    }
+    {
+      \sidenote{\fullcite[#2]{#3}}
+    }
+  }
+  {
+    \IfNoValueOrEmptyTF{#2}
+    {
+      \sidenote{\fullcite[#1]{#3}}
+    }
+    {
+      \sidenote{\fullcite[#1][#2]{#3}}
+    }
+  }
+}
+\ExplSyntaxOff
+
+
diff --git a/Master/texmf-dist/tex/latex/sidenotes/sidenotes.sty b/Master/texmf-dist/tex/latex/sidenotes/sidenotes.sty
index 36d41bc7b31..b9040b117ee 100644
--- a/Master/texmf-dist/tex/latex/sidenotes/sidenotes.sty
+++ b/Master/texmf-dist/tex/latex/sidenotes/sidenotes.sty
@@ -13,7 +13,7 @@
 %% about the files the work consists of.
 %% 
 \RequirePackage{l3keys2e}%
-\ProvidesExplPackage{sidenotes}{2014/06/05}{0.97e}{rich text in the margin for LaTeX}
+\ProvidesExplPackage{sidenotes}{2015/03/04}{0.98}{rich text in the margin for LaTeX}
 \RequirePackage{marginnote} % provides an offset option for the marginals instead of a float
 \RequirePackage{caption} % handles the captions (in the margin)
 \RequirePackage{xparse} % new LaTeX3 syntax to define macros and environments