From 1525e857e113e594e72a2cde6b75d9cce4c9dd9d Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Thu, 31 Mar 2005 18:08:52 +0000 Subject: [PATCH] build switched to generate all RNG schemas from DTDs; now also generates RNC versions from RNGs (you can use the RNCs for context-sensitive, validated editing in Emacs/nXML mode, Oxygen XML Editor, etc.); RNG and RNC conversions both rely on "trang"; tagged the directory (tag name: "original") before making the change, so original CVS-maintained RNG files and union.xml and Makefile that were in this directory can be checked out at any time by doing a "cvs update -r original" --- website/schema/relaxng/.cvsignore | 5 +- website/schema/relaxng/Makefile | 44 ++- website/schema/relaxng/autolayout.rng | 418 ------------------------ website/schema/relaxng/extensions.rng | 220 ------------- website/schema/relaxng/forms.rng | 380 --------------------- website/schema/relaxng/layout.rng | 405 ----------------------- website/schema/relaxng/rddl.rng | 85 ----- website/schema/relaxng/union.xml | 14 - website/schema/relaxng/website-full.rng | 82 ----- website/schema/relaxng/website.rng | 78 ----- 10 files changed, 36 insertions(+), 1695 deletions(-) delete mode 100644 website/schema/relaxng/autolayout.rng delete mode 100644 website/schema/relaxng/extensions.rng delete mode 100644 website/schema/relaxng/forms.rng delete mode 100644 website/schema/relaxng/layout.rng delete mode 100644 website/schema/relaxng/rddl.rng delete mode 100644 website/schema/relaxng/union.xml delete mode 100644 website/schema/relaxng/website-full.rng delete mode 100644 website/schema/relaxng/website.rng diff --git a/website/schema/relaxng/.cvsignore b/website/schema/relaxng/.cvsignore index e8ae1ed78..3b11a4146 100644 --- a/website/schema/relaxng/.cvsignore +++ b/website/schema/relaxng/.cvsignore @@ -1,3 +1,2 @@ -elements.xml -websitedb.rng -config.xml +.rng +.rnc diff --git a/website/schema/relaxng/Makefile b/website/schema/relaxng/Makefile index f474a87d5..096fe06ba 100644 --- a/website/schema/relaxng/Makefile +++ b/website/schema/relaxng/Makefile @@ -1,16 +1,40 @@ include ../../../cvstools/Makefile.incl -SCHEMADIR=../../../schema -RELAXNG=$(SCHEMADIR)/relaxng -DOCBOOKRNG=/share/doctypes/docbook42/relaxng +VPATH=../dtd -all: websitedb.rng +RDDLNS=http://www.rddl.org/ +XLINKNS=http://www.w3.org/1999/xlink +HTMLNS=http://www.w3.org/1999/xhtml -config.xml: union.xml - $(XSLT) $(RELAXNG)/simple/config.xml $(SCHEMADIR)/tools/union-config.xsl $@ \ - union.xml=/sourceforge/docbook/website/schema/relaxng/union.xml +SED=sed +SED_OPTS=-i # edit files in place -websitedb.rng: config.xml - $(XSLT) $(DOCBOOKRNG)/docbook.rng $(SCHEMADIR)/tools/configure.xsl $@ \ - config=/sourceforge/docbook/website/schema/relaxng/$< +RNCFILES=autolayout.rnc layout.rnc website.rnc website-full.rnc website-custom.rnc +all: $(RNCFILES) + +autolayout.rng: autolayout.dtd + $(RUNTRANG) $< $@ + +layout.rng: layout.dtd + $(RUNTRANG) $< $@ + +website-%.rng: website-%.dtd + $(RUNTRANG) \ + -i xmlns:rddl=$(RDDLNS) -i xmlns:xlink=$(XLINKNS) -i xmlns:html=$(HTMLNS) \ + $< $@ + +website.rng: ../dtd/website.dtd + $(RUNTRANG) \ + -i xmlns:rddl=$(RDDLNS) -i xmlns:xlink=$(XLINKNS) -i xmlns:html=$(HTMLNS) \ + $< $@ + +../dtd/website.dtd: + make -C ../dtd + +%.rnc: %.rng + $(RUNTRANG) $< $@ + $(SED) $(SED_OPTS) 's/start \+= \+webpage \+| \+article/start = webpage/' $@ + +clean: + rm -f *.rng *.rnc *.dtd diff --git a/website/schema/relaxng/autolayout.rng b/website/schema/relaxng/autolayout.rng deleted file mode 100644 index aa97fb262..000000000 --- a/website/schema/relaxng/autolayout.rng +++ /dev/null @@ -1,418 +0,0 @@ - - - - - -$Id$ -Website Autolayout Schema -Website -2.5.0 -autolayout - -2002 -2003 -Norman Walsh - - - - -This is the autolayout schema for Website. -Please use the following formal public identifier to identify it: - -"-//Norman Walsh//DTD Website Autolayout V2.5.0//EN" - -For example: - - - [...]>]]> - -Please direct all questions and comments about this DTD to -Norman Walsh, ndw@nwalsh.com. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - added - changed - - - - - - - 0 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/website/schema/relaxng/extensions.rng b/website/schema/relaxng/extensions.rng deleted file mode 100644 index df67b52b7..000000000 --- a/website/schema/relaxng/extensions.rng +++ /dev/null @@ -1,220 +0,0 @@ - - - - - -$Id$ -Website Extensions -Website -2.4.1 -extensions - -2002 -2003 -Norman Walsh - - - - -This is the extensions module for Website. - -Please direct all questions and comments about this schema to -Norman Walsh, ndw@nwalsh.com. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - yes - no - - - - - - - - - - - - - - - - - - - - - - - - - - - - - XML - - - - diff --git a/website/schema/relaxng/forms.rng b/website/schema/relaxng/forms.rng deleted file mode 100644 index 585f7dace..000000000 --- a/website/schema/relaxng/forms.rng +++ /dev/null @@ -1,380 +0,0 @@ - - - - - -$Id$ -Website HTML Forms Module -Website -2.4.1 -forms - -2002 -2003 -Norman Walsh - - - - -This is the HTML Forms module for Website. - -Please direct all questions and comments about this schema to -Norman Walsh, ndw@nwalsh.com. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - GET - POST - - - - - - - - - - - - - - - text - password - checkbox - radio - submit - reset - file - hidden - image - button - - - - - - - - - - - - - - - - - - - - - - checked - - - - - - - disabled - - - - - - - readonly - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - button - submit - reset - - - - - - - - - - - - - disabled - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - multiple - - - - - - - disabled - - - - - - - - - - - - - - - - - - - - - - - - - - - - - selected - - - - - - - disabled - - - - - - - - - - - - - - - - - - - - - - - disabled - - - - - - - readonly - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/website/schema/relaxng/layout.rng b/website/schema/relaxng/layout.rng deleted file mode 100644 index 9e95e4f90..000000000 --- a/website/schema/relaxng/layout.rng +++ /dev/null @@ -1,405 +0,0 @@ - - - - - -$Id$ -Website Layout Schema -Website -2.5.0 -layout - -2002 -2003 -Norman Walsh - - - - -This is the layout schema for Website. -Please use the following formal public identifier to identify it: - -"-//Norman Walsh//DTD Website Layout V2.5.0//EN" - -For example: - - - [...]>]]> - -Please direct all questions and comments about this DTD to -Norman Walsh, ndw@nwalsh.com. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - added - changed - - - - - - - 0 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/website/schema/relaxng/rddl.rng b/website/schema/relaxng/rddl.rng deleted file mode 100644 index 47376daab..000000000 --- a/website/schema/relaxng/rddl.rng +++ /dev/null @@ -1,85 +0,0 @@ - - - - - -$Id$ -Website RDDL Module -Website -2.4.1 -rddl - -2002 -2003 -Norman Walsh - - - - -This is the RDDL module for Website. - -Please direct all questions and comments about this schema to -Norman Walsh, ndw@nwalsh.com. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - simple - - - - - - - - - - - - - - - - - - - - - diff --git a/website/schema/relaxng/union.xml b/website/schema/relaxng/union.xml deleted file mode 100644 index 3f0155f68..000000000 --- a/website/schema/relaxng/union.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/website/schema/relaxng/website-full.rng b/website/schema/relaxng/website-full.rng deleted file mode 100644 index 7d1f64f17..000000000 --- a/website/schema/relaxng/website-full.rng +++ /dev/null @@ -1,82 +0,0 @@ - - - - - -$Id$ -Website -Website -2.5.0 -website - -1997 -1998 -1999 -2000 -2001 -2002 -2003 -Norman Walsh - - - - -This is the driver file for V2.5.0 of the Website document type. -Please use the following formal public identifier to identify it: - -"-//Norman Walsh//DTD Website V2.5.0//EN" - -For example, if -you are using the Website DTD directly, use the FPI in the DOCTYPE -declaration: - - - [...]>]]> - -Or, if you have a higher-level driver file that customizes Website, -use the FPI in the parameter entity declaration: - - -%WebsiteDTD;]]> - -Please direct all questions and comments about this DTD to -Norman Walsh, ndw@nwalsh.com. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/website/schema/relaxng/website.rng b/website/schema/relaxng/website.rng deleted file mode 100644 index 42f726f94..000000000 --- a/website/schema/relaxng/website.rng +++ /dev/null @@ -1,78 +0,0 @@ - - - - - -$Id$ -Website -Website -2.5.0 -website - -1997 -1998 -1999 -2000 -2001 -2002 -2003 -Norman Walsh - - - - -This is the driver file for V2.5.0 of the Website document type. -Please use the following formal public identifier to identify it: - -"-//Norman Walsh//DTD Website V2.5.0//EN" - -For example, if -you are using the Website DTD directly, use the FPI in the DOCTYPE -declaration: - - - [...]>]]> - -Or, if you have a higher-level driver file that customizes Website, -use the FPI in the parameter entity declaration: - - -%WebsiteDTD;]]> - -Please direct all questions and comments about this DTD to -Norman Walsh, ndw@nwalsh.com. - - - - - - - - - - - - - - - - - - - - - - - - - - - -- 2.40.0