From owner-freebsd-doc Tue Nov 13 6:26:29 2001 Delivered-To: freebsd-doc@freebsd.org Received: from columbus.cris.net (columbus.cris.net [212.110.128.65]) by hub.freebsd.org (Postfix) with ESMTP id D76D237B417 for ; Tue, 13 Nov 2001 06:26:00 -0800 (PST) Received: from ark.cris.net (ark.cris.net [212.110.128.68]) by columbus.cris.net (8.9.3/8.9.3) with ESMTP id QAA62368 for ; Tue, 13 Nov 2001 16:25:56 +0200 (EET) Received: (from phantom@localhost) by ark.cris.net (8.11.1/8.11.1) id fADEPQ571547; Tue, 13 Nov 2001 16:25:26 +0200 (EET) Date: Tue, 13 Nov 2001 16:25:26 +0200 From: Alexey Zelkin To: doc@FreeBSD.org Subject: [PATCH] Re: Hidden feature == hidden breakage or tidy(1) usage (was: Re: cvs commit: www/en/news/1998 index.sgml www/en/projects mozilla.sgml ...) Message-ID: <20011113162526.A71174@ark.cris.net> References: <200111121437.fACEbwi13471@freefall.freebsd.org> <20011112175729.J65585-100000@news1.macomnet.ru> <20011112210349.A5844@ark.cris.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Mailer: Mutt 1.0i In-Reply-To: <20011112210349.A5844@ark.cris.net>; from phantom@FreeBSD.org on Mon, Nov 12, 2001 at 09:03:49PM +0200 X-Operating-System: FreeBSD 3.5-STABLE i386 Sender: owner-freebsd-doc@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org hi, This patch fixes problems with Russian and Japanese webpages in case of !defined(NO_TIDY). Feedback from Japanese people is quite welcome! As well as from other translation teams. I propose to commit it w/in one or two days. On Mon, Nov 12, 2001 at 09:03:49PM +0200, Alexey Zelkin wrote: > Maxim, > > On Mon, Nov 12, 2001 at 05:58:57PM +0300, Maxim Konovalov wrote: > > > Could you please take a look at > > > > http://www.freebsd.org/ru/news/newsflash.html > > > > It seems something broken with sgml -> html conversion. > > Thank you for notice! > > I've made small invistigations and was surprised that this problem > currently appeared at newsflash.html only. > > Main root of the problem is: > > ---------------------------- > revision 1.37 > date: 2001/10/29 10:14:33; author: murray; state: Exp; lines: +92 -50 > * Make build/install of www /usr/obj prefix clean. > * Use make variables instead of hard coding commands, paths, and > options. > * Wrap some long lines. > * Replace shell loops with make for loops, etc. > > PR: docs/31132 > Submitted by: Cyrille Lefevre > ---------------------------- > > which "silently" added tidy(1) post-processing to whole web tree > generated html files. > > We already had this problem under doc/ tree when without '-raw' or '-latin1' > flags tidy(1) had converted all russian (japanese, etc.) characters to their > sgml specifications (like îÏ×ÏÓÔÉ) > I just tried to build www/ru subtree and realized that all russian pages > are broken now in same way as newsflash.html :-( > > You also may check all translated pages updated since 31 Oct to checkout > this breakage. Index: ja/Makefile.inc =================================================================== RCS file: /home/cvs/freebsd/www/ja/Makefile.inc,v retrieving revision 1.9 diff -u -u -r1.9 Makefile.inc --- ja/Makefile.inc 7 Nov 2000 11:37:51 -0000 1.9 +++ ja/Makefile.inc 13 Nov 2001 14:24:30 -0000 @@ -4,3 +4,5 @@ WEBBASE?= /data/ja WEB_PREFIX?= ${.CURDIR}/../.. + +TIDYFLAGS?= -raw Index: ja/conspectus/Makefile.inc =================================================================== RCS file: /home/cvs/freebsd/www/ja/conspectus/Makefile.inc,v retrieving revision 1.2 diff -u -u -r1.2 Makefile.inc --- ja/conspectus/Makefile.inc 7 Nov 2000 11:37:53 -0000 1.2 +++ ja/conspectus/Makefile.inc 13 Nov 2001 14:24:53 -0000 @@ -4,3 +4,5 @@ WEBBASE?= /data/ja/conspectus WEB_PREFIX?= ${.CURDIR}/../../.. + +TIDYFLAGS?= -raw Index: ja/java/Makefile.inc =================================================================== RCS file: /home/cvs/freebsd/www/ja/java/Makefile.inc,v retrieving revision 1.3 diff -u -u -r1.3 Makefile.inc --- ja/java/Makefile.inc 7 Nov 2000 11:37:55 -0000 1.3 +++ ja/java/Makefile.inc 13 Nov 2001 14:24:58 -0000 @@ -4,3 +4,5 @@ WEBBASE?= /data/ja/java WEB_PREFIX?= ${.CURDIR}/../../.. + +TIDYFLAGS?= -raw Index: ja/news/Makefile.inc =================================================================== RCS file: /home/cvs/freebsd/www/ja/news/Makefile.inc,v retrieving revision 1.2 diff -u -u -r1.2 Makefile.inc --- ja/news/Makefile.inc 7 Nov 2000 11:37:55 -0000 1.2 +++ ja/news/Makefile.inc 13 Nov 2001 14:25:02 -0000 @@ -4,3 +4,5 @@ WEBBASE?= /data/ja/news WEB_PREFIX?= ${.CURDIR}/../../.. + +TIDYFLAGS?= -raw Index: ja/releases/Makefile.inc =================================================================== RCS file: /home/cvs/freebsd/www/ja/releases/Makefile.inc,v retrieving revision 1.5 diff -u -u -r1.5 Makefile.inc --- ja/releases/Makefile.inc 7 Nov 2000 11:37:57 -0000 1.5 +++ ja/releases/Makefile.inc 13 Nov 2001 14:25:04 -0000 @@ -4,3 +4,5 @@ WEBBASE?= /data/ja/releases WEB_PREFIX?= ${.CURDIR}/../../.. + +TIDYFLAGS?= -raw Index: ru/Makefile.inc =================================================================== RCS file: /home/cvs/freebsd/www/ru/Makefile.inc,v retrieving revision 1.3 diff -u -u -r1.3 Makefile.inc --- ru/Makefile.inc 10 Nov 2000 17:27:22 -0000 1.3 +++ ru/Makefile.inc 13 Nov 2001 12:57:45 -0000 @@ -4,3 +4,5 @@ WEBBASE?= /data/ru WEB_PREFIX?= ${.CURDIR}/../.. + +TIDYFLAGS?= -latin1 Index: ru/conspectus/Makefile.inc =================================================================== RCS file: /home/cvs/freebsd/www/ru/conspectus/Makefile.inc,v retrieving revision 1.2 diff -u -u -r1.2 Makefile.inc --- ru/conspectus/Makefile.inc 10 Nov 2000 17:27:32 -0000 1.2 +++ ru/conspectus/Makefile.inc 13 Nov 2001 12:58:30 -0000 @@ -5,3 +5,5 @@ WEBBASE?= /data/ru/conspectus WEB_PREFIX?= ${.CURDIR}/../../.. + +TIDYFLAGS?= -latin1 Index: ru/java/Makefile.inc =================================================================== RCS file: /home/cvs/freebsd/www/ru/java/Makefile.inc,v retrieving revision 1.3 diff -u -u -r1.3 Makefile.inc --- ru/java/Makefile.inc 10 Nov 2000 17:27:35 -0000 1.3 +++ ru/java/Makefile.inc 13 Nov 2001 12:58:43 -0000 @@ -5,3 +5,5 @@ WEBBASE?= /data/ru/java WEB_PREFIX?= ${.CURDIR}/../../.. + +TIDYFLAGS?= -latin1 Index: ru/news/Makefile.inc =================================================================== RCS file: /home/cvs/freebsd/www/ru/news/Makefile.inc,v retrieving revision 1.1 diff -u -u -r1.1 Makefile.inc --- ru/news/Makefile.inc 10 Nov 2000 17:27:37 -0000 1.1 +++ ru/news/Makefile.inc 13 Nov 2001 12:58:54 -0000 @@ -5,3 +5,5 @@ WEBBASE?= /data/ru/news WEB_PREFIX?= ${.CURDIR}/../../.. + +TIDYFLAGS?= -latin1 Index: ru/ports/Makefile.inc =================================================================== RCS file: /home/cvs/freebsd/www/ru/ports/Makefile.inc,v retrieving revision 1.1 diff -u -u -r1.1 Makefile.inc --- ru/ports/Makefile.inc 5 Jan 2000 15:34:14 -0000 1.1 +++ ru/ports/Makefile.inc 13 Nov 2001 12:59:05 -0000 @@ -2,6 +2,8 @@ # The FreeBSD Russian Documentation Project # Original revision: 1.1 +TIDYFLAGS?= -latin1 + PORTINDEX= perl5 ${.CURDIR}/portindex INDEX= INDEX PINDEX= ports/${INDEX} Index: ru/releases/Makefile.inc =================================================================== RCS file: /home/cvs/freebsd/www/ru/releases/Makefile.inc,v retrieving revision 1.3 diff -u -u -r1.3 Makefile.inc --- ru/releases/Makefile.inc 10 Nov 2000 17:27:41 -0000 1.3 +++ ru/releases/Makefile.inc 13 Nov 2001 12:59:13 -0000 @@ -5,3 +5,5 @@ WEBBASE?= /data/ru/releases WEB_PREFIX?= ${.CURDIR}/../../.. + +TIDYFLAGS?= -latin1 Index: share/mk/web.site.mk =================================================================== RCS file: /home/cvs/freebsd/www/share/mk/web.site.mk,v retrieving revision 1.39 diff -u -u -r1.39 web.site.mk --- share/mk/web.site.mk 30 Oct 2001 16:51:34 -0000 1.39 +++ share/mk/web.site.mk 13 Nov 2001 12:57:16 -0000 @@ -44,7 +44,7 @@ XSLTPROC?= ${PREFIX}/bin/xsltproc XSLTPROCFLAGS?= -nonet TIDY?= ${PREFIX}/bin/tidy -TIDYFLAGS?= -i -m -f /dev/null +TIDYOPTS?= -i -m -f /dev/null # # Install dirs derived from the above. @@ -109,7 +109,7 @@ ${SGMLNORM} ${SGMLNORMFLAGS} > ${.TARGET} || \ (${RM} -f ${.TARGET} && false) .if !defined(NO_TIDY) - -${TIDY} ${TIDYFLAGS} ${.TARGET} + -${TIDY} ${TIDYFLAGS} ${TIDYOPTS} ${.TARGET} .endif ### @@ -126,7 +126,7 @@ .docb.html: ${SGMLFMT} ${SGMLFMTFLAGS} ${.IMPSRC} .if !defined(NO_TIDY) - -${TIDY} ${TIDYFLAGS} ${.TARGET} + -${TIDY} ${TIDYFLAGS} ${TIDYOPTS} ${.TARGET} .endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-doc" in the body of the message