summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/skdoc
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-07-19 22:23:54 +0000
committerKarl Berry <karl@freefriends.org>2013-07-19 22:23:54 +0000
commit3d10e4db332aa2b5b393b71cc1ec778aacd41046 (patch)
tree377c6677e3ec5495fc56b2ff964b1fd8f0ccfcb0 /Master/texmf-dist/tex/latex/skdoc
parent9f85d0a8471c373b5f08275607bc6ffae1e0b700 (diff)
skdoc (19jul13)
git-svn-id: svn://tug.org/texlive/trunk@31242 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/skdoc')
-rw-r--r--Master/texmf-dist/tex/latex/skdoc/skdoc.cls71
1 files changed, 47 insertions, 24 deletions
diff --git a/Master/texmf-dist/tex/latex/skdoc/skdoc.cls b/Master/texmf-dist/tex/latex/skdoc/skdoc.cls
index a03f7990f41..d65f36b624c 100644
--- a/Master/texmf-dist/tex/latex/skdoc/skdoc.cls
+++ b/Master/texmf-dist/tex/latex/skdoc/skdoc.cls
@@ -26,7 +26,7 @@
%% and the derived filebase skdoc.cls.
\RequirePackage{expl3}
\ProvidesExplClass{skdoc}
- {2013/05/24}{1.3a}{skdoc documentation class}
+ {2013/05/24}{1.3b}{skdoc documentation class}
\PassOptionsToPackage{log-declarations=false}{xparse}
\LoadClass[ DIV7,
headings=big,
@@ -35,7 +35,7 @@
bibliography=totocnumbered,
index=totoc
]{scrartcl}
-\RequirePackage{etoolbox,xstring,xparse,atbegshi,kvoptions,pdftexcmds}
+\RequirePackage{etoolbox,xstring,xparse,atbegshi,kvoptions,pdftexcmds,everyhook}
\RequirePackage{verbatim,needspace,marginnote,calc,hyperref,multicol,hologo}
\RequirePackage[nomain,xindy,numberedsection,order=letter,
sanitize={description=false,sort=false}]{glossaries}
@@ -44,7 +44,7 @@
\RequirePackage[english=british]{csquotes}
\RequirePackage[font=small,labelfont=bf,textfont=it]{caption}
\RequirePackage{scrpage2,PTSerif}
-\usepackage[scaled=1.03]{inconsolata}
+\usepackage{sourcecodepro}
\RequirePackage[defaultsans,osfigures,scale=0.95]{opensans}
\RequirePackage[babel]{microtype}
\msg_new:nnn{skdoc}{key-exists}{File~key~"#1"~already~declared!}
@@ -66,6 +66,8 @@
\bool_gset_true:N\g__skdoc_with_implementation_bool
\bool_new:N\g__skdoc_in_implementation_bool
\bool_gset_false:N\g__skdoc_in_implementation_bool
+\bool_new:N\g__skdoc_negative_space_bool
+\bool_gset_false:N\g__skdoc_negative_space_bool
\prg_new_conditional:Nnn\__skdoc_if_print_code:{p,T,F,TF}{
\bool_if:nTF{
\g__skdoc_in_implementation_bool &&
@@ -438,6 +440,7 @@
}
\DeclareDocumentEnvironment{MacroCode}{m}{
\__skdoc_if_print_code:T{
+ \bool_if:NT\g__skdoc_negative_space_bool{\vspace{\baselineskip}}
\vspace{.2\baselineskip}
\bool_if:NF\g__skdoc_use_minted_bool{\par\noindent}
}
@@ -714,7 +717,7 @@
\vspace*{\c__skdoc_example_margin_dim}\par
}
\DeclareDocumentEnvironment{macro}{smo}{%
- \@bsphack
+ \IfBooleanTF{#1}{}{\@bsphack}
\index@macro!{\expandafter\@gobble\string#2}
\@macroname{#2}%
\IfBooleanTF{#1}{
@@ -734,7 +737,7 @@
\IfBooleanTF{#1}{}{\@esphack}
}
\DeclareDocumentEnvironment{environment}{smo}{%
- \@bsphack
+ \IfBooleanTF{#1}{}{\@bsphack}
\index@environment!{#2}
\@environmentname{#2}%
\IfBooleanTF{#1}{
@@ -754,7 +757,7 @@
\IfBooleanTF{#1}{}{\@esphack}
}
\DeclareDocumentEnvironment{option}{smg}{%
- \@bsphack
+ \IfBooleanTF{#1}{}{\@bsphack}
\index@option!{#2}
\@optionname{#2}%
\IfBooleanTF{#1}{}{
@@ -772,7 +775,7 @@
\IfBooleanTF{#1}{}{\@esphack}
}
\DeclareDocumentEnvironment{bibentry}{sm}{%
- \@bsphack
+ \IfBooleanTF{#1}{}{\@bsphack}
\index@bibentry!{\expandafter\@gobble\string#2}
\@bibentryname{#2}%
\IfBooleanTF{#1}{}{
@@ -784,7 +787,7 @@
\IfBooleanTF{#1}{}{\@esphack}
}
\DeclareDocumentEnvironment{theme}{sm}{%
- \@bsphack
+ \IfBooleanTF{#1}{}{\@bsphack}
\index@theme!{#2}
\@themename{#2}%
\IfBooleanTF{#1}{}{
@@ -843,11 +846,31 @@
\fi
}
\def\macro@impl@endargs{
- \endgroup\par
+ \endgroup
+ \peek_meaning_ignore_spaces:NTF\begin
+ {
+ \vspace{-\baselineskip}
+ \bool_gset_true:N\g__skdoc_negative_space_bool
+ \PushPreHook{par}{
+ \bool_gset_false:N\g__skdoc_negative_space_bool
+ \PopPreHook{par}
+ }
+ }
+ {\par\medskip}%
}
\def\macro@impl@argline@noarg#1{%
\vspace*{-\baselineskip}
- \par\noindent{#1\strut}\par\medskip%
+ \par\noindent{#1\strut}
+ \peek_meaning_ignore_spaces:NTF\begin
+ {
+ \vspace{-\baselineskip}
+ \bool_gset_true:N\g__skdoc_negative_space_bool
+ \PushPreHook{par}{
+ \bool_gset_false:N\g__skdoc_negative_space_bool
+ \PopPreHook{par}
+ }
+ }
+ {\par\medskip}%
}
\prg_new_conditional:Nnn\__skdoc_if_do_index:{p,T,F,TF}{
\bool_if:nTF{
@@ -873,9 +896,9 @@
}
}
\DeclareDocumentCommand\index@macro{st!m}{
- \def\skdoc@temp{#3}
+ \def\skdoc@temp{#3-macro}
\ifglsentryexists{index-\skdoc@temp}{}{
- \@index@{#3}{\cs*{#3}}
+ \@index@{#3-macro}{\cs*{#3}}
}
\__skdoc_if_do_index:T{
\IfBooleanTF{#2}{
@@ -890,9 +913,9 @@
}
}
\DeclareDocumentCommand\index@environment{st!m}{
- \def\skdoc@temp{\string#3}
+ \def\skdoc@temp{\string#3-env}
\ifglsentryexists{index-\skdoc@temp}{}{
- \@index@{\string#3}{\env*{\string#3}~(environment)}
+ \@index@{\string#3-env}{\env*{\string#3}~(environment)}
}
\__skdoc_if_do_index:T{
\IfBooleanTF{#2}{
@@ -907,9 +930,9 @@
}
}
\DeclareDocumentCommand\index@option{st!m}{
- \def\skdoc@temp{\string#3}
+ \def\skdoc@temp{\string#3-opt}
\ifglsentryexists{index-\skdoc@temp}{}{
- \@index@{\string#3}{\opt*{\string#3}~(option)}
+ \@index@{\string#3-opt}{\opt*{\string#3}~(option)}
}
\__skdoc_if_do_index:T{
\IfBooleanTF{#2}{
@@ -924,9 +947,9 @@
}
}
\DeclareDocumentCommand\index@bibentry{st!m}{
- \def\skdoc@temp{#3}
+ \def\skdoc@temp{#3-bib}
\ifglsentryexists{index-\skdoc@temp}{}{
- \@index@{#3}{\bib*{#3}~(\hologoRobust{BibTeX}~entry~type)}
+ \@index@{#3-bib}{\bib*{#3}~(\hologoRobust{BibTeX}~entry~type)}
}
\__skdoc_if_do_index:T{
\IfBooleanTF{#2}{
@@ -941,9 +964,9 @@
}
}
\DeclareDocumentCommand\index@theme{st!m}{
- \def\skdoc@temp{\string#3}
+ \def\skdoc@temp{\string#3-theme}
\ifglsentryexists{index-\skdoc@temp}{}{
- \@index@{\string#3}{\thm*{\string#3}~(theme)}
+ \@index@{\string#3-theme}{\thm*{\string#3}~(theme)}
}
\__skdoc_if_do_index:T{
\IfBooleanTF{#2}{
@@ -958,9 +981,9 @@
}
}
\DeclareDocumentCommand\index@package{st!m}{
- \def\skdoc@temp{\string#3}
+ \def\skdoc@temp{\string#3-pkg}
\ifglsentryexists{index-\skdoc@temp}{}{
- \@index@{\string#3}{\pkg*{\string#3}~(package)}
+ \@index@{\string#3-pkg}{\pkg*{\string#3}~(package)}
}
\__skdoc_if_do_index:T{
\IfBooleanTF{#2}{
@@ -975,9 +998,9 @@
}
}
\DeclareDocumentCommand\index@file{st!m}{
- \def\skdoc@temp{\string#3}
+ \def\skdoc@temp{\string#3-file}
\ifglsentryexists{index-\skdoc@temp}{}{
- \@index@{\string#3}{\file*{\string#3}~(file)}
+ \@index@{\string#3-file}{\file*{\string#3}~(file)}
}
\__skdoc_if_do_index:T{
\IfBooleanTF{#2}{