docs-common Makefile.common,1.130,1.131
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20933
Modified Files:
Makefile.common
Log Message:
Fix OMF building... this we will probably keep, since no one should
have to write these on their own.
Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- Makefile.common 5 Aug 2006 03:50:51 -0000 1.130
+++ Makefile.common 5 Aug 2006 04:30:42 -0000 1.131
@@ -884,10 +884,10 @@
define omf_template
omf-$(1):: fedora-doc-${DOCBASE}-$(1).omf
-fedora-doc-${DOCBASE}-$(1).omf:: ${RPMINFO}
+fedora-doc-${DOCBASE}-$(1).omf:: ${1}/${RPMINFO}
LANG=$(1).UTF-8 ${XSLTPROC} --stringparam docbase "${DOCBASE}" \
--stringparam lang "$(1)" \
- ${FDPDIR}/docs-common/packaging/omf.xsl ${RPMINFO} | \
+ ${FDPDIR}/docs-common/packaging/omf.xsl ${1}/${RPMINFO} | \
$(XMLFORMAT) $(XMLFOPTS) >fedora-doc-${DOCBASE}-$(1).omf.tmp && \
move-if-change fedora-doc-${DOCBASE}-$(1).omf.tmp fedora-doc-${DOCBASE}-$(1).omf
17 years, 9 months
docs-common/packaging omf.xsl,1.8,1.9
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/packaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20897
Modified Files:
omf.xsl
Log Message:
Get rid of superfluous junk and use the real description instead of title
Index: omf.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/omf.xsl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- omf.xsl 11 Apr 2006 20:24:26 -0000 1.8
+++ omf.xsl 5 Aug 2006 04:29:41 -0000 1.9
@@ -27,7 +27,7 @@
/>
<subject category="General|Linux|Distributions|Other"/>
<description>
- <xsl:call-template name="get-title"/>
+ <xsl:call-template name="get-desc"/>
</description>
<type>
<xsl:call-template name="get-title"/>
@@ -51,14 +51,6 @@
</omf>
</xsl:template>
- <xsl:template name="get-title">
- <xsl:for-each select="/rpm-info/titles/translation">
- <xsl:choose>
- <xsl:when test="@lang = $lang">
- <xsl:value-of select="title"/>
- </xsl:when>
- </xsl:choose>
- </xsl:for-each>
- </xsl:template>
+ <xsl:include href="templates.xsl"/>
</xsl:stylesheet>
17 years, 9 months
docs-common/packaging templates.xsl,1.3,1.4
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/packaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20871
Modified Files:
templates.xsl
Log Message:
Make get-title and get-desc templates work with new DTD
Index: templates.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/templates.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- templates.xsl 4 Feb 2006 06:52:27 -0000 1.3
+++ templates.xsl 5 Aug 2006 04:28:18 -0000 1.4
@@ -4,24 +4,12 @@
<!-- Print the translated title of a document for language $lang -->
<xsl:template name="get-title">
- <xsl:for-each select="/rpm-info/titles/translation">
- <xsl:choose>
- <xsl:when test="@lang = $lang">
- <xsl:value-of select="title"/>
- </xsl:when>
- </xsl:choose>
- </xsl:for-each>
+ <xsl:value-of select="/rpm-info/title"/>
</xsl:template>
<!-- Print the translated description of a document for language $lang -->
<xsl:template name="get-desc">
- <xsl:for-each select="/rpm-info/titles/translation">
- <xsl:choose>
- <xsl:when test="@lang = $lang">
- <xsl:value-of select="desc"/>
- </xsl:when>
- </xsl:choose>
- </xsl:for-each>
+ <xsl:value-of select="/rpm-info/desc"/>
</xsl:template>
<!-- Print a hierarchical entry for a given worker with id $who -->
17 years, 9 months
docs-common/bin insert-changelog,1.7,1.8
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/bin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20786/bin
Modified Files:
insert-changelog
Log Message:
By the way, this should really allow us to put FDPDIR elsewhere.
Index: insert-changelog
===================================================================
RCS file: /cvs/docs/docs-common/bin/insert-changelog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- insert-changelog 4 Feb 2006 16:06:42 -0000 1.7
+++ insert-changelog 5 Aug 2006 04:11:35 -0000 1.8
@@ -95,6 +95,6 @@
--stringparam person "$ID" \
--stringparam date "$REVDATE" \
--stringparam detail "$DETAILS" \
- ../docs-common/packaging/insert-changelog.xsl "$RPMINFO" | \
+ ${FDPDIR}/docs-common/packaging/insert-changelog.xsl "$RPMINFO" | \
${XMLFORMAT} ${XMLFOPTS} > ${OUTPUT}
echo "New $RPMINFO written to $OUTPUT"
17 years, 9 months
docs-common/packaging rpm-info.dtd,1.13,1.14
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/packaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20746/packaging
Modified Files:
rpm-info.dtd
Log Message:
Let's not forget the new DTD either.
Index: rpm-info.dtd
===================================================================
RCS file: /cvs/docs/docs-common/packaging/rpm-info.dtd,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- rpm-info.dtd 2 Mar 2006 22:32:00 -0000 1.13
+++ rpm-info.dtd 5 Aug 2006 04:09:49 -0000 1.14
@@ -1,4 +1,4 @@
-<!ELEMENT rpm-info (colophon,author+,(translator|editor)*, license,copyright+,titles,changelog) >
+<!ELEMENT rpm-info (colophon,author+,(translator|editor)*, license,copyright+,title,desc,changelog) >
<!ELEMENT release EMPTY >
<!ATTLIST release rel CDATA #REQUIRED >
@@ -11,10 +11,12 @@
<!ELEMENT year (#PCDATA) >
<!ELEMENT holder (#PCDATA) >
+<!--
<!ELEMENT titles (translation+) >
<!ELEMENT translation (title,desc)* >
<!ATTLIST translation lang CDATA #REQUIRED >
+-->
<!ELEMENT title (#PCDATA) >
<!ELEMENT desc (#PCDATA) >
@@ -48,4 +50,6 @@
<!ATTLIST translator worker IDREF #REQUIRED >
<!ELEMENT details (#PCDATA) >
+<!--
<!ATTLIST details lang CDATA "en_US" >
+-->
17 years, 9 months
docs-common/bin fdp-functions,1.14,1.15
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/bin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20717
Modified Files:
fdp-functions
Log Message:
Let's get that language right too.
Index: fdp-functions
===================================================================
RCS file: /cvs/docs/docs-common/bin/fdp-functions,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- fdp-functions 5 Aug 2006 04:06:36 -0000 1.14
+++ fdp-functions 5 Aug 2006 04:07:19 -0000 1.15
@@ -18,7 +18,7 @@
FDPBINDIR="${FDPDIR}/docs-common/bin"
FDPPKGDIR="${FDPDIR}/docs-common/packaging"
-PRI_LANG=${PRI_LANG:-"en"}
+PRI_LANG=${PRI_LANG:-"en_US"}
RPMINFO=${RPMINFO:-"${PRI_LANG}/rpm-info.xml"}
XSLTPROC=${XSLTPROC:-xsltproc}
XMLFORMAT=${XMLFORMAT:-"${FDPBINDIR}/xmlformat"}
17 years, 9 months
docs-common/bin fdp-functions,1.13,1.14
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/bin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20693
Modified Files:
fdp-functions
Log Message:
Point common fdpsh functions to new location of rpm-info document.
Index: fdp-functions
===================================================================
RCS file: /cvs/docs/docs-common/bin/fdp-functions,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fdp-functions 22 Feb 2006 07:20:59 -0000 1.13
+++ fdp-functions 5 Aug 2006 04:06:36 -0000 1.14
@@ -19,7 +19,7 @@
FDPBINDIR="${FDPDIR}/docs-common/bin"
FDPPKGDIR="${FDPDIR}/docs-common/packaging"
PRI_LANG=${PRI_LANG:-"en"}
-RPMINFO=${RPMINFO:-"rpm-info.xml"}
+RPMINFO=${RPMINFO:-"${PRI_LANG}/rpm-info.xml"}
XSLTPROC=${XSLTPROC:-xsltproc}
XMLFORMAT=${XMLFORMAT:-"${FDPBINDIR}/xmlformat"}
XMLFOPTS=${XMLFOPTS:-"-f ${FDPBINDIR}/xmlformat-fdp.conf"}
17 years, 9 months
example-tutorial/en_US rpm-info.xml,1.1,1.2
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/example-tutorial/en_US
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20653
Modified Files:
rpm-info.xml
Log Message:
Note to self: don't monkey with copyright information unless you
really know why you're doing it.
Index: rpm-info.xml
===================================================================
RCS file: /cvs/docs/example-tutorial/en_US/rpm-info.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rpm-info.xml 5 Aug 2006 03:50:46 -0000 1.1
+++ rpm-info.xml 5 Aug 2006 04:03:49 -0000 1.2
@@ -19,12 +19,15 @@
<version>1.0</version>
</license>
<copyright>
+ <year>2003</year>
<year>2004</year>
<year>2005</year>
<year>2006</year>
+ <holder>Tammy Fox</holder>
<holder>Tommy Reynolds</holder>
<holder>Paul W. Frields</holder>
<holder>Dimitris Glezos</holder>
+ <holder>Red Hat, Inc.</holder>
</copyright>
<title>Example Tutorial</title>
<desc>This is quite a feat.</desc>
17 years, 9 months
docs-common/packaging insert-changelog.xsl,1.5,1.6
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/packaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18041
Modified Files:
insert-changelog.xsl
Log Message:
No longer need to provide a lang here.
Index: insert-changelog.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/insert-changelog.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- insert-changelog.xsl 24 Feb 2006 02:36:23 -0000 1.5
+++ insert-changelog.xsl 5 Aug 2006 03:56:35 -0000 1.6
@@ -39,7 +39,6 @@
<xsl:element name="changelog" use-attribute-sets="clog">
<xsl:element name="revision" use-attribute-sets="rev">
<xsl:element name="author" use-attribute-sets="auth"/>
- <xsl:comment>PLEASE SET "lang" ATTRIBUTE IN DETAILS WHERE NEEDED</xsl:comment>
<xsl:element name="details"><xsl:value-of
select="$detail"/></xsl:element>
</xsl:element>
17 years, 9 months
docs-common/packaging bookinfo.xsl,1.27,1.28
by fedora-docs-commits＠redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/packaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17952/docs-common/packaging
Modified Files:
bookinfo.xsl
Log Message:
This change temporarily breaks building but will improve translation
overall. The rpm-info.xml should no longer contain any translations,
and should now be stored in the original language directory. It will
still be used to generate fdp-info.xml, and we will probably also
strip RPM information out of the DTD since we intend to use a standard
specfile for this purpose from here on out.
Index: bookinfo.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/bookinfo.xsl,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- bookinfo.xsl 15 Jul 2006 15:20:46 -0000 1.27
+++ bookinfo.xsl 5 Aug 2006 03:50:52 -0000 1.28
@@ -59,27 +59,9 @@
<xsl:call-template name="initials"><xsl:with-param name="who" select="author/@worker"/></xsl:call-template>
</xsl:element>
<xsl:element name="revdescription">
- <xsl:choose>
- <xsl:when test="details[@lang = $lang]">
- <xsl:for-each select="details[@lang = $lang]">
- <xsl:element name="para">
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:for-each>
- </xsl:when>
- <xsl:when test="details[@lang = 'en_US']">
- <xsl:for-each select="details[@lang = 'en_US']">
- <xsl:element name="para">
- <xsl:apply-templates/>
- </xsl:element>
- </xsl:for-each>
- </xsl:when>
- <xsl:otherwise>
- <xsl:element name="para">
- <xsl:text>(...)</xsl:text>
- </xsl:element>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:element name="para">
+ <xsl:value-of select="details"/>
+ </xsl:element>
</xsl:element>
</xsl:element>
</xsl:for-each>
17 years, 9 months