From e6ddecda975d353fc842ec9a616498a1ef02cca5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 20 Jul 2015 22:09:40 +0000 Subject: skrapport (20jul15) git-svn-id: svn://tug.org/texlive/trunk@37911 c570f23f-e606-0410-a88d-b1316a301751 --- .../skrapport/skrapport-colortheme-cruelwater.sty | 2 +- .../skrapport/skrapport-colortheme-default.sty | 2 +- .../latex/skrapport/skrapport-colortheme-skdoc.sty | 2 +- .../skrapport/skrapport-colortheme-unscathed.sty | 2 +- .../skrapport/skrapport-colortheme-violet.sty | 2 +- .../tex/latex/skrapport/skrapport-size-common.sty | 2 +- .../tex/latex/skrapport/skrapport-size10pt.clo | 2 +- .../tex/latex/skrapport/skrapport-size11pt.clo | 2 +- .../tex/latex/skrapport/skrapport-size12pt.clo | 2 +- .../texmf-dist/tex/latex/skrapport/skrapport.cls | 37 +++++++--------------- 10 files changed, 21 insertions(+), 34 deletions(-) (limited to 'Master/texmf-dist/tex/latex/skrapport') diff --git a/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-cruelwater.sty b/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-cruelwater.sty index 1d3b2387227..3cf98cffa4d 100644 --- a/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-cruelwater.sty +++ b/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-cruelwater.sty @@ -1,7 +1,7 @@ %% This is file `skrapport-colortheme-cruelwater.sty', generated from `skrapport.tex' (key `theme-cruelwater'). %% skrapport Skånings rapportklass %% -%% Copyright (C) 2012-2013 by Simon Sigurdhsson +%% Copyright (C) 2012-2015 by Simon Sigurdhsson %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-default.sty b/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-default.sty index ec25eaa46ee..a53abb0edc5 100644 --- a/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-default.sty +++ b/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-default.sty @@ -1,7 +1,7 @@ %% This is file `skrapport-colortheme-default.sty', generated from `skrapport.tex' (key `theme-default'). %% skrapport Skånings rapportklass %% -%% Copyright (C) 2012-2013 by Simon Sigurdhsson +%% Copyright (C) 2012-2015 by Simon Sigurdhsson %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-skdoc.sty b/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-skdoc.sty index f21bf49beb1..17572b7ac42 100644 --- a/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-skdoc.sty +++ b/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-skdoc.sty @@ -1,7 +1,7 @@ %% This is file `skrapport-colortheme-skdoc.sty', generated from `skrapport.tex' (key `theme-skdoc'). %% skrapport Skånings rapportklass %% -%% Copyright (C) 2012-2013 by Simon Sigurdhsson +%% Copyright (C) 2012-2015 by Simon Sigurdhsson %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-unscathed.sty b/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-unscathed.sty index 9d06a6ea193..374eeda6862 100644 --- a/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-unscathed.sty +++ b/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-unscathed.sty @@ -1,7 +1,7 @@ %% This is file `skrapport-colortheme-unscathed.sty', generated from `skrapport.tex' (key `theme-unscathed'). %% skrapport Skånings rapportklass %% -%% Copyright (C) 2012-2013 by Simon Sigurdhsson +%% Copyright (C) 2012-2015 by Simon Sigurdhsson %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-violet.sty b/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-violet.sty index e13cdf09de1..df36875719d 100644 --- a/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-violet.sty +++ b/Master/texmf-dist/tex/latex/skrapport/skrapport-colortheme-violet.sty @@ -1,7 +1,7 @@ %% This is file `skrapport-colortheme-violet.sty', generated from `skrapport.tex' (key `theme-violet'). %% skrapport Skånings rapportklass %% -%% Copyright (C) 2012-2013 by Simon Sigurdhsson +%% Copyright (C) 2012-2015 by Simon Sigurdhsson %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/skrapport/skrapport-size-common.sty b/Master/texmf-dist/tex/latex/skrapport/skrapport-size-common.sty index d6e4f00985b..c551c85407f 100644 --- a/Master/texmf-dist/tex/latex/skrapport/skrapport-size-common.sty +++ b/Master/texmf-dist/tex/latex/skrapport/skrapport-size-common.sty @@ -1,7 +1,7 @@ %% This is file `skrapport-size-common.sty', generated from `skrapport.tex' (key `size-common'). %% skrapport Skånings rapportklass %% -%% Copyright (C) 2012-2013 by Simon Sigurdhsson +%% Copyright (C) 2012-2015 by Simon Sigurdhsson %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/skrapport/skrapport-size10pt.clo b/Master/texmf-dist/tex/latex/skrapport/skrapport-size10pt.clo index c0a2c84bf70..e82520de31d 100644 --- a/Master/texmf-dist/tex/latex/skrapport/skrapport-size10pt.clo +++ b/Master/texmf-dist/tex/latex/skrapport/skrapport-size10pt.clo @@ -1,7 +1,7 @@ %% This is file `skrapport-size10pt.clo', generated from `skrapport.tex' (key `size-10'). %% skrapport Skånings rapportklass %% -%% Copyright (C) 2012-2013 by Simon Sigurdhsson +%% Copyright (C) 2012-2015 by Simon Sigurdhsson %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/skrapport/skrapport-size11pt.clo b/Master/texmf-dist/tex/latex/skrapport/skrapport-size11pt.clo index b3cf8108074..5a590480bec 100644 --- a/Master/texmf-dist/tex/latex/skrapport/skrapport-size11pt.clo +++ b/Master/texmf-dist/tex/latex/skrapport/skrapport-size11pt.clo @@ -1,7 +1,7 @@ %% This is file `skrapport-size11pt.clo', generated from `skrapport.tex' (key `size-11'). %% skrapport Skånings rapportklass %% -%% Copyright (C) 2012-2013 by Simon Sigurdhsson +%% Copyright (C) 2012-2015 by Simon Sigurdhsson %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/skrapport/skrapport-size12pt.clo b/Master/texmf-dist/tex/latex/skrapport/skrapport-size12pt.clo index d1763532115..016435c1d58 100644 --- a/Master/texmf-dist/tex/latex/skrapport/skrapport-size12pt.clo +++ b/Master/texmf-dist/tex/latex/skrapport/skrapport-size12pt.clo @@ -1,7 +1,7 @@ %% This is file `skrapport-size12pt.clo', generated from `skrapport.tex' (key `size-12'). %% skrapport Skånings rapportklass %% -%% Copyright (C) 2012-2013 by Simon Sigurdhsson +%% Copyright (C) 2012-2015 by Simon Sigurdhsson %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/skrapport/skrapport.cls b/Master/texmf-dist/tex/latex/skrapport/skrapport.cls index 9684dc50f07..6dec7cc8e1b 100644 --- a/Master/texmf-dist/tex/latex/skrapport/skrapport.cls +++ b/Master/texmf-dist/tex/latex/skrapport/skrapport.cls @@ -1,7 +1,7 @@ %% This is file `skrapport.cls', generated from `skrapport.tex' (key `class'). %% skrapport Skånings rapportklass %% -%% Copyright (C) 2012-2013 by Simon Sigurdhsson +%% Copyright (C) 2012-2015 by Simon Sigurdhsson %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -29,7 +29,7 @@ \RequirePackage{expl3,l3keys2e,xparse,xstring,etoolbox} \ProvidesExplClass{skrapport}% - {2013/09/09}{0.12c}{stylish report document class} + {2015/07/17}{0.12e}{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!} @@ -80,7 +80,7 @@ \bool_new:N\g__skrapport_has_polyglossia_bool \int_new:N\g__skrapport_grid_lines_int \cs_new:Npn\__skrapport_setup_paper:n#1{ - \str_case:nnn{#1}{ + \str_case:nnF{#1}{ {a4}{ \PassOptionsToPackage{paper=A4}{typearea} \int_gset:Nn\g__skrapport_grid_lines_int{40} @@ -96,7 +96,7 @@ \AtBeginDocument{\recalctypearea} } \cs_new:Npn\__skrapport_setup_ptsize:n#1{ - \str_case:nnn{#1}{ + \str_case:nnF{#1}{ {10pt}{\int_const:Nn\c__skrapport_ptsize_int{0}} {11pt}{\int_const:Nn\c__skrapport_ptsize_int{1}} {12pt}{\int_const:Nn\c__skrapport_ptsize_int{2}} @@ -270,7 +270,7 @@ \file_input:n{fleqn.clo} } \cs_new:Npn\__skrapport_setup_titles:n#1{ - \str_case:nnn{#1}{ + \str_case:nnF{#1}{ {rm}{\cs_new_protected:Nn\__skrapport_title_style:{\rmfamily}} {it}{\cs_new_protected:Nn\__skrapport_title_style:{\itshape}} {bf}{\cs_new_protected:Nn\__skrapport_title_style:{\bfseries}} @@ -281,7 +281,7 @@ } } \cs_new:Npn\__skrapport_setup_lang:n#1{ - \str_case:nnn{#1}{ + \str_case:nnF{#1}{ {sv}{ \bool_if:NTF\g__skrapport_has_polyglossia_bool{ \setmainlanguage{swedish} @@ -324,12 +324,6 @@ \cs_gset:Nn\__skrapport_etc_word:{\emph{etc.}} \cs_gset:Nn\__skrapport_cf_word:{jfr.} \cs_gset:Nn\__skrapport_viz_word:{dvs.} - \cs_gset:Npn\contentsname{Innehåll} - \cs_gset:Npn\refname{Referenser} - \cs_gset:Npn\figurename{Figur} - \cs_gset:Npn\tablename{Tabell} - \cs_gset:Npn\appendixname{Bilaga} - \cs_gset:Npn\abstractname{Sammanfattning} } \cs_gset:Npn\dateswedish{ \cs_gset:Npn\today @@ -344,12 +338,6 @@ \cs_gset:Nn\__skrapport_etc_word:{\emph{etc.}} \cs_gset:Nn\__skrapport_cf_word:{\emph{cf.}} \cs_gset:Nn\__skrapport_viz_word:{\emph{viz.}} - \cs_gset:Npn\contentsname{Contents} - \cs_gset:Npn\refname{References} - \cs_gset:Npn\figurename{Figurr} - \cs_gset:Npn\tablename{Table} - \cs_gset:Npn\appendixname{Appendix} - \cs_gset:Npn\abstractname{Abstract} } \cs_gset:Npn\datebritish{ \cs_gset:Npn\today @@ -364,12 +352,6 @@ \cs_gset:Nn\__skrapport_etc_word:{usw.} \cs_gset:Nn\__skrapport_cf_word:{vgl.} \cs_gset:Nn\__skrapport_viz_word:{\emph{viz.}} - \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\datengerman{ \cs_gset:Npn\today @@ -379,7 +361,7 @@ \cs_new:Npn\__skrapport_setup_font:n#1{ \PassOptionsToPackage{intlimits}{amsmath} \PassOptionsToPackage{full}{textcomp} - \str_case:nnn{#1}{ + \str_case:nnF{#1}{ {none}{ \bool_if:nT{\luatex_if_engine_p: || \xetex_if_engine_p:}{ \RequirePackage[quiet]{fontspec} @@ -1536,6 +1518,11 @@ \DeclareDocumentCommand\viz{}{ \__skrapport_peek_punctuation:x{\__skrapport_viz_word:} } +\DeclareDocumentCommand\dash{}{ + \cs_if_exist_use:NT\texorpdfstring + {\unskip\nobreak\thinspace\textemdash\thinspace\ignorespaces}{{ - }} +} +\cs_if_exist_use:NT\DeclareUnicodeCharacter{{2014}{\dash}} \bool_if:NT\g__skrapport_color_bool{ \apptocmd{\bfseries} {\color{skrapport@boldcolor}}{} -- cgit v1.2.3