press-release fdp-pr.xsl,1.8,1.9

Author: jtr

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

Modified Files:
	fdp-pr.xsl 
Log Message:
Use "font-family" instead of "font" attributes to allow recovery if
the rendering machine doesn't have some fonts we'd expect.  Hmmm,
I'll need to think about font selection more for non-Romance
languages.

Removed all non-translatable English text from the .XSL template.



Index: fdp-pr.xsl
===================================================================
RCS file: /cvs/docs/press-release/fdp-pr.xsl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fdp-pr.xsl	15 Mar 2006 07:09:43 -0000	1.8
+++ fdp-pr.xsl	15 Mar 2006 15:17:17 -0000	1.9
@@ -10,7 +10,7 @@
 
   <xsl:param name="lang">en_US</xsl:param>
   <xsl:param name="today">2006-02-06</xsl:param>
-  <xsl:param name="font">Verdana</xsl:param>
+  <xsl:param name="fonts">Verdana, Courier, Helvetica, Sans,
Serif</xsl:param>
   <xsl:param name="font.size.header">12pt</xsl:param>
   <xsl:param name="font.size.body">12pt</xsl:param>
   <xsl:param name="font.size.footer">12pt</xsl:param>
@@ -34,10 +34,10 @@
         </fo:page-sequence-master>
       </fo:layout-master-set>
       <fo:page-sequence master-reference="PressRelease">
-        <fo:static-content flow-name="xsl-region-before"
font="{$font}" font-size="{$font.size.header}"
margin-left="0.3in" margin-right="1in">
+        <fo:static-content flow-name="xsl-region-before"
font-family="{$fonts}" font-size="{$font.size.header}"
margin-left="0.3in" margin-right="1in">
           <fo:table border-collapse="separate"
table-layout="fixed" width="100%">
-            <fo:table-column column-number="1"
column-width="50%"/>
-            <fo:table-column column-number="2"
column-width="50%"/>
+            <fo:table-column column-number="1"
column-width="40%"/>
+            <fo:table-column column-number="2"
column-width="60%"/>
             <fo:table-body>
               <fo:table-row>
                 <fo:table-cell text-align="left">
@@ -45,11 +45,10 @@
                     <xsl:value-of select="/fdp-pr/@embargo"/>
                   </fo:block>
                 </fo:table-cell>
-                <fo:table-cell text-align="right">
+                <fo:table-cell text-align="center">
                   <fo:block>
                     <xsl:value-of select="/fdp-pr/@org"/>
-                  </fo:block>
-                  <fo:block space-before="0.25em">
+                    <xsl:text> </xsl:text>
                     <xsl:value-of select="/fdp-pr/@kind"/>
                   </fo:block>
                 </fo:table-cell>
@@ -57,21 +56,20 @@
             </fo:table-body>
           </fo:table>
         </fo:static-content>
-        <fo:static-content flow-name="xsl-region-after"
font="{$font}" font-size="{$font.size.footer}"
margin-left="0.3in" margin-right="1in">
+        <fo:static-content flow-name="xsl-region-after"
font-family="{$fonts}" font-size="{$font.size.footer}"
margin-left="0.3in" margin-right="1in">
           <fo:table border-collapse="separate"
table-layout="fixed" width="100%">
-            <fo:table-column column-number="1"
column-width="50%"/>
-            <fo:table-column column-number="2"
column-width="50%"/>
+            <fo:table-column column-number="1"
column-width="40%"/>
+            <fo:table-column column-number="2"
column-width="60%"/>
             <fo:table-body>
               <fo:table-row>
                 <fo:table-cell text-align="left">
                   <fo:block>
-                    <xsl:text>Page </xsl:text>
                     <fo:page-number/>
-                    <xsl:text> of </xsl:text>
+                    <xsl:text> / </xsl:text>
                     <fo:page-number-citation ref-id="EOF"/>
                   </fo:block>
                 </fo:table-cell>
-                <fo:table-cell text-align="right">
+                <fo:table-cell text-align="center">
                   <fo:block>
                     <xsl:value-of select="$today"/>
                   </fo:block>
@@ -80,7 +78,7 @@
             </fo:table-body>
           </fo:table>
         </fo:static-content>
-        <fo:flow flow-name="xsl-region-body" font="{$font}"
font-size="{$font.size.body}">
+        <fo:flow flow-name="xsl-region-body"
font-family="{$fonts}" font-size="{$font.size.body}">
           <xsl:apply-templates select="*" />
           <fo:block id="EOF" space-before="2.00em"
text-align="center">
             <xsl:value-of select="/fdp-pr/@end"/>
@@ -89,6 +87,9 @@
       </fo:page-sequence>
     </xsl:element>
   </xsl:template>
+  <xsl:template match="source">
+    <!-- Dummy template until I figure out what this element should do -->
+  </xsl:template>
   <xsl:template match="header">
     <fo:block font-weight="bold" keep-with-next="always"
space-after="0.25em" space-before="1.0em">
       <xsl:apply-templates/>