From owner-freebsd-doc@FreeBSD.ORG Thu Aug 5 05:23:45 2004 Return-Path: Delivered-To: freebsd-doc@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 20C6B16A4CE; Thu, 5 Aug 2004 05:23:45 +0000 (GMT) Received: from volginfo.ru (ns.volginfo.ru [217.23.84.100]) by mx1.FreeBSD.org (Postfix) with ESMTP id E881A43D1D; Thu, 5 Aug 2004 05:23:43 +0000 (GMT) (envelope-from den@FreeBSD.org) Received: from FreeBSD.org (llp-13.vistcom.ru [217.23.84.68]) by volginfo.ru (Postfix) with ESMTP id 85F0E2010; Thu, 5 Aug 2004 09:23:42 +0400 (MSD) Message-ID: <4111C45C.8000006@FreeBSD.org> Date: Thu, 05 Aug 2004 09:23:40 +0400 From: Denis Peplin User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.6) Gecko/20040205 X-Accept-Language: ru, en-us, en MIME-Version: 1.0 To: Denis Peplin References: <4110CB82.8000204@FreeBSD.org> In-Reply-To: <4110CB82.8000204@FreeBSD.org> Content-Type: multipart/mixed; boundary="------------050001040001010906010201" cc: freebsd-doc@FreeBSD.org Subject: Re: [patch] SP_ENCODING support in doc.docbook.mk X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Aug 2004 05:23:45 -0000 This is a multi-part message in MIME format. --------------050001040001010906010201 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Hello! Same patch, but with cleanups from ru and with fixed list parsing. Denis Peplin wrote: > Patch in attacment can fix encoding of printed > formats, at least for KOI8-R (and for encodings, > supported by jade). > > Please, review it. > > Thanks! --------------050001040001010906010201 Content-Type: text/plain; name="db_j1.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="db_j1.diff" Index: doc.docbook.mk =================================================================== RCS file: /home/ncvs/doc/share/mk/doc.docbook.mk,v retrieving revision 1.108 diff -u -r1.108 doc.docbook.mk --- doc.docbook.mk 14 Jul 2004 05:28:11 -0000 1.108 +++ doc.docbook.mk 5 Aug 2004 05:17:51 -0000 @@ -119,6 +119,9 @@ MASTERDOC?= ${.CURDIR}/${DOC}.${DOCBOOKSUFFIX} +# List of supported SP_ENCODINGs +SP_ENCODING_LIST?= KOI8-R + # Which stylesheet type to use. 'dsssl' or 'xsl' STYLESHEET_TYPE?= dsssl @@ -144,6 +147,8 @@ SX?= ${PREFIX}/bin/sx .endif +JADE_CMD= ${JADE} + DSLHTML?= ${DOC_PREFIX}/share/sgml/default.dsl DSLPRINT?= ${DOC_PREFIX}/share/sgml/default.dsl DSLPGP?= ${DOC_PREFIX}/share/sgml/pgp.dsl @@ -447,6 +452,16 @@ all: ${_docs} +# +# SP_ENCODING support +# +CUR_ENCODING!= ${ECHO} ${LANGCODE} | ${SED} 's/^.*\.//' +.for _sp_encoding in ${SP_ENCODING_LIST} +.if ${CUR_ENCODING} == ${_sp_encoding} +JADE_CMD= SP_ENCODING=${CUR_ENCODING} ${JADE} +.endif +.endfor + # XML -------------------------------------------------------------------- # sx generates a lot of (spurious) errors of the form "reference to @@ -465,7 +480,7 @@ .if ${STYLESHEET_TYPE} == "dsssl" index.html HTML.manifest: ${SRCS} ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \ ${LOCAL_IMAGES_TXT} ${INDEX_SGML} ${HTML_SPLIT_INDEX} ${LOCAL_CSS_SHEET} - ${JADE} -V html-manifest ${HTMLOPTS} -ioutput.html.images \ + ${JADE_CMD} -V html-manifest ${HTMLOPTS} -ioutput.html.images \ ${JADEOPTS} -t sgml ${MASTERDOC} .elif ${STYLESHEET_TYPE} == "xsl" index.html: ${DOC}.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \ @@ -482,7 +497,7 @@ .if ${STYLESHEET_TYPE} == "dsssl" ${DOC}.html: ${SRCS} ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} \ ${LOCAL_IMAGES_TXT} ${INDEX_SGML} ${HTML_INDEX} ${LOCAL_CSS_SHEET} - ${JADE} -V nochunks ${HTMLOPTS} -ioutput.html.images \ + ${JADE_CMD} -V nochunks ${HTMLOPTS} -ioutput.html.images \ ${JADEOPTS} -t sgml ${MASTERDOC} > ${.TARGET} || \ (${RM} -f ${.TARGET} && false) .elif ${STYLESHEET_TYPE} == "xsl" @@ -500,7 +515,7 @@ # Special target to produce HTML with no images in it. .if ${STYLESHEET_TYPE} == "dsssl" ${DOC}.html-text: ${SRCS} ${INDEX_SGML} ${HTML_INDEX} ${LOCAL_IMAGES_TXT} - ${JADE} -V nochunks ${HTMLTXTOPTS} \ + ${JADE_CMD} -V nochunks ${HTMLTXTOPTS} \ ${JADEOPTS} -t sgml ${MASTERDOC} > ${.TARGET} || \ (${RM} -f ${.TARGET} && false) .elif ${STYLESHEET_TYPE} == "xsl" @@ -548,7 +563,7 @@ # RTF -------------------------------------------------------------------- ${DOC}.rtf: ${SRCS} ${LOCAL_IMAGES_EPS} ${LOCAL_IMAGES_TXT} - ${JADE} -V rtf-backend ${PRINTOPTS} \ + ${JADE_CMD} -V rtf-backend ${PRINTOPTS} \ ${JADEOPTS} -t rtf -o ${.TARGET} ${MASTERDOC} # @@ -560,7 +575,7 @@ ${DOC}.tex: ${SRCS} ${LOCAL_IMAGES_EPS} ${INDEX_SGML} ${PRINT_INDEX} \ ${LOCAL_IMAGES_TXT} ${LOCAL_IMAGES_EN} - ${JADE} -V tex-backend ${PRINTOPTS} \ + ${JADE_CMD} -V tex-backend ${PRINTOPTS} \ ${JADEOPTS} -t tex -o ${.TARGET} ${MASTERDOC} ${DOC}.tex-ps: ${DOC}.tex @@ -571,7 +586,7 @@ ${LOCAL_IMAGES_TXT} ${RM} -f ${.TARGET} ${CAT} ${PDFTEX_DEF} > ${.TARGET} - ${JADE} -V tex-backend ${PRINTOPTS} -ioutput.print.pdf \ + ${JADE_CMD} -V tex-backend ${PRINTOPTS} -ioutput.print.pdf \ ${JADEOPTS} -t tex -o /dev/stdout ${MASTERDOC} >> ${.TARGET} .endif @@ -647,12 +662,12 @@ ${PERL} ${COLLATEINDEX} -N -o ${.TARGET} ${HTML_INDEX}: - ${JADE} -V html-index -V nochunks ${HTMLOPTS} -ioutput.html.images \ + ${JADE_CMD} -V html-index -V nochunks ${HTMLOPTS} -ioutput.html.images \ ${JADEOPTS} -t sgml ${MASTERDOC} > /dev/null ${PERL} ${COLLATEINDEX} -g -o ${INDEX_SGML} ${.TARGET} ${HTML_SPLIT_INDEX}: - ${JADE} -V html-index ${HTMLOPTS} -ioutput.html.images \ + ${JADE_CMD} -V html-index ${HTMLOPTS} -ioutput.html.images \ ${JADEOPTS} -t sgml ${MASTERDOC} > /dev/null ${PERL} ${COLLATEINDEX} -g -o ${INDEX_SGML} ${.TARGET} --------------050001040001010906010201--