trans-coord/gnun/prep/gnun validate-html README...

[Kaloian Doganov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Kaloian Doganov <kaloian>       08/02/06 13:45:10

Modified files:
        gnun/prep/gnun : validate-html README GNUmakefile ChangeLog 

Log message:
        * validate-html: Lookup for user-wide DTD resources in addition to
        the system wide catalog.
        * README: Mention w3c-dtd-xhtml as a dependency.
        
        * GNUmakefile (VALIDATE-HTML): New variable.
        ($(rootdir)/home.$(1).shtml, $(subst /po/,/,$(1).html)): Introduce
        validation for generated HTML files.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/prep/gnun/validate-html?cvsroot=trans-coord&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/prep/gnun/README?cvsroot=trans-coord&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/prep/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/prep/gnun/ChangeLog?cvsroot=trans-coord&r1=1.31&r2=1.32

Patches:
Index: validate-html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/prep/gnun/validate-html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- validate-html       6 Feb 2008 11:13:15 -0000       1.3
+++ validate-html       6 Feb 2008 13:45:10 -0000       1.4
@@ -8,6 +8,7 @@
 fi
 
 ROOT=`dirname $0`/../..
+USERDTD=$HOME/dtd
 
 cat $1 | sed "s/<\!--#include virtual=\"\/\?\(.*\)\" -->/include(\`\1')/g" \
-  | m4 -EE -I $ROOT | xmllint --loaddtd --nonet --noout -
+  | m4 -EE -I $ROOT | xmllint --path "$USERDTD" --loaddtd --nonet --noout -

Index: README
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/prep/gnun/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- README      6 Feb 2008 10:25:24 -0000       1.2
+++ README      6 Feb 2008 13:45:10 -0000       1.3
@@ -9,4 +9,5 @@
 GNU Guile >= 1.6
 po4a from CVS
 Libxml2 (>= 2.6.24 ?, needed for XHTML validation only)
+w3c-dtd-xhtml (needed for XHTML validation only)
 CVS (>= 1.12.9 ?, needed if VCS operations are enabled)

Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/prep/gnun/GNUmakefile,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- GNUmakefile 5 Feb 2008 06:46:54 -0000       1.28
+++ GNUmakefile 6 Feb 2008 13:45:10 -0000       1.29
@@ -19,6 +19,7 @@
 PO4A-GETTEXTIZE = po4a-gettextize
 PO4A-TRANSLATE = po4a-translate
 MAKE-PROTOTYPE = ./make-prototype
+VALIDATE-HTML = ./validate-html
 SED = sed
 M4 = m4
 
@@ -175,7 +176,8 @@
 else
        [ ! -f $(rootdir)/gnusflashes.$(1).include ] || $(SED) --in-place 
"s/\(<!--#include file=\"gnusflashes*\)\(.include\" -->\)/\1.$(1)\2/g" 
$(rootdir)/po/home.$(1).m4
 endif
-       $(M4) $(rootdir)/po/home.$(1).m4 > $(rootdir)/home.$(1).shtml
+       $(M4) $(rootdir)/po/home.$(1).m4 > $$@
+       $(VALIDATE-HTML) $$@
 endef
 
 $(foreach h_lang,$(HOME_LINGUAS),$(eval $(call home_rules,$(h_lang))))
@@ -209,6 +211,7 @@
                $(SED) --in-place "s/\(<!--#include 
virtual=\".*$$$$replaceable\)\(.html\" -->\)/\1.$(2)\2/g" $(1).m4; \
        done;
        $(M4) $(1).m4 > $$@
+       $(VALIDATE-HTML) $$@
 endef
 
 $(foreach base,$(ALL_BASE),$(eval $(call article_pot_rules,$(base))))

Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/prep/gnun/ChangeLog,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- ChangeLog   6 Feb 2008 12:09:50 -0000       1.31
+++ ChangeLog   6 Feb 2008 13:45:10 -0000       1.32
@@ -1,3 +1,13 @@
+2008-02-06  Kaloian Doganov  <address@hidden>
+
+       * validate-html: Lookup for user-wide DTD resources in addition to
+       the system wide catalog.
+       * README: Mention w3c-dtd-xhtml as a dependency.
+
+       * GNUmakefile (VALIDATE-HTML): New variable.
+       ($(rootdir)/home.$(1).shtml, $(subst /po/,/,$(1).html)): Introduce
+       validation for generated HTML files.
+
 2008-02-06  Yavor Doganov  <address@hidden>
 
        * gnun.mk (gnu): Add `gnu-history', `linux-and-gnu' and