From 4b52b3987478d3197855edc2e7e24276fc2c3cb3 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 17 Oct 2019 03:01:04 +0000 Subject: CTAN sync 201910170301 --- macros/latex/contrib/skrapport/Makefile | 14 ++++++-- macros/latex/contrib/skrapport/README | 2 +- macros/latex/contrib/skrapport/skrapport.pdf | Bin 268245 -> 289637 bytes macros/latex/contrib/skrapport/skrapport.tex | 48 +++++++++++++++------------ 4 files changed, 40 insertions(+), 24 deletions(-) (limited to 'macros/latex/contrib/skrapport') diff --git a/macros/latex/contrib/skrapport/Makefile b/macros/latex/contrib/skrapport/Makefile index 016ee911ae..85553f9331 100644 --- a/macros/latex/contrib/skrapport/Makefile +++ b/macros/latex/contrib/skrapport/Makefile @@ -1,3 +1,13 @@ +ZIP_NOATTRS := +ifeq ($(shell uname -s),Darwin) + ZIP_NOATTRS += -X +endif + +TAR_NOATTRS := +ifeq ($(shell uname -s),Darwin) + TAR_NOATTRS += --disable-copyfile +endif + TEXMFHOME ?= $(shell kpsewhich -var-value TEXMFHOME) .PHONY: all clean distclean install dist test clean-test all: skrapport.tex skrapport.pdf skrapport.cls README @@ -45,7 +55,7 @@ skrapport.tds.zip: all mkdir -p skrapport/source/latex/skrapport cp skrapport.tex skrapport/source/latex/skrapport/skrapport.tex cp README skrapport/doc/latex/skrapport/README - cd skrapport && zip -r ../skrapport.tds.zip * + cd skrapport && zip $(ZIP_NOATTRS) -r ../skrapport.tds.zip * rm -rf skrapport skrapport.tar.gz: all skrapport.tds.zip @@ -54,7 +64,7 @@ skrapport.tar.gz: all skrapport.tds.zip cp skrapport.pdf skrapport/skrapport.pdf cp README skrapport/README cp Makefile skrapport/Makefile - tar -czf $@ skrapport skrapport.tds.zip + tar $(TAR_NOATTRS) -czf $@ skrapport skrapport.tds.zip rm -rf skrapport dist: skrapport.tar.gz diff --git a/macros/latex/contrib/skrapport/README b/macros/latex/contrib/skrapport/README index 36773f96bf..e323031fc3 100644 --- a/macros/latex/contrib/skrapport/README +++ b/macros/latex/contrib/skrapport/README @@ -26,7 +26,7 @@ %% * skrapport-size11pt.clo %% * skrapport-size12pt.clo -This is version 0.12i of the skrapport document class, intended for simple +This is version 0.12k 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/macros/latex/contrib/skrapport/skrapport.pdf b/macros/latex/contrib/skrapport/skrapport.pdf index 3ec7599b6a..ff041c9d53 100644 Binary files a/macros/latex/contrib/skrapport/skrapport.pdf and b/macros/latex/contrib/skrapport/skrapport.pdf differ diff --git a/macros/latex/contrib/skrapport/skrapport.tex b/macros/latex/contrib/skrapport/skrapport.tex index 397da4a918..9624b5caa6 100644 --- a/macros/latex/contrib/skrapport/skrapport.tex +++ b/macros/latex/contrib/skrapport/skrapport.tex @@ -49,9 +49,9 @@ \begin{filecontents}{skrapport.bib} @article{kpfonts, author = {Christophe Caignaert}, - title = {KP-Fonts 3.31}, - year = {2010}, - url = {http://www.tex.ac.uk/tex-archive/fonts/kpfonts/doc/kpfonts.pdf} + title = {KP-Fonts 3.33}, + year = {2018}, + url = {http://mirror.ctan.org/fonts/kpfonts/doc/kpfonts.pdf} } @standard{ISO216, title = {ISO 216:2007}, @@ -99,7 +99,7 @@ % This is where the documentation begins \begin{document} % Change & version info - \version{0.12i} + \version{0.12k} \changes{0.01}{Initial version} \changes{0.03}{Removed \cs{rd} and \cs{id}} \changes{0.04}{Added \pkg{microtype} package} @@ -128,6 +128,8 @@ \changes{0.12g}{Track \pkg{expl3} changes (thanks to Joseph Wright)} \changes{0.12h}{Fix incompatibilities with recent \pkg{expl3}} \changes{0.12i}{Track \pkg{expl3} changes (thanks to Joseph Wright)} + \changes{0.12j}{Track \pkg{expl3} changes (thanks to Phelype Oleinik). Replaces \pkg{opensans} option \opt{osfigures} with \opt{oldstyle}} + \changes{0.12k}{Don't try to generate \texttt{c}-variant macros from \texttt{n}-variant base forms} % Don't forget to update the version number and release date of % the package declaration in the implementation! @@ -636,7 +638,7 @@ \begin{MacroCode}{class} \RequirePackage{expl3,l3keys2e,xparse,xstring,etoolbox} \ProvidesExplClass{skrapport}% - {2018/12/29}{0.12i}{stylish report document class} + {2019/10/15}{0.12k}{stylish report document class} \end{MacroCode} \subsection{Messages} @@ -1297,7 +1299,7 @@ \begin{MacroCode}{class} {skdoc}{ \RequirePackage{PTSerif} - \RequirePackage[defaultsans,osfigures,scale=0.95]{opensans} + \RequirePackage[defaultsans,oldstyle,scale=0.95]{opensans} } \end{MacroCode} The \texttt{word} font stack mimics recent versions of Microsoft @@ -2228,7 +2230,7 @@ separating them with commas. \begin{MacroCode}{class} \cs_new:Nn\__skrapport_email_list:{ - \int_compare:nT{\clist_count:N\g__skrapport_author_clist>\c_zero}{ + \int_compare:nT{\clist_count:N\g__skrapport_author_clist>\c_zero_int}{ \clist_use:Nnnn\g__skrapport_email_clist{\\}{\\}{\\} } } @@ -2648,24 +2650,28 @@ \paragraph{Generic sectioning macros} We will now set up a generic sectioning macro. First, we need version of the above macros that expand their arguments. - \begin{macro*}{\__skrapport_pre_section:c} + \begin{macro*}{\__skrapport_pre_section:v} + \changes{0.12k}{Argument specification changed from \texttt{c} to \texttt{v}} \begin{MacroCode}{class} -\cs_generate_variant:Nn\__skrapport_pre_section:n{c} +\cs_generate_variant:Nn\__skrapport_pre_section:n{v} \end{MacroCode} \end{macro*} - \begin{macro*}{\__skrapport_post_section:c} + \begin{macro*}{\__skrapport_post_section:v} + \changes{0.12k}{Argument specification changed from \texttt{c} to \texttt{v}} \begin{MacroCode}{class} -\cs_generate_variant:Nn\__skrapport_post_section:n{c} +\cs_generate_variant:Nn\__skrapport_post_section:n{v} \end{MacroCode} \end{macro*} - \begin{macro*}{\__skrapport_section_star:ccn} + \begin{macro*}{\__skrapport_section_star:vvn} + \changes{0.12k}{Argument specification changed from \texttt{ccn} to \texttt{vvn}} \begin{MacroCode}{class} -\cs_generate_variant:Nn\__skrapport_section_star:nnn{ccn} +\cs_generate_variant:Nn\__skrapport_section_star:nnn{vvn} \end{MacroCode} \end{macro*} - \begin{macro*}{\__skrapport_section_nostar:nnccnn} + \begin{macro*}{\__skrapport_section_nostar:nnvvnn} + \changes{0.12k}{Argument specification changed from \texttt{nnccnn} to \texttt{nnvvnn}} \begin{MacroCode}{class} -\cs_generate_variant:Nn\__skrapport_section_nostar:nnnnnn{nnccnn} +\cs_generate_variant:Nn\__skrapport_section_nostar:nnnnnn{nnvvnn} \end{MacroCode} \end{macro*} @@ -2683,22 +2689,22 @@ {Section title text} \begin{MacroCode}{class} \cs_set:Nn\__skrapport_generic_section:nnnnn{ - \__skrapport_pre_section:c{c__skrapport_#1_pre_skip} + \__skrapport_pre_section:v{c__skrapport_#1_pre_skip} \IfBooleanTF#3{ - \__skrapport_section_star:ccn + \__skrapport_section_star:vvn {c__skrapport_#1_indent_dim} {__skrapport_#1_style:} {#5} }{ \IfNoValueTF{#4}{ - \__skrapport_section_nostar:nnccnn + \__skrapport_section_nostar:nnvvnn {#1}{#2} {c__skrapport_#1_indent_dim} {__skrapport_#1_style:} {#5} {#5} }{ - \__skrapport_section_nostar:nnccnn + \__skrapport_section_nostar:nnvvnn {#1}{#2} {c__skrapport_#1_indent_dim} {__skrapport_#1_style:} @@ -2706,7 +2712,7 @@ {#4} } } - \__skrapport_post_section:c{c__skrapport_#1_post_skip} + \__skrapport_post_section:v{c__skrapport_#1_post_skip} } \end{MacroCode} \end{macro} @@ -3130,7 +3136,7 @@ \begin{MacroCode}{class} \cs_new:Nn\__skrapport_emphstyle:{ \itshape - \dim_compare:nF{\fontdimen\c_one\font>\c_zero_dim}{\bfseries} + \dim_compare:nF{\fontdimen\c_one_int\font>\c_zero_dim}{\bfseries} } \end{MacroCode} \end{macro*} -- cgit v1.2.3