From 0168411031d55e24d53ec933508bd3b88f5fba00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?= =?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= Date: Wed, 3 Apr 2013 21:32:54 +0400 Subject: [PATCH] Use xlstproc instead of docbook2html --- docs/manuals.mak | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/docs/manuals.mak b/docs/manuals.mak index ebf65e4efe..353650ce16 100644 --- a/docs/manuals.mak +++ b/docs/manuals.mak @@ -87,20 +87,12 @@ $(BUILDDIR)/$(MAIN): $(XML) $(CSS) $(EXTRA_SRC) cp ../version.entities $(BUILDDIR) ; \ cp $(top_srcdir)/docs/url.entities $(BUILDDIR) -# we should switch to xsltproc -# docbook2html aka jade can't add the encoding easily to the html meta -# (but we are lazy and just abuse sed to add it) -# jw -f docbook -b html -d pwg.dsl -o ../html -V '%use-id-as-filename%' $(MAIN) -# this is a starting point -# xsltproc --nonet /usr/share/xml/docbook/stylesheet/nwalsh/html/docbook.xsl pwg.xml -# html/index.html: $(BUILDDIR)/$(MAIN) $(PNG_BUILT) $(FIG_SRC) @$(MAKE) check-local @echo "*** Generating HTML output ***" @-mkdir -p html @cp -f $(srcdir)/../image-png $(BUILDDIR)/image.entities - @cd $(BUILDDIR) && SP_ENCODING="UTF-8" docbook2html -o ../html -V '%use-id-as-filename%' $(MAIN) - @$(SED) -i -e 's/\(^CONTENT.*\)\(.>\)/\1;charset=UTF-8\2/' html/*html + @cd $(BUILDDIR) && $(XSLTPROC) -o ../html/ --stringparam chunker.output.encoding UTF-8 --stringparam use.id.as.filename 1 $(XSLTPROC_FLAGS) "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl" $(MAIN) @test "x$(CSS)" != "x" && \ echo "Copying .css files: $(CSS)" && \ cp $(srcdir)/$(CSS) html