skdoc (8feb17)

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

1 files changed, 15 insertions, 14 deletions

diff --git a/Master/texmf-dist/tex/latex/skdoc/skdoc.cls b/Master/texmf-dist/tex/latex/skdoc/skdoc.cls
index f8ef5de16b7..a4e469543bc 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-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 @@
 %% and the derived filebase skdoc.cls.
 \RequirePackage{expl3}
 \ProvidesExplClass{skdoc}
-    {2017/01/08}{1.4b}{skdoc documentation class}
+    {2017/02/07}{1.5}{skdoc documentation class}
 \PassOptionsToPackage{log-declarations=false}{xparse}
 \LoadClass[ DIV7,
             headings=big,
@@ -125,12 +125,15 @@
         \__skdoc_if_shellescape:TF{
             \__skdoc_if_pygmentize:TF{
                 \bool_gset_true:N\g__skdoc_use_minted_bool
+                \cs_undefine:N\c@linenumber
+                \cs_undefine:N\cl@linenumber
+                \cs_undefine:N\p@linenumber
+                \cs_undefine:N\thelinenumber
                 \RequirePackage{minted}
                 \renewcommand{\theFancyVerbLine}{
                     \sffamily\tiny\textcolor{lightgray}{
                     \oldstylenums{\arabic{FancyVerbLine}}}
                 }
-                \renewcommand\minted@usedefaultstyle{}
                 \def\PY@reset{\let\PY@it=\relax \let\PY@bf=\relax%
                     \let\PY@ul=\relax \let\PY@tc=\relax%
                     \let\PY@bc=\relax \let\PY@ff=\relax}
@@ -326,7 +329,7 @@
         \tl_set:Nx\l_tmpa_tl{\skdoc@preamble}
         \edef\skdoc@temp{\tl_head:N\l_tmpa_tl}
         \def\skdoc@preamble@extra{
-            \skdoc@temp\skdoc@temp\space~This~is~file~`#2',~generated~from~`\c_sys_jobame_str.tex'~(key~`\skdoc@key').
+            \skdoc@temp\skdoc@temp\space~This~is~file~`#2',~generated~from~`\c_sys_jobname_str.tex'~(key~`\skdoc@key').
         }
     }
     \expandafter\xdef\csname skdoc@write@#2\endcsname{%
@@ -354,12 +357,11 @@
     }
     \__skdoc_if_print_code:T{
         \bool_if:NTF\g__skdoc_use_minted_bool{
-            \minted@resetoptions%
-            \exp_args:Nnx\setkeys{minted@opt}{
-                \int_compare:nNnF{\clist_count:N\l__skdoc_keys}>\c_one{
-                    \bool_if:NF\g__skdoc_in_example_bool{linenos,}
-                    firstnumber=\int_use:c{skdoc@output@#1@line}
-                }
+            \bool_if:NF\g__skdoc_in_example_bool{
+                \setkeys{minted@opt@g}{linenos}
+            }%
+            \exp_args:Nnx\setkeys{FV}{
+                firstnumber=\int_use:c{skdoc@output@#1@line}
             }%
             \iow_open:Nn\minted@code{\jobname.pyg}%
             \Needspace*{2\baselineskip}%
@@ -476,7 +478,7 @@
     \group_end:
 }
 \DeclareDocumentCommand\SelfPreambleTo{m}{%
-    \PreambleTo{#1}{\c_sys_jobame_str}%
+    \PreambleTo{#1}{\c_sys_jobname_str}%
 }
 \definecolorset{RGB}{}{}{
     section,11,72,107;
@@ -1265,7 +1267,7 @@
 \DeclareDocumentCommand\Warning{+m}{
     \vspace{\baselineskip}
     \par\noindent
-    \fbox{\begin{minipage}[c]{\textwidth}
+    \fbox{\begin{minipage}[c]{\textwidth-2\fboxsep-2\fboxrule}
         \centering
         \textbf{Warning:}~#1
     \end{minipage}}
@@ -1275,13 +1277,12 @@
 \DeclareDocumentCommand\LongWarning{+m}{
     \Warning{
         \par\noindent
-        \begin{minipage}{\textwidth}
+        \begin{minipage}{\textwidth-2\fboxsep-2\fboxrule}
             #1
         \end{minipage}
     }
 }
 \def\@maketitle{%
-    \newpage
     \null
     \begin{flushleft}%
     {%