svn commit: r41561 - in projects/xml-tools/share: mk xml

[Gabor Kovesdan]

Author: gabor
Date: Tue May  7 14:33:38 2013
New Revision: 41561
URL: http://svnweb.freebsd.org/changeset/doc/41561

Log:
  - Use absolute URLs in printed formats

Modified:
  projects/xml-tools/share/mk/doc.docbook.mk
  projects/xml-tools/share/xml/urls.ent

Modified: projects/xml-tools/share/mk/doc.docbook.mk
==============================================================================
--- projects/xml-tools/share/mk/doc.docbook.mk	Tue May  7 13:05:59 2013	(r41560)
+++ projects/xml-tools/share/mk/doc.docbook.mk	Tue May  7 14:33:38 2013	(r41561)
@@ -204,7 +204,7 @@ LOCAL_CSS_SHEET= ${.OBJDIR}/${CSS_SHEET:
 LOCAL_CSS_SHEET= ${CSS_SHEET:T}
 .endif
 
-CLEANFILES+= ${DOC}.parsed.xml
+CLEANFILES+= ${DOC}.parsed.xml ${DOC}.parsed.print.xml
 
 .for _curformat in ${FORMATS}
 _cf=${_curformat}
@@ -360,6 +360,8 @@ ${DOC}.parsed.xml: ${SRCS}
 	${RM} ${.TARGET}.tmp
 .else
 	${MV} ${.TARGET}.tmp ${.TARGET}
+	${SED} 's|@@URL_RELPREFIX@@|http://www.FreeBSD.org|g' < ${.TARGET} > ${DOC}.parsed.print.xml
+	${SED} -i '' 's|@@URL_RELPREFIX@@|../../../..|g' ${.TARGET}
 .endif
 
 # XHTML -------------------------------------------------------------
@@ -452,7 +454,7 @@ ${DOC}.tex: ${SRCS} ${LOCAL_IMAGES_EPS} 
 		${LOCAL_IMAGES_TXT} ${LOCAL_IMAGES_EN} \
 		${DOC}.parsed.xml
 	${JADE} -V tex-backend ${PRINTOPTS} \
-		${JADEOPTS} -t tex -o ${.TARGET} ${XMLDECL} ${DOC}.parsed.xml
+		${JADEOPTS} -t tex -o ${.TARGET} ${XMLDECL} ${DOC}.parsed.print.xml
 	${SED} -i '' -e 's|{1}\\def\\ScaleY%|{0.5}\\def\\ScaleY%|g' \
 		-e 's|{1}\\def\\EntitySystemId%|{0.5}\\def\\EntitySystemId%|g' \
 		${.TARGET}
@@ -489,8 +491,8 @@ ${DOC}.pdf:
 .endif
 
 .elif ${RENDERENGINE} == "fop"
-${DOC}.fo: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
-	${XSLTPROC} ${XSLTPROCOPTS} ${XSLFO} ${DOC}.parsed.xml > ${.TARGET}
+${DOC}.fo: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} ${DOC}.parsed.xml
+	${XSLTPROC} ${XSLTPROCOPTS} ${XSLFO} ${DOC}.parsed.print.xml > ${.TARGET}
 
 ${DOC}.pdf: ${DOC}.fo ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
 	${FOP} ${FOPOPTS} ${DOC}.fo ${.TARGET}

Modified: projects/xml-tools/share/xml/urls.ent
==============================================================================
--- projects/xml-tools/share/xml/urls.ent	Tue May  7 13:05:59 2013	(r41560)
+++ projects/xml-tools/share/xml/urls.ent	Tue May  7 14:33:38 2013	(r41561)
@@ -6,10 +6,7 @@
 
 <!ENTITY url.relprefix "../../../..">
 
-<![ %freebsd.urls.absolute; [
-<!ENTITY url.base "http://www.FreeBSD.org">
-]]>
-<!ENTITY url.base "&url.relprefix;">
+<!ENTITY url.base "@@URL_RELPREFIX@@">
 
 <!-- XXX: This will be removed soon -->
 <!ENTITY url.main "&url.base;">