press-release fdp-pr.dtd, 1.1, 1.2 fdp-pr.xsl, 1.1, 1.2 params.xsl.in, 1.1, 1.2

Tommy Reynolds (jtr) fedora-docs-commits at redhat.com
Tue Feb 7 17:31:07 UTC 2006


Author: jtr

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

Modified Files:
	fdp-pr.dtd fdp-pr.xsl params.xsl.in 
Log Message:
Parameterized the font name and sizes.
Replaced all fixed text with settings from the various <fdp-pr>
attributes.



Index: fdp-pr.dtd
===================================================================
RCS file: /cvs/docs/press-release/fdp-pr.dtd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fdp-pr.dtd	7 Feb 2006 15:04:50 -0000	1.1
+++ fdp-pr.dtd	7 Feb 2006 17:30:59 -0000	1.2
@@ -4,6 +4,7 @@
 <!ATTLIST fdp-pr	end		CDATA	"# # #"				>
 <!ATTLIST fdp-pr	lang		CDATA	"en"				>
 <!ATTLIST fdp-pr	org		CDATA	"FEDORA FOUNDATION"		>
+<!ATTLIST fdp-pr	kind		CDATA	"PRESS RELEASE"			>
 <!ELEMENT source			(#PCDATA)				>
 
 <!ELEMENT para				(#PCDATA|ulink)*			>


Index: fdp-pr.xsl
===================================================================
RCS file: /cvs/docs/press-release/fdp-pr.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fdp-pr.xsl	7 Feb 2006 15:04:50 -0000	1.1
+++ fdp-pr.xsl	7 Feb 2006 17:30:59 -0000	1.2
@@ -6,12 +6,15 @@
   <xsl:output encoding="UTF-8" indent="yes" media-type="letter" omit-xml-declaration="no" standalone="no"/>
 
   <xsl:param name="today">2006-02-06</xsl:param>
-  <xsl:param name="organization">FEDORA FOUNDATION PRESS RELEASE</xsl:param>
+  <xsl:param name="font">Verdana</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>
 
   <xsl:template match="/">
     <fo:root>
       <fo:layout-master-set>
-        <fo:simple-page-master master-name="Letter" margin-bottom="0.3in" margin-left="0.3in" margin-right="0.3in" margin-top="0.3in" page-height="11in" page-width="8.5in">
+        <fo:simple-page-master master-name="Letter" margin-bottom="0.3in" margin-left="0.3in" margin-right="0.3in" margin-top="0.6in" page-height="11in" page-width="8.5in">
           <fo:region-body margin-bottom="1.5in" margin-left="0.6in" margin-right="0.6in" margin-top="0.5in"/>
           <fo:region-before extent="1.5in"/>
           <fo:region-after extent="0.75in"/>
@@ -21,11 +24,11 @@
         </fo:page-sequence-master>
       </fo:layout-master-set>
       <fo:page-sequence master-reference="PressRelease">
-        <fo:static-content flow-name="xsl-region-before" margin-left="0.3in" margin-right="1in">
+        <fo:static-content flow-name="xsl-region-before" font="{$font}" 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-body font-family="monospace" font-size="14pt">
+            <fo:table-body>
               <fo:table-row>
                 <fo:table-cell text-align="left">
                   <fo:block>
@@ -35,18 +38,20 @@
                 <fo:table-cell text-align="right">
                   <fo:block>
                     <xsl:value-of select="/fdp-pr/@org"/>
-                    PRESS RELEASE
+                  </fo:block>
+                  <fo:block>
+                    <xsl:value-of select="/fdp-pr/@kind"/>
                   </fo:block>
                 </fo:table-cell>
               </fo:table-row>
             </fo:table-body>
           </fo:table>
         </fo:static-content>
-        <fo:static-content flow-name="xsl-region-after" margin-left="0.3in" margin-right="1in">
+        <fo:static-content flow-name="xsl-region-after" font="{$font}" 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-body font-family="monospace" font-size="14pt">
+            <fo:table-body>
               <fo:table-row>
                 <fo:table-cell text-align="left">
                   <fo:block>
@@ -62,9 +67,9 @@
             </fo:table-body>
           </fo:table>
         </fo:static-content>
-        <fo:flow flow-name="xsl-region-body">
+        <fo:flow flow-name="xsl-region-body" font="{$font}" font-size="{$font.size.body}">
           <xsl:apply-templates select="*" />
-          <fo:block font-family="monospace" font-size="16pt" id="EOF" margin-top="6pt" text-align="center">
+          <fo:block id="EOF" margin-top="6pt" text-align="center">
             <xsl:value-of select="/fdp-pr/@end"/>
           </fo:block>
         </fo:flow>
@@ -72,12 +77,12 @@
     </fo:root>
   </xsl:template>
   <xsl:template match="header">
-    <fo:block font-family="monospace" font-size="14pt" font-weight="bold" keep-with-next="always" margin-top="6pt">
+    <fo:block font-weight="bold" keep-with-next="always" margin-top="6pt">
       <xsl:apply-templates/>
     </fo:block>
   </xsl:template>
   <xsl:template match="para">
-    <fo:block font-family="monospace" font-size="14pt" keep-together="always" margin-top="6pt">
+    <fo:block keep-together="always" margin-top="6pt">
       <xsl:apply-templates/>
     </fo:block>
   </xsl:template>
@@ -97,11 +102,13 @@
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-    <fo:list-block font-family="monospace" font-size="14pt" provisional-distance-between-starts="18pt" provisional-label-separation="6pt">
+    <fo:list-block provisional-distance-between-starts="18pt" provisional-label-separation="6pt">
       <xsl:for-each select="item">
         <fo:list-item margin-top="8pt">
           <fo:list-item-label end-indent="label-end()">
-            <fo:block><xsl:value-of select="$mark"/></fo:block>
+            <fo:block>
+              <xsl:value-of select="$mark"/>
+            </fo:block>
           </fo:list-item-label>
           <fo:list-item-body start-indent="body-start()">
             <fo:block>


Index: params.xsl.in
===================================================================
RCS file: /cvs/docs/press-release/params.xsl.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- params.xsl.in	7 Feb 2006 15:04:50 -0000	1.1
+++ params.xsl.in	7 Feb 2006 17:30:59 -0000	1.2
@@ -5,4 +5,10 @@
     The 'today' value is provided by the Makefile, so please do not edit this definition yourself!
   -->
   <xsl:param name="today">DATE</xsl:param>
+  <!--
+    <xsl:param name="font">Verdana</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>
+    -->
 </xsl:stylesheet>




More information about the Fedora-docs-commits mailing list