os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Always build pdf from ps and remove related nits. This is what was already

Browse source 
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.
This commit is contained in:
Gabor Kovesdan 2013-03-31 21:11:07 +00:00
parent 9334bf876f
commit c8eadc3369
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/projects/xml-tools/; revision=41330
16 changed files with 4 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

1
de_DE.ISO8859-1/books/handbook/Makefile
View file

@ -23,7 +23,6 @@ DOC?= book
FORMATS?= html-split FORMATS?= html-split
HAS_INDEX= true HAS_INDEX= true
USE_PS2PDF= yes
INSTALL_COMPRESSED?= gz INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?= INSTALL_ONLY_COMPRESSED?=

1
el_GR.ISO8859-7/books/handbook/Makefile
View file

@ -44,7 +44,6 @@ DOC?= book
FORMATS?= html-split FORMATS?= html-split
HAS_INDEX= true HAS_INDEX= true
USE_PS2PDF= yes
INSTALL_COMPRESSED?= gz INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?= INSTALL_ONLY_COMPRESSED?=

1
en_US.ISO8859-1/books/handbook/Makefile
View file

@ -40,7 +40,6 @@ DOC?= book
FORMATS?= html-split FORMATS?= html-split
HAS_INDEX= true HAS_INDEX= true
USE_PS2PDF= yes
INSTALL_COMPRESSED?= gz INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?= INSTALL_ONLY_COMPRESSED?=

1
es_ES.ISO8859-1/books/handbook/Makefile
View file

@ -37,7 +37,6 @@ DOC?= book
FORMATS?= html-split FORMATS?= html-split
HAS_INDEX= true HAS_INDEX= true
USE_PS2PDF= yes
INSTALL_COMPRESSED?= gz INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?= INSTALL_ONLY_COMPRESSED?=

1
fr_FR.ISO8859-1/books/handbook/Makefile
View file

@ -34,7 +34,6 @@ DOC?= book
FORMATS?= html-split FORMATS?= html-split
HAS_INDEX= true HAS_INDEX= true
USE_PS2PDF= yes
INSTALL_COMPRESSED?= gz INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?= INSTALL_ONLY_COMPRESSED?=

1
hu_HU.ISO8859-2/books/handbook/Makefile
View file

@ -45,7 +45,6 @@ DOC?= book
FORMATS?= html-split FORMATS?= html-split
HAS_INDEX= true HAS_INDEX= true
USE_PS2PDF= yes
INSTALL_COMPRESSED?= gz INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?= INSTALL_ONLY_COMPRESSED?=

1
it_IT.ISO8859-15/books/handbook/Makefile
View file

@ -35,7 +35,6 @@ DOC?= book
FORMATS?= html-split FORMATS?= html-split
HAS_INDEX= true HAS_INDEX= true
USE_PS2PDF= yes
INSTALL_COMPRESSED?= gz INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?= INSTALL_ONLY_COMPRESSED?=

1
ja_JP.eucJP/books/handbook/Makefile
View file

@ -42,7 +42,6 @@ DOC?= book
FORMATS?= html-split FORMATS?= html-split
HAS_INDEX= true HAS_INDEX= true
USE_PS2PDF= yes
INSTALL_COMPRESSED?= gz INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?= INSTALL_ONLY_COMPRESSED?=

1
mn_MN.UTF-8/books/handbook/Makefile
View file

@ -43,7 +43,6 @@ DOC?= book
FORMATS?= html-split FORMATS?= html-split
HAS_INDEX= true HAS_INDEX= true
USE_PS2PDF= yes
INSTALL_COMPRESSED?= gz INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?= INSTALL_ONLY_COMPRESSED?=

1
nl_NL.ISO8859-1/books/handbook/Makefile
View file

@ -43,7 +43,6 @@ DOC?= book
FORMATS?= html-split FORMATS?= html-split
HAS_INDEX= true HAS_INDEX= true
USE_PS2PDF= yes
INSTALL_COMPRESSED?= gz INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?= INSTALL_ONLY_COMPRESSED?=

1
pl_PL.ISO8859-2/books/handbook/Makefile
View file

@ -35,7 +35,6 @@ DOC?= book
FORMATS?= html-split FORMATS?= html-split
HAS_INDEX= true HAS_INDEX= true
USE_PS2PDF= yes
INSTALL_COMPRESSED?= gz INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?= INSTALL_ONLY_COMPRESSED?=

1
pt_BR.ISO8859-1/books/handbook/Makefile
View file

@ -36,7 +36,6 @@ DOC?= book
FORMATS?= html-split FORMATS?= html-split
HAS_INDEX= true HAS_INDEX= true
USE_PS2PDF= yes
INSTALL_COMPRESSED?= gz INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?= INSTALL_ONLY_COMPRESSED?=

1
ru_RU.KOI8-R/books/handbook/Makefile
View file

@ -38,7 +38,6 @@ DOC?= book
FORMATS?= html-split FORMATS?= html-split
#HAS_INDEX= true #HAS_INDEX= true
USE_PS2PDF= yes
INSTALL_COMPRESSED?= gz INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?= INSTALL_ONLY_COMPRESSED?=

45
share/mk/doc.docbook.mk
View file

@ -452,31 +452,12 @@ ${DOC}.rtf:
.if ${RENDERENGINE} == "jade" .if ${RENDERENGINE} == "jade"
.if !defined(NO_TEX) .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} \ ${DOC}.tex: ${SRCS} ${LOCAL_IMAGES_EPS} ${PRINT_INDEX} \
${LOCAL_IMAGES_TXT} ${LOCAL_IMAGES_EN} \ ${LOCAL_IMAGES_TXT} ${LOCAL_IMAGES_EN} \
${DOC}.parsed.xml ${DOC}.parsed.xml
${JADE} -V tex-backend ${PRINTOPTS} \ ${JADE} -V tex-backend ${PRINTOPTS} \
${JADEOPTS} -t tex -o ${.TARGET} ${XMLDECL} ${DOC}.parsed.xml ${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) .if !target(${DOC}.dvi)
${DOC}.dvi: ${DOC}.tex ${LOCAL_IMAGES_EPS} ${DOC}.dvi: ${DOC}.tex ${LOCAL_IMAGES_EPS}
.for _curimage in ${LOCAL_IMAGES_EPS:M*share*} .for _curimage in ${LOCAL_IMAGES_EPS:M*share*}
@ -492,41 +473,23 @@ ${DOC}.dvi: ${DOC}.tex ${LOCAL_IMAGES_EPS}
.endif .endif
.if !target(${DOC}.pdf) .if !target(${DOC}.pdf)
.if !defined(USE_PS2PDF)
${DOC}.pdf: ${DOC}.tex-pdf ${IMAGES_PDF}
.else
${DOC}.pdf: ${DOC}.ps ${IMAGES_PDF} ${DOC}.pdf: ${DOC}.ps ${IMAGES_PDF}
.endif #.for _curimage in ${IMAGES_PDF:M*share*}
.for _curimage in ${IMAGES_PDF:M*share*} # ${CP} -p ${_curimage} ${.CURDIR:H:H}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR}||}
${CP} -p ${_curimage} ${.CURDIR:H:H}/${_curimage:H:S|${IMAGES_EN_DIR}/||:S|${.CURDIR}||} #.endfor
.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
${PS2PDF} ${DOC}.ps ${.TARGET} ${PS2PDF} ${DOC}.ps ${.TARGET}
.endif .endif
.endif
${DOC}.ps: ${DOC}.dvi ${DOC}.ps: ${DOC}.dvi
${DVIPS} ${DVIPSOPTS} -o ${.TARGET} ${.ALLSRC} ${DVIPS} ${DVIPSOPTS} -o ${.TARGET} ${.ALLSRC}
.else .else
# NO_TEX # NO_TEX
${DOC}.tex ${DOC}.tex-ps ${DOC}.dvi ${DOC}.ps: ${DOC}.tex ${DOC}.dvi ${DOC}.ps:
${TOUCH} ${.TARGET} ${TOUCH} ${.TARGET}
.if !target(${DOC}.pdf) .if !target(${DOC}.pdf)
${DOC}.pdf: ${DOC}.pdf:
${TOUCH} ${.TARGET} ${TOUCH} ${.TARGET}
.endif .endif
.if !target(${DOC}.tex-pdf)
${DOC}.tex-pdf:
${TOUCH} ${.TARGET}
.endif
.endif .endif
.elif ${RENDERENGINE} == "fop" .elif ${RENDERENGINE} == "fop"

1
zh_CN.GB2312/books/handbook/Makefile
View file

@ -41,7 +41,6 @@ DOC?= book
FORMATS?= html-split FORMATS?= html-split
HAS_INDEX= true HAS_INDEX= true
USE_PS2PDF= yes
INSTALL_COMPRESSED?= gz INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?= INSTALL_ONLY_COMPRESSED?=

1
zh_TW.Big5/books/handbook/Makefile
View file

@ -34,7 +34,6 @@ DOC?= book
FORMATS?= html-split FORMATS?= html-split
HAS_INDEX= true HAS_INDEX= true
USE_PS2PDF= yes
INSTALL_COMPRESSED?= gz INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?= INSTALL_ONLY_COMPRESSED?=