- From: SVG Working Group repository <cam+svgwgrepo@mcc.id.au>
- Date: Fri, 11 Apr 2014 06:02:54 -0700
- To: public-svg-wg@w3.org
details: https://svgwg.org/hg/svg2/rev/6166e5cb5b57
branches:
changeset: 664:6166e5cb5b57
user: Cameron McCormack <cam@mcc.id.au>
date: Fri Apr 11 20:20:11 2014 +1000
description:
Don't die if we can't check that svg2-tools is up-to-date.
details: https://svgwg.org/hg/svg2/rev/d642b1a44c25
branches:
changeset: 665:d642b1a44c25
user: Cameron McCormack <cam@mcc.id.au>
date: Fri Apr 11 20:25:15 2014 +1000
description:
Removed remnants of SVG Fonts and mention the removal in the Changes appendix.
diffstat:
Makefile | 4 +-
master/changes.html | 14 +++
master/definitions.xml | 189 +++---------------------------------------------
master/feature.html | 14 ---
master/idlindex.html | 10 --
master/linking.html | 2 +-
master/struct.html | 17 +----
master/text.html | 40 +--------
8 files changed, 36 insertions(+), 254 deletions(-)
diffs (829 lines):
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,17 @@
-# Makefile for SVG 1.1 Second Edition.
+# Makefile for SVG 2.
all-with-tools-check : tools-check all
all-specs : all
@for spec in specs/*; do [ -f $$spec/Makefile ] && make -C $$spec/ all; done
tools-check :
- @bash -c "REMOTE_REV=$$(hg id -i http://svgwg.org/hg/svg2-tools); [ \$$? = 0 -o \"\$$REMOTE_REV\" != \"\" ] || exit 0; LOCAL_REV=$$(hg id -i ../svg2-tools); [ \"\$$LOCAL_REV\" = \"\$$REMOTE_REV\" -o \"\$$LOCAL_REV\" = \"\$$REMOTE_REV\"+ ] || (echo \"You must update your svg2-tools repository! (Remote repository has revision \$$REMOTE_REV, but you are at \$$LOCAL_REV.)\"; exit 1)"
+ @bash -c "REMOTE_REV=$$(hg id -i http://svgwg.org/hg/svg2-tools 2>/dev/null); [ \$$? = 0 -a \"\$$REMOTE_REV\" != \"\" ] || exit 0; LOCAL_REV=$$(hg id -i ../svg2-tools); [ \"\$$LOCAL_REV\" = \"\$$REMOTE_REV\" -o \"\$$LOCAL_REV\" = \"\$$REMOTE_REV\"+ ] || (echo \"You must update your svg2-tools repository! (Remote repository has revision \$$REMOTE_REV, but you are at \$$LOCAL_REV.)\"; exit 1)"
all :
@../svg2-tools/build.py
pdf : all
prince --no-author-style -s build/publish/style/svg-style.css -s http://www.w3.org/StyleSheets/TR/W3C-REC -s build/publish/style/svg-style-print.css build/publish/single-page.html -o build/publish/single-page.pdf
ZIPDIR=REC-SVG11-20110802
diff --git a/master/changes.html b/master/changes.html
--- a/master/changes.html
+++ b/master/changes.html
@@ -310,16 +310,30 @@ have been made.</p>
<li>Removed the <span class="element-name">animateColor</span> element.</li>
<li>Added the onbegin, onend and onrepeat attributes to the <a>SVGAnimationElement</a> interface.</li>
</ul>
<h3 id="fonts">Fonts chapter</h3>
<ul>
<li>Added WOFF requirement, rearranged content.</li>
+
+ <li class='added-since-last-wd'>Removed this chapter and the SVG Fonts
+ feature is contained, including the
+ <span class='element-name'>'font'</span>,
+ <span class='element-name'>'glyph'</span>,
+ <span class='element-name'>'missing-glyph'</span>,
+ <span class='element-name'>'hkern'</span>,
+ <span class='element-name'>'vkern'</span>,
+ <span class='element-name'>'font-face'</span>,
+ <span class='element-name'>'font-face-src'</span>,
+ <span class='element-name'>'font-face-uri'</span>,
+ <span class='element-name'>'font-face-format'</span> and
+ <span class='element-name'>'font-face-name'</span> elements
+ and their corresponding IDL interfaces.</li>
</ul>
<h3 id="extend">Extensibility chapter</h3>
<ul>
<li>Made <a>'foreignObject'</a> a <a>graphics element</a>.</li>
<li>Made <a>'foreignObject/width'</a> and <a>'foreignObject/height'</a> presentation attributes on the <a>'foreignObject'</a> element.</li>
</ul>
diff --git a/master/definitions.xml b/master/definitions.xml
--- a/master/definitions.xml
+++ b/master/definitions.xml
@@ -9,17 +9,17 @@
then a stand-alone <attribute> entry must be added in the next
section.
-->
<element
name='a'
href='linking.html#AElement'
contentmodel='textoranyof'
elementcategories='animation, descriptive, shape, structural, paint server'
- elements='a, clipPath, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, view, text, altGlyphDef'
+ elements='a, clipPath, cursor, filter, foreignObject, image, marker, mask, script, style, switch, view, text, altGlyphDef'
attributecategories='aria, navigation, conditional processing, core, graphical event, presentation, style, xlink'
interfaces='SVGAElement'>
<attribute name='xlink:href' href='linking.html#AElementXLinkHrefAttribute' animatable='yes'/>
<attribute name='xlink:show' href='linking.html#XLinkShowAttribute'/>
<attribute name='xlink:actuate' href='linking.html#AElementXLinkActuateAttribute'/>
<attribute name='target' href='linking.html#AElementTargetAttribute' animatable='yes'/>
</element>
@@ -157,17 +157,17 @@
<attribute name='xlink:href' href='interact.html#CursorElementHrefAttribute' animatable='yes'/>
</element>
<element
name='defs'
href='struct.html#DefsElement'
contentmodel='anyof'
elementcategories='animation, descriptive, shape, structural, paint server'
- elements='a, clipPath, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, view, text, altGlyphDef'
+ elements='a, clipPath, cursor, filter, foreignObject, image, marker, mask, script, style, switch, view, text, altGlyphDef'
attributecategories='core, graphical event, presentation, style'
interfaces='SVGDefsElement'/>
<element
name='desc'
href='struct.html#DescElement'
contentmodel='any'
attributecategories='core, style'
attributes='lang'
@@ -193,164 +193,50 @@
interfaces='SVGEllipseElement'>
<attribute name='cx' href='shapes.html#EllipseElementCXAttribute' animatable='yes'/>
<attribute name='cy' href='shapes.html#EllipseElementCYAttribute' animatable='yes'/>
<attribute name='rx' href='shapes.html#EllipseElementRXAttribute' animatable='yes'/>
<attribute name='ry' href='shapes.html#EllipseElementRYAttribute' animatable='yes'/>
</element>
<element
- name='font'
- href='fonts.html#FontElement'
- contentmodel='anyof'
- elementcategories='descriptive, paint server'
- elements='clipPath, font-face, glyph, hkern, mask, marker, missing-glyph, script, vkern'
- attributecategories='core, style, presentation'
- interfaces='SVGFontElement'>
- <attribute name='horiz-origin-x' href='fonts.html#FontElementHorizOriginXAttribute'/>
- <attribute name='horiz-origin-y' href='fonts.html#FontElementHorizOriginYAttribute'/>
- <attribute name='horiz-adv-x' href='fonts.html#FontElementHorizAdvXAttribute'/>
- <attribute name='vert-origin-x' href='fonts.html#FontElementVertOriginXAttribute'/>
- <attribute name='vert-origin-y' href='fonts.html#FontElementVertOriginYAttribute'/>
- <attribute name='vert-adv-y' href='fonts.html#FontElementVertAdvYAttribute'/>
- </element>
-
- <element
- name='font-face'
- href='fonts.html#FontFaceElement'
- contentmodel='anyof'
- elements='script'
- attributecategories='core'
- interfaces='SVGFontFaceElement'>
- <x:contentmodel xmlns='http://www.w3.org/1999/xhtml'>Any number of <a>descriptive elements</a>, <a>'script'</a> and at most one <a>'font-face-src'</a> element, in any order.</x:contentmodel>
- <attribute name='font-family' href='fonts.html#FontFaceElementFontFamilyAttribute'/>
- <attribute name='font-style' href='fonts.html#FontFaceElementFontStyleAttribute'/>
- <attribute name='font-variant' href='fonts.html#FontFaceElementFontVariantAttribute'/>
- <attribute name='font-weight' href='fonts.html#FontFaceElementFontWeightAttribute'/>
- <attribute name='font-stretch' href='fonts.html#FontFaceElementFontStretchAttribute'/>
- <attribute name='font-size' href='fonts.html#FontFaceElementFontSizeAttribute'/>
- <attribute name='unicode-range' href='fonts.html#FontFaceElementUnicodeRangeAttribute'/>
- <attribute name='units-per-em' href='fonts.html#FontFaceElementUnitsPerEmAttribute'/>
- <attribute name='panose-1' href='fonts.html#FontFaceElementPanose1Attribute'/>
- <attribute name='stemv' href='fonts.html#FontFaceElementStemvAttribute'/>
- <attribute name='stemh' href='fonts.html#FontFaceElementStemhAttribute'/>
- <attribute name='slope' href='fonts.html#FontFaceElementSlopeAttribute'/>
- <attribute name='cap-height' href='fonts.html#FontFaceElementCapHeightAttribute'/>
- <attribute name='x-height' href='fonts.html#FontFaceElementXHeightAttribute'/>
- <attribute name='accent-height' href='fonts.html#FontFaceElementAccentHeightAttribute'/>
- <attribute name='ascent' href='fonts.html#FontFaceElementAscentAttribute'/>
- <attribute name='descent' href='fonts.html#FontFaceElementDescentAttribute'/>
- <attribute name='widths' href='fonts.html#FontFaceElementWidthsAttribute'/>
- <attribute name='bbox' href='fonts.html#FontFaceElementBboxAttribute'/>
- <attribute name='ideographic' href='fonts.html#FontFaceElementIdeographicAttribute'/>
- <attribute name='alphabetic' href='fonts.html#FontFaceElementAlphabeticAttribute'/>
- <attribute name='mathematical' href='fonts.html#FontFaceElementMathematicalAttribute'/>
- <attribute name='hanging' href='fonts.html#FontFaceElementHangingAttribute'/>
- <attribute name='v-ideographic' href='fonts.html#FontFaceElementVertIdeographicAttribute'/>
- <attribute name='v-alphabetic' href='fonts.html#FontFaceElementVertAlphabeticAttribute'/>
- <attribute name='v-mathematical' href='fonts.html#FontFaceElementVertMathematicalAttribute'/>
- <attribute name='v-hanging' href='fonts.html#FontFaceElementVertHangingAttribute'/>
- <attribute name='underline-position' href='fonts.html#FontFaceElementUnderlinePositionAttribute'/>
- <attribute name='underline-thickness' href='fonts.html#FontFaceElementUnderlineThicknessAttribute'/>
- <attribute name='strikethrough-position' href='fonts.html#FontFaceElementStrikeThroughPositionAttribute'/>
- <attribute name='strikethrough-thickness' href='fonts.html#FontFaceElementStrikeThroughThicknessAttribute'/>
- <attribute name='overline-position' href='fonts.html#FontFaceElementOverlinePositionAttribute'/>
- <attribute name='overline-thickness' href='fonts.html#FontFaceElementOverlineThicknessAttribute'/>
- </element>
-
- <element
- name='font-face-format'
- href='fonts.html#FontFaceFormatElement'
- contentmodel='anyof'
- elements='script'
- attributecategories='core'
- interfaces='SVGFontFaceFormatElement'>
- <attribute name='string' href='fonts.html#FontFaceFormatElementStringAttribute'/>
- </element>
-
- <element
- name='font-face-name'
- href='fonts.html#FontFaceNameElement'
- contentmodel='anyof'
- elements='script'
- attributecategories='core'
- interfaces='SVGFontFaceNameElement'>
- <attribute name='name' href='fonts.html#FontFaceNameElementNameAttribute'/>
- </element>
-
- <element
- name='font-face-src'
- href='fonts.html#FontFaceSrcElement'
- contentmodel='oneormoreof'
- elements='font-face-uri, font-face-name, script'
- attributecategories='core'
- interfaces='SVGFontFaceSrcElement'/>
-
- <element
- name='font-face-uri'
- href='fonts.html#FontFaceURIElement'
- contentmodel='anyof'
- elements='font-face-format, script'
- attributecategories='core, xlink'
- interfaces='SVGFontFaceUriElement'>
- <attribute name='xlink:href' href='fonts.html#FontFaceUriElementHrefAttribute'/>
- </element>
-
- <element
name='foreignObject'
href='extend.html#ForeignObjectElement'
contentmodel='any'
attributecategories='aria, navigation, core, conditional processing, graphical event, presentation, style'
interfaces='SVGForeignObjectElement'>
<attribute name='x' href='extend.html#ForeignObjectElementXAttribute' animatable='yes'/>
<attribute name='y' href='extend.html#ForeignObjectElementYAttribute' animatable='yes'/>
<attribute name='width' href='extend.html#ForeignObjectElementWidthAttribute' animatable='yes' presentation='yes'/>
<attribute name='height' href='extend.html#ForeignObjectElementHeightAttribute' animatable='yes' presentation='yes'/>
</element>
<element
name='g'
href='struct.html#GElement'
contentmodel='anyof'
elementcategories='animation, descriptive, shape, structural, paint server'
- elements='a, altGlyphDef, clipPath, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, text, view'
+ elements='a, altGlyphDef, clipPath, cursor, filter, foreignObject, image, marker, mask, script, style, switch, text, view'
attributecategories='aria, navigation, conditional processing, core, graphical event, presentation, style'
interfaces='SVGGElement'/>
<element
- name='glyph'
- href='fonts.html#GlyphElement'
- contentmodel='anyof'
- elementcategories='animation, descriptive, shape, structural, paint server'
- elements='a, altGlyphDef, clipPath, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, text, view'
- attributecategories='core, style, presentation'
- attributes='d, horiz-adv-x, vert-origin-x, vert-origin-y, vert-adv-y'
- interfaces='SVGGlyphElement'>
- <attribute name='unicode' elements='glyph' href='fonts.html#GlyphElementUnicodeAttribute'/>
- <attribute name='glyph-name' elements='glyph' href='fonts.html#GlyphElementGlyphNameAttribute'/>
- <attribute name='orientation' elements='glyph' href='fonts.html#GlyphElementOrientationAttribute'/>
- <attribute name='arabic-form' elements='glyph' href='fonts.html#GlyphElementArabicFormAttribute'/>
- <attribute name='lang' elements='glyph' href='fonts.html#GlyphElementLangAttribute'/>
- </element>
-
- <element
name='glyphRef'
href='text.html#GlyphRefElement'
elementcategories='paint server'
contentmodel='anyof'
elements='clipPath, marker, mask, script'
- attributecategories='core, style, presentation, xlink'
+ attributecategories='core, style, presentation'
interfaces='SVGGlyphRefElement'>
<attribute name='x' href='text.html#GlyphRefElementXAttribute'/>
<attribute name='y' href='text.html#GlyphRefElementYAttribute'/>
<attribute name='dx' href='text.html#GlyphRefElementDXAttribute'/>
<attribute name='dy' href='text.html#GlyphRefElementDYAttribute'/>
<attribute name='glyphRef' href='text.html#GlyphRefElementGlyphRefAttribute'/>
<attribute name='format' href='text.html#GlyphRefElementFormatAttribute'/>
- <attribute name='xlink:href' href='text.html#GlyphRefElementHrefAttribute'/>
</element>
<element
name='hatch'
href='pservers.html#HatchElement'
contentmodel='anyof'
elementcategories='animation, descriptive'
elements='hatchPath, script'
@@ -374,25 +260,16 @@
elements='script'
attributecategories='core, presentation, style'
interfaces='SVGHatchPathElement'>
<attribute name='d' href='paths.html#DAttribute' animatable='yes'/>
<attribute name='offset' href='pservers.html#HatchPathElementOffsetAttribute' animatable='yes'/>
</element>
<element
- name='hkern'
- href='fonts.html#HKernElement'
- contentmodel='anyof'
- elements='script'
- attributecategories='core'
- attributes='u1, g1, u2, g2, k'
- interfaces='SVGHKernElement'/>
-
- <element
name='iframe'
href='embedded.html#IframeElement'
contentmodel='anyof'
elementcategories='animation, descriptive, paint server, structurally external'
elements='clipPath, marker, mask, script'
attributecategories='aria, navigation, core, conditional processing, graphical event, style, presentation, embedding placement, embedding size'
attributes='preserveAspectRatio'
interfaces='SVGIframeElement'>
@@ -452,17 +329,17 @@
<attribute name='xlink:href' href='pservers.html#LinearGradientElementHrefAttribute' animatable='yes'/>
</element>
<element
name='marker'
href='painting.html#MarkerElement'
contentmodel='anyof'
elementcategories='animation, descriptive, shape, structural, paint server'
- elements='a, clipPath, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, view, text, altGlyphDef'
+ elements='a, clipPath, cursor, filter, foreignObject, image, marker, mask, script, style, switch, view, text, altGlyphDef'
attributecategories='core, presentation, style'
attributes='viewBox, preserveAspectRatio'
interfaces='SVGMarkerElement'>
<attribute name='refX' href='painting.html#MarkerElementRefXAttribute' animatable='yes'/>
<attribute name='refY' href='painting.html#MarkerElementRefYAttribute' animatable='yes'/>
<attribute name='markerUnits' href='painting.html#MarkerUnitsAttribute' animatable='yes'/>
<attribute name='markerWidth' href='painting.html#MarkerWidthAttribute' animatable='yes'/>
<attribute name='markerHeight' href='painting.html#MarkerHeightAttribute' animatable='yes'/>
@@ -509,26 +386,16 @@
<element
name='metadata'
href='metadata.html#MetadataElement'
contentmodel='any'
attributecategories='core'
interfaces='SVGMetadataElement'/>
<element
- name='missing-glyph'
- href='fonts.html#MissingGlyphElement'
- contentmodel='anyof'
- elementcategories='animation, descriptive, shape, structural, paint server'
- elements='a, altGlyphDef, clipPath, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, text, view'
- attributecategories='core, style, presentation'
- attributes='d, horiz-adv-x, vert-origin-x, vert-origin-y, vert-adv-y'
- interfaces='SVGMissingGlyphElement'/>
-
- <element
name='mpath'
href='animate.html#MPathElement'
contentmodel='anyof'
elementcategories='descriptive'
elements='script'
attributecategories='core, xlink'
interfaces='SVGMPathElement'>
<attribute name='xlink:href' href='animate.html#MPathElementHrefAttribute'/>
@@ -546,17 +413,17 @@
<attribute name='pathLength' href='paths.html#PathLengthAttribute' animatable='yes'/>
</element>
<element
name='pattern'
href='pservers.html#PatternElement'
contentmodel='anyof'
elementcategories='animation, descriptive, shape, structural, paint server'
- elements='a, altGlyphDef, clipPath, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, text, view'
+ elements='a, altGlyphDef, clipPath, cursor, filter, foreignObject, image, marker, mask, script, style, switch, text, view'
attributecategories='core, presentation, style, xlink'
attributes='viewBox, preserveAspectRatio'
interfaces='SVGPatternElement'>
<attribute name='x' href='pservers.html#PatternElementXAttribute' animatable='yes'/>
<attribute name='y' href='pservers.html#PatternElementYAttribute' animatable='yes'/>
<attribute name='width' href='pservers.html#PatternElementWidthAttribute' animatable='yes'/>
<attribute name='height' href='pservers.html#PatternElementHeightAttribute' animatable='yes'/>
<attribute name='patternUnits' href='pservers.html#PatternElementPatternUnitsAttribute' animatable='yes'/>
@@ -695,17 +562,17 @@
<attribute name='title' href='styling.html#StyleElementTitleAttribute'/>
</element>
<element
name='svg'
href='struct.html#SVGElement'
contentmodel='anyof'
elementcategories='animation, descriptive, shape, structural, paint server'
- elements='a, altGlyphDef, clipPath, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, text, view'
+ elements='a, altGlyphDef, clipPath, cursor, filter, foreignObject, image, marker, mask, script, style, switch, text, view'
attributecategories='aria, navigation, conditional processing, core, document event, graphical event, presentation, style'
attributes='viewBox, preserveAspectRatio, zoomAndPan'
interfaces='SVGSVGElement'>
<attribute name='x' href='struct.html#SVGElementXAttribute' animatable='yes'/>
<attribute name='y' href='struct.html#SVGElementYAttribute' animatable='yes'/>
<attribute name='width' href='struct.html#SVGElementWidthAttribute' animatable='yes' presentation='yes'/>
<attribute name='height' href='struct.html#SVGElementHeightAttribute' animatable='yes' presentation='yes'/>
<attribute name='playbackOrder' href='struct.html#SVGElementPlaybackOrderAttribute' animatable='no'/>
@@ -722,17 +589,17 @@
interfaces='SVGSwitchElement'>
</element>
<element
name='symbol'
href='struct.html#SymbolElement'
contentmodel='anyof'
elementcategories='animation, descriptive, shape, structural, paint server'
- elements='a, altGlyphDef, clipPath, cursor, filter, font, font-face, foreignObject, image, marker, mask, script, style, switch, text, view'
+ elements='a, altGlyphDef, clipPath, cursor, filter, foreignObject, image, marker, mask, script, style, switch, text, view'
attributecategories='aria, navigation, core, graphical event, presentation, style'
attributes='preserveAspectRatio, viewBox'
interfaces='SVGSymbolElement'>
</element>
<element
name='text'
href='text.html#TextElement'
@@ -860,29 +727,21 @@
contentmodel='anyof'
elementcategories='animation, descriptive'
elements='script'
attributecategories='aria, navigation, core'
attributes='viewBox, preserveAspectRatio, zoomAndPan'
interfaces='SVGViewElement'>
<attribute name='viewTarget' elements='view' href='linking.html#ViewElementViewTargetAttribute'/>
</element>
- <element
- name='vkern'
- href='fonts.html#VKernElement'
- contentmodel='anyof'
- elements='script'
- attributecategories='core'
- attributes='u1, g1, u2, g2, k'
- interfaces='SVGVKernElement'/>
<!-- ... element categories ............................................ -->
<elementcategory name='animation' href='intro.html#TermAnimationElement' elements='animate, animateMotion, animateTransform, discard, set'/>
- <elementcategory name='container' href='intro.html#TermContainerElement' elements='svg, g, defs, symbol, mask, pattern, marker, a, switch, glyph, missing-glyph'/>
+ <elementcategory name='container' href='intro.html#TermContainerElement' elements='svg, g, defs, symbol, mask, pattern, marker, a, switch'/>
<elementcategory name='descriptive' href='intro.html#TermDescriptiveElement' elements='desc, title, metadata'/>
<elementcategory name='gradient' href='intro.html#TermGradientElement' elements='linearGradient, radialGradient, meshGradient'/>
<elementcategory name='graphics' href='intro.html#TermGraphicsElement' elements='path, text, rect, circle, ellipse, line, polyline, polygon, image, use, foreignObject, iframe, video, audio, canvas'/>
<elementcategory name='graphics referencing' href='intro.html#TermGraphicsReferencingElement' elements='use, image, iframe, video, audio'/>
<elementcategory name='light source' href='intro.html#TermLightSourceElement' elements='feDistantLight, fePointLight, feSpotLight'/>
<elementcategory name='markable' href='intro.html#TermMarkableElement' elements='path, line, polyline, polygon'/>
<elementcategory name='paint server' href='intro.html#TermPaintServerElement' elements='solidColor, linearGradient, radialGradient, meshGradient, pattern, hatch'/>
<elementcategory name='shape' href='intro.html#TermShapeElement' elements='circle, ellipse, line, path, polygon, polyline, rect'/>
@@ -895,47 +754,33 @@
<!-- Note: An <attribute> defined here applies only to the listed
elements if a list is given in 'elements', otherwise, it
applies to all <element>s that include the attribute name in
their 'attribute' attribute.
-->
<!-- attributes common to both desc and title -->
- <attribute name='lang' elements='desc, title' href='fonts.html#GlyphElementLangAttribute'/>
-
- <!-- attributes common to both glyph and missing-glyph -->
- <attribute name='d' elements='glyph, missing-glyph' href='fonts.html#GlyphElementDAttribute'/>
- <attribute name='horiz-adv-x' elements='glyph, missing-glyph' href='fonts.html#GlyphElementHorizAdvXAttribute'/>
- <attribute name='vert-origin-x' elements='glyph, missing-glyph' href='fonts.html#GlyphElementVertOriginXAttribute'/>
- <attribute name='vert-origin-y' elements='glyph, missing-glyph' href='fonts.html#GlyphElementVertOriginYAttribute'/>
- <attribute name='vert-adv-y' elements='glyph, missing-glyph' href='fonts.html#GlyphElementVertAdvYAttribute'/>
-
- <!-- attributes common to hkern and vkern -->
- <attribute name='u1' elements='hkern, vkern' href='fonts.html#HKernElementU1Attribute'/>
- <attribute name='g1' elements='hkern, vkern' href='fonts.html#HKernElementG1Attribute'/>
- <attribute name='u2' elements='hkern, vkern' href='fonts.html#HKernElementU2Attribute'/>
- <attribute name='g2' elements='hkern, vkern' href='fonts.html#HKernElementG2Attribute'/>
- <attribute name='k' elements='hkern, vkern' href='fonts.html#HKernElementKAttribute'/>
+ <attribute name='lang' elements='desc, title' href='struct.html#LangAttribute'/>
<!-- attributes common to text elements -->
<attribute name='x' elements='tref, tspan' href='text.html#TSpanElementXAttribute' animatable='yes'/>
<attribute name='y' elements='tref, tspan' href='text.html#TSpanElementYAttribute' animatable='yes'/>
<attribute name='dx' elements='tref, tspan' href='text.html#TSpanElementDXAttribute' animatable='yes'/>
<attribute name='dy' elements='tref, tspan' href='text.html#TSpanElementDYAttribute' animatable='yes'/>
<attribute name='rotate' elements='tref, tspan' href='text.html#TSpanElementRotateAttribute' animatable='yes'/>
<attribute name='textLength' elements='textPath, tref, tspan' href='text.html#TSpanElementTextLengthAttribute' animatable='yes'/>
<attribute name='lengthAdjust' elements='text, textPath, tref, tspan' href='text.html#TextElementLengthAdjustAttribute' animatable='yes'/>
<!-- attribute common to text content block elements -->
<!-- <attribute name='width' elements='text' href='text.html#TextElementWidthAttribute' animatable='yes'/> -->
<!-- xlink:show and xlink:actuate for all elements supporting the XLink attributes, except a -->
- <attribute name='xlink:show' elements='animate, set, animateMotion, mpath, animateTransform, filter, feImage, font-face-uri, cursor, pattern, hatch, script, textPath, tref, use, image, altGlyph, glyphRef, linearGradient, radialGradient, meshGradient' href='linking.html#XLinkShowAttribute'/>
- <attribute name='xlink:actuate' elements='animate, set, animateMotion, mpath, animateTransform, filter, feImage, font-face-uri, cursor, pattern, hatch, script, textPath, tref, use, image, altGlyph, glyphRef, linearGradient, radialGradient, meshGradient' href='linking.html#XLinkActuateAttribute'/>
+ <attribute name='xlink:show' elements='animate, set, animateMotion, mpath, animateTransform, filter, feImage, cursor, pattern, hatch, script, textPath, tref, use, image, altGlyph, linearGradient, radialGradient, meshGradient' href='linking.html#XLinkShowAttribute'/>
+ <attribute name='xlink:actuate' elements='animate, set, animateMotion, mpath, animateTransform, filter, feImage, cursor, pattern, hatch, script, textPath, tref, use, image, altGlyph, linearGradient, radialGradient, meshGradient' href='linking.html#XLinkActuateAttribute'/>
<!-- attribute common to all animation elements -->
<attribute name='xlink:href' elements='animate, animateMotion, animateTransform, set' href='animate.html#HrefAttribute'/>
<!-- misc: Applies to all <element>s that include attribute name in 'attribute'. -->
<attribute name='viewBox' href='coords.html#ViewBoxAttribute' animatable='yes'/>
<attribute name='preserveAspectRatio' href='coords.html#PreserveAspectRatioAttribute' animatable='yes'/>
<attribute name='zoomAndPan' href='interact.html#ZoomAndPanAttribute'/>
@@ -1316,26 +1161,16 @@
<interface name='SVGZoomEvent' href='script.html#InterfaceSVGZoomEvent'/>
<interface name='SVGAnimateElement' href='animate.html#InterfaceSVGAnimateElement'/>
<interface name='SVGSetElement' href='animate.html#InterfaceSVGSetElement'/>
<interface name='SVGAnimateMotionElement' href='animate.html#InterfaceSVGAnimateMotionElement'/>
<interface name='SVGMPathElement' href='animate.html#InterfaceSVGMPathElement'/>
<interface name='SVGAnimateTransformElement' href='animate.html#InterfaceSVGAnimateTransformElement'/>
<interface name='TimeEvent' href='animate.html#InterfaceTimeEvent'/>
<interface name='SVGAnimationElement' href='animate.html#InterfaceSVGAnimationElement'/>
- <interface name='SVGFontElement' href='fonts.html#InterfaceSVGFontElement'/>
- <interface name='SVGGlyphElement' href='fonts.html#InterfaceSVGGlyphElement'/>
- <interface name='SVGMissingGlyphElement' href='fonts.html#InterfaceSVGMissingGlyphElement'/>
- <interface name='SVGHKernElement' href='fonts.html#InterfaceSVGHKernElement'/>
- <interface name='SVGVKernElement' href='fonts.html#InterfaceSVGVKernElement'/>
- <interface name='SVGFontFaceElement' href='fonts.html#InterfaceSVGFontFaceElement'/>
- <interface name='SVGFontFaceSrcElement' href='fonts.html#InterfaceSVGFontFaceSrcElement'/>
- <interface name='SVGFontFaceUriElement' href='fonts.html#InterfaceSVGFontFaceUriElement'/>
- <interface name='SVGFontFaceFormatElement' href='fonts.html#InterfaceSVGFontFaceFormatElement'/>
- <interface name='SVGFontFaceNameElement' href='fonts.html#InterfaceSVGFontFaceNameElement'/>
<interface name='SVGMetadataElement' href='metadata.html#InterfaceSVGMetadataElement'/>
<interface name='SVGForeignObjectElement' href='extend.html#InterfaceSVGForeignObjectElement'/>
<interface name='SVGSolidColorElement' href='pservers.html#InterfaceSVGSolidColorElement'/>
<interface name='SVGVideoElement' href='embedded.html#InterfaceSVGVideoElement'/>
<interface name='SVGAudioElement' href='embedded.html#InterfaceSVGAudioElement'/>
<interface name='SVGIframeElement' href='embedded.html#InterfaceSVGIframeElement'/>
<interface name='SVGCanvasElement' href='embedded.html#InterfaceSVGCanvasElement'/>
<interface name='SVGSourceElement' href='embedded.html#InterfaceSVGSourceElement'/>
diff --git a/master/feature.html b/master/feature.html
--- a/master/feature.html
+++ b/master/feature.html
@@ -404,30 +404,16 @@ the SVG 1.0 feature strings can be consi
</dl>
<dl id="Animation">
<dt>Feature String:</dt>
<dd>http://www.w3.org/TR/SVG11/feature#Animation</dd>
<dt>User Agent Supports:</dt>
<dd>
the <a>'animate'</a>, <a>'set'</a>, <a>'animateMotion'</a>, <a>'animateTransform'</a> and <a>'mpath'</a> elements</dd>
</dl>
-<dl id="Font">
- <dt>Feature String:</dt>
- <dd>http://www.w3.org/TR/SVG11/feature#Font</dd>
- <dt>User Agent Supports:</dt>
- <dd>
- the <a>'font element'</a>, <a>'font-face'</a>, <a>'glyph'</a>, <a>'missing-glyph'</a>, <a>'hkern'</a>, <a>'vkern'</a>, <a>'font-face-src'</a>, <a>'font-face-uri'</a>, <a>'font-face-format'</a> and <a>'font-face-name'</a> elements</dd>
-</dl>
-<dl id="BasicFont">
- <dt>Feature String:</dt>
- <dd>http://www.w3.org/TR/SVG11/feature#BasicFont</dd>
- <dt>User Agent Supports:</dt>
- <dd>
- the <a>'font element'</a>, <a>'font-face'</a>, <a>'glyph'</a>, <a>'missing-glyph'</a>, <a>'hkern'</a>, <a>'font-face-src'</a> and <a>'font-face-name'</a> elements</dd>
-</dl>
<dl id="Extensibility">
<dt>Feature String:</dt>
<dd>http://www.w3.org/TR/SVG11/feature#Extensibility</dd>
<dt>User Agent Supports:</dt>
<dd>
the <a>'foreignObject'</a> element</dd>
</dl>
diff --git a/master/idlindex.html b/master/idlindex.html
--- a/master/idlindex.html
+++ b/master/idlindex.html
@@ -48,47 +48,38 @@
<li><a>SVGColorProfileRule</a></li>
<li><a>SVGCursorElement</a></li>
<li><a>SVGDefsElement</a></li>
<li><a>SVGDescElement</a></li>
<li><a>SVGDocument</a></li>
<li><a>SVGElement</a></li>
<li><a>SVGEllipseElement</a></li>
<li><a>SVGFitToViewBox</a></li>
- <li><a>SVGFontElement</a></li>
- <li><a>SVGFontFaceElement</a></li>
- <li><a>SVGFontFaceFormatElement</a></li>
- <li><a>SVGFontFaceNameElement</a></li>
- <li><a>SVGFontFaceSrcElement</a></li>
- <li><a>SVGFontFaceUriElement</a></li>
<li><a>SVGForeignObjectElement</a></li>
<li><a>SVGGElement</a></li>
<li><a>SVGGeometryElement</a></li>
- <li><a>SVGGlyphElement</a></li>
<li><a>SVGGlyphRefElement</a></li>
<li><a>SVGGradientElement</a></li>
<li><a>SVGGraphicsElement</a></li>
- <li><a>SVGHKernElement</a></li>
<li><a>SVGImageElement</a></li>
<li><a>SVGLength</a></li>
<li><a>SVGLengthList</a></li>
<li><a>SVGLineElement</a></li>
<li><a>SVGLinearGradientElement</a></li>
<li><a>SVGMPathElement</a></li>
<li><a>SVGMarkableElement</a></li>
<li><a>SVGMarkerElement</a></li>
<li><a>SVGMarkerInstance</a></li>
<li><a>SVGMarkerList</a></li>
<li><a>SVGMaskElement</a></li>
<li><a>SVGMatrix</a></li>
<li><a>SVGMeshGradientElement</a></li>
<li><a>SVGMeshPatchElement</a></li>
<li><a>SVGMeshRowElement</a></li>
<li><a>SVGMetadataElement</a></li>
- <li><a>SVGMissingGlyphElement</a></li>
<li><a>SVGNumber</a></li>
<li><a>SVGNumberList</a></li>
<li><a>SVGPathElement</a></li>
<li><a>SVGPathSeg</a></li>
<li><a>SVGPathSegArcAbs</a></li>
<li><a>SVGPathSegArcRel</a></li>
<li><a>SVGPathSegClosePath</a></li>
<li><a>SVGPathSegCurvetoCubicAbs</a></li>
@@ -135,17 +126,16 @@
<li><a>SVGTextPathElement</a></li>
<li><a>SVGTextPositioningElement</a></li>
<li><a>SVGTitleElement</a></li>
<li><a>SVGTransform</a></li>
<li><a>SVGTransformList</a></li>
<li><a>SVGURIReference</a></li>
<li><a>SVGUnitTypes</a></li>
<li><a>SVGUseElement</a></li>
- <li><a>SVGVKernElement</a></li>
<li><a>SVGViewElement</a></li>
<li><a>SVGViewSpec</a></li>
<li><a>SVGZoomAndPan</a></li>
<li><a>SVGZoomEvent</a></li>
<li><a>TimeEvent</a></li>
</ul>
</body>
diff --git a/master/linking.html b/master/linking.html
--- a/master/linking.html
+++ b/master/linking.html
@@ -163,17 +163,17 @@ agents.)</p>
themselves are treated as invalid circular references.</li>
</ul>
<p>The following list describes the elements and properties that allow IRI
references and the valid target types for those references:</p>
<ul>
<li>the <a>'a'</a> element can reference any local or non-local resource</li>
- <li>the <a>'altGlyph'</a> element must reference either an <a>'altGlyphDef'</a> element or a <a>'glyph'</a> element</li>
+ <li>the <a>'altGlyph'</a> element must reference an <a>'altGlyphDef'</a> element</li>
<li>the <a>'animate'</a> element (see <a href="animate.html#TargetElement">Identifying the target element for an animation</a> for reference rules)</li>
<li>the <a>'animateMotion'</a> element (see <a href="animate.html#TargetElement">Identifying the target element for an animation</a> for reference rules)</li>
<li>the <a>'animateTransform'</a> element (see <a href="animate.html#TargetElement">Identifying the target element for an animation</a> for reference rules)</li>
<li>the <a>'clip-path'</a> property must reference a <a>'clipPath'</a> element</li>
<li>the <a href="color.html#ColorProfileSrcProperty">'src'</a> descriptor on an @color-profile definition must reference an ICC profile resource</li>
<li>the <a>'cursor element'</a> element must reference a resource that can provide an image for the cursor graphic</li>
<li>the <a>'cursor property'</a> property must reference a resource that can provide an image for the cursor graphic</li>
<li>the <a>'feImage'</a> element must reference any local or non-local resource</li>
diff --git a/master/struct.html b/master/struct.html
--- a/master/struct.html
+++ b/master/struct.html
@@ -1718,17 +1718,17 @@ attributes <a>'xml:lang'</a> and <a>'xml
<tr>
<th>Owner:</th>
<td>Chris (<a href="http://www.w3.org/Graphics/SVG/WG/track/actions/3004">ACTION-3004</a> and
<a href="http://www.w3.org/Graphics/SVG/WG/track/actions/3005">ACTION-3005</a>, done)</td>
</tr>
</table>
</div>
-<p class="issue">Should we be moving <span class="attr-name">'lang'</span> instead
+<p class="issue" id="LangAttribute">Should we be moving <span class="attr-name">'lang'</span> instead
of <span class="attr-name">'xlink:lang'</span>?</p>
<dl class="attrdef-list">
<dt>
<table class="propdef attrdef">
<tr>
<th>Name</th>
<th>Value</th>
@@ -2077,26 +2077,16 @@ specifications. [<a href="refs.html#ref-
<td>no restrictions</td>
</tr>
<tr>
<td><a>'g'</a></td>
<td><code title="attr-aria-role-preseentation">presentation</code> role provided no associated <a>'title'</a> element, <a>'desc'</a> element, <a>'aria-label'</a> attribute, <a>'aria-labelledby'</a> attribute, or <a>'aria-describedby'</a> attribute; otherwise, <code title="attr-aria-role-group">group</code> role</td>
<td>no restrictions</td>
</tr>
<tr>
- <td><a>'glyph'</a></td>
- <td>none</td>
- <td>no role may be applied</td>
- </tr>
- <tr>
- <td><a>'glyphRef'</a></td>
- <td>none</td>
- <td>no role may be applied</td>
- </tr>
- <tr>
<td><a>'hatch'</a></td>
<td>none</td>
<td>no role may be applied</td>
</tr>
<tr>
<td><a>'hatchPath'</a></td>
<td>none</td>
<td>no role may be applied</td>
@@ -2147,21 +2137,16 @@ specifications. [<a href="refs.html#ref-
<td>no role may be applied</td>
</tr>
<tr>
<td><a>'metadata'</a></td>
<td>none</td>
<td>no role may be applied</td>
</tr>
<tr>
- <td><a>'missing-glyph'</a></td>
- <td>none</td>
- <td>no role may be applied</td>
- </tr>
- <tr>
<td><a>'mpath'</a></td>
<td>none</td>
<td>no role may be applied</td>
</tr>
<tr>
<td><a>'path'</a></td>
<td><code title="attr-aria-role-preseentation">presentation</code> role provided no associated <a>'title'</a> element, <a>'desc'</a> element, <a>'aria-label'</a> attribute, <a>'aria-labelledby'</a> attribute, or <a>'aria-describedby'</a> attribute; otherwise, <code title="attr-aria-role-group">group</code> role</td>
<td>no restrictions</td>
diff --git a/master/text.html b/master/text.html
--- a/master/text.html
+++ b/master/text.html
@@ -6441,27 +6441,20 @@ style="font-weight:bold; color:green">tr
<h4 id="AltGlyphAttributes">Attributes</h4>
<dl class="attrdef-list-svg2">
<dt id="AltGlyphElementHrefAttribute"><span class="adef">xlink:href</span></dt>
<dd>
<p>
An <a href="linking.html#IRIReference">IRI reference</a>
- either to a <a>'glyph'</a> element in an SVG document fragment
- or to an <a>'altGlyphDef'</a> element.
+ to an <a>'altGlyphDef'</a> element.
</p>
<p>
- If the reference is to a <a>'glyph'</a> element and that glyph
- is available, then that glyph is rendered instead of the
- character(s) that are inside of the <a>'altGlyph'</a> element.
- </p>
- <p>
- If the reference is to an <a>'altGlyphDef'</a> element, then
- if an appropriate set of alternate glyphs is located from
+ If an appropriate set of alternate glyphs is located from
processing the <a>'altGlyphDef'</a> element, then those
alternate glyphs are rendered instead of the character(s) that
are inside of the <a>'altGlyph'</a> element.
</p>
<dl class="attrdef-svg2">
<dt>Value</dt> <dd><a href="types.html#DataTypeIRI"><iri></a></dd>
<dt><a>Lacuna value</a></dt> <dd></dd>
@@ -6628,18 +6621,18 @@ style="font-weight:bold; color:green">tr
</dl>
<p>
If the references to alternate glyphs do not result in successful
identification of alternate glyphs to use, then the character(s)
that are inside of the <a>'altGlyph'</a> element are rendered as
if the <a>'altGlyph'</a> element were a <a>'tspan'</a> element
- instead.</p> <p>An <a>'altGlyph'</a> element either references a
- <a>'glyph'</a> element or an <a>'altGlyphDef'</a> element via its
+ instead.</p> <p>An <a>'altGlyph'</a> element references
+ an <a>'altGlyphDef'</a> element via its
<a>'xlink:href'</a> attribute or identifies a glyph by means of
<a href="text.html#FontPropertiesUsedBySVG">font selection
properties</a>, a glyph identifier and a font format. If
the <a>'xlink:href'</a> attribute is specified, it takes
precedence, and the other glyph identification attributes and
properties are ignored.</p>
</edit:with>
@@ -6709,33 +6702,16 @@ style="font-weight:bold; color:green">tr
use.
</p>
<edit:elementsummary name='glyphRef'/>
<h4 id="GlyphRefAttributes">Attributes</h4>
<dl class="attrdef-list-svg2">
- <dt id="GlyphRefElementHrefAttribute"><span class="adef">xlink:href</span></dt>
- <dd>
- <p>
- An <a href="linking.html#IRIReference">IRI reference</a> to
- a <a>'glyph'</a> element in an SVG document fragment. The
- referenced <a>'glyph'</a> is rendered as an alternate
- glyph.
- </p>
-
- <dl class="attrdef-svg2">
- <dt>Value</dt> <dd><a href="types.html#DataTypeIRI"><iri></a></dd>
- <dt><a>Lacuna value</a></dt> <dd></dd>
- <dt><a>Animatable</a></dt> <dd>no</dd>
- </dl>
-
- </dd>
-
<dt id="GlyphRefElementGlyphRefAttribute"><span class="adef">glyphRef</span></dt>
<dd>
<p>
The glyph identifier, the format of which is dependent on
the <a>'format'</a> of the given font.
</p>
<dl class="attrdef-svg2">
@@ -6848,19 +6824,17 @@ style="font-weight:bold; color:green">tr
<dt><a>Lacuna value</a></dt> <dd>0</dd>
<dt><a>Animatable</a></dt> <dd>No</dd>
</dl>
</dd>
</dl>
<p>
- A <a>'glyphRef element'</a> either references a
- <a>'glyph'</a> element in an SVG document fragment via its
- <a>'xlink:href'</a> attribute or identifies a glyph by means
+ A <a>'glyphRef element'</a> identifies a glyph by means
of <a href="text.html#FontPropertiesUsedBySVG">font selection
properties</a>, a glyph identifier and a font format. If
insufficient attributes and properties have been specified to
identify a glyph, then the <a>'glyphRef element'</a> is processed
in the same manner as when a glyph reference is fully specified,
but the given glyph is not available. If the <a>'xlink:href'</a>
attribute is specified, it takes precedence, and the other glyph
identification attributes and properties are ignored.
@@ -7840,19 +7814,17 @@ The <a>SVGAltGlyphItemElement</a> interf
<pre class="idl">interface <b>SVGGlyphRefElement</b> : <a>SVGElement</a> {
attribute DOMString <a href="text.html#__svg__SVGGlyphRefElement__glyphRef">glyphRef</a>;
attribute DOMString <a href="text.html#__svg__SVGGlyphRefElement__format">format</a>;
attribute float <a href="text.html#__svg__SVGGlyphRefElement__x">x</a>;
attribute float <a href="text.html#__svg__SVGGlyphRefElement__y">y</a>;
attribute float <a href="text.html#__svg__SVGGlyphRefElement__dx">dx</a>;
attribute float <a href="text.html#__svg__SVGGlyphRefElement__dy">dy</a>;
-};
-
-<a>SVGGlyphRefElement</a> implements <a>SVGURIReference</a>;</pre>
+};</pre>
<dl class="interface">
<dt class="attributes-header">Attributes:</dt>
<dd>
<dl class="attributes">
<dt id="__svg__SVGGlyphRefElement__glyphRef" class="attribute first-child"><b>glyphRef</b><span class="idl-type-parenthetical"> (DOMString)</span></dt>
<dd class="attribute">
Received on Friday, 11 April 2014 13:03:21 UTC