From owner-svn-doc-projects@FreeBSD.ORG  Sat Jul 13 07:02:58 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 1F27B4DA;
 Sat, 13 Jul 2013 07:02:58 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id EC6AF13C6;
 Sat, 13 Jul 2013 07:02:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6D72vaV025311;
 Sat, 13 Jul 2013 07:02:57 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6D72vC2025309;
 Sat, 13 Jul 2013 07:02:57 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201307130702.r6D72vC2025309@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sat, 13 Jul 2013 07:02:57 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r42268 - in projects/db5/share: mk xsl
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Jul 2013 07:02:58 -0000

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"/>