press-release/tools fdp-pr.dtd,1.1,1.2 fdp-pr.xsl,1.1,1.2
Tommy Reynolds (jtr)
fedora-docs-commits at redhat.com
Mon Aug 14 13:12:52 UTC 2006
Author: jtr
Update of /cvs/docs/press-release/tools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5202/tools
Modified Files:
fdp-pr.dtd fdp-pr.xsl
Log Message:
Removed <fdp-pr> attributes in favor of explicit elements, so we can
get all the translatable strings out in the open.
Index: fdp-pr.dtd
===================================================================
RCS file: /cvs/docs/press-release/tools/fdp-pr.dtd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fdp-pr.dtd 13 Aug 2006 18:40:42 -0000 1.1
+++ fdp-pr.dtd 14 Aug 2006 13:12:50 -0000 1.2
@@ -1,23 +1,31 @@
-<!ELEMENT fdp-pr (source,(header|para|list)+) >
-<!ATTLIST fdp-pr embargo CDATA "FOR IMMEDIATE RELEASE" >
-<!ATTLIST fdp-pr end CDATA "# # #" >
-<!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)* >
-<!ELEMENT header (#PCDATA) >
-
-<!ELEMENT list (item+) >
-<!ATTLIST list mark (star|dot) "star" >
-<!ELEMENT item (#PCDATA|ulink)* >
-
-<!ELEMENT ulink EMPTY >
-<!ATTLIST ulink url CDATA #REQUIRED >
-
-<!ELEMENT dateline (location,date) >
-<!ELEMENT location (#PCDATA) >
-<!ELEMENT date (#PCDATA) >
-<!ATTLIST date format (iso) #REQUIRED >
+<!ELEMENT fdp-pr (lang,about,(header|para|list)+) >
+
+<!ELEMENT lang (#PCDATA) >
+
+<!ELEMENT about (source,org,kind,embargo,subhead?,end) >
+
+<!ELEMENT kind (#PCDATA) >
+<!ELEMENT org (#PCDATA) >
+<!ELEMENT end (#PCDATA) >
+<!ELEMENT embargo (#PCDATA) >
+<!ELEMENT subhead (#PCDATA) >
+<!ELEMENT source (#PCDATA) >
+
+<!ELEMENT para (#PCDATA|ulink|dateline)* >
+
+<!ELEMENT header (#PCDATA) >
+
+<!ELEMENT list (item+) >
+<!ATTLIST list mark (star|dot) "star" >
+
+<!ELEMENT item (#PCDATA|ulink)* >
+
+<!ELEMENT ulink EMPTY >
+<!ATTLIST ulink url CDATA #REQUIRED >
+
+<!ELEMENT dateline (location,date) >
+
+<!ELEMENT location (#PCDATA) >
+
+<!ELEMENT date (#PCDATA) >
+<!ATTLIST date format (iso) #REQUIRED >
Index: fdp-pr.xsl
===================================================================
RCS file: /cvs/docs/press-release/tools/fdp-pr.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fdp-pr.xsl 13 Aug 2006 19:25:53 -0000 1.1
+++ fdp-pr.xsl 14 Aug 2006 13:12:50 -0000 1.2
@@ -22,7 +22,7 @@
http://www.w3.org/1999/XSL/Format
</xsl:attribute>
<xsl:attribute name="language">
- <xsl:value-of select="$lang"/>
+ <xsl:value-of select="/fdp-pr/about/lang"/>
</xsl:attribute>
<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.6in" page-height="11in" page-width="8.5in">
@@ -44,12 +44,12 @@
<fo:table-row>
<fo:table-cell text-align="left">
<fo:block>
- <xsl:value-of select="/fdp-pr/@embargo"/>
+ <xsl:value-of select="/fdp-pr/about/embargo"/>
</fo:block>
</fo:table-cell>
<fo:table-cell text-align="right">
<fo:block>
- <xsl:value-of select="/fdp-pr/@org"/>
+ <xsl:value-of select="/fdp-pr/about/org"/>
</fo:block>
</fo:table-cell>
</fo:table-row>
@@ -57,12 +57,12 @@
<fo:table-row>
<fo:table-cell text-align="left">
<fo:block>
- <xsl:value-of select="/fdp-pr/@spare"/>
+ <xsl:value-of select="/fdp-pr/about/subhead"/>
</fo:block>
</fo:table-cell>
<fo:table-cell text-align="right">
<fo:block>
- <xsl:value-of select="/fdp-pr/@kind"/>
+ <xsl:value-of select="/fdp-pr/about/kind"/>
</fo:block>
</fo:table-cell>
</fo:table-row>
@@ -94,7 +94,7 @@
<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"/>
+ <xsl:value-of select="/fdp-pr/about/end"/>
</fo:block>
</fo:flow>
</fo:page-sequence>
@@ -156,4 +156,6 @@
</xsl:for-each>
</fo:list-block>
</xsl:template>
+ <xsl:template match="lang|about|source|org|kind|embargo|end|subhead">
+ </xsl:template>
</xsl:stylesheet>
More information about the Fedora-docs-commits
mailing list