diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:28:18 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:28:18 -0700 |
| commit | d76e3920c56d37c942092b7dca20fcaded81c0a5 (patch) | |
| tree | 80a55c7b59c38377216daaada4e8bc47b69ceb9a /xml/relaxng/src/resources/html5-schema/svg11/svg-basic-font.rnc | |
| parent | 3b37877a2561bf9fbe072253a18688807d523505 (diff) | |
| parent | 1aa2e09bdbd413eacb677e9fa4b50630530d0656 (diff) | |
| download | idea-d76e3920c56d37c942092b7dca20fcaded81c0a5.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java
Change-Id: Id899dae9a1e1c79272f8a70e14a7dcef4f760d7f
Diffstat (limited to 'xml/relaxng/src/resources/html5-schema/svg11/svg-basic-font.rnc')
| -rw-r--r-- | xml/relaxng/src/resources/html5-schema/svg11/svg-basic-font.rnc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xml/relaxng/src/resources/html5-schema/svg11/svg-basic-font.rnc b/xml/relaxng/src/resources/html5-schema/svg11/svg-basic-font.rnc index 32eb1460f564..94f5b7fa3121 100644 --- a/xml/relaxng/src/resources/html5-schema/svg11/svg-basic-font.rnc +++ b/xml/relaxng/src/resources/html5-schema/svg11/svg-basic-font.rnc @@ -97,7 +97,7 @@ grammar { attribute overline-thickness { Number.datatype }? a:documentation [ "\x{a}" ~ " glyph: Glyph Element\x{a}" ~ " " ] SVG.glyph.class = notAllowed - SVG.glyph.content = SVG.Description.class*, SVG.glyph.class* + SVG.glyph.content = SVG.Description.class* | SVG.glyph.class* glyph = element glyph { attlist.glyph, SVG.glyph.content } attlist.glyph &= SVG.Core.attrib, @@ -120,7 +120,7 @@ grammar { ] SVG.missing-glyph.class = notAllowed SVG.missing-glyph.content = - SVG.Description.class*, SVG.missing-glyph.class* + SVG.Description.class* | SVG.missing-glyph.class* missing-glyph = element missing-glyph { attlist.missing-glyph, SVG.missing-glyph.content |