From 54cf68eab200a0111704a85ea84ffe36df1caf1d Mon Sep 17 00:00:00 2001
From: Alexey Zelkin <phantom@FreeBSD.org>
Date: Wed, 12 Dec 2001 11:49:38 +0000
Subject: [PATCH] Force tidy(1) to use '-raw' and newly added '-preserve'
options to process generated HTML. This not cause any side effects except
leaving some character entities in their numeric form instead converting them
into alphabetical notation (< instead of <), but since all browsers
understand such cases it is not a problem.
This commit should make all translations tidy clean, since
tidy should not arise entities conversion problem as it did
for long time before. Therefore all occurences of manual settings
of TIDYFLAGS and NO_TIDY declarations for translations are removed.
No objections from: -doc
Requested by: Russian and Japanese translation teams
---
de_DE.ISO8859-1/books/Makefile.inc | 4 +---
ja_JP.eucJP/articles/Makefile.inc | 2 --
ja_JP.eucJP/articles/contributing/Makefile | 2 --
ja_JP.eucJP/articles/contributors/Makefile | 2 --
ja_JP.eucJP/articles/dialup-firewall/Makefile | 2 --
ja_JP.eucJP/articles/diskless-x/Makefile | 4 +---
ja_JP.eucJP/articles/fonts/Makefile | 2 --
ja_JP.eucJP/articles/ipsec-must/Makefile | 4 +---
ja_JP.eucJP/articles/multi-os/Makefile | 4 +---
ja_JP.eucJP/articles/zip-drive/Makefile | 2 --
ja_JP.eucJP/books/Makefile.inc | 4 +---
ja_JP.eucJP/books/design-44bsd/Makefile | 2 --
ja_JP.eucJP/books/faq/Makefile | 4 +---
ja_JP.eucJP/books/fdp-primer/Makefile | 2 --
ja_JP.eucJP/books/handbook/Makefile | 2 --
ja_JP.eucJP/books/porters-handbook/Makefile | 4 +---
nl_NL.ISO8859-1/books/Makefile.inc | 2 --
ru_RU.KOI8-R/articles/Makefile.inc | 1 -
ru_RU.KOI8-R/books/Makefile.inc | 2 --
share/mk/doc.docbook.mk | 2 +-
share/mk/doc.html.mk | 2 +-
sr_YU.ISO8859-2/articles/Makefile.inc | 2 +-
sr_YU.ISO8859-2/books/Makefile.inc | 2 +-
zh_TW.Big5/books/faq/Makefile | 2 --
24 files changed, 11 insertions(+), 50 deletions(-)
diff --git a/de_DE.ISO8859-1/books/Makefile.inc b/de_DE.ISO8859-1/books/Makefile.inc
index bf1cfcd893..072c97101b 100644
--- a/de_DE.ISO8859-1/books/Makefile.inc
+++ b/de_DE.ISO8859-1/books/Makefile.inc
@@ -2,10 +2,8 @@
# The FreeBSD Documentation Project
# The FreeBSD German Documentation Project
#
-# $FreeBSD: doc/de_DE.ISO8859-1/books/Makefile.inc,v 1.2 2001/02/01 21:24:06 alex Exp $
+# $FreeBSD$
# $FreeBSDde: de-docproj/books/Makefile.inc,v 1.4 2001/02/01 21:24:27 alex Exp $
#
-TIDYFLAGS= -latin1
-
DESTDIR?= ${DOCDIR}/de_DE.ISO8859-1/books/${.CURDIR:T}
diff --git a/ja_JP.eucJP/articles/Makefile.inc b/ja_JP.eucJP/articles/Makefile.inc
index e0577d837b..f432a40463 100644
--- a/ja_JP.eucJP/articles/Makefile.inc
+++ b/ja_JP.eucJP/articles/Makefile.inc
@@ -3,6 +3,4 @@
#
# Original revision: 1.4
-TIDYFLAGS= -raw
-
DESTDIR?= ${DOCDIR}/ja/articles/${.CURDIR:T}
diff --git a/ja_JP.eucJP/articles/contributing/Makefile b/ja_JP.eucJP/articles/contributing/Makefile
index 5d01b02690..58a0ff32b8 100644
--- a/ja_JP.eucJP/articles/contributing/Makefile
+++ b/ja_JP.eucJP/articles/contributing/Makefile
@@ -12,8 +12,6 @@ JADEFLAGS+= -V %generate-article-toc%
SRCS= article.sgml
-NO_TIDY=YES
-
DOC_PREFIX?= ${.CURDIR}/../../..
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ja_JP.eucJP/articles/contributors/Makefile b/ja_JP.eucJP/articles/contributors/Makefile
index 5d01b02690..58a0ff32b8 100644
--- a/ja_JP.eucJP/articles/contributors/Makefile
+++ b/ja_JP.eucJP/articles/contributors/Makefile
@@ -12,8 +12,6 @@ JADEFLAGS+= -V %generate-article-toc%
SRCS= article.sgml
-NO_TIDY=YES
-
DOC_PREFIX?= ${.CURDIR}/../../..
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ja_JP.eucJP/articles/dialup-firewall/Makefile b/ja_JP.eucJP/articles/dialup-firewall/Makefile
index 4bfeb13ff2..0d87c27db0 100644
--- a/ja_JP.eucJP/articles/dialup-firewall/Makefile
+++ b/ja_JP.eucJP/articles/dialup-firewall/Makefile
@@ -10,8 +10,6 @@ INSTALL_ONLY_COMPRESSED?=
SRCS= article.sgml
-NO_TIDY=YES
-
DOC_PREFIX?= ${.CURDIR}/../../..
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ja_JP.eucJP/articles/diskless-x/Makefile b/ja_JP.eucJP/articles/diskless-x/Makefile
index 042cb6635c..55ffe5118c 100644
--- a/ja_JP.eucJP/articles/diskless-x/Makefile
+++ b/ja_JP.eucJP/articles/diskless-x/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: doc/ja_JP.eucJP/articles/diskless-x/Makefile,v 1.2 2000/10/03 11:08:09 hrs Exp $
+# $FreeBSD$
# Original revision: 1.5
DOC?= article
@@ -10,8 +10,6 @@ INSTALL_ONLY_COMPRESSED?=
SRCS= article.sgml
-NO_TIDY=YES
-
DOC_PREFIX?= ${.CURDIR}/../../..
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ja_JP.eucJP/articles/fonts/Makefile b/ja_JP.eucJP/articles/fonts/Makefile
index 18a96d67dc..624dcd9eb7 100644
--- a/ja_JP.eucJP/articles/fonts/Makefile
+++ b/ja_JP.eucJP/articles/fonts/Makefile
@@ -10,8 +10,6 @@ INSTALL_ONLY_COMPRESSED?=
SRCS= article.sgml
-NO_TIDY=YES
-
DOC_PREFIX?= ${.CURDIR}/../../..
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ja_JP.eucJP/articles/ipsec-must/Makefile b/ja_JP.eucJP/articles/ipsec-must/Makefile
index c0b8202706..d58839e308 100644
--- a/ja_JP.eucJP/articles/ipsec-must/Makefile
+++ b/ja_JP.eucJP/articles/ipsec-must/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: doc/ja_JP.eucJP/articles/ipsec-must/Makefile,v 1.2 2001/09/04 10:40:53 hrs Exp $
+# $FreeBSD$
# Original revision: 1.2
DOC?= article
@@ -10,8 +10,6 @@ INSTALL_ONLY_COMPRESSED?=
SRCS= article.sgml
-NO_TIDY=YES
-
DOC_PREFIX?= ${.CURDIR}/../../..
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ja_JP.eucJP/articles/multi-os/Makefile b/ja_JP.eucJP/articles/multi-os/Makefile
index 26211a0fba..624dcd9eb7 100644
--- a/ja_JP.eucJP/articles/multi-os/Makefile
+++ b/ja_JP.eucJP/articles/multi-os/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: doc/ja_JP.eucJP/articles/multi-os/Makefile,v 1.1.1.1 2000/01/06 07:22:41 kuriyama Exp $
+# $FreeBSD$
# Original revision: 1.8
DOC?= article
@@ -10,8 +10,6 @@ INSTALL_ONLY_COMPRESSED?=
SRCS= article.sgml
-NO_TIDY= YES
-
DOC_PREFIX?= ${.CURDIR}/../../..
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ja_JP.eucJP/articles/zip-drive/Makefile b/ja_JP.eucJP/articles/zip-drive/Makefile
index 4bfeb13ff2..0d87c27db0 100644
--- a/ja_JP.eucJP/articles/zip-drive/Makefile
+++ b/ja_JP.eucJP/articles/zip-drive/Makefile
@@ -10,8 +10,6 @@ INSTALL_ONLY_COMPRESSED?=
SRCS= article.sgml
-NO_TIDY=YES
-
DOC_PREFIX?= ${.CURDIR}/../../..
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/ja_JP.eucJP/books/Makefile.inc b/ja_JP.eucJP/books/Makefile.inc
index 534a7db0fd..1ced1bce78 100644
--- a/ja_JP.eucJP/books/Makefile.inc
+++ b/ja_JP.eucJP/books/Makefile.inc
@@ -1,7 +1,5 @@
#
-# $FreeBSD: doc/ja_JP.eucJP/books/Makefile.inc,v 1.4 1999/09/06 06:53:19 peter Exp $
+# $FreeBSD$
#
-TIDYFLAGS= -raw
-
DESTDIR?= ${DOCDIR}/ja/books/${.CURDIR:T}
diff --git a/ja_JP.eucJP/books/design-44bsd/Makefile b/ja_JP.eucJP/books/design-44bsd/Makefile
index 2ebd2060f8..2d8d9e676d 100644
--- a/ja_JP.eucJP/books/design-44bsd/Makefile
+++ b/ja_JP.eucJP/books/design-44bsd/Makefile
@@ -10,8 +10,6 @@ IMAGES= fig1.eps fig2.eps
INSTALL_COMPRESSED?=gz
INSTALL_ONLY_COMPRESSED?=
-NO_TIDY= YES
-
SRCS= book.sgml
# Use the local DSSSL file
diff --git a/ja_JP.eucJP/books/faq/Makefile b/ja_JP.eucJP/books/faq/Makefile
index 851dce3997..b97abaf74d 100644
--- a/ja_JP.eucJP/books/faq/Makefile
+++ b/ja_JP.eucJP/books/faq/Makefile
@@ -1,5 +1,5 @@
#
-# $FreeBSD: doc/ja_JP.eucJP/books/faq/Makefile,v 1.8 2000/02/03 03:11:04 kuriyama Exp $
+# $FreeBSD$
#
# Build the FreeBSD FAQ
#
@@ -15,8 +15,6 @@ FORMATS?= html-split html
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
-NO_TIDY= YES
-
#
# SRCS lists the individual SGML files that make up the document. Changes
# to any of these files will force a rebuild
diff --git a/ja_JP.eucJP/books/fdp-primer/Makefile b/ja_JP.eucJP/books/fdp-primer/Makefile
index 0101034192..f31792a11e 100644
--- a/ja_JP.eucJP/books/fdp-primer/Makefile
+++ b/ja_JP.eucJP/books/fdp-primer/Makefile
@@ -15,8 +15,6 @@ FORMATS?= html-split html
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
-NO_TIDY= YES
-
#
# SRCS lists the individual SGML files that make up the document. Changes
# to any of these files will force a rebuild
diff --git a/ja_JP.eucJP/books/handbook/Makefile b/ja_JP.eucJP/books/handbook/Makefile
index 71e75d3d88..cd243a28d8 100644
--- a/ja_JP.eucJP/books/handbook/Makefile
+++ b/ja_JP.eucJP/books/handbook/Makefile
@@ -35,8 +35,6 @@ FORMATS?= html-split
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
-NO_TIDY= YES
-
#IMAGES = advanced-networking/isdn-bus.eps
#IMAGES+= advanced-networking/isdn-twisted-pair.eps
#IMAGES+= advanced-networking/natd.eps
diff --git a/ja_JP.eucJP/books/porters-handbook/Makefile b/ja_JP.eucJP/books/porters-handbook/Makefile
index 44df0e0a39..14c27aafd8 100644
--- a/ja_JP.eucJP/books/porters-handbook/Makefile
+++ b/ja_JP.eucJP/books/porters-handbook/Makefile
@@ -1,5 +1,5 @@
#
-# $FreeBSD: doc/ja_JP.eucJP/books/porters-handbook/Makefile,v 1.1.1.1 2000/04/29 07:55:15 kuriyama Exp $
+# $FreeBSD$
#
# Build the FreeBSD Porter's Handbook.
#
@@ -14,8 +14,6 @@ FORMATS?= html-split
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
-NO_TIDY= YES
-
#
# SRCS lists the individual SGML files that make up the document. Changes
# to any of these files will force a rebuild
diff --git a/nl_NL.ISO8859-1/books/Makefile.inc b/nl_NL.ISO8859-1/books/Makefile.inc
index 394627fcc8..3ed2a73554 100644
--- a/nl_NL.ISO8859-1/books/Makefile.inc
+++ b/nl_NL.ISO8859-1/books/Makefile.inc
@@ -2,6 +2,4 @@
# $FreeBSD$
#
-TIDYFLAGS= -latin1
-
DESTDIR?= ${DOCDIR}/nl_NL.ISO8859-1/books/${.CURDIR:T}
diff --git a/ru_RU.KOI8-R/articles/Makefile.inc b/ru_RU.KOI8-R/articles/Makefile.inc
index 73c98375f4..d4815d80a1 100644
--- a/ru_RU.KOI8-R/articles/Makefile.inc
+++ b/ru_RU.KOI8-R/articles/Makefile.inc
@@ -5,5 +5,4 @@
# Original revision: 1.3
#
-TIDYFLAGS= -latin1
DESTDIR?= ${DOCDIR}/ru_RU.KOI8-R/articles/${.CURDIR:T}
diff --git a/ru_RU.KOI8-R/books/Makefile.inc b/ru_RU.KOI8-R/books/Makefile.inc
index 51b1240523..06972b7728 100644
--- a/ru_RU.KOI8-R/books/Makefile.inc
+++ b/ru_RU.KOI8-R/books/Makefile.inc
@@ -4,6 +4,4 @@
#
# Original revision: 1.4
-TIDYFLAGS= -latin1
-
DESTDIR?= ${DOCDIR}/ru_RU.KOI8-R/books/${.CURDIR:T}
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk
index 973482f073..6b52a6636f 100644
--- a/share/mk/doc.docbook.mk
+++ b/share/mk/doc.docbook.mk
@@ -180,7 +180,7 @@ XARGS?= /usr/bin/xargs
TEX?= ${PREFIX}/bin/tex
PDFTEX?= ${PREFIX}/bin/pdftex
TIDY?= ${PREFIX}/bin/tidy
-TIDYOPTS?= -i -m -f /dev/null ${TIDYFLAGS}
+TIDYOPTS?= -i -m -raw -preserve -f /dev/null ${TIDYFLAGS}
HTML2TXT?= ${PREFIX}/bin/links
HTML2TXTOPTS?= -dump ${HTML2TXTFLAGS}
HTML2PDB?= ${PREFIX}/bin/iSiloBSD
diff --git a/share/mk/doc.html.mk b/share/mk/doc.html.mk
index d2a715a4a2..06cec7c31f 100644
--- a/share/mk/doc.html.mk
+++ b/share/mk/doc.html.mk
@@ -68,7 +68,7 @@ TAR?= /usr/bin/tar
XARGS?= /usr/bin/xargs
TIDY?= ${PREFIX}/bin/tidy
-TIDYOPTS?= -i -m -f /dev/null ${TIDYFLAGS}
+TIDYOPTS?= -i -m -raw -preserve -f /dev/null ${TIDYFLAGS}
HTML2TXT?= ${PREFIX}/bin/links
HTML2TXTOPTS?= -dump ${HTML2TXTFLAGS}
HTML2PDB?= ${PREFIX}/bin/iSiloBSD
diff --git a/sr_YU.ISO8859-2/articles/Makefile.inc b/sr_YU.ISO8859-2/articles/Makefile.inc
index b2920c257c..6bfa2a5dae 100644
--- a/sr_YU.ISO8859-2/articles/Makefile.inc
+++ b/sr_YU.ISO8859-2/articles/Makefile.inc
@@ -1,4 +1,4 @@
-TIDYFLAGS= -raw
+# $FreeBSD$
.if defined(OPENJADE)
JADE= SP_ENCODING=ISO-8859-2 ${PREFIX}/bin/openjade
diff --git a/sr_YU.ISO8859-2/books/Makefile.inc b/sr_YU.ISO8859-2/books/Makefile.inc
index 3715549e13..324dac7bcd 100644
--- a/sr_YU.ISO8859-2/books/Makefile.inc
+++ b/sr_YU.ISO8859-2/books/Makefile.inc
@@ -1,4 +1,4 @@
-TIDYFLAGS= -raw
+# $FreeBSD$
.if defined(OPENJADE)
JADE= SP_ENCODING=ISO-8859-2 ${PREFIX}/bin/openjade
diff --git a/zh_TW.Big5/books/faq/Makefile b/zh_TW.Big5/books/faq/Makefile
index 7e38e86434..bf5a8268f9 100644
--- a/zh_TW.Big5/books/faq/Makefile
+++ b/zh_TW.Big5/books/faq/Makefile
@@ -6,8 +6,6 @@
MAINTAINER=foxfair@FreeBSD.org
-TIDYFLAGS= -raw
-
DOC?= book
FORMATS?= html-split html