press-release Makefile,1.4,1.5 fdp-pr.xsl,1.5,1.6

[Tommy Reynolds (jtr)]

Author: jtr

Update of /cvs/docs/press-release
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2602

Modified Files:
	Makefile fdp-pr.xsl 
Log Message:
Make PDF output look reasonable using the default xmlto RPM.
Text output is still mangled because it's getting rendered into HTML first;
don't ask me why.



Index: Makefile
===================================================================
RCS file: /cvs/docs/press-release/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile	14 Mar 2006 23:04:52 -0000	1.4
+++ Makefile	15 Mar 2006 06:20:58 -0000	1.5
@@ -43,7 +43,7 @@
 # forms
 define	OUTPUT_template
 
-${DOC_BASE}-$(1).pdf::	${DOC_BASE}-$(1).xml params.xsl.in
+${DOC_BASE}-$(1).pdf::	${DOC_BASE}-$(1).xml params.xsl.in ${XSL}
 	LC_ALL=${1}.UTF-8 ${SED} -e "s|DATE|$$(date +'%x %X')|" 	\
 	       params.xsl.in >params.xsl
 	LC_ALL=${1}.UTF-8 ${XMLTO} -x ${XSL} ${XMLTOFLAGS} pdf 		\
@@ -53,11 +53,13 @@
 distclean::
 	${RM} ${DOC_BASE}-${1}.pdf
 
-${DOC_BASE}-$(1).txt::	${DOC_BASE}-$(1).xml params.xsl.in
+XMLPOSTFLAGS=-p '-cols 72'
+
+${DOC_BASE}-$(1).txt::	${DOC_BASE}-$(1).xml params.xsl.in ${XSL}
 	LC_ALL=${1}.UTF-8 ${SED} -e "s|DATE|$$(date +'%x %X')|" 	\
 	       params.xsl.in >params.xsl
-	LC_ALL=${1}.UTF-8 ${XMLTO} -x ${XSL} ${XMLTOFLAGS} txt 		\
-	       ${DOC_BASE}-$(1).xml
+	LC_ALL=${1}.UTF-8 ${XMLTO} -x ${XSL} ${XMLTOFLAGS} $${XMLPOSTFLAGS} \
+	       txt ${DOC_BASE}-$(1).xml
 	${RM} params.xsl
 
 distclean::


Index: fdp-pr.xsl
===================================================================
RCS file: /cvs/docs/press-release/fdp-pr.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fdp-pr.xsl	11 Mar 2006 17:22:43 -0000	1.5
+++ fdp-pr.xsl	15 Mar 2006 06:20:58 -0000	1.6
@@ -42,7 +42,7 @@
                   <fo:block>
                     <xsl:value-of select="/fdp-pr/@org"/>
                   </fo:block>
-                  <fo:block>
+                  <fo:block space-before="0.50em">
                     <xsl:value-of select="/fdp-pr/@kind"/>
                   </fo:block>
                 </fo:table-cell>
@@ -74,7 +74,7 @@
         </fo:static-content>
         <fo:flow flow-name="xsl-region-body" font="{$font}" font-size="{$font.size.body}">
           <xsl:apply-templates select="*" />
-          <fo:block id="EOF" margin-top="6pt" text-align="center">
+          <fo:block id="EOF" space-before="2.00em" text-align="center">
             <xsl:value-of select="/fdp-pr/@end"/>
           </fo:block>
         </fo:flow>
@@ -82,12 +82,12 @@
     </fo:root>
   </xsl:template>
   <xsl:template match="header">
-    <fo:block font-weight="bold" keep-with-next="always" margin-top="6pt">
+    <fo:block font-weight="bold" keep-with-next="always" space-after="0.25em" space-before="1.0em">
       <xsl:apply-templates/>
     </fo:block>
   </xsl:template>
   <xsl:template match="para">
-    <fo:block keep-together="always" margin-top="6pt">
+    <fo:block keep-together="always" space-before="1.25em">
       <xsl:apply-templates/>
     </fo:block>
   </xsl:template>
@@ -118,9 +118,9 @@
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-    <fo:list-block provisional-distance-between-starts="18pt" provisional-label-separation="6pt">
+    <fo:list-block provisional-distance-between-starts="18pt" provisional-label-separation="6pt" space-before="0.5em">
       <xsl:for-each select="item">
-        <fo:list-item margin-top="8pt">
+        <fo:list-item space-before="1.25em">
           <fo:list-item-label end-indent="label-end()">
             <fo:block>
               <xsl:value-of select="$mark"/>