skrapport (25jun16)

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

13 files changed, 23 insertions, 22 deletions

diff --git a/Master/texmf-dist/doc/latex/skrapport/README b/Master/texmf-dist/doc/latex/skrapport/README
index 54de2acecf0..203d1669913 100644
--- a/Master/texmf-dist/doc/latex/skrapport/README
+++ b/Master/texmf-dist/doc/latex/skrapport/README
@@ -1,6 +1,6 @@
 %% skrapport Skånings rapportklass
 %%
-%% Copyright (C) 2012-2015 by Simon Sigurdhsson <sigurdhsson@gmail.com>
+%% Copyright (C) 2012-2016 by Simon Sigurdhsson <sigurdhsson@gmail.com>
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -26,7 +26,7 @@
 %%  * skrapport-size11pt.clo
 %%  * skrapport-size12pt.clo
 
-This is version 0.12e of the skrapport document class, intended for simple
+This is version 0.12f of the skrapport document class, intended for simple
 reports submitted by the author at Chalmers University of Technology.
 
 The following files are enclosed.
diff --git a/Master/texmf-dist/doc/latex/skrapport/skrapport.pdf b/Master/texmf-dist/doc/latex/skrapport/skrapport.pdf
index af07c04a088..8a71a04e73a 100644
--- a/Master/texmf-dist/doc/latex/skrapport/skrapport.pdf
+++ b/Master/texmf-dist/doc/latex/skrapport/skrapport.pdf
diff --git a/Master/texmf-dist/source/latex/skrapport/skrapport.tex b/Master/texmf-dist/source/latex/skrapport/skrapport.tex
index 67dc64405e1..a7e51e7378a 100644
--- a/Master/texmf-dist/source/latex/skrapport/skrapport.tex
+++ b/Master/texmf-dist/source/latex/skrapport/skrapport.tex
@@ -1,6 +1,6 @@
 %% skrapport Skånings rapportklass
 %%
-%% Copyright (C) 2012-2015 by Simon Sigurdhsson <sigurdhsson@gmail.com>
+%% Copyright (C) 2012-2016 by Simon Sigurdhsson <sigurdhsson@gmail.com>
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -99,7 +99,7 @@
 % This is where the documentation begins
 \begin{document}
     % Change & version info
-    \version{0.12e}
+    \version{0.12f}
     \changes{0.01}{Initial version}
     \changes{0.03}{Removed \cs{rd} and \cs{id}}
     \changes{0.04}{Added \pkg{microtype} package}
@@ -124,6 +124,7 @@
     \changes{0.12c}{Added german language option, fixed sectioning macros in \opt{twocolumn} mode}
     \changes{0.12d}{Added \opt{hanging-titles}, latin phrase macros. Load \pkg{isomath}. Don't load \pkg{icomma}. Use \cs{frenchspacing}}
     \changes{0.12e}{Replace usage of deprecated \pkg{expl3} macros (thanks for the heads-up, Joseph Wright!)}
+    \changes{0.12f}{Fix incorrect usage of \pkg{xparse} macros}
     % Don't forget to update the version number and release date of
     % the package declaration in the implementation!
 
@@ -632,7 +633,7 @@
 \begin{MacroCode}{class}
 \RequirePackage{expl3,l3keys2e,xparse,xstring,etoolbox}
 \ProvidesExplClass{skrapport}%
-    {2015/07/17}{0.12e}{stylish report document class}
+    {2016/06/25}{0.12f}{stylish report document class}
 \end{MacroCode}
 
     \subsection{Messages}
@@ -2320,7 +2321,7 @@
                 \@textsuperscript{\normalfont\@thefnmark}
             }
         }
-        \RenewDocumentCommand\@makefntext{m+}{
+        \RenewDocumentCommand\@makefntext{+m}{
             \dim_set:Nn\parindent{1em}\noindent
             \hbox_to_wd:nn{1.8em}{
                 \hss\@textsuperscript{\normalfont\@thefnmark}
@@ -3129,7 +3130,7 @@
 \end{MacroCode}
     \end{macro*}
 \begin{MacroCode}{class}
-\DeclareDocumentCommand\emph{m+}{
+\DeclareDocumentCommand\emph{+m}{
     \ifmmode
         \text{\__skrapport_emphstyle: #1}
     \else
@@ -3148,7 +3149,7 @@
     \end{macro*}
     \begin{macro*}{\@makefntext}
 \begin{MacroCode}{class}
-\DeclareDocumentCommand\@makefntext{m+}{
+\DeclareDocumentCommand\@makefntext{+m}{
     \dim_set:Nn\parindent{1em}\noindent
     \hbox_to_wd:nn{1.8em}{\hss\@makefnmark}
     #1
diff --git a/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-cruelwater.sty b/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-cruelwater.sty
index 3cf98cffa4d..ef5adf286be 100644
--- a/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-cruelwater.sty
+++ b/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-cruelwater.sty
@@ -1,7 +1,7 @@
 %% This is file `skrapport-colortheme-cruelwater.sty', generated from `skrapport.tex' (key `theme-cruelwater').
 %% skrapport Skånings rapportklass
 %%
-%% Copyright (C) 2012-2015 by Simon Sigurdhsson <sigurdhsson@gmail.com>
+%% Copyright (C) 2012-2016 by Simon Sigurdhsson <sigurdhsson@gmail.com>
 %%
 %% 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/skrapport/skrapport-colortheme-default.sty b/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-default.sty
index a53abb0edc5..b27155ae24c 100644
--- a/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-default.sty
+++ b/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-default.sty
@@ -1,7 +1,7 @@
 %% This is file `skrapport-colortheme-default.sty', generated from `skrapport.tex' (key `theme-default').
 %% skrapport Skånings rapportklass
 %%
-%% Copyright (C) 2012-2015 by Simon Sigurdhsson <sigurdhsson@gmail.com>
+%% Copyright (C) 2012-2016 by Simon Sigurdhsson <sigurdhsson@gmail.com>
 %%
 %% 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/skrapport/skrapport-colortheme-skdoc.sty b/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-skdoc.sty
index 17572b7ac42..706fb3c5c13 100644
--- a/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-skdoc.sty
+++ b/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-skdoc.sty
@@ -1,7 +1,7 @@
 %% This is file `skrapport-colortheme-skdoc.sty', generated from `skrapport.tex' (key `theme-skdoc').
 %% skrapport Skånings rapportklass
 %%
-%% Copyright (C) 2012-2015 by Simon Sigurdhsson <sigurdhsson@gmail.com>
+%% Copyright (C) 2012-2016 by Simon Sigurdhsson <sigurdhsson@gmail.com>
 %%
 %% 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/skrapport/skrapport-colortheme-unscathed.sty b/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-unscathed.sty
index 374eeda6862..9040cce479a 100644
--- a/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-unscathed.sty
+++ b/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-unscathed.sty
@@ -1,7 +1,7 @@
 %% This is file `skrapport-colortheme-unscathed.sty', generated from `skrapport.tex' (key `theme-unscathed').
 %% skrapport Skånings rapportklass
 %%
-%% Copyright (C) 2012-2015 by Simon Sigurdhsson <sigurdhsson@gmail.com>
+%% Copyright (C) 2012-2016 by Simon Sigurdhsson <sigurdhsson@gmail.com>
 %%
 %% 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/skrapport/skrapport-colortheme-violet.sty b/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-violet.sty
index df36875719d..a3fecf17f24 100644
--- a/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-violet.sty
+++ b/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-violet.sty
@@ -1,7 +1,7 @@
 %% This is file `skrapport-colortheme-violet.sty', generated from `skrapport.tex' (key `theme-violet').
 %% skrapport Skånings rapportklass
 %%
-%% Copyright (C) 2012-2015 by Simon Sigurdhsson <sigurdhsson@gmail.com>
+%% Copyright (C) 2012-2016 by Simon Sigurdhsson <sigurdhsson@gmail.com>
 %%
 %% 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/skrapport/skrapport-size-common.sty b/Master/texmf-dist/tex/latex/skrapport/skrapport-size-common.sty
index c551c85407f..a298018fcff 100644
--- a/Master/texmf-dist/tex/latex/skrapport/skrapport-size-common.sty
+++ b/Master/texmf-dist/tex/latex/skrapport/skrapport-size-common.sty
@@ -1,7 +1,7 @@
 %% This is file `skrapport-size-common.sty', generated from `skrapport.tex' (key `size-common').
 %% skrapport Skånings rapportklass
 %%
-%% Copyright (C) 2012-2015 by Simon Sigurdhsson <sigurdhsson@gmail.com>
+%% Copyright (C) 2012-2016 by Simon Sigurdhsson <sigurdhsson@gmail.com>
 %%
 %% 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/skrapport/skrapport-size10pt.clo b/Master/texmf-dist/tex/latex/skrapport/skrapport-size10pt.clo
index e82520de31d..099444ad434 100644
--- a/Master/texmf-dist/tex/latex/skrapport/skrapport-size10pt.clo
+++ b/Master/texmf-dist/tex/latex/skrapport/skrapport-size10pt.clo
@@ -1,7 +1,7 @@
 %% This is file `skrapport-size10pt.clo', generated from `skrapport.tex' (key `size-10').
 %% skrapport Skånings rapportklass
 %%
-%% Copyright (C) 2012-2015 by Simon Sigurdhsson <sigurdhsson@gmail.com>
+%% Copyright (C) 2012-2016 by Simon Sigurdhsson <sigurdhsson@gmail.com>
 %%
 %% 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/skrapport/skrapport-size11pt.clo b/Master/texmf-dist/tex/latex/skrapport/skrapport-size11pt.clo
index 5a590480bec..07109ab56da 100644
--- a/Master/texmf-dist/tex/latex/skrapport/skrapport-size11pt.clo
+++ b/Master/texmf-dist/tex/latex/skrapport/skrapport-size11pt.clo
@@ -1,7 +1,7 @@
 %% This is file `skrapport-size11pt.clo', generated from `skrapport.tex' (key `size-11').
 %% skrapport Skånings rapportklass
 %%
-%% Copyright (C) 2012-2015 by Simon Sigurdhsson <sigurdhsson@gmail.com>
+%% Copyright (C) 2012-2016 by Simon Sigurdhsson <sigurdhsson@gmail.com>
 %%
 %% 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/skrapport/skrapport-size12pt.clo b/Master/texmf-dist/tex/latex/skrapport/skrapport-size12pt.clo
index 016435c1d58..57ee8694fc0 100644
--- a/Master/texmf-dist/tex/latex/skrapport/skrapport-size12pt.clo
+++ b/Master/texmf-dist/tex/latex/skrapport/skrapport-size12pt.clo
@@ -1,7 +1,7 @@
 %% This is file `skrapport-size12pt.clo', generated from `skrapport.tex' (key `size-12').
 %% skrapport Skånings rapportklass
 %%
-%% Copyright (C) 2012-2015 by Simon Sigurdhsson <sigurdhsson@gmail.com>
+%% Copyright (C) 2012-2016 by Simon Sigurdhsson <sigurdhsson@gmail.com>
 %%
 %% 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/skrapport/skrapport.cls b/Master/texmf-dist/tex/latex/skrapport/skrapport.cls
index 6dec7cc8e1b..e35d4769086 100644
--- a/Master/texmf-dist/tex/latex/skrapport/skrapport.cls
+++ b/Master/texmf-dist/tex/latex/skrapport/skrapport.cls
@@ -1,7 +1,7 @@
 %% This is file `skrapport.cls', generated from `skrapport.tex' (key `class').
 %% skrapport Skånings rapportklass
 %%
-%% Copyright (C) 2012-2015 by Simon Sigurdhsson <sigurdhsson@gmail.com>
+%% Copyright (C) 2012-2016 by Simon Sigurdhsson <sigurdhsson@gmail.com>
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -29,7 +29,7 @@
 
 \RequirePackage{expl3,l3keys2e,xparse,xstring,etoolbox}
 \ProvidesExplClass{skrapport}%
-    {2015/07/17}{0.12e}{stylish report document class}
+    {2016/06/25}{0.12f}{stylish report document class}
 \msg_new:nnnn{skrapport}{option-deprecated}{Option~`#1'~deprecated!}
     {Please~use~`#2'~instead.}
 \msg_new:nnnn{skrapport}{option-no-effect}{Option~`#1'~deprecated!}
@@ -889,7 +889,7 @@
                 \@textsuperscript{\normalfont\@thefnmark}
             }
         }
-        \RenewDocumentCommand\@makefntext{m+}{
+        \RenewDocumentCommand\@makefntext{+m}{
             \dim_set:Nn\parindent{1em}\noindent
             \hbox_to_wd:nn{1.8em}{
                 \hss\@textsuperscript{\normalfont\@thefnmark}
@@ -1237,7 +1237,7 @@
     \itshape
     \dim_compare:nF{\fontdimen\c_one\font>\c_zero_dim}{\bfseries}
 }
-\DeclareDocumentCommand\emph{m+}{
+\DeclareDocumentCommand\emph{+m}{
     \ifmmode
         \text{\__skrapport_emphstyle: #1}
     \else
@@ -1245,7 +1245,7 @@
     \fi
 }
 \DeclareDocumentCommand\footnoterule{}{}
-\DeclareDocumentCommand\@makefntext{m+}{
+\DeclareDocumentCommand\@makefntext{+m}{
     \dim_set:Nn\parindent{1em}\noindent
     \hbox_to_wd:nn{1.8em}{\hss\@makefnmark}
     #1