From owner-freebsd-doc@FreeBSD.ORG Fri Jan 27 06:51:22 2012 Return-Path: Delivered-To: freebsd-doc@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DF8C71065670 for ; Fri, 27 Jan 2012 06:51:22 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from mail.allbsd.org (gatekeeper-int.allbsd.org [IPv6:2001:2f0:104:e002::2]) by mx1.freebsd.org (Postfix) with ESMTP id 4076C8FC08 for ; Fri, 27 Jan 2012 06:51:22 +0000 (UTC) Received: from alph.allbsd.org ([IPv6:2001:2f0:104:e010:862b:2bff:febc:8956]) (authenticated bits=128) by mail.allbsd.org (8.14.4/8.14.4) with ESMTP id q0R6p804035687; Fri, 27 Jan 2012 15:51:18 +0900 (JST) (envelope-from hrs@FreeBSD.org) Received: from localhost (localhost [IPv6:::1]) (authenticated bits=0) by alph.allbsd.org (8.14.4/8.14.4) with ESMTP id q0R6p4ZY044420; Fri, 27 Jan 2012 15:51:05 +0900 (JST) (envelope-from hrs@FreeBSD.org) Date: Fri, 27 Jan 2012 15:50:54 +0900 (JST) Message-Id: <20120127.155054.2121952239893273004.hrs@allbsd.org> To: wblock@wonkity.com From: Hiroki Sato In-Reply-To: References: <20120127.124619.1645166101623286100.hrs@allbsd.org> X-PGPkey-fingerprint: BDB3 443F A5DD B3D0 A530 FFD7 4F2C D3D8 2793 CF2D X-Mailer: Mew version 6.4 on Emacs 23.3 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Multipart/Signed; protocol="application/pgp-signature"; micalg=pgp-sha1; boundary="--Security_Multipart0(Fri_Jan_27_15_50_54_2012_707)--" Content-Transfer-Encoding: 7bit X-Virus-Scanned: clamav-milter 0.97 at gatekeeper.allbsd.org X-Virus-Status: Clean X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.3 (mail.allbsd.org [IPv6:2001:2f0:104:e001::32]); Fri, 27 Jan 2012 15:51:20 +0900 (JST) X-Spam-Status: No, score=-104.1 required=13.0 tests=BAYES_00, CONTENT_TYPE_PRESENT, FAKEDWORD_ZERO, RDNS_NONE, SPF_SOFTFAIL, USER_IN_WHITELIST autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on gatekeeper.allbsd.org Cc: freebsd-doc@FreeBSD.org Subject: Re: Tidy and HTML tab spacing X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jan 2012 06:51:23 -0000 ----Security_Multipart0(Fri_Jan_27_15_50_54_2012_707)-- Content-Type: Multipart/Mixed; boundary="--Next_Part(Fri_Jan_27_15_50_54_2012_985)--" Content-Transfer-Encoding: 7bit ----Next_Part(Fri_Jan_27_15_50_54_2012_985)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Warren Block wrote in : wb> On Fri, 27 Jan 2012, Hiroki Sato wrote: wb> wb> > Changes look good to me, but it is better to use something like this wb> > wb> > REINPLACE_TABS_CMD?=${SED} -i -e 's/ /\ /g' wb> > wb> > in doc.common.mk (with some comments explaining this is a hack to wb> > preserve literal tab characters) and use it in these three. wb> wb> Revised patch attached (for real, this time). Only lightly tested but wb> no problems noticed. wb> wb> On Windows XP, IE8 and Firefox 9 render the tabs in the new version wb> correctly. wb> wb> wb> There is another issue: PDFs. A PDF version with the patch above is wb> at http://www.wonkity.com/~wblock/porters/book.pdf.bz2 wb> wb> Actual tabs come out as a single space in the PDF. Compare that with wb> the unpatched tabs-to-spaces version at wb> ftp://ftp.freebsd.org/pub/FreeBSD/doc/en_US.ISO8859-1/books/porters-handbook/book.pdf.bz2 wb> wb> ...which still isn't quite right. Tabs at the beginning of lines are wb> removed. (That file has not been rebuilt in quite a while, either.) wb> wb> I'm thinking the conversion will be different with DocBook XML, wb> possibly more correct. There are other problems with the current PDFs wb> that might also be cured. wb> wb> As far as the other formats, book.txt looks somewhat okay, but I've wb> honestly never looked at the .txt or .rtf formats before. Ah, okay. It is due to the DSSSL processor. Jade and OpenJade do not implement expand-tabs: characteristics in paragraph flow object class. I think the attached patch should fix the issue in the PDF format. Could you test it? -- Hiroki ----Next_Part(Fri_Jan_27_15_50_54_2012_985)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="expand-tabs-freebsd-print.20120127-1.diff" Index: freebsd-print.dsl =================================================================== RCS file: /home/ncvs/doc/share/sgml/freebsd-print.dsl,v retrieving revision 1.2 diff -d -u -I \$FreeBSD:.*\$ -I \$NetBSD:.*\$ -I \$OpenBSD:.*\$ -I \$DragonFly:.*\$ -I \$Id:.*\$ -I \$Translation:.*\$ -I \$hrs:.*\$ -r1.2 freebsd-print.dsl --- freebsd-print.dsl 8 Dec 2010 06:25:59 -0000 1.2 +++ freebsd-print.dsl 27 Jan 2012 06:46:51 -0000 @@ -616,6 +616,56 @@ (with-mode section-title-mode (process-node-list subtitles)) ($section-info$ info)))) + + (define ($verbatim-display$ indent line-numbers?) + (let* ((width-in-chars (if (attribute-string (normalize "width")) + (string->number (attribute-string (normalize "width"))) + %verbatim-default-width%)) + (fsize (lambda () (if (or (attribute-string (normalize "width")) + (not %verbatim-size-factor%)) + (/ (/ (- %text-width% (inherited-start-indent)) + width-in-chars) + 0.7) + (* (inherited-font-size) + %verbatim-size-factor%)))) + (vspace-before (if (INBLOCK?) + 0pt + (if (INLIST?) + %para-sep% + %block-sep%))) + (vspace-after (if (INBLOCK?) + 0pt + (if (INLIST?) + 0pt + %block-sep%)))) + (make paragraph + use: verbatim-style + space-before: (if (and (string=? (gi (parent)) (normalize "entry")) + (absolute-first-sibling?)) + 0pt + vspace-before) + space-after: (if (and (string=? (gi (parent)) (normalize "entry")) + (absolute-last-sibling?)) + 0pt + vspace-after) + font-size: (fsize) + line-spacing: (* (fsize) %line-spacing-factor%) + start-indent: (if (INBLOCK?) + (inherited-start-indent) + (+ %block-start-indent% (inherited-start-indent))) + (if (or indent line-numbers?) + ($linespecific-line-by-line$ indent line-numbers?) + (let loop ((kl (children (current-node))) + (res (empty-sosofo))) + (if (node-list-empty? kl) + res + (loop + (node-list-rest kl) + (let ((c (node-list-first kl))) + (if (char=? (node-property 'char c + default: #\U-0000) #\U-0009) + (sosofo-append res (literal " ") (process-node-list c)) + (sosofo-append res (process-node-list c))))))))))) ]]>