summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/skrapport
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-09-10 22:46:35 +0000
committerKarl Berry <karl@freefriends.org>2013-09-10 22:46:35 +0000
commit8148607713ce67f4a8d132facbbf3a1d68dabdc1 (patch)
tree930b9065af7780298d0ab54a9ab2198394b4c127 /Master/texmf-dist/tex/latex/skrapport
parent91ff0e396787dd80a11dfb7b633db20058c3963a (diff)
skrapport (10sep13)
git-svn-id: svn://tug.org/texlive/trunk@31623 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/skrapport')
-rw-r--r--Master/texmf-dist/tex/latex/skrapport/skrapport.cls81
1 files changed, 54 insertions, 27 deletions
diff --git a/Master/texmf-dist/tex/latex/skrapport/skrapport.cls b/Master/texmf-dist/tex/latex/skrapport/skrapport.cls
index fcbdcea0594..642334ebf10 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}%
- {2013/07/24}{0.12b}{stylish report document class}
+ {2013/09/09}{0.12c}{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!}
@@ -155,32 +155,38 @@
\AfterEndEnvironment{alignat}{\end{gridenv}}
\BeforeBeginEnvironment{alignat*}{\begin{gridenv}}
\AfterEndEnvironment{alignat*}{\end{gridenv}}
- \cs_set_eq:NN\__skrapport_saved_section:w\section
- \RenewDocumentCommand\section{som}{
- \IfBooleanTF{##1}
- {\__skrapport_saved_section:w*{##3}}
- {\IfNoValueTF{##2}
- {\__skrapport_saved_section:w{##3}}
- {\__skrapport_saved_section:w[##2]{##3}}
- }
+ \skip_gset:Nn\c__skrapport_section_pre_skip{-.999\baselineskip}
+ \skip_gset:Nn\c__skrapport_section_post_skip{0.001\baselineskip}
+ \dim_gset:Nn \c__skrapport_section_indent_dim{\c_zero_dim}
+ \cs_set_protected:Nn\__skrapport_section_style:
+ {\normalfont\__skrapport_title_style:}
+ \DeclareDocumentCommand\section{som}{
+ \__skrapport_generic_section:nnnnn{section}{1}{##1}{##2}{##3}
}
- \cs_set_eq:NN\__skrapport_saved_subsection:w\subsection
- \RenewDocumentCommand\subsection{som}{
- \IfBooleanTF{##1}
- {\__skrapport_saved_subsection:w*{##3}}
- {\IfNoValueTF{##2}
- {\__skrapport_saved_subsection:w{##3}}
- {\__skrapport_saved_subsection:w[##2]{##3}}
- }
+ \skip_gset:Nn\c__skrapport_subsection_pre_skip{\baselineskip}
+ \skip_gset:Nn\c__skrapport_subsection_post_skip{-.35\baselineskip}
+ \dim_gset:Nn \c__skrapport_subsection_indent_dim{\c_zero_dim}
+ \cs_set_protected:Nn\__skrapport_subsection_style:
+ {\normalfont\__skrapport_title_style:\unskip}
+ \DeclareDocumentCommand\subsection{som}{
+ \__skrapport_generic_section:nnnnn{subsection}{2}{##1}{##2}{##3}
+ }
+ \skip_gset:Nn\c__skrapport_subsubsection_pre_skip{\baselineskip}
+ \skip_gset:Nn\c__skrapport_subsubsection_post_skip{-.35\baselineskip}
+ \dim_gset:Nn \c__skrapport_subsubsection_indent_dim{\c_zero_dim}
+ \cs_set_protected:Nn\__skrapport_subsubsection_style:
+ {\normalfont\itshape\__skrapport_title_style:\unskip}
+ \DeclareDocumentCommand\subsubsection{som}{
+ \__skrapport_generic_section:nnnnn{subsubsection}{3}{##1}{##2}{##3}
}
- \cs_set_eq:NN\__skrapport_saved_subsubsection:w\subsubsection
- \RenewDocumentCommand\subsubsection{som}{
- \IfBooleanTF{##1}
- {\__skrapport_saved_subsubsection:w*{##3}}
- {\IfNoValueTF{##2}
- {\__skrapport_saved_subsubsection:w{##3}}
- {\__skrapport_saved_subsubsection:w[##2]{##3}}
+ \DeclareDocumentCommand\l@section{mm}{
+ \group_begin:
+ \skip_vertical:n{.75ex}
+ \__skrapport_title_style:
+ \__skrapport_toc_line:nnnnn{1}{0em}{1.3em}{##1}{
+ \__skrapport_title_style: ##2
}
+ \group_end:
}
\cs_new:Npn\__skrapport_xdblfloat:nn##1##2{\@xdblfloat{##1}[##2]}
\cs_generate_variant:Nn\__skrapport_xdblfloat:nn{nx}
@@ -317,6 +323,27 @@
\cs_gset:Nn\__skrapport_RFC_language:{eng}
\PassOptionsToPackage{iso,british}{isodate}
}
+ {de}{
+ \bool_if:NTF\g__skrapport_has_polyglossia_bool{
+ \setmainlanguage{ngerman}
+ \setotherlanguage[variant=british]{english}
+ }{
+ \RequirePackage[british,ngerman]{babel}
+ }
+ \cs_gset:Nn\__skrapport_and_word:{und}
+ \cs_gset:Nn\__skrapport_Email_word:{E-Mail}
+ \cs_gset:Nn\__skrapport_Comment_word:{Kommentar}
+ \cs_gset:Npn\contentsname{Inhaltsverzeichnis}
+ \cs_gset:Npn\refname{Literatur}
+ \cs_gset:Npn\figurename{Abbildung}
+ \cs_gset:Npn\tablename{Tabelle}
+ \cs_gset:Npn\appendixname{Anhang}
+ \cs_gset:Npn\abstractname{Zusammenfassung}
+ \cs_gset:Npn\today
+ {\int_use:N\day.\,\int_use:N\month.\,\int_use:N\year}
+ \cs_gset:Nn\__skrapport_RFC_language:{ger}
+ \PassOptionsToPackage{iso,ngerman}{isodate}
+ }
}{
\msg_info:nnn{skrapport}{invalid-lang}{#1}
}
@@ -570,7 +597,7 @@
{sftitles}{titles=sf}
\keys_set:nn{skrapport}{titles=sf}},
lang .choices:nn =
- { sv, en }
+ { sv, en, de }
{\__skrapport_setup_lang:x{\tl_use:N\l_keys_choice_tl}},
lang .value_required:,
swe .code:n =
@@ -1253,6 +1280,7 @@
}{
\end@float
}
+\cs_generate_variant:Nn\coffin_typeset:Nnnnn{Nnnon}
\DeclareDocumentEnvironment{figcenter}{}{
\cs_set_eq:NN\l__tmpa_cs\caption
\cs_set:Npn\caption{\msg_error:nn{skrapport}{caption-in-figcenter}}
@@ -1261,8 +1289,7 @@
}{
\hcoffin_set_end:
\dim_set:Nn\l_tmpa_dim{(\textwidth - \coffin_wd:N\l_tmpa_coffin)/2}
- \skip_horizontal:n{-\l_tmpa_dim}
- \coffin_typeset:Nnnnn\l_tmpa_coffin{H}{l}{0pt}{0pt}
+ \coffin_typeset:Nnnon\l_tmpa_coffin{H}{l}{\dim_use:N\l_tmpa_dim}{0pt}
\cs_set_eq:NN\caption\l__tmpa_cs
\cs_undefine:N\l__tmpa_cs
}