24 messages in org.freebsd.freebsd-docRe: Tidy and HTML tab spacing| From | Sent On | Attachments |
|---|---|---|
| Warren Block | Jan 18, 2012 2:49 pm | |
| Hiroki Sato | Jan 18, 2012 3:44 pm | |
| Warren Block | Jan 18, 2012 5:13 pm | |
| Hiroki Sato | Jan 18, 2012 10:57 pm | |
| Warren Block | Jan 20, 2012 12:05 pm |  .c |
| Gabor Kovesdan | Jan 21, 2012 3:16 pm | |
| Warren Block | Jan 21, 2012 4:29 pm | |
| Gabor Kovesdan | Jan 23, 2012 9:07 am | |
| Warren Block | Jan 23, 2012 11:38 am | .py |
| Hiroki Sato | Jan 24, 2012 5:23 pm | |
| Gabor Kovesdan | Jan 24, 2012 6:15 pm | |
| Hiroki Sato | Jan 24, 2012 6:18 pm | |
| Warren Block | Jan 26, 2012 10:20 am | |
| Warren Block | Jan 26, 2012 10:22 am | .diff |
| Hiroki Sato | Jan 26, 2012 7:45 pm | |
| Warren Block | Jan 26, 2012 9:46 pm | .diff |
| Hiroki Sato | Jan 26, 2012 10:50 pm | .diff |
| Hiroki Sato | Jan 27, 2012 5:24 am | .diff |
| Warren Block | Jan 27, 2012 7:53 am | .diff |
| Hiroki Sato | Jan 27, 2012 8:58 am | .diff |
| Warren Block | Jan 27, 2012 11:43 am | |
| Hiroki Sato | Jan 28, 2012 12:57 am | |
| Warren Block | Jan 28, 2012 2:47 pm | |
| Hiroki Sato | Jan 28, 2012 10:24 pm |
| Subject: | Re: Tidy and HTML tab spacing | |
|---|---|---|
| From: | Warren Block (wbl...@wonkity.com) | |
| Date: | Jan 27, 2012 7:53:45 am | |
| List: | org.freebsd.freebsd-doc | |
| Attachments: | ||
On Fri, 27 Jan 2012, Hiroki Sato wrote:
Hiroki Sato <hr...@freebsd.org> wrote in <2012...@allbsd.org>:
hr> I think the attached patch should fix the issue in the PDF format. hr> Could you test it?
The previous patch did not include width calculation of the tab expansion (always used 8 spaces). The attached one does it for a simple character sequence.
That helps a lot! Single tabs and multiple tabs are slightly different, but it's close. http://www.wonkity.com/~wblock/porters/tab1.png (good!) http://www.wonkity.com/~wblock/porters/tab2.png (close)
http://www.wonkity.com/~wblock/porters/tab3.png
Should be: LIB_DEPENDS+= foo.0:${PORTSDIR}/devel/foo CONFIGURE_ARGS+= --enable-foo
The second line '=' lands right before a tab stop, and the tab is replaced with a single space.
Thanks!
PS: somehow I missed escaping the '#' in my patch to doc.common.mk, revision attached.
Index: doc/share/mk/doc.common.mk =================================================================== RCS file: /home/dcvs/doc/share/mk/doc.common.mk,v retrieving revision 1.18 diff -u -r1.18 doc.common.mk --- doc/share/mk/doc.common.mk 2 Nov 2006 18:58:17 -0000 1.18 +++ doc/share/mk/doc.common.mk 27 Jan 2012 15:30:17 -0000 @@ -9,6 +9,9 @@ GREP?= /usr/bin/grep REALPATH?= /bin/realpath SED?= /usr/bin/sed +# a hack to keep tidy from converting tabs to spaces +# replace them with 	 before calling tidy +REINPLACE_TABS_CMD?= ${SED} -i -e 's/ /\&\#09;/g'
.if defined(DOC_PREFIX) && !empty(DOC_PREFIX) WEB_PREFIX?= ${DOC_PREFIX}/../www Index: doc/share/mk/doc.docbook.mk =================================================================== RCS file: /home/dcvs/doc/share/mk/doc.docbook.mk,v retrieving revision 1.129 diff -u -r1.129 doc.docbook.mk --- doc/share/mk/doc.docbook.mk 15 May 2011 20:41:31 -0000 1.129 +++ doc/share/mk/doc.docbook.mk 27 Jan 2012 15:30:17 -0000 @@ -525,6 +525,7 @@ ${DOC}.xml .endif .if !defined(NO_TIDY) + ${REINPLACE_TABS_CMD} $$(${XARGS} < HTML.manifest) -${TIDY} ${TIDYOPTS} $$(${XARGS} < HTML.manifest) .endif
@@ -545,6 +546,7 @@ ${DOC}.xml > ${.TARGET} .endif .if !defined(NO_TIDY) + ${REINPLACE_TABS_CMD} ${.TARGET} -${TIDY} ${TIDYOPTS} ${.TARGET} .endif
Index: doc/share/mk/doc.html.mk =================================================================== RCS file: /home/dcvs/doc/share/mk/doc.html.mk,v retrieving revision 1.21 diff -u -r1.21 doc.html.mk --- doc/share/mk/doc.html.mk 25 Feb 2006 23:19:40 -0000 1.21 +++ doc/share/mk/doc.html.mk 27 Jan 2012 15:30:17 -0000 @@ -144,6 +144,7 @@ ${DOC}.html: ${SRCS} ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} ${LOCAL_CSS_SHEET} ${SGMLNORM} -c ${HTMLCATALOG} ${SRCS:S|^|${.CURDIR}/|} > ${.TARGET} .if !defined(NO_TIDY) + ${REINPLACE_TABS_CMD} ${.TARGET} -${TIDY} ${TIDYOPTS} ${.TARGET} .endif
Index: doc/share/mk/doc.xml.mk =================================================================== RCS file: /home/dcvs/doc/share/mk/doc.xml.mk,v retrieving revision 1.15 diff -u -r1.15 doc.xml.mk --- doc/share/mk/doc.xml.mk 9 Aug 2011 06:32:50 -0000 1.15 +++ doc/share/mk/doc.xml.mk 27 Jan 2012 15:30:17 -0000 @@ -385,6 +385,7 @@ ${XSLT.${_ID}} ${XML.${_ID}} . if !defined(NO_TIDY) || empty(NO_TIDY) . if !defined(NO_TIDY.${_ID}) || empty(NO_TIDY.${_ID}) + ${REINPLACE_TABS_CMD} ${.TARGET} -${TIDY} ${TIDYOPTS} ${.TARGET} . endif . endif
_______________________________________________ free...@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-doc To unsubscribe, send any mail to "free...@freebsd.org"