sidenotes (14feb14)

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

8 files changed, 258 insertions, 168 deletions

diff --git a/Master/texmf-dist/doc/latex/sidenotes/README b/Master/texmf-dist/doc/latex/sidenotes/README
index 6850f1fec58..cf32662b3c6 100644
--- a/Master/texmf-dist/doc/latex/sidenotes/README
+++ b/Master/texmf-dist/doc/latex/sidenotes/README
@@ -1,3 +1,3 @@
-This package tries to allow typesetting of texts with notes, figures, citations, captions and tables in the margin.
+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 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
diff --git a/Master/texmf-dist/doc/latex/sidenotes/caesar_example.pdf b/Master/texmf-dist/doc/latex/sidenotes/caesar_example.pdf
index c14745b0f2f..d4661fa4de5 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/caesar_example.tex b/Master/texmf-dist/doc/latex/sidenotes/caesar_example.tex
index 3cb3d70fd48..614bd41731c 100644
--- a/Master/texmf-dist/doc/latex/sidenotes/caesar_example.tex
+++ b/Master/texmf-dist/doc/latex/sidenotes/caesar_example.tex
@@ -1,5 +1,7 @@
 \documentclass{caesar_book}
 %
+% !BIB TS-program = biber
+%
 % -- use dummy graphics
 \usepackage{mwe}
 
diff --git a/Master/texmf-dist/doc/latex/sidenotes/sidenotes.pdf b/Master/texmf-dist/doc/latex/sidenotes/sidenotes.pdf
index e7c8014088a..ded0402e859 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 f97ae822b58..c482389ccee 100644
--- a/Master/texmf-dist/source/latex/sidenotes/sidenotes.dtx
+++ b/Master/texmf-dist/source/latex/sidenotes/sidenotes.dtx
@@ -2,7 +2,7 @@
 %
 % sidenotes.dtx
 %
-% Copyright (C) 2011 by Andy Thomas <andythomas(at)web.de>
+% Copyright (C) 2011-2014 by Andy Thomas <andythomas(at)web.de>
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -19,12 +19,11 @@
 %</driver>
 %<package>\ProvidesPackage{sidenotes}[%
 %<*driver|package>
-  2012/04/07 v0.93 rich text in the margin for LaTeX]
+  2014/02/14 v0.96a rich text in the margin for LaTeX]
 %</driver|package>
-%<package>\RequirePackage{marginnote} % puts the stuff in the margin and provides an offset option instead of a float
-%<package>\RequirePackage{caption} % handles the figure caption (in the margin)
-%<package>\RequirePackage{xifthen} % provide an if command 
-%<package>\RequirePackage{twoopt} % two optional arguments possible
+%<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
 %<package>\RequirePackage[strict]{changepage} % Changepage package for symmetric twoside handling
 %<*driver>
 \documentclass{ltxdoc}
@@ -60,18 +59,22 @@
 % 
 %
 % \title{The \textsf{sidenotes} package\thanks{This document
-%   corresponds to \textsf{sidenotes}~\fileversion, dated \filedate.}}
-% \author{Andy Thomas\\ \texttt{andythomas(at)web.de}\\ \\Oliver Schebaum }
+% corresponds to \textsf{sidenotes}~\fileversion, dated \filedate. 
+% Earlier versions by Oliver Schebaum.}}
+% \author{Andy Thomas\\ \texttt{andythomas(at)web.de}}
 %
 % \maketitle
 %
 % \changes{v0.51}{2011/10/05}{Extent the documentation of the macros.}
 % \changes{v0.90}{2012/06/02}{two opt package is required, the definitions are too confusing otherwise}
 % \changes{v0.92}{2012/11/09}{corrected typo in email address}
+% \changes{v0.95}{2014/01/23}{cleaned up the documentation.}
+%
 % \begin{abstract}
-% This package tries to allow the typesetting of rich content in the margin. 
-% This includes text, but also figures, captions, tables and citations.
-% This is common in science textbooks such as Feynman's \textit{Lectures on Physics}.
+% \noindent This package allows the typesetting of rich content in the margin. 
+% It includes text, but also figures, captions, tables and citations,
+% which is common in science textbooks such as Feynman's 
+% \textit{Lectures on Physics}.
 % \end{abstract}
 %
 % \tableofcontents
@@ -83,73 +86,99 @@
 % \section{Usage}
 %
 % \DescribeMacro{\sidenote}
-% The macro is very similar to
-% the footnote macro and tries to emulate its behavior. But like the name
-% says, the note is put in the margin, hence the name sidenote. It has the
-% same parameters as footnote, plus an additional offset:
-% \verb+\sidenote[number][offset]{text}+. The sidenote moves up or down (floats)
-% to not overlap with other floats in the margin if no offset is given. 
-% and all the sidenotes are subsequently numbered. The
-% first, optional parameter will manually change the numbering.
-% The sidenote will be fixed at a particular position in the margin if the
-% offset parameter is used.
+% The macro is very similar to the footnote macro and tries to emulate
+% its behavior. It just puts the notes in the margin instead of the bottom
+% of the page, therefore the name \emph{sidenote}. It has the same parameters 
+% as footnote as well as an additional offset:
+% \verb+\sidenote[number][offset]{text}+. All the sidenotes are subsequently 
+% numbered and float in the margin to avoid overlap.  
+% The first, optional parameter will manually change the numbering to the given
+% value. The second offset parameter will fix the text at a certain position 
+% in the margin. In particular, there is a difference between not providing an 
+% offset (floating text) and an offset of 0 (fix text at actual position).
 %
 % \DescribeMacro{\sidenotemark} 
-% Sidenote tries to mimic the footnote behavior and tries to provide the same solutions. 
-% Sometimes it is not possible to directly
-% call a sidenote macro, e.g. in particular environments. Then, 
-% you can also use \verb+\sidenotemark[number]+ and \verb+\sidenotetext[number][offset]{text}+ 
-% commands. \verb+\sidenotemark+ puts a mark at the current position. Then, outside of the environment 
+% Sidenote tries to mimic the footnote behavior and, consequently, provides the 
+% same solutions. Sometimes, it is not possible to directly call a sidenote 
+% macro, e.g.\ inside of a figure caption. Then, you can use 
+% \verb+\sidenotemark[number]+ and \verb+\sidenotetext[number][offset]{text}+ 
+% macros. \verb+\sidenotemark+ puts a mark at the current position. Afterwards, 
+% outside of the environment that causes the trouble, 
 % \DescribeMacro{\sidenotetext}
-% that causes the trouble, it is possible the call \verb+\sidenotetext[number][offset]{text}+ 
-% to actually make the sidenote. The
-% first, optional parameter will change the numbering of the sidenote and the offset
-% parameter will change the position manually.
+% it is possible the call \verb+\sidenotetext[number][offset]{text}+ to provide 
+% the text and typeset the sidenote. The optional parameters are similar to the 
+% sidenote macro. The first, optional parameter will change the numbering and 
+% the offset will change the position.
 %
 % \changes{v0.61}{2011/10/17}{documentation of sidetext}
 %
 %\DescribeMacro{\sidecaption}
-% The \verb+\sidecaption[entry][offset]{text}+ macro can be used if the caption of a figure or table 
-% is supposed to be in the margin. The caption has to be adjacent to the figure, so a float is not an option
-% here. Therefore, the caption might overlap with sidenotes that have to be manually adjusted. 
-% Please note, that the formatting is done by the caption package by defining a sidecaption style. 
-%\DescribeMacro{\sidecaption*}
-% This macro has a sister \verb+\sidecaption*[offset]{text}+ that generates no entry.
+% The \verb+\sidecaption[entry][offset]{text}+ macro can be used if the caption 
+% of a figure or table should be in the margin. The caption has to be adjacent 
+% to the figure, so a float is not an option here. Therefore, the caption might 
+% overlap with other marginals. Then, these marginals have to be adjusted with
+% offset parameters. The formatting of the caption is done by the \emph{caption}
+% package by defining a \emph{sidecaption} style. Please refer to the 
+% documentation of the caption package for information on styles. The macro can
+% be starred, which is analog to the regular starred caption (no numbering, no 
+% tof entry): \verb+\sidecaption*[offset]{text}+.
 %
 % \DescribeEnv{marginfigure}
-% The marginfigure environment puts a figure and its caption in the margin. Instead of 
-% \verb+\begin{figure}[htbp]+ use \verb+\begin{marginfigure}[offset]+. The offset switches the behavior
-% from float to fixed position. 
+% The marginfigure environment puts a figure and its caption in the margin. 
+% Instead of \verb+\begin{figure}[htbp]+ use \verb+\begin{marginfigure}[offset]+. 
+% Again, using an offset value switches the behavior from float to fixed 
+% position. The marginfigure has its own caption style named \emph{marginfigure}.   
 %
 % \DescribeEnv{margintable}
-% The margintable environment works similarly, but with table environments. Use \verb+\begin{margintable}[offset]+ instead
-% of \verb+\begin{table}[htbp]+.
+% The margintable environment works similar to marginfigure, but with table 
+% environments. Use \verb+\begin{margintable}[offset]+ instead of 
+% \verb+\begin{table}[htbp]+, its caption style is named \emph{margintable}.
 %
 % \DescribeEnv{figure*}
-% The \verb+figure*+ environment is used to position figures across the full page, i.e. the text width plus
-% margin. The captions type can be changed by changing the widefigure style. 
+% The \verb+figure*+ environment is used to position figures across the full 
+% page, i.e. the text width plus the margin. The algorithm has to distinguish
+% between recto and verso (left and right) pages and might need up to three
+% \LaTeX{} runs to provide the desired result. The corresponding caption style
+% is called \emph{widefigure}. 
 % \DescribeEnv{table*}
-% The \verb+table*+ environment is very similar, but for tables. Use widetable for its caption style.  
+% The sister environment for tables is \verb+table*+. Use \emph{widetable} to 
+% change its caption style. 
 %
 % \section{Technical note}
 %
-% When writing the package, we tried to provide a minimum extension to standard \LaTeX{} for typesetting
-% rich content in the margin. Also, we tried to not break compatibility with packages the user might 
-% want to additionally load in a custom class file or a document. However, the following packages are 
-% needed by this package and might introduce side effects with other packages.
+% When writing the package, we tried to provide a \emph{minimum} extension to 
+% standard \LaTeX{} for typesetting rich content in the margin. This means,
+% that there are no sensible default values for most things such as page
+% geometry, fonts and font sizes. However, the \emph{caesar\textunderscore 
+% book}-class accompanies this package as an example implementation as well 
+% as a template we use for our theses. 
+% 
+% In addition, we tried to keep compatibility with 
+% packages the user might want to use later. However, the following packages 
+% are needed by \emph{sidenotes} and might introduce side effects with other 
+% packages.
 %
 % \section{Required packages}
 % 
 %  \changes{v0.52}{2011/10/06}{added a section that the package needs marginnote, caption and xifthen.}
 %  \changes{v0.90}{2012/06/02}{added a section that the package needs twoopt and changepage.}
+%  \changes{v0.94}{2014/01/22}{start using xparse} 
+%
 %  \begin{description}
 %     \item[marginnote]
-%        supports another command to create notes in the margin. The notes are not floats and can be shifted up or down. 
+%        supports an alternative to \verb+\marginpar+ and creates notes in the 
+%        margin. The notes are not floats and can be shifted up or down. 
+%        Technically, every time an offset is provided the package uses 
+%        \verb+\marginnote+ and \verb+\marginpar+ otherwise.
 %     \item[caption]
-%        is used to set figure and table captions in the margin and to allow formatting of these captions.
-%	  \item[xifthen] is used to test for empty, optional arguments.  
-%     \item[twoopt] is used to define macros with two optional arguments.
-%     \item[changepage] is used to correctly shift figure* and table*. It has to use the option [strict]. 
+%        allows to set figure and table captions in the margin and allows 
+%        easier formatting of these captions. Please refer to the  
+%        \emph{caption} manual for details on styles. 
+%     \item[xparse] is used to take advantage of the improved \LaTeX3 syntax.
+%        All macros and environments are defined using this package.
+%     \item[changepage] is used to correctly shift figure* and table*. It has 
+%        to use the option [strict] to work properly. This might lead to an 
+%        option clash, if the same package is loaded without this option. 
 %  \end{description}%
 %
 % \section{Implementation}
@@ -157,15 +186,38 @@
 % \iffalse
 %<*package>
 % \fi
+%
 % \changes{v0.91}{2012/06/03}{sidenotetextstyle is not needed any more}
-% We need a counter similar to the footnote counter and we want to 
-% have a buffer. 
+% \changes{v0.94}{2014/01/22}{change sidenote counter behavior} 
+%
+% We need a counter similar to the footnote counter.
+%
 %    \begin{macrocode}
-\newcounter{sidenote} % make counter
-\newcounter{@sidenotes@buffer}
-\setcounter{sidenote}{1} % init counter 
+\newcounter{sidenote} % make a counter 
+\setcounter{sidenote}{1} % init the counter 
+%    \end{macrocode}
+% 
+% \noindent The \LaTeX3 parts concerning the optional arguments should not 
+% distinguish between an empty bracket pair and no optional 
+% argument. This is required to keep macros with two leading 
+% optional arguments.
+%
+%    \begin{macrocode}
+\ExplSyntaxOn 
+\DeclareExpandableDocumentCommand{\IfNoValueOrEmptyTF}{mmm}
+{
+ \IfNoValueTF{#1}
+  {#2} % true
+  {\tl_if_empty:nTF {#1} {#2} {#3}} % false
+}
+\ExplSyntaxOff
 %    \end{macrocode}
+%
 % \changes{v0.93}{2012/04/17}{regular ifnextchar gobbles trailing whitespaces, introduce a new one that does not.}
+%
+% \noindent The regular \verb+\ifnextchar+ gobbles trailing whitespaces, 
+% introduce a new one that does not.
+%
 %    \begin{macrocode}
 \def\@sidenotes@ifnextchar#1#2#3{%
 \let\@sidenotes@buffere #1\def\@sidenotes@buffera{#2}%
@@ -176,14 +228,19 @@
 %    \end{macrocode}
 %
 % \begin{macro}{\sidenote}
-% Introduce the sidenote macro with an additional optional argument to set the offset.
+% 
+% Introduce the \verb+\sidenote+ macro with two optional 
+% arguments to set the number and the offset.
+%
 % \changes{v0.53}{2011/10/07}{bugfix, now optional number and offset possible}
 % \changes{v0.80}{2011/11/10}{unstar the newcommand.}
 % \changes{v0.81}{2011/11/29}{added a comma between subsequent sidenotes} 
 % \changes{v0.90}{2012/06/02}{add optional offset for sidenote} 
 % \changes{v0.93}{2012/04/17}{removed mandatory whitespace, new ifnextchar takes care of that}
+% \changes{v0.94}{2014/01/11}{use xparse syntax}
+%
 %    \begin{macrocode}
-\newcommandtwoopt{\sidenote}[3][][]{%
+\NewDocumentCommand \sidenote { o o +m } {%
 \sidenotemark[#1]%
 \sidenotetext[#1][#2]{#3}%
 \@sidenotes@ifnextchar\sidenote{\kern-0.07em\textsuperscript{,}}%
@@ -193,17 +250,20 @@
 % \end{macro}
 %
 % \begin{macro}{\sidenotemark}
+%
 % Sidenotemark is supposed to work similarly to footnotemark.
+%
+% \changes{v0.94}{2014/01/11}{use xparse syntax, change counter behavior}
+% \changes{v0.96}{2014/02/14}{increase the sidenote counter in sidenotetext now}
+%
 %    \begin{macrocode}
-\newcommand{\sidenotemark}[1][]{%
+\NewDocumentCommand \sidenotemark { o } {%
 \nobreak\hspace{0.1pt}\nobreak%
-\ifthenelse{\isempty{#1}}%
-{\textsuperscript{\thesidenote}%
-\refstepcounter{sidenote}}% if no argument is given use sidenote counter%
-{\setcounter{@sidenotes@buffer}{\value{sidenote}}%
-\setcounter{sidenote}{#1}%
-\textsuperscript{\thesidenote}% print out the argument otherwise
-\setcounter{sidenote}{\value{@sidenotes@buffer}}}%
+\IfNoValueOrEmptyTF{#1}%
+{%
+\textsuperscript{\thesidenote}%
+}% if no argument is given use sidenote counter%
+{\textsuperscript{#1}}% print out the argument otherwise
 \@sidenotes@ifnextchar\sidenote{\textsuperscript{,}}{}%
 \ignorespaces%
 }%
@@ -211,19 +271,23 @@
 % \end{macro}
 %
 % \begin{macro}{\sidenotetext}
-% Sidenotetext is supposed to work similarly to footnotetext. The additional, optional argument sets the offset.
+%
+% Sidenotetext is supposed to work similarly to footnotetext. The additional, 
+% optional argument sets the offset.
+%
 % \changes{v0.80}{2011/11/10}{unstar the newcommand.}
 % \changes{v0.90}{2012/06/02}{add optional offset for sidenotetext}
 % \changes{v0.93}{2012/04/17}{add missing comment marks}
+% \changes{v0.94}{2014/01/11}{use xparse syntax, change counter behavior}
+%
 %    \begin{macrocode}
-\newcommandtwoopt{\sidenotetext}[3][][]{%
-\ifthenelse{\isempty{#1}}{% sitenotemark given?
-\addtocounter{sidenote}{-1}%
-\ifthenelse{\isempty{#2}}% offset given?
+\NewDocumentCommand \sidenotetext { o o +m } {%
+\IfNoValueOrEmptyTF{#1}{% sitenotemark given?
+\IfNoValueOrEmptyTF{#2}% offset given?
 {\marginpar{\textsuperscript{\thesidenote}{} #3}}%
 {\marginnote{\textsuperscript{\thesidenote}{} #3}[#2]}%
-\addtocounter{sidenote}{1}}%
-{\ifthenelse{\isempty{#2}}% offset given?
+\refstepcounter{sidenote}}%
+{\IfNoValueOrEmptyTF{#2}% offset given?
 {\marginpar{\textsuperscript{#1} #3}}%
 {\marginnote{\textsuperscript{#1} #3}[#2]}}%
 }%
@@ -231,78 +295,92 @@
 % \end{macro}
 %
 % \begin{macro}{\sidecaption}
+%
 % \changes{v0.91}{2012/06/03}{sidecaption* accompanies sidecaption}
-% Sidecaption puts the caption in the margin.  
-% It never floats with the other text in the margin, since it has to be next to the figure.
+% \changes{v0.94}{2014/01/22}{use xparse syntax} 
+%
+% Sidecaption puts the caption in the margin. It never floats with the other 
+% text in the margin, since it has to be next to the figure.
 % Sidecaption* works similarly to sidecaption, but without an entry.
+%
 %    \begin{macrocode}
 \DeclareCaptionStyle{sidecaption}{font=footnotesize}
-\newcommand{\sidecaption}{\@ifstar\@sidenotes@sidecaption@starred\@sidenotes@sidecaption@unstarred}
-\newcommandtwoopt{\@sidenotes@sidecaption@unstarred}[3][][]{%
+\NewDocumentCommand \sidecaption {s o o m} {%
 \captionsetup{style=sidecaption}%
-\ifthenelse{\isempty{#2}}{\marginnote{\caption[#1]{#3}}}{\marginnote{\caption[#1]{#3}}[#2]}}%
-\newcommand{\@sidenotes@sidecaption@starred}[2][]{%
-\captionsetup{style=sidecaption}%
-\ifthenelse{\isempty{#1}}{\marginnote{\caption*{#2}}}{\marginnote{\caption*{#2}}[#1]}}%
-%
+\IfBooleanTF{#1}%is the macro starred
+{\IfNoValueOrEmptyTF{#2}%
+{\marginnote{\caption*{#4}}}%
+{\marginnote{\caption*{#4}}[#2]}%
+}% yes, starred macro
+{%
+\IfNoValueOrEmptyTF{#2}%
+{\def\@sidenotes@sidecaption@tof{#4}}%
+{\def\@sidenotes@sidecaption@tof{#2}}%
+\IfNoValueOrEmptyTF{#3}%
+{\marginnote{\caption[\@sidenotes@sidecaption@tof]{#4}}}%
+{\marginnote{\caption[\@sidenotes@sidecaption@tof]{#4}}[#3]}%
+}% no, unstarred macro
+}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{environment}{marginfigure}
+%
 % \changes{v0.3}{2011/09/29}{define the sidefigure enviroment without the environ package}
 % \changes{v0.90}{2012/06/02}{the optional offset parameter is back, renamed environment from sidefigure to marginfigure}
-% The marginfigure is similar to the figure environment. But the figure is put in the margin.
+% \changes{v0.94}{2014/01/22}{use xparse syntax} 
+%
+% The marginfigure environment is similar to the figure environment. But the 
+% figure is put in the margin.
+%
 %    \begin{macrocode}
 \newsavebox{\@sidenotes@sidefigurebox}
-\newboolean{@sidenotes@sidefigure@skip}
-\newcommand{\@sidenotes@sidefigure@skiplength}{}
 \DeclareCaptionStyle{marginfigure}{font=footnotesize}
-\newenvironment{marginfigure}[1][]%
-{\ifthenelse{\isempty{#1}}% offset?
-{\setboolean{@sidenotes@sidefigure@skip}{false}}%
-{\setboolean{@sidenotes@sidefigure@skip}{true}%
-\renewcommand{\@sidenotes@sidefigure@skiplength}{#1}}%
-\begin{lrbox}{\@sidenotes@sidefigurebox}%
+\NewDocumentEnvironment{marginfigure}{o} 
+{\begin{lrbox}{\@sidenotes@sidefigurebox}%
 \begin{minipage}{\marginparwidth}%
 \captionsetup{type=figure,style=marginfigure}}%
 {\end{minipage}%
 \end{lrbox}%
-\ifthenelse{\boolean{@sidenotes@sidefigure@skip}}% offset?
-{\marginnote{\usebox{\@sidenotes@sidefigurebox}}[\@sidenotes@sidefigure@skiplength]}% offset
+\IfNoValueOrEmptyTF{#1}% offset?
 {\marginpar{\usebox{\@sidenotes@sidefigurebox}}}% no offset
+{\marginnote{\usebox{\@sidenotes@sidefigurebox}}[#1]}% offset
 }
 %    \end{macrocode}
 % \end{environment}
 %
 % \begin{environment}{margintable}
+%
 % \changes{v0.4}{2011/09/30}{define the sidetable enviroment without the environ package}
 % \changes{v0.90}{2012/06/02}{the optional offset parameter is back, renamed environment from sidetable to margintable}
-% The sidetable is similar to the table environment. But the table is put in the margin.
+% \changes{v0.94}{2014/01/22}{use xparse syntax} 
+%
+% The margintable is similar to the table environment. But the table 
+% is put in the margin.
+%
 %    \begin{macrocode}
 \newsavebox{\@sidenotes@margintablebox}
-\newboolean{@sidenotes@margintable@skip}
-\newcommand{\@sidenotes@margintable@skiplength}{}
 \DeclareCaptionStyle{margintable}{font=footnotesize}
-\newenvironment{margintable}[1][]%
-{\ifthenelse{\isempty{#1}}% 
-{\setboolean{@sidenotes@margintable@skip}{false}}%
-{\setboolean{@sidenotes@margintable@skip}{true}%
-\renewcommand{\@sidenotes@margintable@skiplength}{#1}}%
-\begin{lrbox}{\@sidenotes@margintablebox}%
+\NewDocumentEnvironment{margintable}{o}
+{\begin{lrbox}{\@sidenotes@margintablebox}%
 \begin{minipage}{\marginparwidth}%
 \captionsetup{type=table,style=margintable}}%
 {\end{minipage}%
 \end{lrbox}%
-\ifthenelse{\boolean{@sidenotes@margintable@skip}}% 
-{\marginnote{\usebox{\@sidenotes@margintablebox}}[\@sidenotes@margintable@skiplength]}% 
+\IfNoValueOrEmptyTF{#1}% offset?
 {\marginpar{\usebox{\@sidenotes@margintablebox}}} % 
+{\marginnote{\usebox{\@sidenotes@margintablebox}}[#1]}% 
 }%
 %    \end{macrocode}
 % \end{environment}
 %
-%\begin{environment}{figure*}
+% \begin{environment}{figure*}
+%
 % \changes{v0.85}{2011/06/01}{added the figure* environment}
-% The figure* environment provides a figure environment for figures across text and margin width
+%
+% The figure* environment provides a figure environment for figures that 
+% span across the full page (text plus margin width).
+%
 %    \begin{macrocode}  
 \AtBeginDocument{%
 \newlength{\@sidenotes@extrawidth}
@@ -324,9 +402,13 @@
 %    \end{macrocode}
 % \end{environment}
 
-%\begin{environment}{table*}
+% \begin{environment}{table*}
+%
 % \changes{v0.85}{2011/06/01}{added the table* environment}
-% The table* environment provides a table environment for figures across text and margin width
+%
+% The table* environment provides a table environment for figures across 
+% text and margin width.
+%
 %    \begin{macrocode}  
 \DeclareCaptionStyle{widetable}{margin={0pt,-\@sidenotes@extrawidth},font=footnotesize}
 \renewenvironment{table*}[1][htbp]{\begin{table}[#1]%
diff --git a/Master/texmf-dist/source/latex/sidenotes/sidenotes.ins b/Master/texmf-dist/source/latex/sidenotes/sidenotes.ins
index dfa0c1c9bb7..b43f2a68ba0 100644
--- a/Master/texmf-dist/source/latex/sidenotes/sidenotes.ins
+++ b/Master/texmf-dist/source/latex/sidenotes/sidenotes.ins
@@ -1,5 +1,5 @@
 %%
-%% Copyright (C) 2011 by Andy Thomas <andy.thomas(at)uni.bielefeld.de>
+%% Copyright (C) 2011-2014 by Andy Thomas <andythomas(at)web.de>
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/sidenotes/caesar_book.cls b/Master/texmf-dist/tex/latex/sidenotes/caesar_book.cls
index 750ae562708..b1812381a5e 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}[2013/12/18 v0.93 Caesar book]
+\ProvidesFile{caesar_book.cls}[2014/02/14 v0.96 Caesar book]
 % Load the amsmath and the mhchem package before loading microtype
 \RequirePackage{amsmath}% better math handling
 \RequirePackage[version=3]{mhchem}% chemical formulas
@@ -12,10 +12,16 @@
 \RequirePackage{microtype}% microtypography
 \@ifpackagelater{microtype}{2011/08/18}% xxx allow LaTeX and earlier microtype
 {\renewcommand{\caesar@letterspace}[1]{\textls{#1}}}%
-{\AtEndDocument{\ClassWarningNoLine{caesar_book}{Need newest microtype (beta) for letterspacing.}}}
-% Set page layout geometry -- default is epubli science-book format
-\RequirePackage[paperwidth=170mm, paperheight=240mm, left=42pt, top=40pt, textwidth=280pt, marginparsep=20pt, marginparwidth=100pt, textheight=560pt, footskip=40pt]{geometry}
-% fontsize is 10pt, 13pt for book 
+{\AtEndDocument{\ClassWarningNoLine{caesar_book}{Need newest microtype for letterspacing.}}}
+%
+% Set page layout geometry -- default is science-book format
+% this means a (portrait) paper size of 170mm x 240mm
+%
+\RequirePackage{geometry}
+\geometry{paperwidth=170mm, paperheight=240mm, left=42pt, top=40pt, textwidth=280pt, marginparsep=20pt, marginparwidth=100pt, textheight=560pt, footskip=40pt}
+%
+% fontsize is 10pt with a leading (line spacing) of 13pt for book 
+%
 \renewcommand{\normalsize}{\fontsize{10pt}{13pt}\selectfont}%
 \renewcommand{\footnotesize}{\fontsize{8pt}{10pt}\selectfont}%
 % fullwidth environment, text across textwidth+marginparsep+marginparwidth
@@ -44,8 +50,8 @@
 	\mhchemoptions{textfontcommand=\addfontfeature{Numbers=Lining}} % use lining numbers for chemical formulas
 \else% in LaTeX we load fonts differently
 	\IfFileExists{mathpazo.sty}{\RequirePackage[osf,sc]{mathpazo}}{}% palatino clone for math
-  	\IfFileExists{helvet.sty}{\RequirePackage{helvet}}{}% helvetica is sans serif font
-  	\IfFileExists{beramono.sty}{\RequirePackage{beramono}}{}% beramono is tt font
+  	\IfFileExists{helvet.sty}{\RequirePackage[scaled=0.90]{helvet}}{}% helvetica is sans serif font
+  	\IfFileExists{beramono.sty}{\RequirePackage[scaled=0.85]{beramono}}{}% beramono is tt font
   	\RequirePackage[T1]{fontenc}% finally load fontenc
 \fi
 % nice headings and TOC
diff --git a/Master/texmf-dist/tex/latex/sidenotes/sidenotes.sty b/Master/texmf-dist/tex/latex/sidenotes/sidenotes.sty
index a6598e9bb1f..47596038a85 100644
--- a/Master/texmf-dist/tex/latex/sidenotes/sidenotes.sty
+++ b/Master/texmf-dist/tex/latex/sidenotes/sidenotes.sty
@@ -13,93 +13,93 @@
 %% about the files the work consists of.
 %% 
 \ProvidesPackage{sidenotes}[%
-  2012/04/07 v0.93 rich text in the margin for LaTeX]
-\RequirePackage{marginnote} % puts the stuff in the margin and provides an offset option instead of a float
-\RequirePackage{caption} % handles the figure caption (in the margin)
-\RequirePackage{xifthen} % provide an if command
-\RequirePackage{twoopt} % two optional arguments possible
+  2014/02/14 v0.96a 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
 \RequirePackage[strict]{changepage} % Changepage package for symmetric twoside handling
-\newcounter{sidenote} % make counter
-\newcounter{@sidenotes@buffer}
-\setcounter{sidenote}{1} % init counter
+\newcounter{sidenote} % make a counter
+\setcounter{sidenote}{1} % init the counter
+\ExplSyntaxOn
+\DeclareExpandableDocumentCommand{\IfNoValueOrEmptyTF}{mmm}
+{
+ \IfNoValueTF{#1}
+  {#2} % true
+  {\tl_if_empty:nTF {#1} {#2} {#3}} % false
+}
+\ExplSyntaxOff
 \def\@sidenotes@ifnextchar#1#2#3{%
 \let\@sidenotes@buffere #1\def\@sidenotes@buffera{#2}%
 \def\@sidenotes@bufferb{#3}\futurelet\@sidenotes@bufferc\@sidenotes@ifnextchar@real}%
 \def\@sidenotes@ifnextchar@real{%
 \ifx\@sidenotes@bufferc \@sidenotes@buffere \let\@sidenotes@bufferd\@sidenotes@buffera%
 \else\let\@sidenotes@bufferd\@sidenotes@bufferb\fi\@sidenotes@bufferd}%
-\newcommandtwoopt{\sidenote}[3][][]{%
+\NewDocumentCommand \sidenote { o o +m } {%
 \sidenotemark[#1]%
 \sidenotetext[#1][#2]{#3}%
 \@sidenotes@ifnextchar\sidenote{\kern-0.07em\textsuperscript{,}}%
 {\@sidenotes@ifnextchar\sidecite{\kern-0.07em\textsuperscript{,}}{}}%
 }
-\newcommand{\sidenotemark}[1][]{%
+\NewDocumentCommand \sidenotemark { o } {%
 \nobreak\hspace{0.1pt}\nobreak%
-\ifthenelse{\isempty{#1}}%
-{\textsuperscript{\thesidenote}%
-\refstepcounter{sidenote}}% if no argument is given use sidenote counter%
-{\setcounter{@sidenotes@buffer}{\value{sidenote}}%
-\setcounter{sidenote}{#1}%
-\textsuperscript{\thesidenote}% print out the argument otherwise
-\setcounter{sidenote}{\value{@sidenotes@buffer}}}%
+\IfNoValueOrEmptyTF{#1}%
+{%
+\textsuperscript{\thesidenote}%
+}% if no argument is given use sidenote counter%
+{\textsuperscript{#1}}% print out the argument otherwise
 \@sidenotes@ifnextchar\sidenote{\textsuperscript{,}}{}%
 \ignorespaces%
 }%
-\newcommandtwoopt{\sidenotetext}[3][][]{%
-\ifthenelse{\isempty{#1}}{% sitenotemark given?
-\addtocounter{sidenote}{-1}%
-\ifthenelse{\isempty{#2}}% offset given?
+\NewDocumentCommand \sidenotetext { o o +m } {%
+\IfNoValueOrEmptyTF{#1}{% sitenotemark given?
+\IfNoValueOrEmptyTF{#2}% offset given?
 {\marginpar{\textsuperscript{\thesidenote}{} #3}}%
 {\marginnote{\textsuperscript{\thesidenote}{} #3}[#2]}%
-\addtocounter{sidenote}{1}}%
-{\ifthenelse{\isempty{#2}}% offset given?
+\refstepcounter{sidenote}}%
+{\IfNoValueOrEmptyTF{#2}% offset given?
 {\marginpar{\textsuperscript{#1} #3}}%
 {\marginnote{\textsuperscript{#1} #3}[#2]}}%
 }%
 \DeclareCaptionStyle{sidecaption}{font=footnotesize}
-\newcommand{\sidecaption}{\@ifstar\@sidenotes@sidecaption@starred\@sidenotes@sidecaption@unstarred}
-\newcommandtwoopt{\@sidenotes@sidecaption@unstarred}[3][][]{%
-\captionsetup{style=sidecaption}%
-\ifthenelse{\isempty{#2}}{\marginnote{\caption[#1]{#3}}}{\marginnote{\caption[#1]{#3}}[#2]}}%
-\newcommand{\@sidenotes@sidecaption@starred}[2][]{%
+\NewDocumentCommand \sidecaption {s o o m} {%
 \captionsetup{style=sidecaption}%
-\ifthenelse{\isempty{#1}}{\marginnote{\caption*{#2}}}{\marginnote{\caption*{#2}}[#1]}}%
+\IfBooleanTF{#1}%is the macro starred
+{\IfNoValueOrEmptyTF{#2}%
+{\marginnote{\caption*{#4}}}%
+{\marginnote{\caption*{#4}}[#2]}%
+}% yes, starred macro
+{%
+\IfNoValueOrEmptyTF{#2}%
+{\def\@sidenotes@sidecaption@tof{#4}}%
+{\def\@sidenotes@sidecaption@tof{#2}}%
+\IfNoValueOrEmptyTF{#3}%
+{\marginnote{\caption[\@sidenotes@sidecaption@tof]{#4}}}%
+{\marginnote{\caption[\@sidenotes@sidecaption@tof]{#4}}[#3]}%
+}% no, unstarred macro
+}
 \newsavebox{\@sidenotes@sidefigurebox}
-\newboolean{@sidenotes@sidefigure@skip}
-\newcommand{\@sidenotes@sidefigure@skiplength}{}
 \DeclareCaptionStyle{marginfigure}{font=footnotesize}
-\newenvironment{marginfigure}[1][]%
-{\ifthenelse{\isempty{#1}}% offset?
-{\setboolean{@sidenotes@sidefigure@skip}{false}}%
-{\setboolean{@sidenotes@sidefigure@skip}{true}%
-\renewcommand{\@sidenotes@sidefigure@skiplength}{#1}}%
-\begin{lrbox}{\@sidenotes@sidefigurebox}%
+\NewDocumentEnvironment{marginfigure}{o}
+{\begin{lrbox}{\@sidenotes@sidefigurebox}%
 \begin{minipage}{\marginparwidth}%
 \captionsetup{type=figure,style=marginfigure}}%
 {\end{minipage}%
 \end{lrbox}%
-\ifthenelse{\boolean{@sidenotes@sidefigure@skip}}% offset?
-{\marginnote{\usebox{\@sidenotes@sidefigurebox}}[\@sidenotes@sidefigure@skiplength]}% offset
+\IfNoValueOrEmptyTF{#1}% offset?
 {\marginpar{\usebox{\@sidenotes@sidefigurebox}}}% no offset
+{\marginnote{\usebox{\@sidenotes@sidefigurebox}}[#1]}% offset
 }
 \newsavebox{\@sidenotes@margintablebox}
-\newboolean{@sidenotes@margintable@skip}
-\newcommand{\@sidenotes@margintable@skiplength}{}
 \DeclareCaptionStyle{margintable}{font=footnotesize}
-\newenvironment{margintable}[1][]%
-{\ifthenelse{\isempty{#1}}%
-{\setboolean{@sidenotes@margintable@skip}{false}}%
-{\setboolean{@sidenotes@margintable@skip}{true}%
-\renewcommand{\@sidenotes@margintable@skiplength}{#1}}%
-\begin{lrbox}{\@sidenotes@margintablebox}%
+\NewDocumentEnvironment{margintable}{o}
+{\begin{lrbox}{\@sidenotes@margintablebox}%
 \begin{minipage}{\marginparwidth}%
 \captionsetup{type=table,style=margintable}}%
 {\end{minipage}%
 \end{lrbox}%
-\ifthenelse{\boolean{@sidenotes@margintable@skip}}%
-{\marginnote{\usebox{\@sidenotes@margintablebox}}[\@sidenotes@margintable@skiplength]}%
+\IfNoValueOrEmptyTF{#1}% offset?
 {\marginpar{\usebox{\@sidenotes@margintablebox}}} %
+{\marginnote{\usebox{\@sidenotes@margintablebox}}[#1]}%
 }%
 \AtBeginDocument{%
 \newlength{\@sidenotes@extrawidth}