From owner-svn-doc-projects@FreeBSD.ORG Mon Feb 18 13:03:20 2013 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 60C79E1; Mon, 18 Feb 2013 13:03:20 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 49F75AD5; Mon, 18 Feb 2013 13:03:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1ID3Kx7069525; Mon, 18 Feb 2013 13:03:20 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1ID3JEC069522; Mon, 18 Feb 2013 13:03:19 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201302181303.r1ID3JEC069522@svn.freebsd.org> From: Gabor Kovesdan Date: Mon, 18 Feb 2013 13:03:19 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r41006 - in projects/xml-tools/share: mk xml X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Feb 2013 13:03:20 -0000 Author: gabor Date: Mon Feb 18 13:03:19 2013 New Revision: 41006 URL: http://svnweb.freebsd.org/changeset/doc/41006 Log: - Fix rendering of Handbook with (Open)Jade Modified: projects/xml-tools/share/mk/doc.commands.mk projects/xml-tools/share/mk/doc.docbook.mk projects/xml-tools/share/xml/freebsd45.dtd Modified: projects/xml-tools/share/mk/doc.commands.mk ============================================================================== --- projects/xml-tools/share/mk/doc.commands.mk Mon Feb 18 11:40:31 2013 (r41005) +++ projects/xml-tools/share/mk/doc.commands.mk Mon Feb 18 13:03:19 2013 (r41006) @@ -70,9 +70,9 @@ HTML2TXT?= ${PREFIX}/bin/w3m HTML2TXTOPTS?= -dump ${HTML2TXTFLAGS} .if exists(${PREFIX}/bin/jade) && !defined(OPENJADE) -JADE?= ${PREFIX}/bin/jade +JADE?= ${ENV} SP_ENCODING=XML ${PREFIX}/bin/jade .else -JADE?= ${PREFIX}/bin/openjade +JADE?= ${ENV} SP_ENCODING=XML ${PREFIX}/bin/openjade JADEFLAGS+= -V openjade .endif @@ -93,7 +93,7 @@ TEX_CMD?= ${PREFIX}/bin/tex PDFTEX_CMD?= ${PREFIX}/bin/pdftex .endif LATEX_CMD?= ${PREFIX}/bin/latex -JADETEX_CMD?= ${TEX_CMD} "&jadetex" +JADETEX_CMD?= ${PDFTEX_CMD} "&jadetex" JADETEX_PREPROCESS?= /bin/cat PDFJADETEX_CMD?=${PDFTEX_CMD} "&pdfjadetex" PDFJADETEX_PREPROCESS?= /bin/cat Modified: projects/xml-tools/share/mk/doc.docbook.mk ============================================================================== --- projects/xml-tools/share/mk/doc.docbook.mk Mon Feb 18 11:40:31 2013 (r41005) +++ projects/xml-tools/share/mk/doc.docbook.mk Mon Feb 18 13:03:19 2013 (r41006) @@ -71,9 +71,6 @@ MASTERDOC?= ${.CURDIR}/${DOC}.xml -# List of supported SP_ENCODINGs -SP_ENCODING_LIST?= ISO-8859-2 KOI8-R - # Either jade or fop RENDERENGINE?= jade @@ -94,7 +91,8 @@ XSLFO?= ${DOC_PREFIX}/share/xsl/freebsd IMAGES_LIB?= -JADEOPTS?= -w no-valid ${JADEFLAGS} -D ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} -D ${CANONICALOBJDIR} +JADEOPTS?= -ijade.compat -w no-valid ${JADEFLAGS} \ + -D ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T} -D ${CANONICALOBJDIR} XSLTPROCOPTS?= --nonet KNOWN_FORMATS= html html.tar html-split html-split.tar \ @@ -326,7 +324,14 @@ NO_RTF= yes # Parsed XML ------------------------------------------------------- ${DOC}.parsed.xml: ${SRCS} - ${XMLLINT} --nonet --noent --valid --xinclude --dropdtd ${MASTERDOC} > ${.TARGET} + ${GREP} '^' ${DOC}.xml > ${.TARGET} +.if ${DOC} == "book" + ${ECHO_CMD} '' >> ${.TARGET} +.else + ${ECHO_CMD} '' >> ${.TARGET} +.endif + ${XMLLINT} --nonet --noent --valid --xinclude --dropdtd ${MASTERDOC} | \ + ${GREP} -v '^' >> ${.TARGET} # XHTML ------------------------------------------------------------- Modified: projects/xml-tools/share/xml/freebsd45.dtd ============================================================================== --- projects/xml-tools/share/xml/freebsd45.dtd Mon Feb 18 11:40:31 2013 (r41005) +++ projects/xml-tools/share/xml/freebsd45.dtd Mon Feb 18 13:03:19 2013 (r41006) @@ -3,7 +3,17 @@ + + +]]> + @@ -41,6 +51,7 @@ "/usr/local/share/xml/docbook/4.5/docbookx.dtd"> %orig-docbook; + %authors; @@ -52,6 +63,7 @@ %orig-entities; +]]>