skdoc (19apr18)

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

4 files changed, 10 insertions, 9 deletions

diff --git a/Master/texmf-dist/doc/latex/skdoc/README b/Master/texmf-dist/doc/latex/skdoc/README
index 6c1b046dd3c..ffa816f4022 100644
--- a/Master/texmf-dist/doc/latex/skdoc/README
+++ b/Master/texmf-dist/doc/latex/skdoc/README
@@ -1,6 +1,6 @@
 %% skdoc documentation class
 %%
-%% Copyright (C) 2012-2017 by Simon Sigurdhsson <sigurdhsson@gmail.com>
+%% Copyright (C) 2012-2018 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
@@ -17,7 +17,7 @@
 %% This work consists of the files skdoc.dtx
 %% and the derived filebase skdoc.cls.
 
-This is version 1.5 of the skdoc document class. It is designed to
+This is version 1.5a of the skdoc document class. It is designed to
 generate both documentation and derivative files using only LaTeX,
 i.e. without using docstrip and ins/dtx files.
 
diff --git a/Master/texmf-dist/doc/latex/skdoc/skdoc.pdf b/Master/texmf-dist/doc/latex/skdoc/skdoc.pdf
index d778b24645f..432f58a3362 100644
--- a/Master/texmf-dist/doc/latex/skdoc/skdoc.pdf
+++ b/Master/texmf-dist/doc/latex/skdoc/skdoc.pdf
diff --git a/Master/texmf-dist/source/latex/skdoc/skdoc.dtx b/Master/texmf-dist/source/latex/skdoc/skdoc.dtx
index aeb7503b4d8..d0eff7eea04 100644
--- a/Master/texmf-dist/source/latex/skdoc/skdoc.dtx
+++ b/Master/texmf-dist/source/latex/skdoc/skdoc.dtx
@@ -1,7 +1,7 @@
 % \iffalse
 %% skdoc documentation class
 %%
-%% Copyright (C) 2012-2017 by Simon Sigurdhsson <sigurdhsson@gmail.com>
+%% Copyright (C) 2012-2018 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
@@ -73,7 +73,7 @@
 %</driver>
 %<class>\ProvidesExplClass{skdoc}
 %<*class>
-    {2017/02/07}{1.5}{skdoc documentation class}
+    {2018/04/18}{1.5a}{skdoc documentation class}
 %</class>
 %
 %<*driver>
@@ -132,7 +132,7 @@
 % {}{\small\pagemark}
 % \pagestyle{skdoc-class}
 %
-% \version{1.5}
+% \version{1.5a}
 % \changes{1.0}{Initial version}
 % \changes{1.1}{Added support for syntax highlighting using \pkg{minted}}
 % \changes{1.1a}{Deprecate the use of \pkg{bibtex} in favour of \pkg{biblatex}}
@@ -144,6 +144,7 @@
 % \changes{1.4a}{Fix various compatibility issues with latest \pkg{glossaries}}
 % \changes{1.4b}{Track \pkg{expl3} changes (thanks to Joseph Wright)}
 % \changes{1.5}{Fix incompatibilities with \pkg{minted}}
+% \changes{1.5a}{Track \pkg{expl3} changes (thanks to Felix Faltin)}
 % \iffalse
 %%% Don't forget to update the version number and release date of
 %%% the package declaration on line 76!
@@ -1509,7 +1510,7 @@
             \tl_put_right:Nx\skdoc@temptl{\iow_newline:}
         }
         \tl_clear:N\l_tmpb_tl
-        \ior_get_str:NN\skdoc@input\l_tmpa_tl
+        \ior_str_get:NN\skdoc@input\l_tmpa_tl
         \tl_put_right:Nx\l_tmpb_tl{\tl_head:N\l_tmpa_tl}
         \IfStrEq{\tl_to_str:N\l_tmpb_tl}{\@percentchar}{%
             \tl_set_eq:NN\l_tmpb_tl\skdoc@temptl
diff --git a/Master/texmf-dist/tex/latex/skdoc/skdoc.cls b/Master/texmf-dist/tex/latex/skdoc/skdoc.cls
index a4e469543bc..65d53f45070 100644
--- a/Master/texmf-dist/tex/latex/skdoc/skdoc.cls
+++ b/Master/texmf-dist/tex/latex/skdoc/skdoc.cls
@@ -8,7 +8,7 @@
 %% 
 %% skdoc documentation class
 %%
-%% Copyright (C) 2012-2017 by Simon Sigurdhsson <sigurdhsson@gmail.com>
+%% Copyright (C) 2012-2018 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 @@
 %% and the derived filebase skdoc.cls.
 \RequirePackage{expl3}
 \ProvidesExplClass{skdoc}
-    {2017/02/07}{1.5}{skdoc documentation class}
+    {2018/04/18}{1.5a}{skdoc documentation class}
 \PassOptionsToPackage{log-declarations=false}{xparse}
 \LoadClass[ DIV7,
             headings=big,
@@ -465,7 +465,7 @@
             \tl_put_right:Nx\skdoc@temptl{\iow_newline:}
         }
         \tl_clear:N\l_tmpb_tl
-        \ior_get_str:NN\skdoc@input\l_tmpa_tl
+        \ior_str_get:NN\skdoc@input\l_tmpa_tl
         \tl_put_right:Nx\l_tmpb_tl{\tl_head:N\l_tmpa_tl}
         \IfStrEq{\tl_to_str:N\l_tmpb_tl}{\@percentchar}{%
             \tl_set_eq:NN\l_tmpb_tl\skdoc@temptl