press-release fdp-pr.dtd,1.5,1.6 fdp-pr.xsl,1.12,1.13

[Tommy Reynolds (jtr)]

Author: jtr

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

Modified Files:
	fdp-pr.dtd fdp-pr.xsl 
Log Message:
Simple, elegant solution that works for everybody, including the
stock xmlto RPM: expand the original header table into a second row.
Put the previously-overlapped text into the rightmost cell of the
second row.  This was so simple it work me up about 3:00AM to fix
itself.

Also added new "spare" attribute to the <fdp-pr/> element that is
copied verbatim into the leftmost cell of the second header line.  I
called it "spare" because I can't think of what should go there in
the final cut.  Ideas accepted.



Index: fdp-pr.dtd
===================================================================
RCS file: /cvs/docs/press-release/fdp-pr.dtd,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fdp-pr.dtd	16 Mar 2006 20:53:15 -0000	1.5
+++ fdp-pr.dtd	17 Mar 2006 09:14:39 -0000	1.6
@@ -4,6 +4,7 @@
 <!ATTLIST fdp-pr	lang		CDATA	"en"			>
 <!ATTLIST fdp-pr	org		CDATA	"FEDORA PROJECT"	>
 <!ATTLIST fdp-pr	kind		CDATA	"PRESS RELEASE"		>
+<!ATTLIST fdp-pr       spare           CDATA   ""                     >
 <!ELEMENT source			(#PCDATA)			>
 
 <!ELEMENT para				(#PCDATA|ulink|dateline)*	>


Index: fdp-pr.xsl
===================================================================
RCS file: /cvs/docs/press-release/fdp-pr.xsl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fdp-pr.xsl	17 Mar 2006 04:50:23 -0000	1.12
+++ fdp-pr.xsl	17 Mar 2006 09:14:39 -0000	1.13
@@ -40,6 +40,7 @@
             <fo:table-column column-number="1" column-width="50%"/>
             <fo:table-column column-number="2" column-width="50%"/>
             <fo:table-body>
+              <!-- Header Line #1 -->
               <fo:table-row>
                 <fo:table-cell text-align="left">
                   <fo:block>
@@ -47,25 +48,22 @@
                   </fo:block>
                 </fo:table-cell>
                 <fo:table-cell text-align="right">
-                  <fo:table border-collapse="inherit" table-layout="fixed" width="100%">
-                    <fo:table-column column-number="1" column-width="100%"/>
-                    <fo:table-body>
-                      <fo:table-row>
-                        <fo:table-cell>
-                          <fo:block>
-                            <xsl:value-of select="/fdp-pr/@org"/>
-                          </fo:block>
-                        </fo:table-cell>
-                      </fo:table-row>
-                      <fo:table-row>
-                        <fo:table-cell>
-                          <fo:block>
-                            <xsl:value-of select="/fdp-pr/@kind"/>
-                          </fo:block>
-                        </fo:table-cell>
-                      </fo:table-row>
-                    </fo:table-body>
-                  </fo:table>
+                  <fo:block>
+                    <xsl:value-of select="/fdp-pr/@org"/>
+                  </fo:block>
+                </fo:table-cell>
+              </fo:table-row>
+              <!-- Header Line #2 -->
+              <fo:table-row>
+                <fo:table-cell text-align="left">
+                  <fo:block>
+                    <xsl:value-of select="/fdp-pr/@spare"/>
+                  </fo:block>
+                </fo:table-cell>
+                <fo:table-cell text-align="right">
+                  <fo:block>
+                    <xsl:value-of select="/fdp-pr/@kind"/>
+                  </fo:block>
                 </fo:table-cell>
               </fo:table-row>
             </fo:table-body>