summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-12-29 23:01:12 +0000
committerKarl Berry <karl@freefriends.org>2018-12-29 23:01:12 +0000
commitc90bfa223f2b8cdeef9cb6c8153c40d5c355461c (patch)
treeea23ae6f1af4c87a7eb8f5e70ea602d9fa72826d
parent428910a342287d8f96d2e4f22ec49d8f5f63a31f (diff)
skrapport (29dec18)
git-svn-id: svn://tug.org/texlive/trunk@49532 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/skrapport/Makefile62
-rw-r--r--Master/texmf-dist/doc/latex/skrapport/README4
-rw-r--r--Master/texmf-dist/doc/latex/skrapport/skrapport.pdfbin268014 -> 268087 bytes
-rw-r--r--Master/texmf-dist/doc/latex/skrapport/skrapport.tex (renamed from Master/texmf-dist/source/latex/skrapport/skrapport.tex)9
-rw-r--r--Master/texmf-dist/tex/latex/skrapport/skrapport.cls6
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds16
6 files changed, 85 insertions, 12 deletions
diff --git a/Master/texmf-dist/doc/latex/skrapport/Makefile b/Master/texmf-dist/doc/latex/skrapport/Makefile
new file mode 100644
index 00000000000..c653763275c
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/skrapport/Makefile
@@ -0,0 +1,62 @@
+TEXMFHOME ?= $(shell kpsewhich -var-value TEXMFHOME)
+.PHONY: all clean distclean install dist test clean-test
+all: skrapport.tex skrapport.pdf skrapport.cls README
+clean: clean-test
+ rm -f *.gl? *.id? *.aux # problematic files
+ rm -f *.bbl *.bcf *.bib *.blg *.xdy # biblatex
+ rm -f *.fls *.log *.out *.run.xml *.toc # junk
+distclean: clean
+ rm -f *.cls *.sty *.clo *.tar.gz *.tds.zip README
+ git reset --hard
+
+%.pdf: %.tex %.cls
+ makeglossaries $*
+ biber $*
+ pdflatex -interaction=nonstopmode -halt-on-error $<
+ makeglossaries $*
+ pdflatex -interaction=nonstopmode -halt-on-error $<
+
+%.cls: %.tex
+ pdflatex -interaction=nonstopmode -halt-on-error $<
+
+%.sty: skrapport.cls
+
+%.clo: skrapport.cls
+
+README: README.md
+ sed -e '1,4d;$$d' $< > $@
+
+install: all
+ install -m 0644 skrapport-*.sty $(TEXMFHOME)/tex/latex/skrapport/
+ install -m 0644 skrapport-*.clo $(TEXMFHOME)/tex/latex/skrapport/
+ install -m 0644 skrapport.cls $(TEXMFHOME)/tex/latex/skrapport/skrapport.cls
+ install -m 0644 skrapport.pdf $(TEXMFHOME)/doc/latex/skrapport/skrapport.pdf
+ install -m 0644 skrapport.tex $(TEXMFHOME)/source/latex/skrapport/skrapport.tex
+ install -m 0644 README $(TEXMFHOME)/doc/latex/skrapport/README
+ -mktexlsr
+
+skrapport.tar.gz: all
+ mkdir -p skrapport
+ cp README skrapport/README
+ cp skrapport.pdf skrapport/skrapport.pdf
+ mkdir -p skrapport/source
+ cp Makefile skrapport/source/Makefile
+ cp skrapport.tex skrapport/source/skrapport.tex
+ mkdir -p skrapport/latex
+ cp skrapport-*.sty skrapport/latex/
+ cp skrapport-*.clo skrapport/latex/
+ cp skrapport.cls skrapport/latex/skrapport.cls
+ tar -czf $@ skrapport
+ rm -rf skrapport
+
+dist: skrapport.tar.gz
+
+test:
+ cp -f skrapport-*.sty tests/
+ cp -f skrapport-*.clo tests/
+ $(MAKE) -C tests
+
+clean-test:
+ $(MAKE) -C tests clean
+ rm -rf tests/skrapport-*.sty
+ rm -rf tests/skrapport-*.clo
diff --git a/Master/texmf-dist/doc/latex/skrapport/README b/Master/texmf-dist/doc/latex/skrapport/README
index f0923a5ae4a..36773f96bfd 100644
--- a/Master/texmf-dist/doc/latex/skrapport/README
+++ b/Master/texmf-dist/doc/latex/skrapport/README
@@ -1,6 +1,6 @@
%% skrapport Skånings rapportklass
%%
-%% Copyright (C) 2012-2017 by Simon Sigurdhsson <sigurdhsson@gmail.com>
+%% Copyright (C) 2012-2019 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
@@ -26,7 +26,7 @@
%% * skrapport-size11pt.clo
%% * skrapport-size12pt.clo
-This is version 0.12h of the skrapport document class, intended for simple
+This is version 0.12i 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 74c848aa3a2..7391e83bdf3 100644
--- a/Master/texmf-dist/doc/latex/skrapport/skrapport.pdf
+++ b/Master/texmf-dist/doc/latex/skrapport/skrapport.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/skrapport/skrapport.tex b/Master/texmf-dist/doc/latex/skrapport/skrapport.tex
index 7d1eb847caa..397da4a9185 100644
--- a/Master/texmf-dist/source/latex/skrapport/skrapport.tex
+++ b/Master/texmf-dist/doc/latex/skrapport/skrapport.tex
@@ -99,7 +99,7 @@
% This is where the documentation begins
\begin{document}
% Change & version info
- \version{0.12h}
+ \version{0.12i}
\changes{0.01}{Initial version}
\changes{0.03}{Removed \cs{rd} and \cs{id}}
\changes{0.04}{Added \pkg{microtype} package}
@@ -127,6 +127,7 @@
\changes{0.12f}{Fix incorrect usage of \pkg{xparse} macros}
\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)}
% Don't forget to update the version number and release date of
% the package declaration in the implementation!
@@ -635,7 +636,7 @@
\begin{MacroCode}{class}
\RequirePackage{expl3,l3keys2e,xparse,xstring,etoolbox}
\ProvidesExplClass{skrapport}%
- {2017/09/14}{0.12h}{stylish report document class}
+ {2018/12/29}{0.12i}{stylish report document class}
\end{MacroCode}
\subsection{Messages}
@@ -2597,7 +2598,7 @@
#2
\hbox_set:Nn\l_tmpa_box{{\skip_horizontal:n{#1}#4}}
\dim_set:Nn\hangindent{#1+\box_wd:N\l_tmpa_box}
- \noindent\box_use_clear:N\l_tmpa_box
+ \noindent\box_use_drop:N\l_tmpa_box
\interlinepenalty\@M % !!!
#3
\group_end:
@@ -3335,7 +3336,7 @@
\global\@minipagefalse % !!!
\hbox_to_wd:nn{\hsize}{
\hfil
- \box_use_clear:N\l_tmpa_box
+ \box_use_drop:N\l_tmpa_box
\hfil
}
}
diff --git a/Master/texmf-dist/tex/latex/skrapport/skrapport.cls b/Master/texmf-dist/tex/latex/skrapport/skrapport.cls
index ec6be5bd69a..ba3407b1f79 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}%
- {2017/09/14}{0.12h}{stylish report document class}
+ {2018/12/29}{0.12i}{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!}
@@ -1064,7 +1064,7 @@
#2
\hbox_set:Nn\l_tmpa_box{{\skip_horizontal:n{#1}#4}}
\dim_set:Nn\hangindent{#1+\box_wd:N\l_tmpa_box}
- \noindent\box_use_clear:N\l_tmpa_box
+ \noindent\box_use_drop:N\l_tmpa_box
\interlinepenalty\@M % !!!
#3
\group_end:
@@ -1337,7 +1337,7 @@
\global\@minipagefalse % !!!
\hbox_to_wd:nn{\hsize}{
\hfil
- \box_use_clear:N\l_tmpa_box
+ \box_use_drop:N\l_tmpa_box
\hfil
}
}
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 8f767475d4f..999bb728d30 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1092,6 +1092,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'simurgh', "&MAKEflatten",
'skak', "&MAKEflatten",
'skeyval', "&MAKEmv_doctex",
+ 'skrapport', "&MAKEflatten",
'slashbox', "die 'skipping, noinfo license, c.1993'",
'slidenotes', "die 'skipping, nonfree'",
'smallcap', "die 'skipping, questionable license, 1996'",
@@ -1457,6 +1458,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'schule', => '&POSTschule',
'simple-resume-cv' => '&POST_simple_rmFonts',
'simple-thesis-dissertation' => '&POST_simple_rmFonts',
+ 'skrapport' => '&POSTskrapport',
'splitindex' => '&POST_do_man',
'startex' => '&POST_otherformat',
'tap' => '&POSTtap',
@@ -2456,6 +2458,7 @@ $standardsource = '(\.(bat|c|drv|dtx|fea|fdd|ins|sfd)'
'rcs', 'rcs.el|src|' . $standardsource,
'ruhyphen', '^[^.]*$|README.ru|hyphen.rules',
'selnolig', 'NULL', # not .fea
+ 'skrapport', 'NULL', # keep in doc
'texosquery', 'java|\.batch$|' . $standardsource,
'thailatex', 'NULL', # no gain in splitting up
'tlcockpit', 'TODO|build|project|src',
@@ -4224,7 +4227,7 @@ sub flatten_dirtree {
# cm-super et al. need to intervene at this point.
&run_prehook ($package);
- # I don't think flattened packages ever want symlinks.
+ # we never want to end up with symlinks.
&SYSTEM ("find . -type l | xargs --no-run-if-empty $RM");
# mv foo/README to README.foo. README.txt is for psfragx.
@@ -5525,7 +5528,7 @@ sub PREHOOK_texfot {
}
sub PREHOOK_tlcockpit {
- print "PREHOOK_$package - flatten only a couple dirs\n";
+ print "PREHOOK_$package - flatten only jar/ and scripts/\n";
&SYSTEM ("$MV jar/* .");
&SYSTEM ("$MV scripts/* .");
}
@@ -5536,7 +5539,7 @@ sub PREHOOK_tudscr {
}
sub PREHOOK_tui {
- print "PREHOOK_$package - flatten only some subdirs\n";
+ print "PREHOOK_$package - flatten only doc/ and tex/\n";
&SYSTEM ("$MV doc/* tex/* .");
}
@@ -6478,6 +6481,13 @@ sub POSTschule {
&SYSTEM ("$MV doc/* . && rmdir doc");
}
+sub POSTskrapport {
+ # ordinarily when we flatten we want the directory name appended, as
+ # in README.doc, README.source, etc. But for this package, better not to.
+ print "POST$package - rename Makefile.source\n";
+ &SYSTEM ("$MV Makefile.source Makefile");
+}
+
sub POST_simple_rmFonts {
print "POST$package - rm Fonts dir\n";
&SYSTEM ("$RM -r Fonts");