Skip to content

Commit

Permalink
More tooling fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
paulehoffman committed Oct 17, 2018
1 parent 0af4bb8 commit 506a1fa
Show file tree
Hide file tree
Showing 10 changed files with 9,092 additions and 439 deletions.
5 changes: 1 addition & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ xml2rfcv3-annotated.rng: xml2rfcv3.rng annotate-rng.xslt draft-iab-rfc7991bis.xm
saxon $< annotate-rng.xslt doc=draft-iab-rfc7991bis.xml > $@

xml2rfcv3-spec.xml: xml2rfcv3.rng rng2xml2rfc.xslt
saxon $< rng2xml2rfc.xslt voc=v3 draft-iab-rfc7991bis.xml > $@
saxon $< rng2xml2rfc.xslt voc=v3 specsrc=draft-iab-rfc7991bis.xml > $@

xml2rfcv3-spec-deprecated.xml: xml2rfcv3.rng rng2xml2rfc.xslt
saxon $< rng2xml2rfc.xslt specsrc=draft-iab-rfc7991bis.xml deprecated=yes > $@
Expand All @@ -41,9 +41,6 @@ differences-from-v2.txt: xml2rfcv3.rnc $(xml2rfcv2)
xml2rfcv3-full.rng: xml2rfcv3.rng
./postprocess-rng.py

%.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 > $@

Expand Down
10 changes: 7 additions & 3 deletions draft-iab-rfc7991bis.redxml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<?rfc linkmailto="no" ?>
<?rfc rfcedstyle="yes"?><!--
...some notes might go here...
... some notes might go here ...
-->
<!DOCTYPE rfc
Expand Down Expand Up @@ -7399,7 +7399,9 @@ artwork =
attribute originalSrc { text }?,
(text* | svg)
}
# https://www.rfc-editor.org/materials/format/SVG-1.2-RFC.rnc
# TODO: replace with link to RSE site, or provide an inline version
include "svg.rnc"

sourcecode =
element sourcecode {
attribute xml:base { text }?,
Expand Down Expand Up @@ -8374,7 +8376,9 @@ to the v3 schema.</t>
+ attribute originalSrc { text }?,
+ (text* | svg)
+ }
+ # https://www.rfc-editor.org/materials/format/SVG-1.2-RFC.rnc
+ # TODO: replace with link to RSE site, or provide an inline
+ version
+ include "svg.rnc"
+ sourcecode =
+ element sourcecode {
+ attribute xml:base { text }?,
Expand Down
Loading

0 comments on commit 506a1fa

Please sign in to comment.