docs-common/images Makefile, 1.5, 1.6 watermark-de.png, 1.1, 1.2 watermark-en.png, 1.1, 1.2 watermark-it.png, 1.1, 1.2 watermark-ja_JP.png, 1.1, 1.2 watermark-ru.png, 1.1, 1.2 watermark-zh_CN.png, 1.1, 1.2 watermark-zh_CN.svg, 1.1, 1.2

[Tommy Reynolds (jtr)]

Author: jtr

Update of /cvs/docs/docs-common/images
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31809

Modified Files:
	Makefile watermark-de.png watermark-en.png watermark-it.png 
	watermark-ja_JP.png watermark-ru.png watermark-zh_CN.png 
	watermark-zh_CN.svg 
Log Message:
Use rsvg(1) to render the SVG into PNG instead of batik, which isn't
GPL'ed.



Index: Makefile
===================================================================
RCS file: /cvs/docs/docs-common/images/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile	10 Dec 2005 02:36:08 -0000	1.5
+++ Makefile	10 Dec 2005 12:43:50 -0000	1.6
@@ -1,7 +1,10 @@
 .SUFFIXES: .png .svg
 
+RSVG	=rsvg
+RSVGOPTS=-d72 -p72 -h768 -w1024 -q100
+
 %.png: %.svg
-	batik -m image/png -h 768 -w 1024 -d `pwd`/$@ file://`pwd`/$<
+	${RSVG} ${RSVGOPTS} $< $@
 
 SVGFILES=watermark-de.svg watermark-en.svg watermark-it.svg             \
         watermark-ja_JP.svg watermark-ru.svg watermark-zh_CN.svg


Index: watermark-zh_CN.svg
===================================================================
RCS file: /cvs/docs/docs-common/images/watermark-zh_CN.svg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- watermark-zh_CN.svg	9 Dec 2005 13:53:20 -0000	1.1
+++ watermark-zh_CN.svg	10 Dec 2005 12:43:51 -0000	1.2
@@ -9,7 +9,7 @@
   <desc>The word DRAFT rendered in grey at 45 degrees</desc>
   <g fill="&bgColor;" font-family="Helvetica" font-size="1in" stroke="&bgColor;" stroke-width="10" text-anchor="start" transform="translate( 1, 1 )">
     <g transform="translate( 512, 384 ) rotate( -45 )">
-      <text font-family="AR PL ZenKai Uni" font-stretch="wider" text-anchor="middle" x="0" y="0">文 档 草 案</text>
+      <text font-family="'AR PL ZenKai Uni'" font-stretch="wider" text-anchor="middle" x="0" y="0">文 档 草 案</text>
       <text fill="&fgColor;" font-size="0.6in" font-stretch="wider" font-variant="small-caps" stroke="rgb( 230, 200, 200 )" stroke-width="1.5" text-anchor="middle" x="0" y="1in">请勿引用</text>
     </g>
   </g>