svn commit: r42268 - in projects/db5/share: mk xsl

[Gabor Kovesdan]

Author: gabor
Date: Sat Jul 13 07:02:57 2013
New Revision: 42268
URL: http://svnweb.freebsd.org/changeset/doc/42268

Log:
  - Make sure images and callouts are found

Modified:
  projects/db5/share/mk/doc.docbook.mk
  projects/db5/share/xsl/freebsd-fo.xsl

Modified: projects/db5/share/mk/doc.docbook.mk
==============================================================================
--- projects/db5/share/mk/doc.docbook.mk	Sat Jul 13 03:51:22 2013	(r42267)
+++ projects/db5/share/mk/doc.docbook.mk	Sat Jul 13 07:02:57 2013	(r42268)
@@ -75,7 +75,9 @@ IMAGES_LIB?=
 SCHEMATRONS?=	${DOC_PREFIX}/share/xml/freebsd.sch
 XSLTPROCOPTS?=	--nonet
 
-DBLATEXOPTS?=	-I ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} -p ${DOC_PREFIX}/share/xsl/freebsd-dblatex.xsl -T simple -d
+IMGDIR?=	${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T}
+CALLOUTDIR=	${.CURDIR}/imagelib/callouts
+DBLATEXOPTS?=	-I ${IMGDIR} -p ${DOC_PREFIX}/share/xsl/freebsd-dblatex.xsl -T simple -d
 FOPOPTS?=	-c ${DOC_PREFIX}/share/misc/fop.xconf
 
 KNOWN_FORMATS=	html html.tar html-split html-split.tar \
@@ -194,6 +196,10 @@ CLEANFILES+= ${_curimage:T} ${_curimage:
 .elif ${_cf} == "pdf"
 CLEANFILES+= ${DOC}.aux ${DOC}.dvi ${DOC}.log ${DOC}.out ${DOC}.tex-pdf ${DOC}.tex-pdf-tmp \
 		${DOC}.tex ${DOC}.fo
+.if ${RENDERENGINE} == "fop"
+XSLTPROCOPTS+=	--param img.src.path "'${IMGDIR}/'"
+XSLTPROCOPTS+=	--param callout.graphics.path "'${CALLOUTDIR}/'"
+.endif
 .for _curimage in ${LOCAL_IMAGES_EPS:M*share*}
 CLEANFILES+= ${_curimage:T} ${_curimage:H:T}/${_curimage:T}
 .endfor

Modified: projects/db5/share/xsl/freebsd-fo.xsl
==============================================================================
--- projects/db5/share/xsl/freebsd-fo.xsl	Sat Jul 13 03:51:22 2013	(r42267)
+++ projects/db5/share/xsl/freebsd-fo.xsl	Sat Jul 13 07:02:57 2013	(r42268)
@@ -29,6 +29,10 @@
 -->
   <xsl:param name="header.column.widths">1 5 1</xsl:param>
 
+  <xsl:param name="callout.graphics.path">imagelib/callouts/</xsl:param>
+  <xsl:param name="callout.graphics.extension">.png</xsl:param>
+  <xsl:param name="default.image.width">400</xsl:param>
+
 
 <xsl:template match="pubdate" mode="article.titlepage.recto.auto.mode"/>