Re: Patch for doctype and faq

Jeff Martin <[email protected]> Fri, 08 Apr 2005 17:00:21 +0100

Newsgroups	gmane.editors.conglomerate.devel
Message-ID	<[email protected]>

Okay apologies for all the noise I've been generating today.

I finally managed to sort out my build so I've actually tested this
stuff. The patch now makes changes to conglomerate.xml and global.ent to
include the faq in the manual.

I've also changed the faq-hack.xsl so the <article/> tag becomes
<chapter id="faq"/> so the faq is not a proper chapter within the
manual.

On Fri, 2005-04-08 at 12:26 +0200, Michèle Garoche wrote:
> Sorry, I did not success in making two patches. So here it is with both 
> changes.
> 
> 
> Michèle
> <http://micmacfr.homeunix.org>
> _______________________________________________ Conglomerate-devel mailing list [email protected] http://lists.copyleft.no/mailman/listinfo/conglomerate-devel
-- 
Jeff Martin

Memetic Engineer

http://www.custommonkey.org/

_______________________________________________
Conglomerate-devel mailing list
[email protected]
http://lists.copyleft.no/mailman/listinfo/conglomerate-devel

faq.patch (text/x-patch, 2.3 KB)

Index: doc/C/Makefile.am
===================================================================
RCS file: /cvs/gnome/conglomerate/doc/C/Makefile.am,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile.am
--- doc/C/Makefile.am	15 Oct 2004 23:09:06 -0000	1.6
+++ doc/C/Makefile.am	8 Apr 2005 15:54:45 -0000
@@ -1,3 +1,7 @@
+# temporary hack until yelp support qanda sets
+faq.xml: faq.xml.orig
+	xsltproc --output $@ faq-hack.xsl $<
+
 more_C_docs = \
   conglomerate-refentry.xml manpage.make conglomerate.1 \
   faq.xml
Index: doc/C/ChangeLog
===================================================================
RCS file: /cvs/gnome/conglomerate/doc/C/ChangeLog,v
retrieving revision 1.24
diff -u -p -r1.24 ChangeLog
--- doc/C/ChangeLog	1 Feb 2005 17:45:53 -0000	1.24
+++ doc/C/ChangeLog	8 Apr 2005 15:54:45 -0000
@@ -1,3 +1,9 @@
+2005-04-08  Jeff Martin <[email protected]>
+
+	* Makefile.am, faq-hack.xsl, faq.xml
+
+	Added temporary transform to replace qanda sets in docbook with sections
+
 2005-02-01  Geert Stappers <[email protected]>
 
 	* conglomerate.xml
Index: doc/C/conglomerate.xml
===================================================================
RCS file: /cvs/gnome/conglomerate/doc/C/conglomerate.xml,v
retrieving revision 1.4
diff -u -p -r1.4 conglomerate.xml
--- doc/C/conglomerate.xml	1 Feb 2005 17:45:53 -0000	1.4
+++ doc/C/conglomerate.xml	8 Apr 2005 15:54:46 -0000
@@ -1336,7 +1336,7 @@
             <title id="dump_xds.title">Dump a Display Spec</title>
             <para>text</para>
         </sect1>
-    </chapter> &doctype_supp; &xds_ele_ref; &xds_dtd_def; <glossary role="auto">
+    </chapter> &faq; &doctype_supp; &xds_ele_ref; &xds_dtd_def; <glossary role="auto">
         <glossentry>
             <glossterm>Dummy</glossterm>
             <glossdef>
Index: doc/C/global.ent
===================================================================
RCS file: /cvs/gnome/conglomerate/doc/C/global.ent,v
retrieving revision 1.1
diff -u -p -r1.1 global.ent
--- doc/C/global.ent	13 Jan 2004 18:33:56 -0000	1.1
+++ doc/C/global.ent	8 Apr 2005 15:54:46 -0000
@@ -17,6 +17,7 @@
     <!ENTITY noticefdl SYSTEM "notice_fdl.xml">
     <!ENTITY noticegpl SYSTEM "notice_gpl.xml">
     <!ENTITY conventions SYSTEM "conventions.xml">
+    <!ENTITY faq SYSTEM "faq.xml">
     <!-- end resources -->
     
     <!-- start reusable instances -->

faq-hack.xsl (text/x-xslt, 893 B)

<?xml version ="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
		version="1.0">

  <xsl:output encoding="UTF-8"/>

  <xsl:template match ="qandaset|question|answer">
    <xsl:apply-templates />
  </xsl:template>

  <xsl:template match ="qandaentry">
    <sect2>
      <xsl:copy-of select="@*"/>
      <xsl:apply-templates />
    </sect2>
  </xsl:template>

  <xsl:template match ="qandadiv">
    <sect1>
      <xsl:copy-of select="@*"/>
      <xsl:apply-templates />
    </sect1>
  </xsl:template>

  <xsl:template match ="question/para">
    <title><xsl:apply-templates /></title>
  </xsl:template>

  <xsl:template match ="article">
    <chapter id="faq"><xsl:apply-templates /></chapter>
  </xsl:template>

  <xsl:template match="*">
    <xsl:copy>
      <xsl:copy-of select="@*"/>
      <xsl:apply-templates/>
    </xsl:copy>
  </xsl:template>

</xsl:stylesheet>