Commits

Anonymous committed 70b8a03

r5792@telaviv1: shlomi | 2008-07-13 11:56:50 +0300
Converted to use docmake instead of xmlto.

Comments (0)

Files changed (4)

 	./bin/clean-up-docbook-xsl-xhtml.pl -o $@ $<
 
 $(DOCBOOK_FO_DIR)/%.fo: $(DOCBOOK_XML_DIR)/%.xml
-	$(XMLTO_WITH_PARAMS) -o $(DOCBOOK_FO_DIR) --stringparam "docmake.output.format=fo" -m $(FO_XSLT_SS) fo $<
+	$(DOCMAKE_WITH_PARAMS) -o $@ --stringparam "docmake.output.format=fo" -x $(FO_XSLT_SS) fo $<
 
 $(DOCBOOK_PDF_DIR)/%.pdf: $(DOCBOOK_FO_DIR)/%.fo
 	fop -fo $< -pdf $@
 	fop -fo $< -rtf $@
 
 $(DOCBOOK_INDIVIDUAL_XHTML_DIR)/%: $(DOCBOOK_XML_DIR)/%.xml $(XSL_SOURCES)
-	$(XMLTO_WITH_PARAMS) --stringparam "docmake.output.format=xhtml" --stringparam "docmake.output.path_to_root="$(shell perl -e '$$_=shift;$$c=tr[/][];print "../"x($$c+2)' $(call get,DOCBOOK_DIRS_MAP,$(patsubst $(DOCBOOK_INDIVIDUAL_XHTML_DIR)/%,%,$@))) -m $(XHTML_XSLT_SS) -o $@ xhtml $<
+	$(DOCMAKE_WITH_PARAMS) --stringparam "docmake.output.format=xhtml" --stringparam "docmake.output.path_to_root="$(shell perl -e '$$_=shift;$$c=tr[/][];print "../"x($$c+2)' $(call get,DOCBOOK_DIRS_MAP,$(patsubst $(DOCBOOK_INDIVIDUAL_XHTML_DIR)/%,%,$@))) -x $(XHTML_XSLT_SS) -o $@ xhtml $<
 	touch $@
 
 DOCMAKE_SGML_PATH = lib/sgml/shlomif-docbook
 
 include $(DOCBOOK_MAK_MAKEFILES_PATH)/docbook-render.mak
 
+DOCMAKE_PARAMS = -v
+
 $(DOCBOOK_ALL_IN_ONE_XHTML_DIR)/%/all-in-one.html: $(DOCBOOK_XML_DIR)/%.xml
-	$(XMLTO) --stringparam "docmake.output.format=xhtml" -m $(XHTML_ONE_CHUNK_XSLT_SS) -o $(patsubst $(DOCBOOK_ALL_IN_ONE_XHTML_DIR)/%/all-in-one.html,$(DOCBOOK_ALL_IN_ONE_XHTML_DIR)/%,$@) xhtml $<
+	$(DOCMAKE) --stringparam "docmake.output.format=xhtml" -x $(XHTML_ONE_CHUNK_XSLT_SS) -o $(patsubst $(DOCBOOK_ALL_IN_ONE_XHTML_DIR)/%/all-in-one.html,$(DOCBOOK_ALL_IN_ONE_XHTML_DIR)/%,$@) xhtml $<
 	mv $(patsubst %/all-in-one.html,%/index.html,$@) $@
 
 $(T2_DEST)/humour/TOWTF/TOW_Fountainhead_1.txt: lib/screenplay-xml/txt/TOW_Fountainhead_1.txt

lib/make/docbook/docbook-render.mak

 
 # Define common Commands
 
-XMLTO ?= xmlto
+DOCMAKE ?= docmake
 
-XMLTO_WITH_PARAMS = $(XMLTO) $(XMLTO_PARAMS)
+DOCMAKE_WITH_PARAMS = $(DOCMAKE) $(DOCMAKE_PARAMS)
 
 # Define upload-related macros
 
 # HTML.
 
 $(HTML_XSL_TARGET_FILE_IN_DIR): $(XSL_SOURCES)
-	$(XMLTO_WITH_PARAMS) --stringparam "docmake.output.format=xhtml" -m $(XHTML_XSLT_SS) -o $(HTML_XSL_TARGET) xhtml $<
+	$(DOCMAKE_WITH_PARAMS) --stringparam "docmake.output.format=xhtml" -m $(XHTML_XSLT_SS) -o $(HTML_XSL_TARGET) xhtml $<
 
 $(HTML_OTHER_SOURCES_DEST) :: $(HTML_XSL_TARGET)/%: %
 	cp -f $< $@
 	db2html $(DB2_HTML_FLAGS) $(MAIN_SOURCE)
 
 $(HTML_ONE_CHUNK_TARGET_FILE): $(XSL_SOURCES)
-	$(XMLTO_WITH_PARAMS) --stringparam "docmake.output.format=xhtml" -m $(XHTML_ONE_CHUNK_XSLT_SS) -o $(HTML_XSL_TARGET)-onechunk xhtml $<
+	$(DOCMAKE_WITH_PARAMS) --stringparam "docmake.output.format=xhtml" -m $(XHTML_ONE_CHUNK_XSLT_SS) -o $(HTML_XSL_TARGET)-onechunk xhtml $<
 
 
 # PDF and RTF.
 # $(PDF_DOC): $(DSSSL_SOURCES)
 #	db2pdf $(DB2_PRINT_FLAGS) $(MAIN_SOURCE)
 $(FO_DOC): $(XSL_SOURCES)
-	$(XMLTO_WITH_PARAMS) --stringparam "docmake.output.format=fo" -m $(FO_XSLT_SS) fo $<
+	$(DOCMAKE_WITH_PARAMS) --stringparam "docmake.output.format=fo" -m $(FO_XSLT_SS) fo $<
 
 $(PDF_DOC): $(FO_DOC)
 	fop -fo $< -pdf $@

lib/sgml/shlomif-docbook/xsl-stylesheets/shlomif-essays-fo.xsl

      version='1.0'
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:fo="http://www.w3.org/1999/XSL/Format"> 
-
+    <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl" />
     <xsl:import href="shlomif-essays.xsl" />
 
 <!--colored and hyphenated links --> 

t2/philosophy/case-for-file-swapping/index.html.wml

 <a href="./revision-3/"><b>HTML Format</b></a>. (read online)
 </li>
 <li>
-<a href="./revision-3/case-for-file-swapping.pdf">Acrobat Reader (PDF) Format</a>.
+<a href="./revision-3/case-for-file-swapping-rev3.pdf">Acrobat Reader (PDF) Format</a>.
 </li>
 <li>
-<a href="./revision-3/case-for-file-swapping.xml">Original DocBook/XML</a>.
+<a href="./revision-3/case-for-file-swapping-rev3.xml">Original DocBook/XML</a>.
 </li>
 <li>
 <a href="./revision-3/style.css">CSS Stylesheet</a>, <a href="./revision-2/tej.xsl">XSLT Driver</a>