From a06da6836bb268aaade379f73b63fca3596f4941 Mon Sep 17 00:00:00 2001 From: Stefan Seefeld Date: Fri, 13 May 2016 11:20:31 -0400 Subject: [PATCH] Clean up slides build process. --- xsl/slides/fo/Makefile.param | 36 +--------------------------- xsl/slides/images/Makefile | 12 ++++++---- xsl/slides/images/callouts/Makefile | 22 +++++++++++++++-- xsl/slides/images/callouts/gen.sh | 23 ------------------ xsl/slides/images/face1.gif | Bin 5279 -> 0 bytes xsl/slides/images/face2.gif | Bin 2378 -> 0 bytes xsl/slides/images/face3.gif | Bin 800 -> 0 bytes xsl/slides/images/face4.gif | Bin 846 -> 0 bytes xsl/slides/schema/xsd/Makefile | 4 +--- xsl/slides/xhtml/Makefile.param | 27 +-------------------- 10 files changed, 31 insertions(+), 93 deletions(-) delete mode 100755 xsl/slides/images/callouts/gen.sh delete mode 100644 xsl/slides/images/face1.gif delete mode 100644 xsl/slides/images/face2.gif delete mode 100644 xsl/slides/images/face3.gif delete mode 100644 xsl/slides/images/face4.gif diff --git a/xsl/slides/fo/Makefile.param b/xsl/slides/fo/Makefile.param index f2c929c06..c2a839280 100644 --- a/xsl/slides/fo/Makefile.param +++ b/xsl/slides/fo/Makefile.param @@ -1,35 +1 @@ -PARAMS=../../params/foil.footer.properties.xml \ - ../../params/foil.header.properties.xml \ - ../../params/foil.master.properties.xml \ - ../../params/foil.page-sequence.properties.xml \ - ../../params/foil.properties.xml \ - ../../params/foil.region-after.properties.xml \ - ../../params/foil.region-before.properties.xml \ - ../../params/foil.region-body.properties.xml \ - ../../params/foil.subtitle.properties.xml \ - ../../params/foil.title.master.xml \ - ../../params/foil.title.properties.xml \ - ../../params/foil.title.size.xml \ - ../../params/generate.copyright.xml \ - ../../params/generate.foilgroup.numbered.toc.xml \ - ../../params/generate.foilgroup.toc.xml \ - ../../params/generate.handoutnotes.xml \ - ../../params/generate.page.number.xml \ - ../../params/generate.pubdate.xml \ - ../../params/generate.speakernotes.xml \ - ../../params/generate.titlepage.xml \ - ../../params/handoutnotes.properties.xml \ - ../../params/mml.embedding.mode.fo.xml \ - ../../params/slide.font.family.xml \ - ../../params/slide.title.font.family.xml \ - ../../params/slides.properties.xml \ - ../../params/slides.titlepage.author.properties.xml \ - ../../params/slides.titlepage.authorgroup.properties.xml \ - ../../params/slides.titlepage.corpauthor.properties.xml \ - ../../params/slides.titlepage.master.properties.xml \ - ../../params/slides.titlepage.pubdate.properties.xml \ - ../../params/slides.titlepage.region-body.properties.xml \ - ../../params/slides.titlepage.subtitle.properties.xml \ - ../../params/slides.titlepage.title.properties.xml \ - ../../params/speakernotes.properties.xml \ - ../../params/svg.embedding.mode.fo.xml +# foo diff --git a/xsl/slides/images/Makefile b/xsl/slides/images/Makefile index 0040b0c69..9fbace5b5 100644 --- a/xsl/slides/images/Makefile +++ b/xsl/slides/images/Makefile @@ -1,7 +1,11 @@ -all: - cp ../slidy/graphics/face* ./ - cd callouts && make all +faces=face1.gif face2.gif face3.gif face4.gif + +all: $(faces) + $(MAKE) -C callouts clean: rm ./face* - cd callouts && make clean + $(MAKE) -C callouts clean + +%.gif: ../slidy/graphics/%.gif + cp $< $@ diff --git a/xsl/slides/images/callouts/Makefile b/xsl/slides/images/callouts/Makefile index c1e38d3fa..86e0b6848 100644 --- a/xsl/slides/images/callouts/Makefile +++ b/xsl/slides/images/callouts/Makefile @@ -1,5 +1,23 @@ -all: - /bin/sh ./gen.sh +low_svg=$(patsubst %, %.svg, $(shell seq 1 9)) +high_svg=$(patsubst %, %.svg, $(shell seq 10 30)) +low_png=$(patsubst %.svg, %.png, $(low_svg)) +high_png=$(patsubst %.svg, %.png, $(high_svg)) + +all: $(low_svg) $(high_svg) $(low_png) $(high_png) clean: rm -rf ./*.png + rm -rf ./*.svg + +$(low_svg): %.svg: + convert -size 202x202 xc:green -transparent green -fill black -draw 'circle 100,100 100' -fill white -stroke none -pointsize 160 -gravity center -kerning -5 -font Helvetica-bold -draw "text 0,5 \"$*\"" -scale '24x24' $*.svg + +$(low_png): %.png: + convert -size 202x202 xc:green -transparent green -fill black -draw 'circle 100,100 100' -fill white -stroke none -pointsize 160 -gravity center -kerning -5 -font Helvetica-bold -draw "text 0,5 \"$*\"" -scale '24x24' $*.png + +$(high_svg): %.svg: + convert -size 202x202 xc:green -transparent green -fill black -draw 'circle 100,100 100' -fill white -stroke none -pointsize 140 -gravity center -kerning -5 -font Helvetica-bold -draw "text 0,5 \"$*\"" -scale '24x24' $*.svg + +$(high_png): %.png: + convert -size 202x202 xc:green -transparent green -fill black -draw 'circle 100,100 100' -fill white -stroke none -pointsize 140 -gravity center -kerning -5 -font Helvetica-bold -draw "text 0,5 \"$*\"" -scale '24x24' $*.png + diff --git a/xsl/slides/images/callouts/gen.sh b/xsl/slides/images/callouts/gen.sh deleted file mode 100755 index bba319583..000000000 --- a/xsl/slides/images/callouts/gen.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -# -# This script was taken from FreeBSD. -# -# It uses ImageMagick to generate callout icons. -# - -for i in `seq 9 1` -do - convert -size 202x202 xc:green -transparent green -fill black -draw 'circle 100,100 100' -fill white -stroke none -pointsize 160 -gravity center -kerning -5 -font Helvetica-bold -draw "text 0,5 \"$i\"" -scale '24x24' $i.png - convert -size 202x202 xc:green -transparent green -fill black -draw 'circle 100,100 100' -fill white -stroke none -pointsize 160 -gravity center -kerning -5 -font Helvetica-bold -draw "text 0,5 \"$i\"" -scale '24x24' $i.svg -done - -for i in `seq 21 10` -do - convert -size 202x202 xc:green -transparent green -fill black -draw 'circle 100,100 100' -fill white -stroke none -pointsize 140 -gravity center -kerning -5 -font Helvetica-bold -draw "text 0,5 \"$i\"" -scale '24x24' $i.png - convert -size 202x202 xc:green -transparent green -fill black -draw 'circle 100,100 100' -fill white -stroke none -pointsize 140 -gravity center -kerning -5 -font Helvetica-bold -draw "text 0,5 \"$i\"" -scale '24x24' $i.svg -done - -exit 0 diff --git a/xsl/slides/images/face1.gif b/xsl/slides/images/face1.gif deleted file mode 100644 index 04e50cd79749153fe9eda6d18558beee586b11fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5279 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 diff --git a/xsl/slides/images/face4.gif b/xsl/slides/images/face4.gif deleted file mode 100644 index 3f687402ab0e8379da8d37367701362a24d7907f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 846 zcmV-U1F`%^Nk%w1Va)*f0HFZ@00030{{a900RR60A^sIZa%Ew3Wn>_CX>@2HRA^-& zM@dak03rDV0SW*D04x9i007MZ`2YX{{*;fY%k2-NoV41Dv);V>4~F7Mmgb43>dLn6 z3&-+I*Y=I)`p)(tOe&Ymrt=AnN~hGS^@`1Ex7@Dx3l59N_^!OfdmU0Jcux% z!h8W5I!q?Op~QwVDq6glV4_C;hZsA0RIxFnhLI!>glt$crOK5CPKIO&vw=&AF>Bg% zFmvP0nmHxz{CTsdMxZK%N+gO@r9%Krn>uAGQG?VA5}#TH&~U2Oty~32y!v!v*RcsE zf_2)EtlG5>B%W#(-&-47=AoynW^ z#J&!L8#g|&Z_eWwCiZp6JUZ=(eT`bbZry;!z7C~(XFahm_VMJ6_HFn*y$0)j+q-`c zpQ%vw^etGAk3T>Dp7s9wQ)mcafC2`fUx5amHQ<2$EjU4f10D!rgbo78V1*J)*ieKT z7C51W9#W9th9br{U~nd$r~!Z@uGpS{D82}z1OSRi<9hbp@znkU0YA zW06+{C}ff^0%&BDO#!H6lqWXiq>~LviDhsYZpmerUV52jn7e&RW|?LVC}x_voylgK z391QaoN~@dXPtK5iD#aA?#XALe*Ot)pn?ucXrYE4ifE#WF3M=5jy?)$q>@fbX{DB4 zifN{rZpvw=o_-2ysG^QaYN@84ifXE=uF7hwuD%Lutg_BZYpu54ifgXA?#gSgzWxeq Yu)+>YY_Y~3iwSJ9$}Y=nngsv=JBBEm8~^|S diff --git a/xsl/slides/schema/xsd/Makefile b/xsl/slides/schema/xsd/Makefile index b3c2f54ef..dfd897cc1 100644 --- a/xsl/slides/schema/xsd/Makefile +++ b/xsl/slides/schema/xsd/Makefile @@ -6,6 +6,4 @@ slides.xsd: ../relaxng/slides.rnc trang $< $@ clean: - -maintainer-clean: clean - rm -f *.xsd + rm -rf *.xsd diff --git a/xsl/slides/xhtml/Makefile.param b/xsl/slides/xhtml/Makefile.param index 127c0d532..c2a839280 100644 --- a/xsl/slides/xhtml/Makefile.param +++ b/xsl/slides/xhtml/Makefile.param @@ -1,26 +1 @@ -PARAMS=../../params/disable.collapsible.xml \ - ../../params/disable.incremental.xml \ - ../../params/generate.copyright.xml \ - ../../params/generate.foilgroup.numbered.toc.xml \ - ../../params/generate.foilgroup.toc.xml \ - ../../params/generate.handoutnotes.xml \ - ../../params/generate.pubdate.xml \ - ../../params/generate.speakernotes.xml \ - ../../params/generate.titlepage.xml \ - ../../params/mml.embedding.mode.xml \ - ../../params/svg.embedding.mode.xml \ - ../../params/user.css.xml \ - ../../params/wrap.slidecontent.xml \ - ../../params/s5.controls.xml \ - ../../params/s5.defaultview.xml \ - ../../params/s5.opera.css.xml \ - ../../params/s5.outline.css.xml \ - ../../params/s5.path.prefix.xml \ - ../../params/s5.print.css.xml \ - ../../params/s5.slides.css.xml \ - ../../params/s5.slides.js.xml \ - ../../params/slidy.duration.xml \ - ../../params/slidy.path.prefix.xml \ - ../../params/slidy.slidy.css.xml \ - ../../params/slidy.slidy.js.xml \ - ../../params/slidy.user.css.xml +# foo -- 2.50.1