Date: Mon, 5 Nov 2001 12:41:56 -0800 From: Murray Stokely <murray@FreeBSD.org> To: Peter Pentchev <roam@ringlet.net> Cc: doc@FreeBSD.org Subject: Re: TIDYFLAGS fixes all around the tree Message-ID: <20011105124156.D10872@windriver.com> In-Reply-To: <20011105175820.D77919@straylight.oblivion.bg>; from roam@ringlet.net on Mon, Nov 05, 2001 at 05:58:20PM %2B0200 References: <20011105175820.D77919@straylight.oblivion.bg>
next in thread | previous in thread | raw e-mail | index | archive | help
--E39vaYmALEf/7YXx
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
How up to date was your source tree? I think I fixed this last
night. There was an open PR for it. Search closed PRs for
'TIDYFLAGS' and sync up your doc tree then try again.
Thanks,
- Murray
On Mon, Nov 05, 2001 at 05:58:20PM +0200, Peter Pentchev wrote:
> Hi,
>=20
> Just today, I tried to build the ru_RU.KOI8-R version of the docs.
> Looking at the build process, I noticed quite a lot of HTML scrolling
> off the screen, which did not quite seem like normal output to me :)
> A closer inspection revealed the issue at hand: all the places which
> set TIDYFLAGS to, say, "-latin1" or "-raw", set them explicitly, while
> doc.docbook.mk and doc.html.mk only add the rest of the flags conditional=
ly.
> Thus, when tidy is invoked in e.g. ru_RU.KOI8-R/articles/explaining-bsd/,
> we have:
>=20
> [roam@straylight:v4 ~/fbsd/r/doc/ru_RU.KOI8-R/articles/explaining-bsd]$ m=
ake -n
> /usr/bin/touch index.sgml
> /bin/cp -p /usr/home/roam/fbsd/r/doc/ru_RU.KOI8-R/articles/explaining-bsd=
/../../
> ../share/misc/docbook.css docbook.css
> /usr/local/bin/jade -V nochunks -ioutput.html -d /usr/home/roam/fbsd/r/do=
c/ru_RU
> .KOI8-R/articles/explaining-bsd/../../../share/sgml/default.dsl -ioutput=
.html.i
> mages -D /usr/obj/usr/home/roam/fbsd/r/doc/ru_RU.KOI8-R/articles/explai=
ning-bs
> d -c /usr/home/roam/fbsd/r/doc/ru_RU.KOI8-R/articles/explaining-bsd/../..=
/../ru_
> RU.KOI8-R/share/sgml/catalog -c /usr/home/roam/fbsd/r/doc/ru_RU.KOI8-R/ar=
ticles/
> explaining-bsd/../../../share/sgml/catalog -c /usr/local/share/sgml/docb=
ook/dss
> sl/modular/catalog -c /usr/local/share/sgml/docbook/catalog -c /usr/loca=
l/share
> /sgml/jade/catalog -t sgml /usr/home/roam/fbsd/r/doc/ru_RU.KOI8-R/articl=
es/expl
> aining-bsd/article.sgml > article.html || (/bin/rm -f article.html && fa=
lse)
> /usr/local/bin/tidy -latin1 article.html
> [roam@straylight:v4 ~/fbsd/r/doc
>=20
> Note the last line, and esp. the lack of -i -m -f /dev/null. What really
> fudges things up is the lack of -m, which means the tidied output goes
> to stdout instead of replacing article.html. Nothing breaks, but
> the resulting files are not tidied at all :)
>=20
> After applying the attached patch:
>=20
>=20
> [roam@straylight:v4 ~/fbsd/r/doc/ru_RU.KOI8-R/articles/explaining-bsd]$ m=
ake -n
> /usr/bin/touch index.sgml
> /bin/cp -p /usr/home/roam/fbsd/r/doc/ru_RU.KOI8-R/articles/explaining-bsd=
/../../
> ../share/misc/docbook.css docbook.css
> /usr/local/bin/jade -V nochunks -ioutput.html -d /usr/home/roam/fbsd/r/do=
c/ru_RU
> .KOI8-R/articles/explaining-bsd/../../../share/sgml/default.dsl -ioutput=
.html.i
> mages -D /usr/obj/usr/home/roam/fbsd/r/doc/ru_RU.KOI8-R/articles/explai=
ning-bs
> d -c /usr/home/roam/fbsd/r/doc/ru_RU.KOI8-R/articles/explaining-bsd/../..=
/../ru_
> RU.KOI8-R/share/sgml/catalog -c /usr/home/roam/fbsd/r/doc/ru_RU.KOI8-R/ar=
ticles/
> explaining-bsd/../../../share/sgml/catalog -c /usr/local/share/sgml/docb=
ook/dss
> sl/modular/catalog -c /usr/local/share/sgml/docbook/catalog -c /usr/loca=
l/share
> /sgml/jade/catalog -t sgml /usr/home/roam/fbsd/r/doc/ru_RU.KOI8-R/articl=
es/expl
> aining-bsd/article.sgml > article.html || (/bin/rm -f article.html && fa=
lse)
> /usr/local/bin/tidy -i -m -f /dev/null -latin1 -latin1 article.html
> [roam@straylight:v4 ~/fbsd/r/doc/ru_RU.KOI8-R/articles/explaining-bsd]$
>=20
> Well, ok, so -latin1 is there twice, but I don't think that's a big deal =
:)
>=20
> The other workaround would be changing the TIDYFLAGS?=3D in doc.docbook.mk
> and doc.html.mk to TIDYFLAGS+=3D, but that would break any future/debuggi=
ng
> invocations where people might want their errors actually displayed.
>=20
> G'luck,
> Peter
>=20
> --=20
> Hey, out there - is it *you* reading me, or is it someone else?
>=20
> Index: doc/de_DE.ISO8859-1/books/Makefile.inc
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/doc/de_DE.ISO8859-1/books/Makefile.inc,v
> retrieving revision 1.3
> diff -u -r1.3 Makefile.inc
> --- doc/de_DE.ISO8859-1/books/Makefile.inc 11 Jun 2001 01:16:24 -0000 1.3
> +++ doc/de_DE.ISO8859-1/books/Makefile.inc 5 Nov 2001 15:47:18 -0000
> @@ -6,6 +6,6 @@
> # $FreeBSDde: de-docproj/books/Makefile.inc,v 1.4 2001/02/01 21:24:27=
alex Exp $
> #
> =20
> -TIDYFLAGS=3D -latin1
> +TIDYFLAGS+=3D -latin1
> =20
> DESTDIR?=3D ${DOCDIR}/de_DE.ISO8859-1/books/${.CURDIR:T}
> Index: doc/ja_JP.eucJP/articles/Makefile.inc
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/doc/ja_JP.eucJP/articles/Makefile.inc,v
> retrieving revision 1.2
> diff -u -r1.2 Makefile.inc
> --- doc/ja_JP.eucJP/articles/Makefile.inc 23 Mar 2000 09:00:10 -0000 1.2
> +++ doc/ja_JP.eucJP/articles/Makefile.inc 5 Nov 2001 15:47:29 -0000
> @@ -3,6 +3,6 @@
> #
> # Original revision: 1.3
> =20
> -TIDYFLAGS=3D -raw
> +TIDYFLAGS+=3D -raw
> =20
> DESTDIR?=3D ${DOCDIR}/ja/articles/${.CURDIR:T}
> Index: doc/ja_JP.eucJP/books/Makefile.inc
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/doc/ja_JP.eucJP/books/Makefile.inc,v
> retrieving revision 1.5
> diff -u -r1.5 Makefile.inc
> --- doc/ja_JP.eucJP/books/Makefile.inc 23 Mar 2000 09:00:12 -0000 1.5
> +++ doc/ja_JP.eucJP/books/Makefile.inc 5 Nov 2001 15:47:36 -0000
> @@ -2,6 +2,6 @@
> # $FreeBSD$
> #
> =20
> -TIDYFLAGS=3D -raw
> +TIDYFLAGS+=3D -raw
> =20
> DESTDIR?=3D ${DOCDIR}/ja/books/${.CURDIR:T}
> Index: doc/nl_NL.ISO8859-1/books/Makefile.inc
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/doc/nl_NL.ISO8859-1/books/Makefile.inc,v
> retrieving revision 1.1
> diff -u -r1.1 Makefile.inc
> --- doc/nl_NL.ISO8859-1/books/Makefile.inc 23 Sep 2001 09:15:52 -0000 1.1
> +++ doc/nl_NL.ISO8859-1/books/Makefile.inc 5 Nov 2001 15:47:41 -0000
> @@ -2,6 +2,6 @@
> # $FreeBSD$
> #
> =20
> -TIDYFLAGS=3D -latin1
> +TIDYFLAGS+=3D -latin1
> =20
> DESTDIR?=3D ${DOCDIR}/nl_NL.ISO8859-1/books/${.CURDIR:T}
> Index: doc/ru_RU.KOI8-R/articles/Makefile.inc
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/doc/ru_RU.KOI8-R/articles/Makefile.inc,v
> retrieving revision 1.3
> diff -u -r1.3 Makefile.inc
> --- doc/ru_RU.KOI8-R/articles/Makefile.inc 25 Jul 2001 13:17:06 -0000 1.3
> +++ doc/ru_RU.KOI8-R/articles/Makefile.inc 5 Nov 2001 15:45:05 -0000
> @@ -5,5 +5,5 @@
> # Original revision: 1.3
> #
> =20
> -TIDYFLAGS=3D -latin1
> +TIDYFLAGS+=3D -latin1
> DESTDIR?=3D ${DOCDIR}/ru_RU.KOI8-R/articles/${.CURDIR:T}
> Index: doc/ru_RU.KOI8-R/books/Makefile.inc
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/doc/ru_RU.KOI8-R/books/Makefile.inc,v
> retrieving revision 1.7
> diff -u -r1.7 Makefile.inc
> --- doc/ru_RU.KOI8-R/books/Makefile.inc 25 Jul 2001 15:29:02 -0000 1.7
> +++ doc/ru_RU.KOI8-R/books/Makefile.inc 5 Nov 2001 15:47:48 -0000
> @@ -4,6 +4,6 @@
> #
> # Original revision: 1.4
> =20
> -TIDYFLAGS=3D -latin1
> +TIDYFLAGS+=3D -latin1
> =20
> DESTDIR?=3D ${DOCDIR}/ru_RU.KOI8-R/books/${.CURDIR:T}
> Index: doc/sr_YU.ISO8859-2/articles/Makefile.inc
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/doc/sr_YU.ISO8859-2/articles/Makefile.inc,v
> retrieving revision 1.2
> diff -u -r1.2 Makefile.inc
> --- doc/sr_YU.ISO8859-2/articles/Makefile.inc 11 Jun 2001 01:20:31 -0000 =
1.2
> +++ doc/sr_YU.ISO8859-2/articles/Makefile.inc 5 Nov 2001 15:48:08 -0000
> @@ -1,4 +1,4 @@
> -TIDYFLAGS=3D -raw
> +TIDYFLAGS+=3D -raw
> =20
> .if defined(OPENJADE)
> JADE=3D SP_ENCODING=3DISO-8859-2 ${PREFIX}/bin/openjade
> Index: doc/sr_YU.ISO8859-2/books/Makefile.inc
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/doc/sr_YU.ISO8859-2/books/Makefile.inc,v
> retrieving revision 1.2
> diff -u -r1.2 Makefile.inc
> --- doc/sr_YU.ISO8859-2/books/Makefile.inc 11 Jun 2001 01:20:32 -0000 1.2
> +++ doc/sr_YU.ISO8859-2/books/Makefile.inc 5 Nov 2001 15:48:04 -0000
> @@ -1,4 +1,4 @@
> -TIDYFLAGS=3D -raw
> +TIDYFLAGS+=3D -raw
> =20
> .if defined(OPENJADE)
> JADE=3D SP_ENCODING=3DISO-8859-2 ${PREFIX}/bin/openjade
> Index: doc/zh_TW.Big5/books/faq/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/ncvs/doc/zh_TW.Big5/books/faq/Makefile,v
> retrieving revision 1.4
> diff -u -r1.4 Makefile
> --- doc/zh_TW.Big5/books/faq/Makefile 6 Sep 1999 06:53:43 -0000 1.4
> +++ doc/zh_TW.Big5/books/faq/Makefile 5 Nov 2001 15:48:18 -0000
> @@ -6,7 +6,7 @@
> =20
> MAINTAINER=3Dfoxfair@FreeBSD.org
> =20
> -TIDYFLAGS=3D -raw
> +TIDYFLAGS+=3D -raw
> =20
> DOC?=3D book
> =20
>=20
> To Unsubscribe: send mail to majordomo@FreeBSD.org
> with "unsubscribe freebsd-doc" in the body of the message
--E39vaYmALEf/7YXx
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (SunOS)
Comment: For info see http://www.gnupg.org
iD8DBQE75vmTtNcQog5FH30RAsTzAJ9B0Hh8aaI49ab1Ip9bbXmiSsz92gCgwqOm
sH7ffq/vWgxoSu6UfyVSknk=
=kFMI
-----END PGP SIGNATURE-----
--E39vaYmALEf/7YXx--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-doc" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20011105124156.D10872>