[project @ 2004-08-21 13:29:26 by panne]

* Factored out labeling options (used by FO now, too)
* Cleaned up stylesheet handling

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 6d61470..fe11b89 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -919,6 +919,10 @@ DVIPS                      = @DvipsCmd@
 
 DIR_DOCBOOK_XSL                = @DIR_DOCBOOK_XSL@
 
+XSLTPROC_LABEL_OPTS    = --stringparam toc.section.depth 3 \
+                         --stringparam section.autolabel 1 \
+                         --stringparam section.label.includes.component.label 1
+
 #-----------------------------------------------------------------------------
 #              FPtools support software
 

diff --git a/mk/paths.mk b/mk/paths.mk
index 5c88a62..9c51dcd 100644 (file)
--- a/mk/paths.mk
+++ b/mk/paths.mk
@@ -352,5 +352,9 @@ SRC_DIST_NAME=$(ProjectNameShort)-$(ProjectVersion)
 DLL_PEN = $(FPTOOLS_TOP)/dll
 
 #------------------------------------------------------------------
+#
+# Stylesheet for HTML generated from DocBook XML
+#
 
-FPTOOLS_CSS = $(FPTOOLS_TOP)/mk/fptools.css
+FPTOOLS_CSS     = fptools.css
+FPTOOLS_CSS_ABS = $(FPTOOLS_TOP)/mk/$(FPTOOLS_CSS)

diff --git a/mk/suffix.mk b/mk/suffix.mk
index ee5fdb7..fb95830 100644 (file)
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -245,33 +245,33 @@ endif
 
 %.html : %.xml
        $(XSLTPROC) --output $@ \
-                   --stringparam toc.section.depth 3 \
-                   --stringparam section.autolabel 1 \
-                   --stringparam section.label.includes.component.label 1 \
-                   --stringparam html.stylesheet fptools.css \
-                   $(XSLTPROC_OPTS) $(DIR_DOCBOOK_XSL)/html/docbook.xsl $<
-       cp $(FPTOOLS_CSS) .
+                   --stringparam html.stylesheet $(FPTOOLS_CSS) \
+                   $(XSLTPROC_LABEL_OPTS) $(XSLTPROC_OPTS) \
+                   $(DIR_DOCBOOK_XSL)/html/docbook.xsl $<
+       cp $(FPTOOLS_CSS_ABS) .
 
 %-html/index.html : %.xml
        $(RM) -rf $(dir $@)
        $(XSLTPROC) --stringparam base.dir $(dir $@) \
-                   --stringparam use.id.as.filename 1 \
-                   --stringparam toc.section.depth 3 \
-                   --stringparam section.autolabel 1 \
-                   --stringparam section.label.includes.component.label 1 \
-                   --stringparam html.stylesheet fptools.css \
-                   $(XSLTPROC_OPTS) $(DIR_DOCBOOK_XSL)/html/chunk.xsl $<
-       cp $(FPTOOLS_CSS) $(dir $@)
+                   --stringparam use.id.as.filename 1 \
+                   --stringparam html.stylesheet $(FPTOOLS_CSS) \
+                   $(XSLTPROC_LABEL_OPTS) $(XSLTPROC_OPTS) \
+                   $(DIR_DOCBOOK_XSL)/html/chunk.xsl $<
+       cp $(FPTOOLS_CSS_ABS) $(dir $@)
 
+# Note: Numeric labeling seems to be uncommon for HTML Help
 %-htmlhelp/index.html : %.xml
        $(RM) -rf $(dir $@)
        $(XSLTPROC) --stringparam base.dir $(dir $@) \
-                   --stringparam manifest.in.base.dir 1 \
-                   $(XSLTPROC_OPTS) $(DIR_DOCBOOK_XSL)/htmlhelp/htmlhelp.xsl $<
+                   --stringparam manifest.in.base.dir 1 \
+                   --stringparam htmlhelp.chm $(basename $<).chm \
+                   $(XSLTPROC_OPTS) \
+                   $(DIR_DOCBOOK_XSL)/htmlhelp/htmlhelp.xsl $<
 
 %.fo : %.xml
        $(XSLTPROC) --output $@ \
-                   $(XSLTPROC_OPTS) $(DIR_DOCBOOK_XSL)/fo/docbook.xsl $<
+                   $(XSLTPROC_LABEL_OPTS) $(XSLTPROC_OPTS) \
+                   $(DIR_DOCBOOK_XSL)/fo/docbook.xsl $<
 
 ifeq "$(FOP)" ""
 ifneq "$(PDFXMLTEX)" ""

diff --git a/mk/target.mk b/mk/target.mk
index 2db0d8a..f4aaa11 100644 (file)
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -830,8 +830,8 @@ install-docs:: $(foreach i,$(XMLDocWays),$(INSTALL_XML_DOC)$(patsubst %.html-no-
                        $(INSTALL_DATA) $(INSTALL_OPTS) $(INSTALL_XML_DOC)`echo .$$i | sed s/\.html-no-chunks/.html/` $(datadir); \
                fi; \
                if [ $$i = "html-no-chunks" ]; then \
-                       echo $(CP) $(FPTOOLS_CSS) $(datadir); \
-                       $(CP) $(FPTOOLS_CSS) $(datadir); \
+                       echo $(CP) $(FPTOOLS_CSS_ABS) $(datadir); \
+                       $(CP) $(FPTOOLS_CSS_ABS) $(datadir); \
                fi \
        done
 endif
@@ -1021,7 +1021,7 @@ pdf            :: $(XML_PDF)
 CLEAN_FILES += $(XML_HTML_NO_CHUNKS) $(XML_FO) $(XML_DVI) $(XML_PS) $(XML_PDF)
 
 extraclean ::
-       $(RM) -rf $(XML_DOC).out $(notdir $(FPTOOLS_CSS)) $(addsuffix -html,$(basename $(XML_DOC))) $(addsuffix -htmlhelp,$(basename $(XML_DOC)))
+       $(RM) -rf $(XML_DOC).out $(FPTOOLS_CSS) $(basename $(XML_DOC))-html $(basename $(XML_DOC))-htmlhelp
 
 validate ::
        $(XMLLINT) --valid --noout $(XMLLINT_OPTS) $(XML_DOC).xml