skrapport (20jul15)

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

13 files changed, 115 insertions, 117 deletions

diff --git a/Master/texmf-dist/doc/latex/skrapport/README b/Master/texmf-dist/doc/latex/skrapport/README
index ed97e381a5c..54de2acecf0 100644
--- a/Master/texmf-dist/doc/latex/skrapport/README
+++ b/Master/texmf-dist/doc/latex/skrapport/README
@@ -1,7 +1,7 @@
 %% skrapport Skånings rapportklass
 %%
-%% Copyright (C) 2012-2013 by Simon Sigurdhsson <sigurdhsson@gmail.com>
-%% 
+%% Copyright (C) 2012-2015 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
 %% of this license or (at your option) any later version.
@@ -9,11 +9,11 @@
 %%   http://www.latex-project.org/lppl.txt
 %% and version 1.3 or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
-%% 
+%%
 %% This work has the LPPL maintenance status `maintained'.
-%% 
+%%
 %% The Current Maintainer of this work is Simon Sigurdhsson.
-%% 
+%%
 %% This work consists of the file skrapport.tex and the derived files:
 %%  * skrapport.cls
 %%  * skrapport-colortheme-default.sty
@@ -26,7 +26,7 @@
 %%  * skrapport-size11pt.clo
 %%  * skrapport-size12pt.clo
 
-This is version 0.12d of the skrapport document class, intended for simple
+This is version 0.12e of the skrapport document class, intended for simple
 reports submitted by the author at Chalmers University of Technology.
 
 The following files are enclosed.
diff --git a/Master/texmf-dist/doc/latex/skrapport/skrapport.pdf b/Master/texmf-dist/doc/latex/skrapport/skrapport.pdf
index 3d83e7906e2..af07c04a088 100644
--- a/Master/texmf-dist/doc/latex/skrapport/skrapport.pdf
+++ b/Master/texmf-dist/doc/latex/skrapport/skrapport.pdf
diff --git a/Master/texmf-dist/source/latex/skrapport/skrapport.tex b/Master/texmf-dist/source/latex/skrapport/skrapport.tex
index 7f355fcaf77..67dc64405e1 100644
--- a/Master/texmf-dist/source/latex/skrapport/skrapport.tex
+++ b/Master/texmf-dist/source/latex/skrapport/skrapport.tex
@@ -1,7 +1,7 @@
 %% skrapport Skånings rapportklass
 %%
-%% Copyright (C) 2012-2013 by Simon Sigurdhsson <sigurdhsson@gmail.com>
-%% 
+%% Copyright (C) 2012-2015 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
 %% of this license or (at your option) any later version.
@@ -9,11 +9,11 @@
 %%   http://www.latex-project.org/lppl.txt
 %% and version 1.3 or later is part of all distributions of LaTeX
 %% version 2005/12/01 or later.
-%% 
+%%
 %% This work has the LPPL maintenance status `maintained'.
-%% 
+%%
 %% The Current Maintainer of this work is Simon Sigurdhsson.
-%% 
+%%
 %% This work consists of the file skrapport.tex and the derived files:
 %%  * skrapport.cls
 %%  * skrapport-colortheme-default.sty
@@ -65,6 +65,15 @@
         author = {{International Organization for Standardization, Technical Committee 154}},
         year = {2004}
     }
+    @article{Flynn,
+        author = {Peter Flynn},
+        title = {Rolling your own Document Class: Using \LaTeX{} to
+                 keep away from the Dark Side},
+        journal = {The Prac\TeX{} Journal},
+        number = {4},
+        year = {2006},
+        url = {http://tug.org/pracjourn/2006-4/flynn/flynn.pdf}
+    }
 \end{filecontents}
 \addbibresource{skrapport.bib}
 
@@ -90,13 +99,13 @@
 % This is where the documentation begins
 \begin{document}
     % Change & version info
-    \version{0.12d}
+    \version{0.12e}
     \changes{0.01}{Initial version}
     \changes{0.03}{Removed \cs{rd} and \cs{id}}
     \changes{0.04}{Added \pkg{microtype} package}
     \changes{0.05}{Improved documentation}
     \changes{0.06}{Corrected cheksum, further improved documentation}
-    \changes{0.07}{Various bugfixes, \hologo{XeLaTeX} compatibility, 
+    \changes{0.07}{Various bugfixes, \hologo{XeLaTeX} compatibility,
                     better float settings, quote style fix,
                     \opt{intlimits} option to \pkg{amsmath}}
     \changes{0.07a}{Fixed \pkg{kpfonts} issues}
@@ -114,6 +123,9 @@
     \changes{0.12b}{Minor and major bugfixes to \cs{maketitle}, \opt{ptsize}, \opt{twocolumn} and others}
     \changes{0.12c}{Added german language option, fixed sectioning macros in \opt{twocolumn} mode}
     \changes{0.12d}{Added \opt{hanging-titles}, latin phrase macros. Load \pkg{isomath}. Don't load \pkg{icomma}. Use \cs{frenchspacing}}
+    \changes{0.12e}{Replace usage of deprecated \pkg{expl3} macros (thanks for the heads-up, Joseph Wright!)}
+    % Don't forget to update the version number and release date of
+    % the package declaration in the implementation!
 
     % Metadata
     \package[ctan=skrapport,vcs=https://github.com/urdh/skrapport]{skrapport}
@@ -201,7 +213,7 @@
 
     \Option{hanging-titles}\WithValues{true, false}\AndDefault{false}
     This options allow sections to be set as \enquote{hanging} titles,
-    \emph{i.e.} with the section number in the margin. 
+    \emph{i.e.} with the section number in the margin.
 
     \Option{color}\WithValues{\meta{color theme}}\AndDefault{default}
     This option tells the class to activate color theme support and
@@ -350,10 +362,10 @@
     good-looking preamble with almost no effort.
 
     The optional argument is a key-value list with two valid entries,
-    \opt*{hide} and \opt*{nopdfinfo}. The \opt*{hide} entry accepts a 
+    \opt*{hide} and \opt*{nopdfinfo}. The \opt*{hide} entry accepts a
     comma-separated list in which the values \opt*{date},
     \opt*{regarding} and \opt*{email}
-    are interpreted as instructions to hide the corresponding entry from 
+    are interpreted as instructions to hide the corresponding entry from
     the front page. The \opt*{nopdfinfo} key disables the generation of
     PDF information by \pkg{hyperref}.
 
@@ -398,7 +410,7 @@
 
     The old font macros, whose use has been discouraged for a long time,
     are now deprecated. Instead of functioning correctly, they will emit
-    an error and require user input. Use the \cs*{text??}/\cs*{??family} 
+    an error and require user input. Use the \cs*{text??}/\cs*{??family}
     macros instead. For emphasis, use the \cs{emph} macro.
 
     \DescribeMacro\emph{<text>}
@@ -427,7 +439,7 @@
     \DescribeMacro\appendix
     This macro signals the end of the main matter and the start of
     the appendix. In essence, it resets the section numbering counter
-    and changes the section numbering to the upper-case alphabetic 
+    and changes the section numbering to the upper-case alphabetic
     sequence.
 
     \subsubsection{Floats}
@@ -482,10 +494,15 @@
     running text and uncomplicated settings). In languages other than
     english, appropriate translations are made if applicable.
 
+    \DescribeMacro\dash
+    This macro prints an em-dash surrounded by thin spaces, as discussed
+    by \textcite[\pno~8]{Flynn}. When \cs*{DeclareUnicodeCharacter} is
+    available, the real em dash uses this definition.
+
     \subsubsection{Color theme support}
     \DescribeMacro\colortheme{<theme>}
     The \cs{colortheme} macro, which is only available when the
-    \opt{color} option is \texttt{true}, applies a color theme to 
+    \opt{color} option is \texttt{true}, applies a color theme to
     the document. For a list of available color themes, see
     \enquote{Color themes} \vpageref{ssec:color}.
 
@@ -538,11 +555,11 @@
     \textcolor[HTML]{70524A}{lighter brown} to quotes.
 
     \Theme{cruelwater}
-    The \thm{cruelwater} theme is also based on a palette from 
+    The \thm{cruelwater} theme is also based on a palette from
     COLOURlovers%
 \footnote{\url{http://www.colourlovers.com/palette/126030/Cruel_Water_at_Night}},
     and applies a \textcolor[HTML]{030C22}{dark blue} color to bold
-    text and captions, a \textcolor[HTML]{20293F}{slightly less dark 
+    text and captions, a \textcolor[HTML]{20293F}{slightly less dark
     blue} to titles and emphasized text, a \textcolor[HTML]{A9B0B3}{
     light gray} color to small print and a \textcolor[HTML]{404749}{
     darker gray} to quotes.
@@ -604,7 +621,7 @@
         \item[--] If a \cs{subsubsection} is the last item of the Table
         of Contents, it will not be indented properly.
     \end{description}
-    
+
     If you discover any bugs in this package, please report them to the issue
     tracker in the \thepackage\ Github repository.
 
@@ -615,9 +632,9 @@
 \begin{MacroCode}{class}
 \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}
 \end{MacroCode}
-    
+
     \subsection{Messages}
     Tons of messages are declared for future use.
 \begin{MacroCode}{class}
@@ -709,7 +726,7 @@
     \end{macro*}
 \begin{MacroCode}{class}
 \cs_new:Npn\__skrapport_setup_paper:n#1{
-    \str_case:nnn{#1}{
+    \str_case:nnF{#1}{
 \end{MacroCode}
     The two options simply consist of passing the appropriate option
     to the \pkg{typearea} package. Note that the use of \pkg{typearea}
@@ -753,7 +770,7 @@
     \file{size11.clo} or \file{size12.clo} as appropriate
 \begin{MacroCode}{class}
 \cs_new:Npn\__skrapport_setup_ptsize:n#1{
-    \str_case:nnn{#1}{
+    \str_case:nnF{#1}{
 \end{MacroCode}
     \begin{macro*}{\c__skrapport_ptsize_token}
 \begin{MacroCode}{class}
@@ -788,7 +805,7 @@
 \begin{MacroCode}{class}
 \cs_new:Nn\__skrapport_setup_twocolumn:{
     \RequirePackage{etoolbox}
-    \AtBeginDocument{  
+    \AtBeginDocument{
         \KOMAoptions{twocolumn=false,DIV=12}
     }
 \end{MacroCode}
@@ -1041,10 +1058,10 @@
                       \texttt{bf} or \texttt{sf})}
     The title styles are implemented by creating a new macro
     \cs{__skrapport_title_style:} which will later be used by
-    \cs{section} and friends. 
+    \cs{section} and friends.
 \begin{MacroCode}{class}
 \cs_new:Npn\__skrapport_setup_titles:n#1{
-    \str_case:nnn{#1}{
+    \str_case:nnF{#1}{
 \end{MacroCode}
     \begin{macro*}{\__skrapport_title_style:}
         \changes{0.11a}{Removed incorrect \cs{bfseries}, replaced
@@ -1076,11 +1093,11 @@
     setting the other as the \enquote{other} language. We check if
     \pkg{polyglossia} has been loaded (this is done by
     \cs{__skrapport_setup_xelatex:}): if it has, we use the
-    \pkg{polyglossia} interface for setting languages, otherwise we 
+    \pkg{polyglossia} interface for setting languages, otherwise we
     load the \pkg{babel} package with appropriate options.
 \begin{MacroCode}{class}
 \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}
@@ -1141,6 +1158,7 @@
     translation strings. This is done using the \cs*{addto} and
     \cs*{captions<lang>}, which is compatible with both packages.
     \begin{macro*}{\captionsswedish}
+    \changes{0.12e}{Don't redefine standard language strings}
     \begin{macro*}{\dateswedish}
 \begin{MacroCode}{class}
     \addto\captionsswedish{
@@ -1152,12 +1170,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
@@ -1167,6 +1179,7 @@
     \end{macro*}
     \end{macro*}
     \begin{macro*}{\captionsbritish}
+    \changes{0.12e}{Don't redefine standard language strings}
     \begin{macro*}{\datebritish}
 \begin{MacroCode}{class}
     \addto\captionsbritish{
@@ -1178,12 +1191,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
@@ -1193,6 +1200,7 @@
     \end{macro*}
     \end{macro*}
     \begin{macro*}{\captionsngerman}
+    \changes{0.12e}{Don't redefine standard language strings}
     \begin{macro*}{\datengerman}
 \begin{MacroCode}{class}
     \addto\captionsngerman{
@@ -1204,12 +1212,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
@@ -1234,7 +1236,7 @@
 \cs_new:Npn\__skrapport_setup_font:n#1{
     \PassOptionsToPackage{intlimits}{amsmath}
     \PassOptionsToPackage{full}{textcomp}
-    \str_case:nnn{#1}{
+    \str_case:nnF{#1}{
 \end{MacroCode}
     The \texttt{none} font stack is special. If we're using
     \hologo{XeTeX} or \hologo{LuaTeX}, we load the \pkg{fontspec}
@@ -1613,20 +1615,20 @@
         {\__skrapport_setup_paper:n{a4}},
     paper / a5 .code:n =
         {\__skrapport_setup_paper:n{a5}},
-    paper / a4paper .code:n = 
+    paper / a4paper .code:n =
         {\msg_warning:nnnn{skrapport}{option-deprecated}
             {paper=a4paper}{paper=a4}
          \keys_set:nn{skrapport}{paper=a4}},
-    paper / a5paper .code:n = 
+    paper / a5paper .code:n =
         {\msg_warning:nnnn{skrapport}{option-deprecated}
             {paper=a5paper}{paper=a5}
          \keys_set:nn{skrapport}{paper=a4}},
     paper .value_required:,
-    a4paper .code:n = 
+    a4paper .code:n =
         {\msg_warning:nnnn{skrapport}{option-deprecated}
             {a4paper}{paper=a4}
          \keys_set:nn{skrapport}{paper=a4}},
-    a5paper .code:n = 
+    a5paper .code:n =
         {\msg_warning:nnnn{skrapport}{option-deprecated}
             {a5paper}{paper=a5}
          \keys_set:nn{skrapport}{paper=a5}},
@@ -1683,7 +1685,7 @@
     draft / true .code:n =
         {\bool_gset_true:N\g__skrapport_draft_bool
          \__skrapport_setup_draft:},
-    draft / false .code:n = 
+    draft / false .code:n =
         {\bool_gset_false:N\g__skrapport_draft_bool},
     draft .default:n = true,
     final .code:n = {\prg_do_nothing:},
@@ -1721,15 +1723,15 @@
         { rm, it, bf, sf }
         {\__skrapport_setup_titles:x{\tl_use:N\l_keys_choice_tl}},
     titles .value_required:,
-    rmtitles .code:n = 
+    rmtitles .code:n =
         {\msg_warning:nnnn{skrapport}{option-deprecated}
             {rmtitles}{titles=rm}
          \keys_set:nn{skrapport}{titles=rm}},
-    bftitles .code:n = 
+    bftitles .code:n =
         {\msg_warning:nnnn{skrapport}{option-deprecated}
             {bftitles}{titles=bf}
          \keys_set:nn{skrapport}{titles=bf}},
-    sftitles .code:n = 
+    sftitles .code:n =
         {\msg_warning:nnnn{skrapport}{option-deprecated}
             {sftitles}{titles=sf}
          \keys_set:nn{skrapport}{titles=sf}},
@@ -1761,15 +1763,15 @@
     \pkg{polyglossia} support. Again, the old \opt{swe} and \opt{eng}
     aliases are deprecated and will be removed.
 \begin{MacroCode}{class}
-    lang .choices:nn = 
+    lang .choices:nn =
         { sv, en, de }
         {\__skrapport_setup_lang:x{\tl_use:N\l_keys_choice_tl}},
     lang .value_required:,
-    swe .code:n = 
+    swe .code:n =
         {\msg_warning:nnnn{skrapport}{option-deprecated}
             {swe}{lang=sv}
          \keys_set:nn{skrapport}{lang=sv}},
-    eng .code:n = 
+    eng .code:n =
         {\msg_warning:nnnn{skrapport}{option-deprecated}
             {eng}{lang=en}
          \keys_set:nn{skrapport}{lang=en}},
@@ -1801,27 +1803,27 @@
         { none, kpfonts, lmodern, palatino, minion, skdoc, word }
         {\__skrapport_setup_font:x{\tl_use:N\l_keys_choice_tl}},
     font .value_required:,
-    nofont .code:n = 
+    nofont .code:n =
         {\msg_warning:nnnn{skrapport}{option-deprecated}
             {nofont}{font=none}
          \keys_set:nn{skrapport}{font=none}},
-    kpfonts .code:n = 
+    kpfonts .code:n =
         {\msg_warning:nnnn{skrapport}{option-deprecated}
             {kpfonts}{font=kpfonts}
          \keys_set:nn{skrapport}{font=kpfonts}},
-    lmodern .code:n = 
+    lmodern .code:n =
         {\msg_warning:nnnn{skrapport}{option-deprecated}
             {lmodern}{font=lmodern}
          \keys_set:nn{skrapport}{font=lmodern}},
-    palatino .code:n = 
+    palatino .code:n =
         {\msg_warning:nnnn{skrapport}{option-deprecated}
             {palatino}{font=palatino}
          \keys_set:nn{skrapport}{font=palatino}},
-    minion .code:n = 
+    minion .code:n =
         {\msg_warning:nnnn{skrapport}{option-deprecated}
             {minion}{font=minion}
          \keys_set:nn{skrapport}{font=minion}},
-    skdoc .code:n = 
+    skdoc .code:n =
         {\msg_warning:nnnn{skrapport}{option-deprecated}
             {skdoc}{font=skdoc}
          \keys_set:nn{skrapport}{font=skdoc}},
@@ -1890,7 +1892,7 @@
 \end{MacroCode}
     \end{option}
     \end{option}
-    
+
     That's it, we're done setting up the \pkg{l3keys} for the options.
 \begin{MacroCode}{class}
 }
@@ -2029,7 +2031,7 @@
     \frenchspacing
 }
 \end{MacroCode}
-    
+
     When the document starts, we set the URL style if the user has
     loaded the \pkg{url} package.
 \begin{MacroCode}{class}
@@ -2051,7 +2053,7 @@
 }
 \end{MacroCode}
     \end{macro}
-    
+
     \subsection{Hidden things}
     Set some default measurements (should probably be replaced with
     simply loading \pkg{typearea}).
@@ -2181,7 +2183,7 @@
         }
     }
 }
-\end{MacroCode}{class}
+\end{MacroCode}
     \end{macro*}
     \begin{macro*}{\g__skrapport_author_clist}
 \begin{MacroCode}{class}
@@ -2230,7 +2232,7 @@
 
     \begin{macro}{\regarding}[1]
         {Text snippet}
-    This macro defines a variable used by \cs{maketitle} to insert a 
+    This macro defines a variable used by \cs{maketitle} to insert a
     simple text into the header on the title page.
     \begin{macro*}{\g__skrapport_regarding_tl}
 \begin{MacroCode}{class}
@@ -2245,7 +2247,7 @@
     \begin{macro}{\license}[1]
         {Short license description}
     \changes{0.07}{Added command \cs{license}}
-    This macro defines a variable used by \cs{maketitle} to insert a 
+    This macro defines a variable used by \cs{maketitle} to insert a
     license into the footer on the titlepage.
     \begin{macro*}{\g__skrapport_copyright_unprinted_bool}
 \begin{MacroCode}{class}
@@ -2702,7 +2704,7 @@
 }
 \end{MacroCode}
     \end{macro}
-    
+
     \paragraph{Public sectioning API}
     It's time to define the public sectioning macros. They all follow
     the same format: first, two skips and one dimension (used by
@@ -3569,7 +3571,7 @@
     \end{macro*}
 
     \subsubsection{Miscellaneous}
-    A macro \cs{comment} (alias \cs{com}/\cs{note}) is defined to let 
+    A macro \cs{comment} (alias \cs{com}/\cs{note}) is defined to let
     the user add comments and notes to the document.
     \begin{macro}{\__skrapport_comment:n}
 \begin{MacroCode}{class}
@@ -3626,7 +3628,7 @@
     }
 }
 \cs_generate_variant:Nn\__skrapport_peek_punctuation:n{x}
-\end{MacroCode}{class}
+\end{MacroCode}
     \end{macro*}
     \end{macro}
     \begin{macro}{\eg}
@@ -3634,35 +3636,44 @@
 \DeclareDocumentCommand\eg{}{
     \__skrapport_peek_punctuation:x{\__skrapport_eg_word:}
 }
-\end{MacroCode}{class}
+\end{MacroCode}
     \end{macro}
     \begin{macro}{\ie}
 \begin{MacroCode}{class}
 \DeclareDocumentCommand\ie{}{
     \__skrapport_peek_punctuation:x{\__skrapport_ie_word:}
 }
-\end{MacroCode}{class}
+\end{MacroCode}
     \end{macro}
     \begin{macro}{\etc}
 \begin{MacroCode}{class}
 \DeclareDocumentCommand\etc{}{
     \__skrapport_peek_punctuation:x{\__skrapport_etc_word:}
 }
-\end{MacroCode}{class}
+\end{MacroCode}
     \end{macro}
     \begin{macro}{\cf}
 \begin{MacroCode}{class}
 \DeclareDocumentCommand\cf{}{
     \__skrapport_peek_punctuation:x{\__skrapport_cf_word:}
 }
-\end{MacroCode}{class}
+\end{MacroCode}
     \end{macro}
     \begin{macro}{\viz}
 \begin{MacroCode}{class}
 \DeclareDocumentCommand\viz{}{
     \__skrapport_peek_punctuation:x{\__skrapport_viz_word:}
 }
-\end{MacroCode}{class}
+\end{MacroCode}
+    \end{macro}
+    \begin{macro}{\dash}
+\begin{MacroCode}{class}
+\DeclareDocumentCommand\dash{}{
+    \cs_if_exist_use:NT\texorpdfstring
+    {\unskip\nobreak\thinspace\textemdash\thinspace\ignorespaces}{{ - }}
+}
+\cs_if_exist_use:NT\DeclareUnicodeCharacter{{2014}{\dash}}
+\end{MacroCode}
     \end{macro}
 
     \subsubsection{Color theme support}
@@ -3758,7 +3769,7 @@
     As described earlier, the user can load color themes to customize
     the appearance of the document if the class was loaded with the
     \opt{color} option. Four themes are available by default.
-    
+
     \subsubsection{Default color theme}
     \begin{theme}{Default}
     \changes{0.09}{Added default color theme}
@@ -4165,7 +4176,7 @@
 \dim_set:Nn\footskip  {30pt}
 \dim_set:Nn\maxdepth  { 5pt}
 \end{MacroCode}
-    These (\emph{i.e.} text width and height) are hopefully overwritten 
+    These (\emph{i.e.} text width and height) are hopefully overwritten
     by \pkg{typearea} later, so we don't bother much with them.
 \begin{MacroCode}{size-10,size-11,size-12}
 \dim_set:Nn\textwidth  {\paperwidth-2cm}
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 <sigurdhsson@gmail.com>
+%% Copyright (C) 2012-2015 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
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 <sigurdhsson@gmail.com>
+%% Copyright (C) 2012-2015 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
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 <sigurdhsson@gmail.com>
+%% Copyright (C) 2012-2015 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
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 <sigurdhsson@gmail.com>
+%% Copyright (C) 2012-2015 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
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 <sigurdhsson@gmail.com>
+%% Copyright (C) 2012-2015 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
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 <sigurdhsson@gmail.com>
+%% Copyright (C) 2012-2015 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
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 <sigurdhsson@gmail.com>
+%% Copyright (C) 2012-2015 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
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 <sigurdhsson@gmail.com>
+%% Copyright (C) 2012-2015 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
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 <sigurdhsson@gmail.com>
+%% Copyright (C) 2012-2015 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
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 <sigurdhsson@gmail.com>
+%% Copyright (C) 2012-2015 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
@@ -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}}{}