svn commit: samba-docs r1141 - in branches/dblatex: . xslt
jelmer at samba.org
jelmer at samba.org
Sat Aug 11 17:26:09 GMT 2007
Author: jelmer
Date: 2007-08-11 17:26:06 +0000 (Sat, 11 Aug 2007)
New Revision: 1141
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=1141
Log:
Clean up some more cruft.
Modified:
branches/dblatex/
branches/dblatex/Makefile
branches/dblatex/Makefile.settings.in
branches/dblatex/configure.ac
branches/dblatex/xslt/latex.xsl
Changeset:
Property changes on: branches/dblatex
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/dblatex/Makefile
===================================================================
--- branches/dblatex/Makefile 2007-08-11 17:26:02 UTC (rev 1140)
+++ branches/dblatex/Makefile 2007-08-11 17:26:06 UTC (rev 1141)
@@ -6,13 +6,13 @@
# Jelmer Vernooij <jelmer at samba.org>
include Makefile.settings
+DBLATEX := $(DBLATEX) -i xslt/latex -i . -p xslt/latex.xsl
+
# Docs to build
MAIN_DOCS = $(patsubst %/index.xml,%,$(wildcard */index.xml))
MANPAGES3 = $(wildcard $(MANPAGEDIR3)/*.?.xml)
-export TEXINPUTS=xslt/latex:.:
# Lists of files to process
-LATEX_FIGURES = xslt/figures/caution.pdf xslt/figures/important.pdf xslt/figures/note.pdf xslt/figures/tip.pdf xslt/figures/warning.pdf
MANPAGES_PLUCKER = $(patsubst $(MANPAGEDIR3)/%.xml,$(PLUCKERDIR)/%.pdb,$(MANPAGES3))
DATETIME := $(shell date +%Y%m%d%H%M%S)
@@ -36,7 +36,7 @@
@echo " release - Build the docs needed for a Samba release"
@echo " all - Build all docs that can be build using the utilities found by configure"
@echo " everything - Build all of the above"
- @echo " pdf,tex,ps,manpages3,txt,pearson,fo,htmlhelp - Build specific output format"
+ @echo " pdf,ps,manpages3,txt,pearson,fo,htmlhelp - Build specific output format"
@echo " html - Build multi-file HTML versions"
@echo " html-single - Build single-file HTML versions"
@echo " htmlman3 - Build HTML version of manpages"
@@ -121,11 +121,10 @@
@mkdir -p $(@D)
$(HTML2TEXT) -nobs -style pretty -o $@ $<
-latexfigures: $(LATEX_FIGURES)
-
-$(PDFDIR)/%.pdf: $(DOCBOOKDIR)/%.xml
+$(PDFDIR)/%.pdf: $(DOCBOOKDIR)/%.xml
+ $(MAKE) $*-images-latex-png
@mkdir -p $(@D)
- $(DBLATEX) --pdf $< -o $@
+ $(DBLATEX) --pdf $< -o $@ -I $*
# Dependency files
%.d: $(DOCBOOKDIR)/%.xml xslt/generate-dependencies.xsl
@@ -136,8 +135,6 @@
--stringparam target "$*" \
-o $@ xslt/generate-dependencies.xsl $<
@echo "$*-images-latex-dia = \$$(wildcard \$$(addsuffix .dia, \$$($*-images-latex)))" >> $@
- @echo "$*-images-latex-eps: \$$(addsuffix .eps, \$$($*-images-latex))" >> $@
- @echo "$*-images-latex-pdf: \$$(patsubst %.dia, %.pdf, \$$($*-images-latex-dia))" >> $@
@echo "$*-images-latex-png: \$$(filter-out \$$(patsubst %.dia,%.png,\$$($*-images-latex-dia)), \$$(addsuffix .png, \$$($*-images-latex)))" >> $@
@echo >> $@
@@ -169,14 +166,9 @@
%.png: %.dia
$(DIA) -e $@ $<
-%.pdf: %.eps
- $(EPSTOPDF) $<
-
-%.eps: %.png
- $(PNGTOPNM) $< | $(PNMTOPS) > $@
-
# PostScript files
$(PSDIR)/%.ps: $(DOCBOOKDIR)/%.xml
+ $(MAKE) $*-images-latex-png
@mkdir -p $(@D)
$(DBLATEX) --ps $< -o $@
@@ -266,7 +258,6 @@
# XSL scripts
xslt/html.xsl: xslt/html-common.xsl
xslt/html-chunk.xsl: xslt/html-common.xsl
-xslt/latex.xsl:
xslt/expand-sambadoc.xsl:
xslt/generate-attributions.xsl:
xslt/man.xsl:
@@ -283,12 +274,10 @@
$(patsubst %.dia,%.eps,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia)))
rm -f *.xml *.d *.tpt *.tex *.loc *.toc *.lof *.glo *.idx *.aux
rm -f *-images-html*
- rm -f *-images-latex-* latexfigures
- rm -f xslt/figures/*pdf
+ rm -f *-images-latex-*
rm -f $(SMBDOTCONFDOC)/parameters.*.xml
rm -f $(addsuffix .*,$(MAIN_DOCS))
# Always keep intermediate files if we can
.SECONDARY:
-.PHONY: clean clobber archive release everything all $(TARGETS) latexfigures
-
+.PHONY: clean clobber archive release everything all $(TARGETS)
Modified: branches/dblatex/Makefile.settings.in
===================================================================
--- branches/dblatex/Makefile.settings.in 2007-08-11 17:26:02 UTC (rev 1140)
+++ branches/dblatex/Makefile.settings.in 2007-08-11 17:26:06 UTC (rev 1141)
@@ -1,17 +1,12 @@
# Programs
XSLTPROC = @XSLTPROC@
XMLLINT = @XMLLINT@
-PNGTOPNM = @PNGTOPNM@
-EPSTOPNM = @EPSTOPNM@
-PNMTOPNG = @PNMTOPNG@
DBLATEX = @DBLATEX@
DIA = @DIA@
-PNMTOPS = @PNMTOPS@
HTML2TEXT = @HTML2TEXT@
DB2TEXI = @DB2TEXI@
MAKEINFO = @MAKEINFO@
PLUCKERBUILD = @PLUCKERBUILD@
-COPY_IMAGES = ./scripts/copy-images.sh
FOP = @FOP@
RM = @RM@
PERL = @PERL@
Modified: branches/dblatex/configure.ac
===================================================================
--- branches/dblatex/configure.ac 2007-08-11 17:26:02 UTC (rev 1140)
+++ branches/dblatex/configure.ac 2007-08-11 17:26:06 UTC (rev 1141)
@@ -41,10 +41,6 @@
fi
fi
-DOCS_TARGET_REQUIRE_PROGRAM(EPSTOPDF, epstopdf, PDF)
-DOCS_TARGET_REQUIRE_PROGRAM(THUMBPDF, thumbpdf, PDF)
-DOCS_TARGET_REQUIRE_PROGRAM(PNGTOPNM, pngtopnm, PS)
-DOCS_TARGET_REQUIRE_PROGRAM(PNMTOPS, pnmtops, PS)
DOCS_TARGET_REQUIRE_PROGRAM(PLUCKERBUILD, plucker-build, PLUCKER)
DOCS_TARGET_REQUIRE_PROGRAM(HTML2TEXT, html2text, TXT)
DOCS_TARGET_REQUIRE_PROGRAM(PERL, perl, UNDOCUMENTED)
Modified: branches/dblatex/xslt/latex.xsl
===================================================================
--- branches/dblatex/xslt/latex.xsl 2007-08-11 17:26:02 UTC (rev 1140)
+++ branches/dblatex/xslt/latex.xsl 2007-08-11 17:26:06 UTC (rev 1141)
@@ -1,11 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-<xsl:import href="http://db2latex.sourceforge.net/xsl/docbook.xsl"/>
<xsl:import href="strip-references.xsl"/>
-
<xsl:param name="latex.mapping.xml" select="document('latex.overrides.xml')"/>
-
<xsl:param name="generate.toc">
/appendix toc,title
article/appendix nop
@@ -27,7 +24,7 @@
set toc,title
</xsl:param>
-<!-- Show real name of the link rather then user specified description -->
+<!-- FIXME: Show real name of the link rather then user specified description
<xsl:template match="link">
<xsl:variable name="target" select="key('id', at linkend)[1]"/>
<xsl:variable name="refelem" select="local-name($target)"/>
@@ -46,7 +43,7 @@
</xsl:call-template>
</xsl:with-param>
</xsl:call-template>
-</xsl:template>
+</xsl:template>-->
<!-- LaTeX doesn't accept verbatim stuff in titles -->
<xsl:template match="//title/filename|//title/command|//title/parameter|//title/constant">
More information about the samba-cvs
mailing list