Before testing updates to the RNG

Makefile

@@ -1,39 +1,55 @@
 all: \
-	draft-iab-xml2rfc-v3-bis.redxml \
-	draft-iab-xml2rfc-v3-bis.txt
-
-TOOLS=tools
+	draft-iab-rfc7991bis.redxml \
+	draft-iab-rfc7991bis.unpg.txt \
+	draft-iab-rfc7991bis.txt
 
 xml2rfc.all: \
-	draft-iab-xml2rfc-v3-bis.xml xml2rfcv3-annotated.rng
+	draft-iab-rfc7991bis.xml xml2rfcv3-annotated.rng
 
 xml2rfcv3.rnc: xml2rfcv3.rng
-	java -jar $(TOOLS)/trang.jar -o lineLength=69 $< $@
+	java -jar tools/trang.jar -o lineLength=69 $< $@
 
 #xml2rfcv3.dtd: xml2rfcv3.rng
-#	java -jar $(TOOLS)/trang.jar $< $@
+#	java -jar tools/trang.jar $< $@
 
-xml2rfcv3-annotated.rng: xml2rfcv3.rng annotate-rng.xslt draft-iab-xml2rfc-v3-bis.xml
-	saxon $< annotate-rng.xslt doc=draft-iab-xml2rfc-v3-bis.xml > $@
+xml2rfcv3-annotated.rng: xml2rfcv3.rng annotate-rng.xslt draft-iab-rfc7991bis.xml
+	saxon $< annotate-rng.xslt doc=draft-iab-rfc7991bis.xml > $@
 
 xml2rfcv3-spec.xml: xml2rfcv3.rng rng2xml2rfc.xslt
-	saxon $< rng2xml2rfc.xslt voc=v3 specsrc=draft-iab-xml2rfc-v3-bis.xml > $@
+	saxon $< rng2xml2rfc.xslt voc=v3 draft-iab-rfc7991bis.xml > $@
 
 xml2rfcv3-spec-deprecated.xml: xml2rfcv3.rng rng2xml2rfc.xslt
-	saxon $< rng2xml2rfc.xslt specsrc=draft-iab-xml2rfc-v3-bis.xml deprecated=yes > $@
+	saxon $< rng2xml2rfc.xslt specsrc=draft-iab-rfc7991bis.xml deprecated=yes > $@
 
 xml2rfcv3.rnc.folded: xml2rfcv3.rnc
 	./fold-rnc.sh $< > $@
 
-draft-iab-xml2rfc-v3-bis.xml: xml2rfcv3-spec.xml xml2rfcv3-spec-deprecated.xml xml2rfcv3.rnc.folded
+draft-iab-rfc7991bis.xml: xml2rfcv3-spec.xml xml2rfcv3-spec-deprecated.xml xml2rfcv3.rnc.folded differences-from-v2.txt
 	cp -v $@ $@.bak
 	./refresh-inclusions.sh $@
 
+xml2rfcv2 = xml2rfcv2.rnc
+
+differences-from-v2.txt:	xml2rfcv3.rnc $(xml2rfcv2)
+	fold -w66 -s $(xml2rfcv2) > $@.v2
+	fold -w66 -s $<  > $@.v3
+	diff -w --old-line-format='- %L' --new-line-format='+ %L' \
+	--unchanged-line-format='  %L' -d $@.v2 $@.v3 \
+	| sed "s/\&/\&amp;/g" > $@
+	rm -f $@.v2 $@.v3
+
 xml2rfcv3-full.rng: xml2rfcv3.rng
 	./postprocess-rng.py
 
-%.redxml:	%.xml $(TOOLS)/clean-for-DTD.xslt
-	saxon -l $< $(TOOLS)/clean-for-DTD.xslt > $@
+%.html:	%.xml tools/rfc2629.xslt myxml2rfc.xslt
+	saxon -l $< myxml2rfc.xslt > $@
+
+%.redxml:	%.xml tools/clean-for-DTD.xslt
+	saxon -l $< tools/clean-for-DTD.xslt > $@
 
 %.txt:	%.redxml
 	tclsh xml2rfc.tcl xml2rfc $< $@
+
+%.unpg.txt:	%.redxml
+	tclsh xml2rfc.tcl xml2rfc $< $@.unpg
+	mv $@.unpg $@

README

@@ -0,0 +1,23 @@
+Structure
+
+Note that the main section ("Elements") of draft-iab-rfc7991bis.xml is
+auto-generated based on:
+
+1) xml2rfcv3.rng (which in turn is derived from the DTD), and
+2) draft-iab-rfc7991bis.xml itself.
+
+Within this section, <t> elements can be added to the element and attribute
+descriptions and are supposed to round-trip through the re-generation
+process.
+
+
+Building
+
+Building the spec requires:
+
+1) java
+2) tclsh (for xml2rfc.tcl)
+3) an XSLT 1.0 processor that support exslt:node-set, such as xsltproc or Saxon 6.5.5 (http://sourceforge.net/projects/saxon/files/saxon6/6.5.5/)
+
+(the XSLT process currently is started by using whatever "saxon" does on the local system)
+