skrapport (14sep17)

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

4 files changed, 14 insertions, 11 deletions

diff --git a/Master/texmf-dist/doc/latex/skrapport/README b/Master/texmf-dist/doc/latex/skrapport/README
index 0739ca334ee..f0923a5ae4a 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-2016 by Simon Sigurdhsson <sigurdhsson@gmail.com>
+%% Copyright (C) 2012-2017 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.12g of the skrapport document class, intended for simple
+This is version 0.12h 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 4324d1aab27..74c848aa3a2 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 cfa502101d7..7d1eb847caa 100644
--- a/Master/texmf-dist/source/latex/skrapport/skrapport.tex
+++ b/Master/texmf-dist/source/latex/skrapport/skrapport.tex
@@ -99,7 +99,7 @@
 % This is where the documentation begins
 \begin{document}
     % Change & version info
-    \version{0.12g}
+    \version{0.12h}
     \changes{0.01}{Initial version}
     \changes{0.03}{Removed \cs{rd} and \cs{id}}
     \changes{0.04}{Added \pkg{microtype} package}
@@ -126,6 +126,7 @@
     \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}
     \changes{0.12g}{Track \pkg{expl3} changes (thanks to Joseph Wright)}
+    \changes{0.12h}{Fix incompatibilities with recent \pkg{expl3}}
     % Don't forget to update the version number and release date of
     % the package declaration in the implementation!
 
@@ -634,7 +635,7 @@
 \begin{MacroCode}{class}
 \RequirePackage{expl3,l3keys2e,xparse,xstring,etoolbox}
 \ProvidesExplClass{skrapport}%
-    {2017/01/08}{0.12g}{stylish report document class}
+    {2017/09/14}{0.12h}{stylish report document class}
 \end{MacroCode}
 
     \subsection{Messages}
@@ -1410,16 +1411,18 @@
 \end{MacroCode}
     \begin{macro*}{\@starttoc}[1]
         {Table of contents extension}
+    \changes{0.12h}{Replaced use of deprecated \cs{c_job_name_tl}
+                    with \cs{c_sys_jobname_str}}
 \begin{MacroCode}{class}
         \RenewDocumentCommand\@starttoc{m}{
             \group_begin:
             \dim_zero:N\parskip
-            \file_if_exist:nT{\c_job_name_tl.##1}{
-                \file_input:n{\c_job_name_tl.##1}
+            \file_if_exist:nT{\c_sys_jobname_str.##1}{
+                \file_input:n{\c_sys_jobname_str.##1}
             }
             \if@filesw
                 \iow_new:c{tf@##1}
-                \iow_open:cn{tf@##1}{\c_job_name_tl.##1}
+                \iow_open:cn{tf@##1}{\c_sys_jobname_str.##1}
             \fi
             \@nobreakfalse
             \group_end:
diff --git a/Master/texmf-dist/tex/latex/skrapport/skrapport.cls b/Master/texmf-dist/tex/latex/skrapport/skrapport.cls
index aec87aaf132..ec6be5bd69a 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}%
-    {2017/01/08}{0.12g}{stylish report document class}
+    {2017/09/14}{0.12h}{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!}
@@ -462,12 +462,12 @@
         \RenewDocumentCommand\@starttoc{m}{
             \group_begin:
             \dim_zero:N\parskip
-            \file_if_exist:nT{\c_job_name_tl.##1}{
-                \file_input:n{\c_job_name_tl.##1}
+            \file_if_exist:nT{\c_sys_jobname_str.##1}{
+                \file_input:n{\c_sys_jobname_str.##1}
             }
             \if@filesw
                 \iow_new:c{tf@##1}
-                \iow_open:cn{tf@##1}{\c_job_name_tl.##1}
+                \iow_open:cn{tf@##1}{\c_sys_jobname_str.##1}
             \fi
             \@nobreakfalse
             \group_end: