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.
This commit is contained in:
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
|
@ -23,7 +23,6 @@ DOC?= book
|
|||
FORMATS?= html-split
|
||||
|
||||
HAS_INDEX= true
|
||||
USE_PS2PDF= yes
|
||||
|
||||
INSTALL_COMPRESSED?= gz
|
||||
INSTALL_ONLY_COMPRESSED?=
|
||||
|
|
|
@ -44,7 +44,6 @@ DOC?= book
|
|||
FORMATS?= html-split
|
||||
|
||||
HAS_INDEX= true
|
||||
USE_PS2PDF= yes
|
||||
|
||||
INSTALL_COMPRESSED?= gz
|
||||
INSTALL_ONLY_COMPRESSED?=
|
||||
|
|
|
@ -40,7 +40,6 @@ DOC?= book
|
|||
FORMATS?= html-split
|
||||
|
||||
HAS_INDEX= true
|
||||
USE_PS2PDF= yes
|
||||
|
||||
INSTALL_COMPRESSED?= gz
|
||||
INSTALL_ONLY_COMPRESSED?=
|
||||
|
|
|
@ -37,7 +37,6 @@ DOC?= book
|
|||
FORMATS?= html-split
|
||||
|
||||
HAS_INDEX= true
|
||||
USE_PS2PDF= yes
|
||||
|
||||
INSTALL_COMPRESSED?= gz
|
||||
INSTALL_ONLY_COMPRESSED?=
|
||||
|
|
|
@ -34,7 +34,6 @@ DOC?= book
|
|||
FORMATS?= html-split
|
||||
|
||||
HAS_INDEX= true
|
||||
USE_PS2PDF= yes
|
||||
|
||||
INSTALL_COMPRESSED?= gz
|
||||
INSTALL_ONLY_COMPRESSED?=
|
||||
|
|
|
@ -45,7 +45,6 @@ DOC?= book
|
|||
FORMATS?= html-split
|
||||
|
||||
HAS_INDEX= true
|
||||
USE_PS2PDF= yes
|
||||
|
||||
INSTALL_COMPRESSED?= gz
|
||||
INSTALL_ONLY_COMPRESSED?=
|
||||
|
|
|
@ -35,7 +35,6 @@ DOC?= book
|
|||
FORMATS?= html-split
|
||||
|
||||
HAS_INDEX= true
|
||||
USE_PS2PDF= yes
|
||||
|
||||
INSTALL_COMPRESSED?= gz
|
||||
INSTALL_ONLY_COMPRESSED?=
|
||||
|
|
|
@ -42,7 +42,6 @@ DOC?= book
|
|||
FORMATS?= html-split
|
||||
|
||||
HAS_INDEX= true
|
||||
USE_PS2PDF= yes
|
||||
|
||||
INSTALL_COMPRESSED?= gz
|
||||
INSTALL_ONLY_COMPRESSED?=
|
||||
|
|
|
@ -43,7 +43,6 @@ DOC?= book
|
|||
FORMATS?= html-split
|
||||
|
||||
HAS_INDEX= true
|
||||
USE_PS2PDF= yes
|
||||
|
||||
INSTALL_COMPRESSED?= gz
|
||||
INSTALL_ONLY_COMPRESSED?=
|
||||
|
|
|
@ -43,7 +43,6 @@ DOC?= book
|
|||
FORMATS?= html-split
|
||||
|
||||
HAS_INDEX= true
|
||||
USE_PS2PDF= yes
|
||||
|
||||
INSTALL_COMPRESSED?= gz
|
||||
INSTALL_ONLY_COMPRESSED?=
|
||||
|
|
|
@ -35,7 +35,6 @@ DOC?= book
|
|||
FORMATS?= html-split
|
||||
|
||||
HAS_INDEX= true
|
||||
USE_PS2PDF= yes
|
||||
|
||||
INSTALL_COMPRESSED?= gz
|
||||
INSTALL_ONLY_COMPRESSED?=
|
||||
|
|
|
@ -36,7 +36,6 @@ DOC?= book
|
|||
FORMATS?= html-split
|
||||
|
||||
HAS_INDEX= true
|
||||
USE_PS2PDF= yes
|
||||
|
||||
INSTALL_COMPRESSED?= gz
|
||||
INSTALL_ONLY_COMPRESSED?=
|
||||
|
|
|
@ -38,7 +38,6 @@ DOC?= book
|
|||
FORMATS?= html-split
|
||||
|
||||
#HAS_INDEX= true
|
||||
USE_PS2PDF= yes
|
||||
|
||||
INSTALL_COMPRESSED?= gz
|
||||
INSTALL_ONLY_COMPRESSED?=
|
||||
|
|
|
@ -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_EPS}
|
|||
.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"
|
||||
|
|
|
@ -41,7 +41,6 @@ DOC?= book
|
|||
FORMATS?= html-split
|
||||
|
||||
HAS_INDEX= true
|
||||
USE_PS2PDF= yes
|
||||
|
||||
INSTALL_COMPRESSED?= gz
|
||||
INSTALL_ONLY_COMPRESSED?=
|
||||
|
|
|
@ -34,7 +34,6 @@ DOC?= book
|
|||
FORMATS?= html-split
|
||||
|
||||
HAS_INDEX= true
|
||||
USE_PS2PDF= yes
|
||||
|
||||
INSTALL_COMPRESSED?= gz
|
||||
INSTALL_ONLY_COMPRESSED?=
|
||||
|
|
Loading…
Reference in a new issue