skdoc (29sep19)

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

1 files changed, 8 insertions, 7 deletions

diff --git a/Master/texmf-dist/source/latex/skdoc/skdoc.dtx b/Master/texmf-dist/source/latex/skdoc/skdoc.dtx
index d0eff7eea04..a7bfdc10d8e 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-2018 by Simon Sigurdhsson <sigurdhsson@gmail.com>
+%% Copyright (C) 2012-2019 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>
-    {2018/04/18}{1.5a}{skdoc documentation class}
+    {2019/09/29}{1.5b}{skdoc documentation class}
 %</class>
 %
 %<*driver>
@@ -132,7 +132,7 @@
 % {}{\small\pagemark}
 % \pagestyle{skdoc-class}
 %
-% \version{1.5a}
+% \version{1.5b}
 % \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}}
@@ -145,6 +145,7 @@
 % \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)}
+% \changes{1.5b}{Track \pkg{expl3} changes (thanks to Phelype Oleinik). Replace \pkg{opensans} option \opt{osfigures} with \opt{oldstyle} (\#40)}
 % \iffalse
 %%% Don't forget to update the version number and release date of
 %%% the package declaration on line 76!
@@ -800,7 +801,7 @@
     \RequirePackage[english=british]{csquotes}
     \RequirePackage[font=small,labelfont=bf,textfont=it]{caption}
     \RequirePackage{PTSerif,sourcecodepro}
-    \RequirePackage[defaultsans,osfigures,scale=0.95]{opensans}
+    \RequirePackage[defaultsans,oldstyle,scale=0.95]{opensans}
     \RequirePackage[babel]{microtype}
 }
 %    \end{macrocode}
@@ -943,7 +944,7 @@
 % if no \cs{write18} access is available, two if we have restricted
 % access and one if access is unrestricted.
 %    \begin{macrocode}
-        \if_int_compare:w\pdf@shellescape=\c_one
+        \if_int_compare:w\pdf@shellescape=\c_one_int
             \prg_return_true:
         \else:
             \prg_return_false:
@@ -1308,7 +1309,7 @@
 % Before doing anything, set create or increment a counter keeping
 % track of the line number of the file we're writing to.
 %    \begin{macrocode}
-        \int_compare:nNnT{\int_use:c{skdoc@output@##1@line}}=\c_zero%
+        \int_compare:nNnT{\int_use:c{skdoc@output@##1@line}}=\c_zero_int%
             {\int_gincr:c{skdoc@output@##1@line}}%
     }
 %    \end{macrocode}
@@ -1381,7 +1382,7 @@
                 \begin{minipage}[c][1ex]{\textwidth}
                     \bool_if:nF{
                         \g__skdoc_in_example_bool &&
-                        !\int_compare_p:nNn{\clist_count:N\l__skdoc_keys}>\c_one
+                        !\int_compare_p:nNn{\clist_count:N\l__skdoc_keys}>\c_one_int
                     }{
                         \makebox[4ex]{%
                             \leavevmode