Date: Sun, 31 Mar 2013 21:11:07 +0000 (UTC) From: Gabor Kovesdan <gabor@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41330 - in projects/xml-tools: de_DE.ISO8859-1/books/handbook el_GR.ISO8859-7/books/handbook en_US.ISO8859-1/books/handbook es_ES.ISO8859-1/books/handbook fr_FR.ISO8859-1/books/handboo... Message-ID: <201303312111.r2VLB7uR092255@svn.freebsd.org>
index | next in thread | raw e-mail
Author: gabor Date: Sun Mar 31 21:11:07 2013 New Revision: 41330 URL: http://svnweb.freebsd.org/changeset/doc/41330 Log: Always build pdf from ps and remove related nits. This is what was already done with Handbook and building pdf directly does not seem to work correctly anyway. This change will help simplifying the build process and spare some image conversions. Modified: projects/xml-tools/de_DE.ISO8859-1/books/handbook/Makefile projects/xml-tools/el_GR.ISO8859-7/books/handbook/Makefile projects/xml-tools/en_US.ISO8859-1/books/handbook/Makefile projects/xml-tools/es_ES.ISO8859-1/books/handbook/Makefile projects/xml-tools/fr_FR.ISO8859-1/books/handbook/Makefile projects/xml-tools/hu_HU.ISO8859-2/books/handbook/Makefile projects/xml-tools/it_IT.ISO8859-15/books/handbook/Makefile projects/xml-tools/ja_JP.eucJP/books/handbook/Makefile projects/xml-tools/mn_MN.UTF-8/books/handbook/Makefile projects/xml-tools/nl_NL.ISO8859-1/books/handbook/Makefile projects/xml-tools/pl_PL.ISO8859-2/books/handbook/Makefile projects/xml-tools/pt_BR.ISO8859-1/books/handbook/Makefile projects/xml-tools/ru_RU.KOI8-R/books/handbook/Makefile projects/xml-tools/share/mk/doc.docbook.mk projects/xml-tools/zh_CN.GB2312/books/handbook/Makefile projects/xml-tools/zh_TW.Big5/books/handbook/Makefile Modified: projects/xml-tools/de_DE.ISO8859-1/books/handbook/Makefile ============================================================================== --- projects/xml-tools/de_DE.ISO8859-1/books/handbook/Makefile Sun Mar 31 18:51:55 2013 (r41329) +++ projects/xml-tools/de_DE.ISO8859-1/books/handbook/Makefile Sun Mar 31 21:11:07 2013 (r41330) @@ -23,7 +23,6 @@ DOC?= book FORMATS?= html-split HAS_INDEX= true -USE_PS2PDF= yes INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= Modified: projects/xml-tools/el_GR.ISO8859-7/books/handbook/Makefile ============================================================================== --- projects/xml-tools/el_GR.ISO8859-7/books/handbook/Makefile Sun Mar 31 18:51:55 2013 (r41329) +++ projects/xml-tools/el_GR.ISO8859-7/books/handbook/Makefile Sun Mar 31 21:11:07 2013 (r41330) @@ -44,7 +44,6 @@ DOC?= book FORMATS?= html-split HAS_INDEX= true -USE_PS2PDF= yes INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= Modified: projects/xml-tools/en_US.ISO8859-1/books/handbook/Makefile ============================================================================== --- projects/xml-tools/en_US.ISO8859-1/books/handbook/Makefile Sun Mar 31 18:51:55 2013 (r41329) +++ projects/xml-tools/en_US.ISO8859-1/books/handbook/Makefile Sun Mar 31 21:11:07 2013 (r41330) @@ -40,7 +40,6 @@ DOC?= book FORMATS?= html-split HAS_INDEX= true -USE_PS2PDF= yes INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= Modified: projects/xml-tools/es_ES.ISO8859-1/books/handbook/Makefile ============================================================================== --- projects/xml-tools/es_ES.ISO8859-1/books/handbook/Makefile Sun Mar 31 18:51:55 2013 (r41329) +++ projects/xml-tools/es_ES.ISO8859-1/books/handbook/Makefile Sun Mar 31 21:11:07 2013 (r41330) @@ -37,7 +37,6 @@ DOC?= book FORMATS?= html-split HAS_INDEX= true -USE_PS2PDF= yes INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= Modified: projects/xml-tools/fr_FR.ISO8859-1/books/handbook/Makefile ============================================================================== --- projects/xml-tools/fr_FR.ISO8859-1/books/handbook/Makefile Sun Mar 31 18:51:55 2013 (r41329) +++ projects/xml-tools/fr_FR.ISO8859-1/books/handbook/Makefile Sun Mar 31 21:11:07 2013 (r41330) @@ -34,7 +34,6 @@ DOC?= book FORMATS?= html-split HAS_INDEX= true -USE_PS2PDF= yes INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= Modified: projects/xml-tools/hu_HU.ISO8859-2/books/handbook/Makefile ============================================================================== --- projects/xml-tools/hu_HU.ISO8859-2/books/handbook/Makefile Sun Mar 31 18:51:55 2013 (r41329) +++ projects/xml-tools/hu_HU.ISO8859-2/books/handbook/Makefile Sun Mar 31 21:11:07 2013 (r41330) @@ -45,7 +45,6 @@ DOC?= book FORMATS?= html-split HAS_INDEX= true -USE_PS2PDF= yes INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= Modified: projects/xml-tools/it_IT.ISO8859-15/books/handbook/Makefile ============================================================================== --- projects/xml-tools/it_IT.ISO8859-15/books/handbook/Makefile Sun Mar 31 18:51:55 2013 (r41329) +++ projects/xml-tools/it_IT.ISO8859-15/books/handbook/Makefile Sun Mar 31 21:11:07 2013 (r41330) @@ -35,7 +35,6 @@ DOC?= book FORMATS?= html-split HAS_INDEX= true -USE_PS2PDF= yes INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= Modified: projects/xml-tools/ja_JP.eucJP/books/handbook/Makefile ============================================================================== --- projects/xml-tools/ja_JP.eucJP/books/handbook/Makefile Sun Mar 31 18:51:55 2013 (r41329) +++ projects/xml-tools/ja_JP.eucJP/books/handbook/Makefile Sun Mar 31 21:11:07 2013 (r41330) @@ -42,7 +42,6 @@ DOC?= book FORMATS?= html-split HAS_INDEX= true -USE_PS2PDF= yes INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= Modified: projects/xml-tools/mn_MN.UTF-8/books/handbook/Makefile ============================================================================== --- projects/xml-tools/mn_MN.UTF-8/books/handbook/Makefile Sun Mar 31 18:51:55 2013 (r41329) +++ projects/xml-tools/mn_MN.UTF-8/books/handbook/Makefile Sun Mar 31 21:11:07 2013 (r41330) @@ -43,7 +43,6 @@ DOC?= book FORMATS?= html-split HAS_INDEX= true -USE_PS2PDF= yes INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= Modified: projects/xml-tools/nl_NL.ISO8859-1/books/handbook/Makefile ============================================================================== --- projects/xml-tools/nl_NL.ISO8859-1/books/handbook/Makefile Sun Mar 31 18:51:55 2013 (r41329) +++ projects/xml-tools/nl_NL.ISO8859-1/books/handbook/Makefile Sun Mar 31 21:11:07 2013 (r41330) @@ -43,7 +43,6 @@ DOC?= book FORMATS?= html-split HAS_INDEX= true -USE_PS2PDF= yes INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= Modified: projects/xml-tools/pl_PL.ISO8859-2/books/handbook/Makefile ============================================================================== --- projects/xml-tools/pl_PL.ISO8859-2/books/handbook/Makefile Sun Mar 31 18:51:55 2013 (r41329) +++ projects/xml-tools/pl_PL.ISO8859-2/books/handbook/Makefile Sun Mar 31 21:11:07 2013 (r41330) @@ -35,7 +35,6 @@ DOC?= book FORMATS?= html-split HAS_INDEX= true -USE_PS2PDF= yes INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= Modified: projects/xml-tools/pt_BR.ISO8859-1/books/handbook/Makefile ============================================================================== --- projects/xml-tools/pt_BR.ISO8859-1/books/handbook/Makefile Sun Mar 31 18:51:55 2013 (r41329) +++ projects/xml-tools/pt_BR.ISO8859-1/books/handbook/Makefile Sun Mar 31 21:11:07 2013 (r41330) @@ -36,7 +36,6 @@ DOC?= book FORMATS?= html-split HAS_INDEX= true -USE_PS2PDF= yes INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= Modified: projects/xml-tools/ru_RU.KOI8-R/books/handbook/Makefile ============================================================================== --- projects/xml-tools/ru_RU.KOI8-R/books/handbook/Makefile Sun Mar 31 18:51:55 2013 (r41329) +++ projects/xml-tools/ru_RU.KOI8-R/books/handbook/Makefile Sun Mar 31 21:11:07 2013 (r41330) @@ -38,7 +38,6 @@ DOC?= book FORMATS?= html-split #HAS_INDEX= true -USE_PS2PDF= yes INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= Modified: projects/xml-tools/share/mk/doc.docbook.mk ============================================================================== --- projects/xml-tools/share/mk/doc.docbook.mk Sun Mar 31 18:51:55 2013 (r41329) +++ projects/xml-tools/share/mk/doc.docbook.mk Sun Mar 31 21:11:07 2013 (r41330) @@ -452,31 +452,12 @@ ${DOC}.rtf: .if ${RENDERENGINE} == "jade" .if !defined(NO_TEX) -# -# This sucks, but there's no way round it. The PS and PDF formats need -# to use different image formats, which are chosen at the .tex stage. So, -# we need to create a different .tex file depending on our eventual output -# format, which will then lead on to a different .dvi file as well. -# - ${DOC}.tex: ${SRCS} ${LOCAL_IMAGES_EPS} ${PRINT_INDEX} \ ${LOCAL_IMAGES_TXT} ${LOCAL_IMAGES_EN} \ ${DOC}.parsed.xml ${JADE} -V tex-backend ${PRINTOPTS} \ ${JADEOPTS} -t tex -o ${.TARGET} ${XMLDECL} ${DOC}.parsed.xml -${DOC}.tex-ps: ${DOC}.tex - ${LN} -f ${.ALLSRC} ${.TARGET} - -.if !target(${DOC}.tex-pdf) -${DOC}.tex-pdf: ${SRCS} ${IMAGES_PDF} ${PRINT_INDEX} \ - ${LOCAL_IMAGES_TXT} ${DOC}.parsed.xml - ${RM} -f ${.TARGET} - ${CAT} ${PDFTEX_DEF} > ${.TARGET} - ${JADE} -V tex-backend ${PRINTOPTS} -ioutput.print.pdf \ - ${JADEOPTS} -t tex -o /dev/stdout ${XMLDECL} ${DOC}.parsed.xml >> ${.TARGET} -.endif - .if !target(${DOC}.dvi) ${DOC}.dvi: ${DOC}.tex ${LOCAL_IMAGES_EPS} .for _curimage in ${LOCAL_IMAGES_EPS:M*share*} @@ -492,41 +473,23 @@ ${DOC}.dvi: ${DOC}.tex ${LOCAL_IMAGES_EP .endif .if !target(${DOC}.pdf) -.if !defined(USE_PS2PDF) -${DOC}.pdf: ${DOC}.tex-pdf ${IMAGES_PDF} -.else ${DOC}.pdf: ${DOC}.ps ${IMAGES_PDF} -.endif -.for _curimage in ${IMAGES_PDF:M*share*} - ${CP} -p ${_curimage} ${.CURDIR:H:H}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR}||} -.endfor -.if !defined(USE_PS2PDF) - ${PDFJADETEX_PREPROCESS} < ${DOC}.tex-pdf > ${DOC}.tex-pdf-tmp - @${ECHO} "==> PDFTeX pass 1/3" - -${PDFJADETEX_CMD} '${TEX_CMDSEQ} \nonstopmode\input{${DOC}.tex-pdf-tmp}' - @${ECHO} "==> PDFTeX pass 2/3" - -${PDFJADETEX_CMD} '${TEX_CMDSEQ} \nonstopmode\input{${DOC}.tex-pdf-tmp}' - @${ECHO} "==> PDFTeX pass 3/3" - -${PDFJADETEX_CMD} '${TEX_CMDSEQ} \nonstopmode\input{${DOC}.tex-pdf-tmp}' -.else +#.for _curimage in ${IMAGES_PDF:M*share*} +# ${CP} -p ${_curimage} ${.CURDIR:H:H}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR}||} +#.endfor ${PS2PDF} ${DOC}.ps ${.TARGET} .endif -.endif ${DOC}.ps: ${DOC}.dvi ${DVIPS} ${DVIPSOPTS} -o ${.TARGET} ${.ALLSRC} .else # NO_TEX -${DOC}.tex ${DOC}.tex-ps ${DOC}.dvi ${DOC}.ps: +${DOC}.tex ${DOC}.dvi ${DOC}.ps: ${TOUCH} ${.TARGET} .if !target(${DOC}.pdf) ${DOC}.pdf: ${TOUCH} ${.TARGET} .endif -.if !target(${DOC}.tex-pdf) -${DOC}.tex-pdf: - ${TOUCH} ${.TARGET} -.endif .endif .elif ${RENDERENGINE} == "fop" Modified: projects/xml-tools/zh_CN.GB2312/books/handbook/Makefile ============================================================================== --- projects/xml-tools/zh_CN.GB2312/books/handbook/Makefile Sun Mar 31 18:51:55 2013 (r41329) +++ projects/xml-tools/zh_CN.GB2312/books/handbook/Makefile Sun Mar 31 21:11:07 2013 (r41330) @@ -41,7 +41,6 @@ DOC?= book FORMATS?= html-split HAS_INDEX= true -USE_PS2PDF= yes INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?= Modified: projects/xml-tools/zh_TW.Big5/books/handbook/Makefile ============================================================================== --- projects/xml-tools/zh_TW.Big5/books/handbook/Makefile Sun Mar 31 18:51:55 2013 (r41329) +++ projects/xml-tools/zh_TW.Big5/books/handbook/Makefile Sun Mar 31 21:11:07 2013 (r41330) @@ -34,7 +34,6 @@ DOC?= book FORMATS?= html-split HAS_INDEX= true -USE_PS2PDF= yes INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED?=help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303312111.r2VLB7uR092255>