[Scummvm-cvs-logs] SF.net SVN: scummvm: [25470] docs/trunk/docbook

Sat Feb 10 18:22:09 CET 2007

Revision: 25470
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25470&view=rev
Author:   fingolfin
Date:     2007-02-10 09:22:08 -0800 (Sat, 10 Feb 2007)

Log Message:
-----------
Improved faq-inc.xsl to only select the qandaset div; removed faq_make_inc.pl

Modified Paths:
--------------
    docs/trunk/docbook/Makefile.common
    docs/trunk/docbook/Makefile.dblatex
    docs/trunk/docbook/Makefile.fop
    docs/trunk/docbook/Makefile.openjade
    docs/trunk/docbook/faq-inc.xsl

Removed Paths:
-------------
    docs/trunk/docbook/faq_make_inc.pl

Modified: docs/trunk/docbook/Makefile.common
===================================================================

--- docs/trunk/docbook/Makefile.common	2007-02-10 17:10:55 UTC (rev 25469)
+++ docs/trunk/docbook/Makefile.common	2007-02-10 17:22:08 UTC (rev 25470)
@@ -29,6 +29,11 @@
 
 $(MANUAL_DST): credits.xml
 
+# Special rule for faq.inc:
+# Only keep everything contained inside the top-most <div> inside the <body>
+faq.inc: faq.html
+	  xsltproc --html --output $@ faq-inc.xsl $<
+
 #
 # For the PDF version of the manual, some of the images should be converted to
 # from PNG to PDF. The following rule does that using ImageMagick.

Modified: docs/trunk/docbook/Makefile.dblatex
===================================================================
--- docs/trunk/docbook/Makefile.dblatex	2007-02-10 17:10:55 UTC (rev 25469)
+++ docs/trunk/docbook/Makefile.dblatex	2007-02-10 17:22:08 UTC (rev 25470)
@@ -38,10 +38,3 @@
 # such as lynk, links, elinks, w3m, ... to do the work
 %.txt: %.html
 	w3m -dump $< > $@
-
-
-
-# Special rule for faq.inc:
-# Only keep everything contained inside the top-most <div> inside the <body>
-faq.inc: faq.html
-	  xsltproc --html --output $@ faq-inc.xsl $<

Modified: docs/trunk/docbook/Makefile.fop
===================================================================
--- docs/trunk/docbook/Makefile.fop	2007-02-10 17:10:55 UTC (rev 25469)
+++ docs/trunk/docbook/Makefile.fop	2007-02-10 17:22:08 UTC (rev 25470)
@@ -44,9 +44,3 @@
 # above).
 # Also, there is room for experiments when it comes to the plain text generation.
 #
-
-
-# Special rule for faq.inc:
-# Only keep everything contained inside the top-most <div> inside the <body>
-faq.inc: faq.html
-	  xsltproc --html --output $@ faq-inc.xsl $<

Modified: docs/trunk/docbook/Makefile.openjade
===================================================================
--- docs/trunk/docbook/Makefile.openjade	2007-02-10 17:10:55 UTC (rev 25469)
+++ docs/trunk/docbook/Makefile.openjade	2007-02-10 17:22:08 UTC (rev 25470)
@@ -34,12 +34,3 @@
 %.html: %.xml
 	docbook2html $(DCL) --nochunks $<
 	tidy -qm $@ || true
-
-
-# Special rule for faq.inc:
-# Remove everything before <div class="qandaset">
-# and at the end of the file remove
-#   </body>
-#   </html>
-faq.inc: faq.html
-	./faq_make_inc.pl < $< > $@

Modified: docs/trunk/docbook/faq-inc.xsl
===================================================================
--- docs/trunk/docbook/faq-inc.xsl	2007-02-10 17:10:55 UTC (rev 25469)
+++ docs/trunk/docbook/faq-inc.xsl	2007-02-10 17:22:08 UTC (rev 25470)
@@ -4,6 +4,11 @@
 
 <xsl:output method="html" indent="no" encoding="iso-8859-1" />
 
-<xsl:template match="/"><xsl:copy-of select="html/body/div" /></xsl:template>
+<xsl:template match="/">
+<xsl:comment> This file was generated from faq.xml. Do *NOT* edit by hand </xsl:comment>
+<xsl:text>
+</xsl:text>
+<xsl:copy-of select="//div[@class='qandaset']" />
+</xsl:template>
 
 </xsl:stylesheet>

Deleted: docs/trunk/docbook/faq_make_inc.pl
===================================================================
--- docs/trunk/docbook/faq_make_inc.pl	2007-02-10 17:10:55 UTC (rev 25469)
+++ docs/trunk/docbook/faq_make_inc.pl	2007-02-10 17:22:08 UTC (rev 25470)
@@ -1,22 +0,0 @@
-#!/usr/bin/perl -w
-use strict;
-
-print "<!-- This file was generated by faq_make_inc.pl. Do *NOT* edit by hand! -->\n";
-
-while (<>) {
-  last if (/<div class="qandaset">/);
-}
-
-print '<div class="qandaset">'."\n";
-# The end of the file is marked by five consecutive </div>s
-my $divs=0;
-while (<>) {
-  if (/<\/div>/) {
-    $divs++;
-  } else {
-    $divs = 0;
-  }
-  last if (/<\/body>/) || $divs == 5;
-  print $_;
-}
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


