skrapport (16oct19)

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

4 files changed, 41 insertions, 35 deletions

diff --git a/Master/texmf-dist/doc/latex/skrapport/README b/Master/texmf-dist/doc/latex/skrapport/README
index 36773f96bfd..e323031fc30 100644
--- a/Master/texmf-dist/doc/latex/skrapport/README
+++ b/Master/texmf-dist/doc/latex/skrapport/README
@@ -26,7 +26,7 @@
 %%  * skrapport-size11pt.clo
 %%  * skrapport-size12pt.clo
 
-This is version 0.12i of the skrapport document class, intended for simple
+This is version 0.12k 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 3ec7599b6a3..ff041c9d536 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 397da4a9185..9624b5caa6c 100644
--- a/Master/texmf-dist/source/latex/skrapport/skrapport.tex
+++ b/Master/texmf-dist/source/latex/skrapport/skrapport.tex
@@ -49,9 +49,9 @@
 \begin{filecontents}{skrapport.bib}
     @article{kpfonts,
         author = {Christophe Caignaert},
-        title = {KP-Fonts 3.31},
-        year = {2010},
-        url = {http://www.tex.ac.uk/tex-archive/fonts/kpfonts/doc/kpfonts.pdf}
+        title = {KP-Fonts 3.33},
+        year = {2018},
+        url = {http://mirror.ctan.org/fonts/kpfonts/doc/kpfonts.pdf}
     }
     @standard{ISO216,
         title = {ISO 216:2007},
@@ -99,7 +99,7 @@
 % This is where the documentation begins
 \begin{document}
     % Change & version info
-    \version{0.12i}
+    \version{0.12k}
     \changes{0.01}{Initial version}
     \changes{0.03}{Removed \cs{rd} and \cs{id}}
     \changes{0.04}{Added \pkg{microtype} package}
@@ -128,6 +128,8 @@
     \changes{0.12g}{Track \pkg{expl3} changes (thanks to Joseph Wright)}
     \changes{0.12h}{Fix incompatibilities with recent \pkg{expl3}}
     \changes{0.12i}{Track \pkg{expl3} changes (thanks to Joseph Wright)}
+    \changes{0.12j}{Track \pkg{expl3} changes (thanks to Phelype Oleinik). Replaces \pkg{opensans} option \opt{osfigures} with \opt{oldstyle}}
+    \changes{0.12k}{Don't try to generate \texttt{c}-variant macros from \texttt{n}-variant base forms}
     % Don't forget to update the version number and release date of
     % the package declaration in the implementation!
 
@@ -636,7 +638,7 @@
 \begin{MacroCode}{class}
 \RequirePackage{expl3,l3keys2e,xparse,xstring,etoolbox}
 \ProvidesExplClass{skrapport}%
-    {2018/12/29}{0.12i}{stylish report document class}
+    {2019/10/15}{0.12k}{stylish report document class}
 \end{MacroCode}
 
     \subsection{Messages}
@@ -1297,7 +1299,7 @@
 \begin{MacroCode}{class}
         {skdoc}{
             \RequirePackage{PTSerif}
-            \RequirePackage[defaultsans,osfigures,scale=0.95]{opensans}
+            \RequirePackage[defaultsans,oldstyle,scale=0.95]{opensans}
         }
 \end{MacroCode}
     The \texttt{word} font stack mimics recent versions of Microsoft
@@ -2228,7 +2230,7 @@
     separating them with commas.
 \begin{MacroCode}{class}
 \cs_new:Nn\__skrapport_email_list:{
-    \int_compare:nT{\clist_count:N\g__skrapport_author_clist>\c_zero}{
+    \int_compare:nT{\clist_count:N\g__skrapport_author_clist>\c_zero_int}{
         \clist_use:Nnnn\g__skrapport_email_clist{\\}{\\}{\\}
     }
 }
@@ -2648,24 +2650,28 @@
     \paragraph{Generic sectioning macros}
     We will now set up a generic sectioning macro. First, we need
     version of the above macros that expand their arguments.
-    \begin{macro*}{\__skrapport_pre_section:c}
+    \begin{macro*}{\__skrapport_pre_section:v}
+    \changes{0.12k}{Argument specification changed from \texttt{c} to \texttt{v}}
 \begin{MacroCode}{class}
-\cs_generate_variant:Nn\__skrapport_pre_section:n{c}
+\cs_generate_variant:Nn\__skrapport_pre_section:n{v}
 \end{MacroCode}
     \end{macro*}
-    \begin{macro*}{\__skrapport_post_section:c}
+    \begin{macro*}{\__skrapport_post_section:v}
+        \changes{0.12k}{Argument specification changed from \texttt{c} to \texttt{v}}
 \begin{MacroCode}{class}
-\cs_generate_variant:Nn\__skrapport_post_section:n{c}
+\cs_generate_variant:Nn\__skrapport_post_section:n{v}
 \end{MacroCode}
     \end{macro*}
-    \begin{macro*}{\__skrapport_section_star:ccn}
+    \begin{macro*}{\__skrapport_section_star:vvn}
+        \changes{0.12k}{Argument specification changed from \texttt{ccn} to \texttt{vvn}}
 \begin{MacroCode}{class}
-\cs_generate_variant:Nn\__skrapport_section_star:nnn{ccn}
+\cs_generate_variant:Nn\__skrapport_section_star:nnn{vvn}
 \end{MacroCode}
     \end{macro*}
-    \begin{macro*}{\__skrapport_section_nostar:nnccnn}
+    \begin{macro*}{\__skrapport_section_nostar:nnvvnn}
+        \changes{0.12k}{Argument specification changed from \texttt{nnccnn} to \texttt{nnvvnn}}
 \begin{MacroCode}{class}
-\cs_generate_variant:Nn\__skrapport_section_nostar:nnnnnn{nnccnn}
+\cs_generate_variant:Nn\__skrapport_section_nostar:nnnnnn{nnvvnn}
 \end{MacroCode}
     \end{macro*}
 
@@ -2683,22 +2689,22 @@
         {Section title text}
 \begin{MacroCode}{class}
 \cs_set:Nn\__skrapport_generic_section:nnnnn{
-    \__skrapport_pre_section:c{c__skrapport_#1_pre_skip}
+    \__skrapport_pre_section:v{c__skrapport_#1_pre_skip}
     \IfBooleanTF#3{
-        \__skrapport_section_star:ccn
+        \__skrapport_section_star:vvn
             {c__skrapport_#1_indent_dim}
             {__skrapport_#1_style:}
             {#5}
     }{
         \IfNoValueTF{#4}{
-            \__skrapport_section_nostar:nnccnn
+            \__skrapport_section_nostar:nnvvnn
                 {#1}{#2}
                 {c__skrapport_#1_indent_dim}
                 {__skrapport_#1_style:}
                 {#5}
                 {#5}
         }{
-            \__skrapport_section_nostar:nnccnn
+            \__skrapport_section_nostar:nnvvnn
                 {#1}{#2}
                 {c__skrapport_#1_indent_dim}
                 {__skrapport_#1_style:}
@@ -2706,7 +2712,7 @@
                 {#4}
         }
     }
-    \__skrapport_post_section:c{c__skrapport_#1_post_skip}
+    \__skrapport_post_section:v{c__skrapport_#1_post_skip}
 }
 \end{MacroCode}
     \end{macro}
@@ -3130,7 +3136,7 @@
 \begin{MacroCode}{class}
 \cs_new:Nn\__skrapport_emphstyle:{
     \itshape
-    \dim_compare:nF{\fontdimen\c_one\font>\c_zero_dim}{\bfseries}
+    \dim_compare:nF{\fontdimen\c_one_int\font>\c_zero_dim}{\bfseries}
 }
 \end{MacroCode}
     \end{macro*}
diff --git a/Master/texmf-dist/tex/latex/skrapport/skrapport.cls b/Master/texmf-dist/tex/latex/skrapport/skrapport.cls
index ba3407b1f79..2e6942b9b32 100644
--- a/Master/texmf-dist/tex/latex/skrapport/skrapport.cls
+++ b/Master/texmf-dist/tex/latex/skrapport/skrapport.cls
@@ -29,7 +29,7 @@
 
 \RequirePackage{expl3,l3keys2e,xparse,xstring,etoolbox}
 \ProvidesExplClass{skrapport}%
-    {2018/12/29}{0.12i}{stylish report document class}
+    {2019/10/15}{0.12k}{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!}
@@ -394,7 +394,7 @@
         }
         {skdoc}{
             \RequirePackage{PTSerif}
-            \RequirePackage[defaultsans,osfigures,scale=0.95]{opensans}
+            \RequirePackage[defaultsans,oldstyle,scale=0.95]{opensans}
         }
         {word}{
             \bool_if:nF{\sys_if_engine_luatex_p: || \sys_if_engine_xetex_p:}{
@@ -836,7 +836,7 @@
         {~\__skrapport_and_word:{}~}{,~}{~\__skrapport_and_word:{}~}
 }
 \cs_new:Nn\__skrapport_email_list:{
-    \int_compare:nT{\clist_count:N\g__skrapport_author_clist>\c_zero}{
+    \int_compare:nT{\clist_count:N\g__skrapport_author_clist>\c_zero_int}{
         \clist_use:Nnnn\g__skrapport_email_clist{\\}{\\}{\\}
     }
 }
@@ -1089,27 +1089,27 @@
         #6
     }
 }
-\cs_generate_variant:Nn\__skrapport_pre_section:n{c}
-\cs_generate_variant:Nn\__skrapport_post_section:n{c}
-\cs_generate_variant:Nn\__skrapport_section_star:nnn{ccn}
-\cs_generate_variant:Nn\__skrapport_section_nostar:nnnnnn{nnccnn}
+\cs_generate_variant:Nn\__skrapport_pre_section:n{v}
+\cs_generate_variant:Nn\__skrapport_post_section:n{v}
+\cs_generate_variant:Nn\__skrapport_section_star:nnn{vvn}
+\cs_generate_variant:Nn\__skrapport_section_nostar:nnnnnn{nnvvnn}
 \cs_set:Nn\__skrapport_generic_section:nnnnn{
-    \__skrapport_pre_section:c{c__skrapport_#1_pre_skip}
+    \__skrapport_pre_section:v{c__skrapport_#1_pre_skip}
     \IfBooleanTF#3{
-        \__skrapport_section_star:ccn
+        \__skrapport_section_star:vvn
             {c__skrapport_#1_indent_dim}
             {__skrapport_#1_style:}
             {#5}
     }{
         \IfNoValueTF{#4}{
-            \__skrapport_section_nostar:nnccnn
+            \__skrapport_section_nostar:nnvvnn
                 {#1}{#2}
                 {c__skrapport_#1_indent_dim}
                 {__skrapport_#1_style:}
                 {#5}
                 {#5}
         }{
-            \__skrapport_section_nostar:nnccnn
+            \__skrapport_section_nostar:nnvvnn
                 {#1}{#2}
                 {c__skrapport_#1_indent_dim}
                 {__skrapport_#1_style:}
@@ -1117,7 +1117,7 @@
                 {#4}
         }
     }
-    \__skrapport_post_section:c{c__skrapport_#1_post_skip}
+    \__skrapport_post_section:v{c__skrapport_#1_post_skip}
 }
 \skip_const:Nn\c__skrapport_section_pre_skip{-4ex~plus~1ex~minus~-1ex}
 \skip_const:Nn\c__skrapport_section_post_skip{.5ex~plus~.5ex}
@@ -1235,7 +1235,7 @@
 \DeclareDocumentCommand\em{}{\msg_error:nnnn{skrapport}{old-font-deprecated}{\em}{\emph}}
 \cs_new:Nn\__skrapport_emphstyle:{
     \itshape
-    \dim_compare:nF{\fontdimen\c_one\font>\c_zero_dim}{\bfseries}
+    \dim_compare:nF{\fontdimen\c_one_int\font>\c_zero_dim}{\bfseries}
 }
 \DeclareDocumentCommand\emph{+m}{
     \ifmmode