Remove the unused SVG-Term class and just use <dfn> where appropriate.
authorCameron McCormack <cam@mcc.id.au>
Thu, 10 May 2012 11:27:20 +0200
changeset 62 2b88abf7bc98
parent 61 b67c929eda7d
child 63 d8fd4e78da6f
Remove the unused SVG-Term class and just use <dfn> where appropriate.
master/animate.html
master/color.html
master/concepts.html
master/coords.html
master/definitions.xml
master/fonts.html
master/implnote.html
master/intro.html
master/linking.html
master/masking.html
master/styling.html
master/svgdom.html
master/text.html
master/types.html
--- a/master/animate.html	Thu May 10 10:45:08 2012 +0200
+++ b/master/animate.html	Thu May 10 11:27:20 2012 +0200
@@ -149,14 +149,14 @@
     the elements which are to be targets of the animations,
     as allowed in SMIL 3.0.</p>
     <p>SMIL Animation requires that the host language define the
-    meaning for <span id='DocumentBegin' class="SVG-Term">document begin</span> and the
-    <span id='DocumentEnd' class="SVG-Term">document end</span>. Since an
+    meaning for <em id='DocumentBegin'>document begin</em> and the
+    <em id='DocumentEnd'>document end</em>. Since an
     <a>'svg'</a> is sometimes the root of
     the XML document tree and other times can be a component of a
-    parent XML grammar, the <em>document begin</em> for a given SVG
+    parent XML grammar, the document begin for a given SVG
     document fragment is defined to be the exact time at which the
     <a>'svg'</a> element's <a href="interact.html#LoadEvent">SVGLoad event</a> is
-    triggered. The <em>document end</em> of an SVG document
+    triggered. The document end of an SVG document
     fragment is the point at which the document fragment has been
     released and is no longer being processed by the user agent.
     However, nested <a>'svg'</a> elements within an SVG
@@ -164,9 +164,9 @@
     and do not define a separate document begin; all times within
     the nested SVG fragment are relative to the document time
     defined for the root <a>'svg'</a> element.</p>
-    <p>For SVG, the term <span id="PresentationTime" class="SVG-Term">presentation time</span>
+    <p>For SVG, the term <dfn id="PresentationTime">presentation time</dfn>
     indicates the position in the timeline relative
-    to the <em>document begin</em> of a given document
+    to the document begin of a given document
     fragment.</p>
     <p>SVG defines more constrained error processing than is
     defined in the <a href="http://www.w3.org/TR/2001/REC-smil-animation-20010904/"><cite>SMIL Animation</cite></a>
@@ -319,7 +319,7 @@
 
 <h3 id="TargetAttributes">Attributes to identify the target attribute or property for an animation</h3>
 
-<p>The following attributes are the <span class='SVG-TermDefine'>animation attribute target attributes</span>,
+<p>The following attributes are the <dfn id='animation-attribute-target-attributes'>animation attribute target attributes</dfn>,
 which identify the target attribute or property for the given 
 <a href="animate.html#TargetElement">target element</a> whose value changes
 over time.</p>
@@ -534,7 +534,7 @@
 
 <h3 id="TimingAttributes">Attributes to control the timing of the animation</h3>
 
-<p>The following attributes are the <span class='SVG-TermDefine'>animation timing attributes</span>.
+<p>The following attributes are the <dfn id='animation-timing-attributes'>animation timing attributes</dfn>.
 They are common to all animation elements and control the timing of the animation,
 including what causes the animation to start and end, whether the
 animation runs repeatedly, and whether to retain the end state
@@ -588,11 +588,10 @@
             Id-value "." ( "begin" | "end" ) ) ( S? ("+"|"-") S? <a
             href="animate.html#ClockValueSyntax">Clock-value</a>
             )?</dt>
-            <dd>Describes a <span class="SVG-Term">syncbase</span>
+            <dd>Describes a <dfn>syncbase</dfn>
             and an optional offset from that syncbase. The element
             begin is defined relative to the begin or active end of
-            another animation. A <span
-            class="SVG-Term">syncbase</span> consists of an ID
+            another animation. A syncbase consists of an ID
             reference to another animation element followed by
             either <code>begin</code> or <code>end</code> to
             identify whether to synchronize with the beginning or
@@ -963,7 +962,7 @@
 
 <h3 id="ValueAttributes">Attributes that define animation values over time</h3>
 
-<p>The following attributes are the <span class='SVG-TermDefine'>animation value attributes</span>.
+<p>The following attributes are the <dfn id='animation-value-attributes'>animation value attributes</dfn>.
 They are common to elements <edit:elementswithattributecategory name='animation value'/>. These
 attributes define the values that are assigned to the target
 attribute or property over time. The attributes below provide
@@ -1341,7 +1340,7 @@
     href="http://www.w3.org/TR/2001/REC-smil-animation-20010904/#Accumulate">
     SMIL Animation: Controlling behavior of repeating animation -
     Cumulative animation</a>.</p>
-    <p>The following attributes are the <span class='SVG-TermDefine'>animation addition attributes</span>,
+    <p>The following attributes are the <dfn id='animation-addition-attributes'>animation addition attributes</dfn>,
     which are common to elements <edit:elementswithattributecategory name='animation addition'/>.</p>
 
     <div class="adef-list">
--- a/master/color.html	Thu May 10 10:45:08 2012 +0200
+++ b/master/color.html	Thu May 10 11:27:20 2012 +0200
@@ -164,7 +164,7 @@
 transform and correct visual data for viewing on different
 devices.</p>
 
-<p>A <span class="SVG-Term">color profile description</span>
+<p>A <dfn id='color-profile-description'>color profile description</dfn>
 provides the bridge between an ICC profile and references to
 that ICC profile within SVG content. The color profile
 description is added to the user agent's list of known color
--- a/master/concepts.html	Thu May 10 10:45:08 2012 +0200
+++ b/master/concepts.html	Thu May 10 11:27:20 2012 +0200
@@ -112,7 +112,7 @@
     individual points.</p>
     <p>SVG provides a general path element, which can be used to
     create a huge variety of graphical objects, and also provides
-    common <a href="intro.html#TermBasicShape">basic shapes</a>
+    common <a>basic shapes</a>
     such as rectangles and ellipses. These are convenient for hand
     coding and may be used in the same ways as the more general
     path element. SVG provides fine control over the coordinate
--- a/master/coords.html	Thu May 10 10:45:08 2012 +0200
+++ b/master/coords.html	Thu May 10 11:27:20 2012 +0200
@@ -16,13 +16,12 @@
 
 <h2 id="Introduction">Introduction</h2>
 
-    <p>For all media, the <span id='SVGCanvas'><span id="SVGViewport" class="SVG-Term">SVG canvas</span></span>
+    <p>For all media, the <a>SVG canvas</a>
     describes "the space where the SVG content is rendered." The
     canvas is infinite for each dimension of the space, but
     rendering occurs relative to a finite rectangular region of the
-    canvas. This finite rectangular region is called the <span
-    class="SVG-Term">SVG viewport</span>. For
-    <a href='http://www.w3.org/TR/2008/REC-CSS2-20080411/media.html#visual-media-group'>visual media</a>
+    canvas. This finite rectangular region is called the <a>SVG viewport</a>.
+     For <a href='http://www.w3.org/TR/2008/REC-CSS2-20080411/media.html#visual-media-group'>visual media</a>
     ([<a href='refs.html#ref-CSS2'>CSS2</a>], section 7.3.1)
     the SVG viewport is the viewing area where the user sees the SVG content.</p>
     <p>The size of the SVG viewport (i.e., its width and height) is
@@ -43,9 +42,8 @@
       ([<a href="refs.html#ref-CSS2">CSS2</a>], section 4.3.2)</li>
     </ul>
     <p id="SVGInitialUserCoordinateSystem">Using the above information, the SVG user agent determines
-    the <span class="SVG-Term">viewport</span>, an initial <span
-    class="SVG-Term">viewport coordinate system</span> and an
-    initial <span class="SVG-Term">user coordinate system</span>
+    the <a>viewport</a>, an initial <a>viewport coordinate system</a> and an
+    initial <a>user coordinate system</a>
     such that the two coordinates systems are identical. Both
     coordinates systems are established such that the origin
     matches the origin of the viewport (for the root viewport, the
@@ -53,9 +51,8 @@
     initial coordinate system equals one "pixel" in the viewport.
     (See <a href="coords.html#InitialCoordinateSystem">Initial
     coordinate system</a>.) The viewport coordinate system is also
-    called <span class="SVG-Term">viewport space</span> and the
-    user coordinate system is also called <span
-    class="SVG-Term">user space</span>.</p>
+    called <a>viewport space</a> and the user coordinate system is also called
+    <a>user space</a>.</p>
     <p id="LengthsInSVG">Lengths in SVG can be specified as:</p>
     <ul>
       <li>(if no unit identifier is provided) values in user space
@@ -68,8 +65,8 @@
     pc, cm, mm, in, and percentages.</p>
     <p>A new user space (i.e., a new current coordinate system) can
     be established at any place within an SVG document fragment by
-    specifying <span class="SVG-Term">transformations</span> in the
-    form of <span class="SVG-Term">transformation matrices</span>
+    specifying <a>transformations</a> in the
+    form of <a>transformation matrices</a>
     or simple transformation operations such as rotation, skewing,
     scaling and translation. Establishing new user spaces via <a
     href="#EstablishingANewUserSpace">coordinate system
@@ -164,9 +161,8 @@
 
     <h2 id="InitialCoordinateSystem">The initial coordinate system</h2>
     <p>For the <a>outermost svg element</a>, the SVG user
-    agent determines an initial <span class="SVG-Term">viewport
-    coordinate system</span> and an initial <span
-    class="SVG-Term">user coordinate system</span> such that the
+    agent determines an initial <a>viewport coordinate system</a> and an
+    initial <a>user coordinate system</a> such that the
     two coordinates systems are identical. The origin of both
     coordinate systems is at the origin of the viewport, and one
     unit in the initial coordinate system equals one "pixel" (i.e.,
@@ -210,8 +206,7 @@
 
     <h2 id="EstablishingANewUserSpace">Coordinate system transformations</h2>
     <p>A new user space (i.e., a new current coordinate system) can
-    be established by specifying <span
-    class="SVG-Term">transformations</span> in the form of a <a>'transform'</a>
+    be established by specifying <a>transformations</a> in the form of a <a>'transform'</a>
     attribute on a container element or graphics element or a
     <a>'viewBox'</a> attribute on an
     <a>'svg'</a>,
@@ -272,7 +267,7 @@
 <edit:example href='images/coords/Skew.svg' name='Skew' description="Show effects of skewX and skewY" image='yes' link='yes'/>
 
     <p id="TransformMatrixDefined">Mathematically, all transformations can be represented as
-    3x3 <span class="SVG-Term">transformation matrices</span> of
+    3x3 <a>transformation matrices</a> of
     the following form:<br />
      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img
     src="images/coords/Matrix.png"
@@ -357,9 +352,9 @@
     all of its ancestors up to and including the element that
     established the current viewport (usually, the <a>'svg'</a>
      element which is the most
-    immediate ancestor to the given element) is called the <span
-    class="SVG-Term">current transformation matrix</span> or <span
-    class="SVG-Term">CTM</span>. The CTM thus represents the
+    immediate ancestor to the given element) is called the
+    <a>current transformation matrix</a> or
+    <a>CTM</a>. The CTM thus represents the
     mapping of current user coordinates to viewport
     coordinates:<br />
      <img src="images/coords/CTM.png"
@@ -983,7 +978,7 @@
 
     <h2 id="Units">Units</h2>
     <p>All coordinates and lengths in SVG can be specified with or
-    without a <span class="SVG-Term">unit identifier</span>.</p>
+    without a unit identifier.</p>
     <p class="issue">
       This is misleading – path data for example takes values that look
       like coordinates and lengths yet does not allow units.
@@ -1137,7 +1132,7 @@
     <h2 id="ObjectBoundingBoxUnits">Object bounding box units</h2>
     <p id="ObjectBoundingBox">The following elements offer the option of expressing
     coordinate values and lengths as fractions (and, in some cases,
-    percentages) of the <span class="SVG-Term">bounding box</span>,
+    percentages) of the <a>bounding box</a>,
     by setting a specified attribute to <span class="attr-value">'objectBoundingBox'</span>
     on the given element:</p>
     <table class='vert' summary="Object bounding box units rules">
@@ -1227,10 +1222,9 @@
         </tr>
       </edit:with>
     </table>
-    <p>In the discussion that follows, the term <span
-    class="SVG-Term">applicable element</span> is the element to
-    which the given effect applies. For gradients and patterns, the
-    applicable element is the <a
+    <p>In the discussion that follows, the term <em>applicable element</em>
+    is the element to which the given effect applies. For gradients and
+    patterns, the applicable element is the <a
     href="intro.html#TermGraphicsElement">graphics element</a>
     which has its <a>'fill'</a> or <a>'stroke'</a> property referencing the
     given gradient or pattern. (See <a
--- a/master/definitions.xml	Thu May 10 10:45:08 2012 +0200
+++ b/master/definitions.xml	Thu May 10 11:27:20 2012 +0200
@@ -1527,6 +1527,8 @@
   <term name='animation elements' href='intro.html#TermAnimationElement'/>
   <term name='container element' href='intro.html#TermContainerElement'/>
   <term name='container elements' href='intro.html#TermContainerElement'/>
+  <term name='basic shape element' href='intro.html#TermBasicShapeElement'/>
+  <term name='basic shapes' href='intro.html#TermBasicShapeElement'/>
   <term name='descriptive element' href='intro.html#TermDescriptiveElement'/>
   <term name='descriptive elements' href='intro.html#TermDescriptiveElement'/>
   <term name='filter primitive element' href='intro.html#TermFilterPrimitiveElement'/>
@@ -1548,6 +1550,8 @@
   <term name='stroke' href='intro.html#TermStroke'/>
   <term name='stroked' href='intro.html#TermStroke'/>
   <term name='structural elements' href='intro.html#TermStructuralElement'/>
+  <term name='SVG canvas' href='intro.html#TermSVGCanvas'/>
+  <term name='SVG viewport' href='intro.html#TermSVGViewport'/>
   <term name='text content element' href='intro.html#TermTextContentElement'/>
   <term name='text content elements' href='intro.html#TermTextContentElement'/>
   <term name='text content child element' href='intro.html#TermTextContentChildElement'/>
@@ -1587,6 +1591,11 @@
   <term name='non-local IRI reference' href='intro.html#TermNonLocalIRIReference'/>
   <term name='non-local IRI references' href='intro.html#TermNonLocalIRIReference'/>
   <!-- ... other, defined in intro.html ... -->
+  <term name='bounding box' href='intro.html#TermBoundingBox'/>
+  <term name='CTM' href='intro.html#TermCTM'/>
+  <term name='current transformation matrix' href='intro.html#TermCurrentTransformationMatrix'/>
+  <term name='glyph' href='intro.html#TermGlyph'/>
+  <term name='glyphs' href='intro.html#TermGlyph'/>
   <term name='hit-test' href='intro.html#TermHitTesting'/>
   <term name='hit-testing' href='intro.html#TermHitTesting'/>
   <term name='Lacuna value' href='intro.html#TermLacunaValue'/>
@@ -1598,9 +1607,17 @@
   <term name='SVG document fragments' href='intro.html#TermSVGDocumentFragment'/>
   <term name='SVG user agent' href='intro.html#TermUserAgent'/>
   <term name='SVG user agents' href='intro.html#TermUserAgent'/>
+  <term name='transformation' href='intro.html#TermTransformation'/>
+  <term name='transformations' href='intro.html#TermTransformation'/>
+  <term name='transformation matrix' href='intro.html#TermTransformationMatrix'/>
+  <term name='transformation matrices' href='intro.html#TermTransformationMatrices'/>
   <term name='user agent' href='intro.html#TermUserAgent'/>
   <term name='user agents' href='intro.html#TermUserAgent'/>
   <term name='user coordinate system' href='intro.html#TermUserCoordinateSystem'/>
+  <term name='user space' href='intro.html#TermViewportSpace'/>
+  <term name='viewport' href='intro.html#TermViewport'/>
+  <term name='viewport coordinate system' href='intro.html#TermViewportCoordinateSystem'/>
+  <term name='viewport space' href='intro.html#TermViewportSpace'/>
   <!-- ... other, defined outside intro.html ... -->
   <term name='Animatable' href="animate.html#Animatable"/>
   <term name='filter region' href='filters.html#FilterEffectsRegion'/>
--- a/master/fonts.html	Thu May 10 10:45:08 2012 +0200
+++ b/master/fonts.html	Thu May 10 11:27:20 2012 +0200
@@ -46,8 +46,7 @@
     to be supported by all <a
     href="conform.html#ConformingSVGViewers">conforming SVG
     viewers</a>, SVG provides a facility to define fonts in SVG.
-    This facility is called <span class="SVG-Term">SVG
-    fonts</span>.</p>
+    This facility is called <em>SVG fonts</em>.</p>
 
     <p id="SVGFonts">SVG fonts can improve the semantic richness of graphics that
     represent text. For example, many company logos consist of the
@@ -58,7 +57,7 @@
 
 <h2 id="SVGFontsOverview">Overview of SVG fonts</h2>
 
-    <p>An <span class="SVG-Term">SVG font</span> is a font defined
+    <p>An SVG font is a font defined
     using SVG's <a>'font element'</a> element.</p>
     <p>The purpose of SVG fonts is to allow for delivery of glyph
     outlines in display-only environments. SVG fonts that accompany
@@ -99,8 +98,8 @@
     locations, and the glyph outlines themselves, are expressed in
     units that are relative to an abstract square whose height is
     the intended distance between lines of type in the same type
-    size. This square is called the <span class="SVG-Term">em
-    square</span> and it is the design grid on which the glyph
+    size. This square is called the <em>em square</em> and
+    it is the design grid on which the glyph
     outlines are defined. The value of the <a>'font-face/units-per-em'</a>
     attribute on the <a>'font-face'</a> element specifies how
     many units the em square is divided into. Common values for
--- a/master/implnote.html	Thu May 10 10:45:08 2012 +0200
+++ b/master/implnote.html	Thu May 10 11:27:20 2012 +0200
@@ -22,7 +22,7 @@
 <h2 id="ErrorProcessing">Error processing</h2>
 
     <p>There are various scenarios where an SVG document fragment
-    is technically <span class="SVG-Term">in error</span>:</p>
+    is technically <em>in error</em>:</p>
     <ul>
       <li>When the content does not conform to the <a href="http://www.w3.org/TR/2008/REC-xml-20081126/">XML 1.0
       specification</a> [<a href="refs.html#ref-XML10">XML10</a>], such as the
--- a/master/intro.html	Thu May 10 10:45:08 2012 +0200
+++ b/master/intro.html	Thu May 10 11:27:20 2012 +0200
@@ -244,23 +244,29 @@
 <h2 id="Definitions">Definitions</h2>
 
 <dl class='definitions'>
-  <dt id="TermAnimationElement"><span class="SVG-TermDefine">animation element</span></dt>
+  <dt id="TermAnimationElement">animation element</dt>
   <dd>An animation element is an element that can be used to animate
   the attribute or property value of another element. The following elements
   are animation elements: <edit:elementcategory name='animation'/>.</dd>
 
-  <dt id="TermAnimationEventAttribute"><span class="SVG-TermDefine">animation event attribute</span></dt>
+  <dt id="TermAnimationEventAttribute">animation event attribute</dt>
   <dd>An animation event attribute is an <a>event attribute</a> that specifies
   script to run for a particular animation-related event.  See
   <a href="script.html#AnimationEvents">Animation event attributes</a>.
   The animation event attributes are <edit:attributecategory name='animation event'/>.</dd>
 
-  <dt id="TermBasicShape"><span id="TermBasicShapeElement" class="SVG-TermDefine">basic shape</span></dt>
+  <dt id="TermBasicShapeElement">basic shape</dt>
   <dd>Standard shapes which are predefined in SVG as a
   convenience for common graphical operations. Specifically:
   <edit:elementcategory name='basic shape'/>.</dd>
 
-  <dt id="TermCanvas"><span class="SVG-TermDefine">canvas</span></dt>
+  <dt id="TermBoundingBox">bounding box</dt>
+  <dd>
+    <p class="issue">Need a definition, which can probably be ported over
+    from SVG Tiny 1.2.</p>
+  </dd>
+
+  <dt id="TermCanvas">canvas</dt>
   <dd>A surface onto which graphics elements are drawn, which
   can be real physical media such as a display or paper or an
   abstract surface such as a allocated region of computer
@@ -269,7 +275,7 @@
   <a href="coords.html">Coordinate Systems, Transformations and
   Units</a>.</dd>
 
-  <dt id="TermClippingPath"><span class="SVG-TermDefine">clipping path</span></dt>
+  <dt id="TermClippingPath">clipping path</dt>
   <dd>A combination of <a>'path'</a>, <a>'text'</a>
   and <a href="#TermBasicShape">basic shapes</a> which serve as the
   outline of a (in the absence of anti-aliasing) 1-bit mask,
@@ -277,12 +283,12 @@
   show through but everything on the outside is masked out. See
   <a href="masking.html#ClippingPaths">Clipping paths</a>.</dd>
 
-  <dt id="TermContainerElement"><span class="SVG-TermDefine">container element</span></dt>
+  <dt id="TermContainerElement">container element</dt>
   <dd>An element which can have graphics elements and other
   container elements as child elements. Specifically:
   <edit:elementcategory name='container'/>.</dd>
 
-  <dt id="TermConditionalProcessingAttribute"><span class="SVG-TermDefine">conditional processing attribute</span></dt>
+  <dt id="TermConditionalProcessingAttribute">conditional processing attribute</dt>
   <dd>A conditional processing attribute is one that controls whether
   or not the element on which it appears is processed.  Most elements,
   but not all, may have conditional processing attributes specified
@@ -290,25 +296,25 @@
   for details.  The conditional processing attributes defined in
   SVG 1.1 are <edit:attributecategory name='conditional processing'/>.</dd>
 
-  <dt id="TermCoreAttributes"><span class="SVG-TermDefine">core attributes</span></dt>
+  <dt id="TermCoreAttributes">core attributes</dt>
   <dd>The core attributes are those attributes that can be specified
   on any SVG element.  See <a href="struct.html#CommonAttributes">Common attributes</a>.
   The core attributes are <edit:attributecategory name='core'/>.</dd>
 
-  <dt id="TermCurrentInnermostSVGDocumentFragment"> <span class="SVG-TermDefine">current innermost SVG document fragment</span></dt>
+  <dt id="TermCurrentInnermostSVGDocumentFragment"> current innermost SVG document fragment</dt>
   <dd>The XML document sub-tree which starts with the most
   immediate ancestor <a href="struct.html#SVGElement"><span
   class="element-name">'svg'</span></a> element of a given SVG
   element.</dd>
 
-  <dt id="TermCurrentSVGDocumentFragment"><span class="SVG-TermDefine">current SVG document fragment</span></dt>
+  <dt id="TermCurrentSVGDocumentFragment">current SVG document fragment</dt>
   <dd>The XML document sub-tree which starts with the outermost
   ancestor <a>'svg'</a> element of a given SVG
   element, with the requirement that all container elements
   between the outermost <a>'svg'</a> and this element are
   all elements in the SVG language.</dd>
 
-  <dt id="TermCurrentTransformationMatrix"><span class="SVG-TermDefine">current transformation matrix (<span id="TermCTM">CTM</span>)</span></dt>
+  <dt id="TermCurrentTransformationMatrix">current transformation matrix (<span id="TermCTM">CTM</span>)</dt>
   <dd>Transformation matrices define the mathematical mapping
   from one coordinate system into another using a 3x3 matrix
   using the equation <span class="code-fragment">[x' y' 1] = [x
@@ -318,41 +324,41 @@
   href="coords.html#EstablishingANewUserSpace">Coordinate
   system transformations</a>.</dd>
 
-  <dt id="TermDescriptiveElement"><span class="SVG-TermDefine">descriptive element</span></dt>
+  <dt id="TermDescriptiveElement">descriptive element</dt>
   <dd>An element which provides supplementary descriptive information about
   its parent.  Specifically, the following elements are descriptive elements:
   <edit:elementcategory name='descriptive'/>.</dd>
 
-  <dt id="TermDocumentEventAttribute"><span class="SVG-TermDefine">document event attribute</span></dt>
+  <dt id="TermDocumentEventAttribute">document event attribute</dt>
   <dd>A document event attribute is an <a>event attribute</a> that specifies
   script to run for a particular document-wide event.  See
   <a href="script.html#DocumentEvents">Document-level event attributes</a>.
   The document event attributes are <edit:attributecategory name='document event'/>.</dd>
 
-  <dt id="TermEventAttribute"><span class="SVG-TermDefine">event attribute</span></dt>
+  <dt id="TermEventAttribute">event attribute</dt>
   <dd>An event attribute is one that specifies some script to run when
   an event of a certain type is dispatched to the element on which the attribute
   is specified.  See <a href="script.html#EventAttributes">Event attributes</a>.</dd>
 
-  <dt id="TermFill"><span class="SVG-TermDefine">fill</span></dt>
+  <dt id="TermFill">fill</dt>
   <dd>The operation of <a
   href="intro.html#TermPaint">painting</a> the interior of a <a
   href="intro.html#TermShape">shape</a> or the interior of the
   character glyphs in a text string.</dd>
 
-  <dt id="TermFilterPrimitiveAttributes"><span class="SVG-TermDefine">filter primitive attributes</span></dt>
+  <dt id="TermFilterPrimitiveAttributes">filter primitive attributes</dt>
   <dd>The filter primitive attributes is the set of attributes that are common
   to all <a>filter primitive elements</a>.  They are
   <edit:attributecategory name='filter primitive'/>.</dd>
 
-  <dt id="TermFilterPrimitiveElement"><span class="SVG-TermDefine">filter primitive element</span></dt>
+  <dt id="TermFilterPrimitiveElement">filter primitive element</dt>
   <dd>A filter primitive element is one that can be used as a child of a
   <a>'filter element'</a> element to specify a node in the filter graph.
   The following elements are the filter primitive elements defined
   in SVG 1.1:
   <edit:elementcategory name='filter primitive'/>.</dd>
 
-  <dt id="TermFont"><span class="SVG-TermDefine">font</span></dt>
+  <dt id="TermFont">font</dt>
   <dd>A font represents an organized collection of <a
   href="intro.html#TermGlyph">glyphs</a> in which the various
   glyph representations will share a common look or styling
@@ -361,7 +367,7 @@
   style and provides consistent inter-character alignment and
   spacing.</dd>
 
-  <dt id="TermGlyph"><span class="SVG-TermDefine">glyph</span></dt>
+  <dt id="TermGlyph">glyph</dt>
   <dd>A glyph represents a unit of rendered content within a <a
   href="intro.html#TermFont">font</a>. Often, there is a
   one-to-one correspondence between characters to be drawn and
@@ -375,27 +381,27 @@
   information such as rendering hints that help a font engine
   to produce legible text in small sizes.</dd>
 
-  <dt id="TermGradientElement"><span class="SVG-TermDefine">gradient element</span></dt>
+  <dt id="TermGradientElement">gradient element</dt>
   <dd>A gradient element is one that defines a gradient paint server.
   SVG 1.1 defines the following gradient elements: <edit:elementcategory name='gradient'/>.</dd>
 
-  <dt id="TermGraphicalEventAttribute"><span class="SVG-TermDefine">graphical event attribute</span></dt>
+  <dt id="TermGraphicalEventAttribute">graphical event attribute</dt>
   <dd>A graphical event attribute is an <a>event attribute</a> that specifies
   script to run for a particular user interaction event.  See
   <a href="script.html#GraphicsEvents">Event attributes on graphics and container elements</a>.
   The graphical event attributes are <edit:attributecategory name='graphical event'/>.</dd>
 
-  <dt id="TermGraphicsElement"><span class="SVG-TermDefine">graphics element</span></dt>
+  <dt id="TermGraphicsElement">graphics element</dt>
   <dd>One of the element types that can cause graphics to be
   drawn onto the target canvas. Specifically:
   <edit:elementcategory name='graphics'/>.</dd>
 
-  <dt id="TermGraphicsReferencingElement"><span class="SVG-TermDefine">graphics referencing element</span></dt>
+  <dt id="TermGraphicsReferencingElement">graphics referencing element</dt>
   <dd>A graphics element which uses a reference to a different
   document or element as the source of its graphical content.
   Specifically: <edit:elementcategory name='graphics referencing'/>.</dd>
 
-  <dt id="TermHitTesting"><span class="SVG-TermDefine">hit-testing</span></dt>
+  <dt id="TermHitTesting">hit-testing</dt>
   <dd>The process of determining whether a pointer intersects a given
   <a>graphics element</a>.  Hit-testing is used in determining which element
   to dispatch a mouse event to, which might be done in response to the user
@@ -406,7 +412,7 @@
   order for user interface events</a> and the definition of the
   <a>'pointer-events'</a> property.</dd>
   
-  <dt id="TermIRIReference"><span class="SVG-TermDefine">IRI reference</span></dt>
+  <dt id="TermIRIReference">IRI reference</dt>
   <dd>An IRI reference is an Internationalized Resource Identifier
   with an optional fragment identifier, as defined in
   <a href="http://www.ietf.org/rfc/rfc3987.txt"><cite>Internationalized Resource Identifiers</cite></a>
@@ -416,7 +422,7 @@
   <a href="struct.html#Head">References and the
   <span class="element-name">'defs'</span> element</a>.</dd>
 
-  <dt id="TermLacunaValue"><span class="SVG-TermDefine">lacuna value</span></dt>
+  <dt id="TermLacunaValue">lacuna value</dt>
   <dd>
     <p class="issue">
       Provide an appropriate definition. This legalese sounding
@@ -426,13 +432,13 @@
     </p>
   </dd>
 
-  <dt id="TermLightSourceElement"><span class="SVG-TermDefine">light source element</span></dt>
+  <dt id="TermLightSourceElement">light source element</dt>
   <dd>A light source element is one that can specify light source
   information for an <a>'feDiffuseLighting'</a> or <a>'feSpecularLighting'</a>
   element.  The following light source elements are defined in SVG 1.1:
   <edit:elementcategory name='light source'/>.</dd>
 
-  <dt id="TermLocalIRIReference"><span class="SVG-TermDefine">local IRI reference</span></dt>
+  <dt id="TermLocalIRIReference">local IRI reference</dt>
   <dd>An Internationalized Resource Identifier [<a href="refs.html#ref-RFC3987">RFC3987</a>] that does
   not include an <span class="code-fragment">&lt;absoluteIRI&gt;</span> or
   <span class="code-fragment">&lt;relativeIRI&gt;</span> and thus
@@ -440,7 +446,7 @@
   document. See <a href="struct.html#Head">References and the
   <span class="element-name">'defs'</span> element</a>.</dd>
 
-  <dt id="TermMask"><span class="SVG-TermDefine">mask</span></dt>
+  <dt id="TermMask">mask</dt>
   <dd>A <a href="intro.html#TermContainerElement">container element</a>
   which can contain <a href="intro.html#TermGraphicsElement">graphics elements</a>
   or other container elements which define a set of graphics
@@ -448,7 +454,7 @@
   foreground objects into the current background. See <a
   href="masking.html#Masking">Masks</a>.</dd>
 
-  <dt id="TermNonLocalIRIReference"><span class="SVG-TermDefine">non-local IRI reference</span></dt>
+  <dt id="TermNonLocalIRIReference">non-local IRI reference</dt>
   <dd>An Internationalized Resource Identifier [<a href="refs.html#ref-RFC3987">RFC3987</a>] that
   includes an <span class="code-fragment">&lt;absoluteIRI&gt;</span> or
   <span class="code-fragment">&lt;relativeIRI&gt;</span> and thus
@@ -457,11 +463,11 @@
   <a href="struct.html#Head">References and the
   <span class="element-name">'defs'</span> element</a>.</dd>
 
-  <dt id="TermOutermostSVGElement"><span class="SVG-TermDefine">outermost svg element</span></dt>
+  <dt id="TermOutermostSVGElement">outermost svg element</dt>
   <dd>The furthest <a>'svg'</a> ancestor element that remains in the
   <a href="#TermCurrentSVGDocumentFragment">current SVG document fragment</a>.</dd>
 
-  <dt id="TermPaint"><span class="SVG-TermDefine">paint</span></dt>
+  <dt id="TermPaint">paint</dt>
   <dd>A paint represents a way of putting color values onto the
   canvas. A paint might consist of both color values and
   associated alpha values which control the blending of colors
@@ -472,7 +478,7 @@
   <a href="pservers.html#Patterns">patterns</a>.</dd>
 
   <!--
-  <dt id="TermPointer"><span class="SVG-TermDefine">pointer</span></dt>
+  <dt id="TermPointer">pointer</dt>
   <dd>
     <p>A pointer is a logical representation of a user-controlled interface interaction (such as moving an on-screen cursor with a mouse, keyboard, or other positioning device, or tapping a touch-screen), and functions as one or more points positioned at a specific coordinates within the viewport.  A pointer may or may not have an associated visual representation, such as a cursor or arrow icon (in contrast to the <span class='prop-value'>pointer</span> value of the <span class='property'>'cursor'</span> <a href="intro.html#TermProperty">property</a>, which refers to a particular cursor style.).</p>  
     <p>Multiple simultaneous pointers, such as with a touch-screen interface, may not be available in all environments, and are not defined in this specification.</p>  
@@ -480,7 +486,7 @@
   </dd>
   -->
 
-  <dt id="TermPresentationAttribute"><span class="SVG-TermDefine">presentation attribute</span></dt>
+  <dt id="TermPresentationAttribute">presentation attribute</dt>
   <dd>An XML attribute on an SVG element which specifies a
   value for a given <a href="intro.html#TermProperty">property</a>
   for that element. See <a href="styling.html">Styling</a>. Note that
@@ -489,7 +495,7 @@
   a given element. The definition of each property states to what set 
   of elements it applies.</dd>
 
-  <dt id="TermProperty"><span class="SVG-TermDefine">property</span></dt>
+  <dt id="TermProperty">property</dt>
   <dd>A parameter that helps specify how a document should be
   rendered. A complete list of SVG's properties can be found in
   <a href="propidx.html">Property Index</a>. Properties are
@@ -499,13 +505,13 @@
   [<a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/">CSS2</a>]. See
   <a href="styling.html">Styling</a>.</dd>
       
-  <dt id="TermRootmostSVGElement"><span class="SVG-TermDefine">rootmost <span class="element-name">'svg'</span> element</span></dt>
+  <dt id="TermRootmostSVGElement">rootmost <span class="element-name">'svg'</span> element</dt>
   <dd>The rootmost <a>'svg'</a> element is the furthest
   <a>'svg'</a> ancestor element that does not exit an
   <a href="intro.html#TermSVGContext"><span class="svg-term">SVG context</span></a>.
   See also <a href="intro.html#TermSVGDocumentFragment"><span class="svg-term">SVG document fragment</span></a>.</dd>
 
-  <dt id="TermShape"><span id="TermShapeElement" class="SVG-TermDefine">shape</span></dt>
+  <dt id="TermShapeElement">shape</dt>
   <dd>A graphics element that is defined by some combination of
   straight lines and curves. Specifically:
   <a>'path'</a>,
@@ -516,24 +522,24 @@
   <a>'polyline'</a> and
   <a>'polygon'</a>.</dd>
 
-  <dt id="TermStroke"><span class="SVG-TermDefine">stroke</span></dt>
+  <dt id="TermStroke">stroke</dt>
   <dd>The operation of <a href="intro.html#TermPaint">painting</a> the outline
   of a <a href="intro.html#TermShape">shape</a> or the outline of
   character glyphs in a text string.</dd>
 
-  <dt id="TermStructuralElement"><span class="SVG-TermDefine">structural element</span></dt>
+  <dt id="TermStructuralElement">structural element</dt>
   <dd>The structural elements are those which define the primary
   structure of an SVG document.  Specifically, the following
   elements are structural elements:
   <edit:elementcategory name='structural'/>.</dd>
 
-  <dt id="TermSVGCanvas"><span class="SVG-TermDefine">SVG canvas</span></dt>
+  <dt id="TermSVGCanvas">SVG canvas</dt>
   <dd>The <a href="#TermCanvas">canvas</a> onto which the SVG
   content is rendered. See the discussion of the
   <a href="coords.html#SVGCanvas">SVG canvas</a> in the chapter on
   <a href="coords.html">Coordinate Systems, Transformations and Units</a>.</dd>
       
-  <dt id="TermSVGContext"><span class="SVG-TermDefine">SVG context</span></dt>
+  <dt id="TermSVGContext">SVG context</dt>
   <dd>
     <p>An SVG context is a document fragment where all elements within the
     fragment must be subject to processing by an
@@ -547,7 +553,7 @@
     not include the contents of the <a>'foreignObject'</a> elements.</p>
   </dd>
 
-  <dt id="TermSVGDocumentFragment"> <span class="SVG-TermDefine">SVG document fragment</span></dt>
+  <dt id="TermSVGDocumentFragment"> SVG document fragment</dt>
   <dd>The XML document sub-tree which starts with an <a>'svg'</a>
   element. An SVG document fragment can consist of a stand-alone SVG document,
   or a fragment of a parent XML document enclosed by an <a>'svg'</a>
@@ -556,29 +562,29 @@
   element. (One SVG document fragment is contained within another SVG document
   fragment.)</dd>
       
-  <dt id="TermSVGUserAgent"><span class="SVG-TermDefine">SVG user agent</span></dt>
+  <dt id="TermSVGUserAgent">SVG user agent</dt>
   <dd>An SVG user agent is a <a>user agent</a> that is able to retrieve and
   render SVG content.</dd>
 
-  <dt id="TermSVGViewport"><span class="SVG-TermDefine">SVG viewport</span></dt>
+  <dt id="TermSVGViewport">SVG viewport</dt>
   <dd>The <a href="#TermViewport">viewport</a> within the
   <a href="#TermSVGCanvas">SVG canvas</a> which defines the rectangular region
   into which SVG content is rendered. See the discussion of the
   <a href="coords.html#SVGViewport">SVG viewport</a> in the chapter on
   <a href="coords.html">Coordinate Systems, Transformations and Units</a>.</dd>
 
-  <dt id="TermTextContentElement"><span class="SVG-TermDefine">text content element</span></dt>
+  <dt id="TermTextContentElement">text content element</dt>
   <dd>A text content element is an SVG element that causes a text string
   to be rendered onto the canvas. The SVG 1.1 text content elements are the
   following: <edit:elementcategory name='text content'/></dd>
 
-  <dt id="TermTextContentChildElement"><span class="SVG-TermDefine">text content child element</span></dt>
+  <dt id="TermTextContentChildElement">text content child element</dt>
   <dd>A text content child element is a <a>text content element</a> that is allowed
   as a descendant of another <a>text content element</a>.  In SVG 1.1,
   the text content child elements are the following:
   <edit:elementcategory name='text content child'/></dd>
   
-  <dt id="TermTextContentBlockElement"><span class="SVG-TermDefine">text content block element</span></dt>
+  <dt id="TermTextContentBlockElement">text content block element</dt>
   <dd>A text content block element is a <a>text content element</a>
   that serves as a standalone element for a unit of text, and which may
   optionally contain certain child <a>text content elements</a>
@@ -592,7 +598,7 @@
   perhaps this definition can be removed.</p>
   <edit:elementcategory name='text block'/></dd>
 
-  <dt id="TermTransformation"><span class="SVG-TermDefine">transformation</span></dt>
+  <dt id="TermTransformation">transformation</dt>
   <dd>A modification of the <a href="#TermCurrentTransformationMatrix">current
   transformation matrix (CTM)</a> by providing a supplemental
   transformation in the form of a set of simple transformations
@@ -601,14 +607,14 @@
   See <a href="coords.html#EstablishingANewUserSpace">Coordinate system
   transformations</a>.</dd>
 
-  <dt id="TermTransformationMatrix"><span class="SVG-TermDefine">transformation matrix</span></dt>
+  <dt id="TermTransformationMatrix">transformation matrix</dt>
   <dd>Transformation matrices define the mathematical mapping
   from one coordinate system into another using a 3x3 matrix
   using the equation <span class="code-fragment">[x' y' 1] = [x y 1] * matrix</span>.
   See <a href="#TermCurrentTransformationMatrix">current transformation matrix (CTM)</a>
   and <a href="coords.html#EstablishingANewUserSpace">Coordinate system transformations</a>.</dd>
 
-  <dt id="TermUserAgent"><span class="SVG-TermDefine">user agent</span></dt>
+  <dt id="TermUserAgent">user agent</dt>
   <dd>
     <p>The general definition of a user agent is an application
     that retrieves and renders Web content, including text,
@@ -627,11 +633,10 @@
     retrieves and renders SVG content.</p>
   </dd>
 
-  <dt id="TermUserCoordinateSystem"><span class="SVG-TermDefine">user coordinate system</span></dt>
+  <dt id="TermUserCoordinateSystem">user coordinate system</dt>
   <dd>In general, a coordinate system defines locations and
   distances on the current <a href="#TermCanvas">canvas</a>.
-  The current <span class="SVG-TermDefine">user coordinate
-  system</span> is the coordinate system that is currently
+  The current user coordinate system is the coordinate system that is currently
   active and which is used to define how coordinates and
   lengths are located and computed, respectively, on the
   current <a href="#TermCanvas">canvas</a>. See
@@ -639,17 +644,17 @@
   system</a> and <a href="coords.html#EstablishingANewUserSpace">Coordinate
   system transformations</a>.</dd>
 
-  <dt id="TermUserSpace"><span class="SVG-TermDefine">user space</span></dt>
+  <dt id="TermUserSpace">user space</dt>
   <dd>A synonym for <a href="#TermUserCoordinateSystem">user coordinate system</a>.</dd>
 
-  <dt id="TermUserUnits"><span class="SVG-TermDefine">user units</span></dt>
+  <dt id="TermUserUnits">user units</dt>
   <dd>A coordinate value or length expressed in user units
   represents a coordinate value or length in the current
   <a href="#TermUserCoordinateSystem">user coordinate system</a>.
   Thus, 10 user units represents a length of 10 units in the
   current user coordinate system.</dd>
 
-  <dt id="TermViewport"><span class="SVG-TermDefine">viewport</span></dt>
+  <dt id="TermViewport">viewport</dt>
   <dd>A rectangular region within the current
   <a href="#TermCanvas">canvas</a> onto which <a
   href="#TermGraphicsElement">graphics elements</a> are to be
@@ -658,11 +663,10 @@
   chapter on <a href="coords.html">Coordinate Systems,
   Transformations and Units</a>.</dd>
 
-  <dt id="TermViewportCoordinateSystem"><span class="SVG-TermDefine">viewport coordinate system</span></dt>
+  <dt id="TermViewportCoordinateSystem">viewport coordinate system</dt>
   <dd>In general, a coordinate system defines locations and
   distances on the current <a href="#TermCanvas">canvas</a>.
-  The <span class="SVG-TermDefine">viewport coordinate
-  system</span> is the coordinate system that is active at the
+  The viewport coordinate system is the coordinate system that is active at the
   start of processing of an <a>'svg'</a> element, before
   processing the optional <a>'viewBox'</a> attribute. In the
   case of an SVG document fragment that is embedded within a
@@ -674,18 +678,18 @@
   <a href="coords.html#EstablishingANewViewport">Establishing a
   new viewport</a>.</dd>
 
-  <dt id="TermViewportSpace"><span class="SVG-TermDefine">viewport space</span></dt>
+  <dt id="TermViewportSpace">viewport space</dt>
   <dd>A synonym for <a href="#TermViewportCoordinateSystem">viewport coordinate
   system</a>.</dd>
 
-  <dt id="TermViewportUnits"><span class="SVG-TermDefine">viewport units</span></dt>
+  <dt id="TermViewportUnits">viewport units</dt>
   <dd>A coordinate value or length expressed in viewport units
   represents a coordinate value or length in the
   <a href="#TermViewportCoordinateSystem">viewport coordinate system</a>.
   Thus, 10 viewport units represents a length of 10 units in the viewport
   coordinate system.</dd>
 
-  <dt id="TermXLinkAttributes"><span class="SVG-TermDefine">XLink attributes</span></dt>
+  <dt id="TermXLinkAttributes">XLink attributes</dt>
   <dd>The XLink attributes are the seven attributes defined in
   the <a href="http://www.w3.org/TR/2001/REC-xlink-20010627/">XML Linking Language</a>
   specification [<a href="refs.html#ref-XLINK">XLINK</a>], which are used
--- a/master/linking.html	Thu May 10 10:45:08 2012 +0200
+++ b/master/linking.html	Thu May 10 11:27:20 2012 +0200
@@ -506,15 +506,15 @@
 
 <p>Because SVG content often represents a picture or drawing
 of something, a common need is to link into a particular
-<span class="SVG-Term">view</span> of the document, where a view indicates
+<em>view</em> of the document, where a view indicates
 the initial transformations so as to present a closeup of a particular
 section of the document.</p>
 
 <h3 id="SVGFragmentIdentifiers">SVG fragment identifiers</h3>
 
 <p>To link into a particular view of an SVG document, the IRI fragment
-identifier needs to be a correctly formed <span class="SVG-Term">SVG
-fragment identifier</span>. An SVG fragment identifier defines the
+identifier needs to be a correctly formed <dfn id='svg-fragment-identifier'>SVG
+fragment identifier</dfn>. An SVG fragment identifier defines the
 meaning of the "selector" or "fragment identifier" portion of IRIs that
 locate resources of MIME media type "image/svg+xml".</p>
 
@@ -526,7 +526,7 @@
   addressing, which allows addressing an SVG element by its ID, is compatible
   with the fragment addressing mechanism for older versions of HTML.</li>
 
-  <li id="SVGViewSpecification"><span class="SVG-Term">SVG view specification</span>
+  <li id="SVGViewSpecification">An <dfn>SVG view specification</dfn>
   (e.g., <span class="attr-value">MyDrawing.svg#svgView(viewBox(0,200,1000,1000))</span>).
   This form of addressing specifies the desired view of the
   document (e.g., the region of the document to view, the
--- a/master/masking.html	Thu May 10 10:45:08 2012 +0200
+++ b/master/masking.html	Thu May 10 11:27:20 2012 +0200
@@ -21,7 +21,7 @@
 <ul>
   <li><a href="#ClippingPaths">clipping paths</a>, which uses
   any combination of <a>'path'</a>, <a>'text'</a> and
-  <a href="intro.html#TermBasicShape">basic shapes</a> to serve as
+  <a>basic shapes</a> to serve as
   the outline of a (in the absence of anti-aliasing) 1-bit
   mask, where everything on the "inside" of the outline is
   allowed to show through but everything on the outside is
--- a/master/styling.html	Thu May 10 10:45:08 2012 +0200
+++ b/master/styling.html	Thu May 10 11:27:20 2012 +0200
@@ -15,7 +15,7 @@
 <h1>Styling</h1>
 
     <h2 id='SVGStylingProperties'>SVG's styling properties</h2>
-    <p>SVG uses <span class="SVG-Term">styling properties</span> to
+    <p>SVG uses <dfn id='styling-properties'>styling properties</dfn> to
     describe many of its document parameters. Styling properties
     define how the graphics elements in the SVG content are to be
     rendered. SVG uses styling properties for the following:</p>
@@ -216,8 +216,8 @@
     <ul>
       <li id="StylingUsingPresentationAttributes">
         <p><strong>Presentation attributes</strong></p>
-        <p>Styling properties can be assigned using SVG's <span
-        class="SVG-Term">presentation attributes</span>. For each
+        <p>Styling properties can be assigned using SVG's
+	<a>presentation attributes</a>. For each
         styling property defined in this specification, there is a
         corresponding XML presentation attribute available on all
         relevant SVG elements. Detailed information on the
@@ -259,8 +259,7 @@
     attributes</h2>
     <p>For each styling property defined in this specification (see
     <a href="propidx.html">Property Index</a>), there is a
-    corresponding XML attribute (the <span
-    class="SVG-Term">presentation attribute</span>) with the same
+    corresponding XML attribute (the <a>presentation attribute</a>) with the same
     name that is available on all relevant SVG elements. For
     example, SVG has a <a>'fill'</a> property that defines how
     to paint the interior of a shape. There is a corresponding
--- a/master/svgdom.html	Thu May 10 10:45:08 2012 +0200
+++ b/master/svgdom.html	Thu May 10 11:27:20 2012 +0200
@@ -854,7 +854,7 @@
     number or an out-of-range value for an enumeration), unless
     this specification indicates otherwise, no exception shall be
     raised on setting, but the given document fragment shall become
-    technically <span class="SVG-Term">in error</span> as described
+    technically <em>in error</em> as described
     in <a href="implnote.html#ErrorProcessing">Error
     processing</a>.</p>
 
--- a/master/text.html	Thu May 10 10:45:08 2012 +0200
+++ b/master/text.html	Thu May 10 11:27:20 2012 +0200
@@ -305,11 +305,11 @@
 <h2 id="CharactersAndGlyphs">Characters and their corresponding glyphs</h2>
 
 <p>In XML [<a href="http://www.w3.org/TR/2008/REC-xml-20081126/">XML10</a>], textual content
-is defined in terms of a sequence of XML <span class="SVG-Term">characters</span>,
+is defined in terms of a sequence of XML characters,
 where each character is defined by a particular Unicode code point
 [<a href="refs.html#ref-UNICODE">UNICODE</a>].
 Fonts, on the other hand, consist of a collection of
-<span class="SVG-Term">glyphs</span> and other associated information, such as
+<a>glyphs</a> and other associated information, such as
 <a href="text.html#FontsTablesBaselines">font tables</a>. A glyph is a
 presentable form of one or more characters (or a part of a character in some
 cases). Each glyph consists of some sort of identifier (in some cases a string,
@@ -390,8 +390,7 @@
     href="http://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#q1">WebFonts</a>
     ([<a href="refs.html#ref-CSS2">CSS2</a>], section 15.1)
     posted at the same Web location as the SVG content.</p>
-    <p>Throughout this chapter, the term <span
-    class="SVG-Term">character</span> shall be equivalent to the
+    <p>Throughout this chapter, the term <em>character</em> shall be equivalent to the
     definition of a character in XML [<a
     href="http://www.w3.org/TR/2008/REC-xml-20081126/">XML10</a>].</p>
 
@@ -1321,8 +1320,8 @@
     relatively simpler than it is for languages which support
     formatting of multi-line text blocks.</p>
     <p id="ReferenceOrientation">For each <a>'text'</a> element, the SVG user
-    agent determines the current <span class="SVG-Term">reference
-    orientation</span>. For standard horizontal or vertical text
+    agent determines the current <dfn>reference
+    orientation</dfn>. For standard horizontal or vertical text
     (i.e., no text-on-a-path), the reference orientation is the
     vector pointing towards negative infinity in Y within the
     current user coordinate system. (Note: in the <a
@@ -1332,8 +1331,7 @@
     orientation is reset with each character.</p>
     <p id="InlineProgressionDirection">Based on the reference orientation and the value for
     property <a>'writing-mode'</a>, the SVG user agent
-    determines the current <span
-    class="SVG-Term">inline-progression-direction</span>. For
+    determines the current <dfn>inline-progression-direction</dfn>. For
     left-to-right text, the inline-progression-direction points 90
     degrees clockwise from the reference orientation vector. For
     right-to-left text, the inline progression points 90 degrees
@@ -1342,8 +1340,7 @@
     degrees from the reference orientation vector.</p>
     <p id="BlockProgressionDirection">Based on the reference orientation and the value for
     property <a>'writing-mode'</a>, the SVG user agent
-    determines the current <span
-    class="SVG-Term">block-progression-direction</span>. For
+    determines the current <dfn>block-progression-direction</dfn>. For
     left-to-right and right-to-left text, the
     block-progression-direction points 180 degrees from the
     reference orientation vector because the only available
@@ -1354,7 +1351,7 @@
     counter-clockwise from the reference orientation vector because
     the only available top-to-bottom <a>'writing-mode'</a> is <span
     class="prop-value">tb-rl</span>.</p>
-    <p id="ShiftDirection">The <span class="SVG-Term">shift direction</span> is the
+    <p id="ShiftDirection">The <dfn>shift direction</dfn> is the
     direction towards which the <a
     href="#FontsTablesBaselines">baseline table</a> moves
     due to positive values for property <a>'baseline-shift'</a>. The shift
@@ -1362,8 +1359,8 @@
     table towards the topmost entry in the parent's <a
     href="#FontsTablesBaselines">baseline table</a>.</p>
     <p id="CurrentTextPosition">In processing a given <a>'text'</a> element, the SVG user
-    agent keeps track of the <span class="SVG-Term">current text
-    position</span>. The initial current text position is
+    agent keeps track of the <dfn>current text
+    position</dfn>. The initial current text position is
     established by the <a>'text/x'</a> and <a>'text/y'</a> attributes on the <a>'text'</a> element.</p>
     <p>The current text position is adjusted after each glyph to
     establish a new current text position at which the next glyph
@@ -1388,7 +1385,7 @@
     <a
     href="fonts.html#FontFaceElementUnitsPerEmAttribute">units-per-em</a>).</p>
     <p id="AlignmentPoint">For each glyph to be rendered, the SVG user agent determines
-    an appropriate <span class="SVG-Term">alignment-point</span> on
+    an appropriate <dfn>alignment-point</dfn> on
     the glyph which will be placed exactly at the current text
     position. The alignment-point is determined based on glyph cell
     metrics in the glyph itself, the current <a
@@ -1417,9 +1414,9 @@
     edge of the glyph with the appropriate vertical baseline. If
     baseline tables are not available, user agents should establish
     baseline tables that reflect common practice.</p>
-    <p id="TextChunks">Adjustments to the current text position are either <span
-    class="SVG-Term">absolute position adjustments</span> or <span
-    class="SVG-Term">relative position adjustments</span>. An
+    <p id="TextChunks">Adjustments to the current text position are either
+    <dfn id='absolute-position-adjustment'>absolute position adjustments</dfn> or
+    <dfn id='relative-position-adjustment'>relative position adjustments</dfn>. An
     absolute position adjustment occurs in the following
     circumstances:</p>
     <ul>
@@ -1432,8 +1429,8 @@
     </ul>
     <p>All other position adjustments to the current text position
     are relative position adjustments.</p>
-  <p id="TextChunk">Each absolute position adjustment defines a new <span
-    class="SVG-Term">text chunk</span>. Absolute position
+  <p id="TextChunk">Each absolute position adjustment defines a new
+    <dfn>text chunk</dfn>. Absolute position
     adjustments impact text layout in the following ways:</p>
     <ul>
       <li>Ligatures only occur when a set of characters which might
@@ -1875,7 +1872,7 @@
     section of CSS 2 ([<a href="refs.html#ref-CSS2">CSS2</a>], section 9.10).</p>
   <p>The processing model for bidirectional text is as follows.
     The user agent processes the characters which are provided in
-    <span class="SVG-Term">logical order</span> (i.e., the order
+    <em>logical order</em> (i.e., the order
     the characters appear in the original document, either via
       direct inclusion or via indirect reference due a <a href="text.html#TRefElement"><span class="element-name">'tref'</span></a> element). The user agent
     determines the set of independent blocks within each of which
@@ -2153,7 +2150,7 @@
     processing of a <a>'text'</a> element; that is, all
     other baselines are defined in relation to this dominant run.
     The baseline of the script with the dominant run is called the
-    <span class="SVG-Term">dominant baseline</span>. So, for
+    <dfn>dominant baseline</dfn>. So, for
     example, if the dominant baseline is the alphabetic baseline,
     there will be offsets in the baseline table for the alternate
     baselines, such as the ideographic baseline and the Indic
@@ -2164,7 +2161,7 @@
     vertical writing.</p>
     <p>The baseline table established at the start of processing of
     a <a>'text'</a> element is called the
-    <span class="SVG-Term">dominant baseline table</span>.</p>
+    <dfn>dominant baseline table</dfn>.</p>
     <p>Because the value of the <a>'font-family'</a> property is a list
     of fonts, to insure a consistent choice of baseline table we
     define the <em>nominal font</em> in a font list as the first
@@ -2176,8 +2173,7 @@
     determination of the font and baseline table that is to be
     used.</p>
     <p>The value of the <a>'font-size'</a> property on the <a>'text'</a> element establishes the
-    <span class="SVG-Term">dominant baseline table font
-    size</span>.</p>
+    <dfn>dominant baseline table font size</dfn>.</p>
     <p>The model assumes that each glyph has a 'alignment-baseline'
     value which specifies the baseline with which the glyph is to
     be aligned. (The 'alignment-baseline' is called the "Baseline
@@ -2192,8 +2188,8 @@
     for glyphs such as a "*" which are ambiguous with respect to
     script membership.</p>
     <p>The model assumes that the font from which the glyph is
-    drawn also has a baseline table, the <span
-    class="SVG-Term">font baseline table</span>. This baseline
+    drawn also has a baseline table, the
+    <dfn>font baseline table</dfn>. This baseline
     table has offsets in units-per-em from the (0,0) point to each
     of the baselines the font knows about. In particular, it has
     the offset from the glyph's (0,0) point to the baseline
@@ -3818,7 +3814,7 @@
     is rotated such that its horizontal axis is parallel to the
     tangent of the curve at the point at which the glyph is
     attached to the path. The box also shows the glyph's
-    <span id="CharWidth" class="SVG-Term">charwidth</span> (i.e., the amount which
+    <dfn id="CharWidth">charwidth</dfn> (i.e., the amount which
     the current text position advances horizontally when the glyph
     is drawn using horizontal text layout).</p>
     <p>The next picture zooms in further to demonstrate the
@@ -3830,7 +3826,7 @@
     href="text.html#SettingInlineProgressionDirection">inline-progression-direction</a>),
     the layout rules are as follows:</p>
     <ul>
-      <li>Determine the <span id="StartPointOnPath" class="SVG-Term">startpoint-on-the-path</span> for the
+      <li>Determine the <dfn id="StartPointOnPath">startpoint-on-the-path</dfn> for the
       first glyph using attribute <a>'startOffset'</a> and property
       <a>'text-anchor'</a>. For <span class='prop-value'>text-anchor:start</span>,
       startpoint-on-the-path is the point on the path which
@@ -3863,16 +3859,16 @@
       distance along the path from the startpoint-on-the-path for
       this glyph, calculated using the user agent's <a
       href="paths.html#DistanceAlongAPath">distance along the
-      path</a> algorithm. This point is the <span id="EndPointOnPath" class="SVG-Term">endpoint-on-the-path</span> for the
+      path</a> algorithm. This point is the <dfn id="EndPointOnPath">endpoint-on-the-path</dfn> for the
       glyph. (In the picture above, the endpoint-on-the-path for
       the glyph is the rightmost dot on the path.)</li>
-      <li>Determine the <span id="MidPointOnPath" class="SVG-Term">midpoint-on-the-path</span>, which is
+      <li>Determine the <dfn id="MidPointOnPath">midpoint-on-the-path</dfn>, which is
       the point on the path which is "halfway" (user agents can
       choose either a distance calculation or a parametric
       calculation) between the startpoint-on-the-path and the
       endpoint-on-the-path. (In the picture above, the
       midpoint-on-the-path is shown as a white dot.)</li>
-      <li>Determine the <span id="GlyphMidline" class="SVG-Term">glyph-midline</span>, which is the
+      <li>Determine the <dfn id="GlyphMidline">glyph-midline</dfn>, which is the
       vertical line in the glyph's coordinate system that goes
       through the glyph's x-axis midpoint. (In the picture above,
       the glyph-midline is shown as a dashed line.)</li>
--- a/master/types.html	Thu May 10 10:45:08 2012 +0200
+++ b/master/types.html	Thu May 10 11:27:20 2012 +0200
@@ -210,7 +210,7 @@
 
 <dl class='definitions'>
   
-  <dt id='DataTypeAngle'><span class='SVG-Term'>&lt;angle&gt;</span></dt>
+  <dt id='DataTypeAngle'>&lt;angle&gt;</dt>
   <dd>
     <p>Angles are specified in one of two ways depending upon whether
     they are used in CSS <a>property</a> syntax or SVG <a>presentation attribute</a>
@@ -244,7 +244,7 @@
       <a>SVGAngle</a> or <a>SVGAnimatedAngle</a> objects.</p>
   </dd>
   
-  <dt id='DataTypeAnything'><span class='SVG-Term'>&lt;anything&gt;</span></dt>
+  <dt id='DataTypeAnything'>&lt;anything&gt;</dt>
   <dd>
     <p>The basic type &lt;anything&gt; is a sequence of zero or more characters.
     Specifically:</p>
@@ -254,7 +254,7 @@
     ([<a href='refs.html#ref-XML10'>XML10</a>], section 2.2).</p>
   </dd>
 
-  <dt id='DataTypeColor'><span class='SVG-Term'>&lt;color&gt;</span></dt>
+  <dt id='DataTypeColor'>&lt;color&gt;</dt>
   <dd>
     <p>The basic type &lt;color&gt; is a CSS2 compatible specification for a
       color in the sRGB color space [<a href="refs.html#ref-SRGB">SRGB</a>].
@@ -325,7 +325,7 @@
       are represented using DOM interface <a>SVGColor</a>.</p>
   </dd>
   
-  <dt id='DataTypeCoordinate'><span class='SVG-Term'>&lt;coordinate&gt;</span></dt>
+  <dt id='DataTypeCoordinate'>&lt;coordinate&gt;</dt>
   <dd>
     <p>A &lt;coordinate&gt; is a length in the user coordinate system that is
       the given distance from the origin of the user coordinate system along the
@@ -338,7 +338,7 @@
   </dd>
   
   
-  <dt id="DataTypeFrequency"><span class='SVG-Term'>&lt;frequency&gt;</span></dt>
+  <dt id="DataTypeFrequency">&lt;frequency&gt;</dt>
   <dd>
     <p>Frequency values are used with aural properties. As defined in
       CSS2, a frequency value is a &lt;number&gt; immediately followed
@@ -355,11 +355,11 @@
       ([<a href='refs.html#ref-DOM2STYLE'>DOM2STYLE</a>], section 2.2).</p>
   </dd>
   
-  <dt id='DataTypeFuncIRI'><span class="SVG-Term">&lt;FuncIRI&gt;</span></dt>
+  <dt id='DataTypeFuncIRI'>&lt;FuncIRI&gt;</dt>
   <dd>Functional notation for an <a>IRI</a>: "url(" <a href="#DataTypeIRI">&lt;IRI&gt;</a> ")".
   </dd>
   
-  <dt id='DataTypeICCColor'><span class='SVG-Term'>&lt;icccolor&gt;</span></dt>
+  <dt id='DataTypeICCColor'>&lt;icccolor&gt;</dt>
   <dd>
     <p>An &lt;icccolor&gt; is an ICC color specification.  In SVG 1.1,
     an ICC color specification is given by a name, which references
@@ -371,7 +371,7 @@
     <a>SVGICCColor</a>.</p>
   </dd>
 
-  <dt id='DataTypeInteger'><span class='SVG-Term'>&lt;integer&gt;</span></dt>
+  <dt id='DataTypeInteger'>&lt;integer&gt;</dt>
   <dd>
     <p>An &lt;integer&gt; is specified as an optional sign character ("+" or
     "-") followed by one or more digits "0" to "9":</p>
@@ -385,7 +385,7 @@
     <a>SVGAnimatedInteger</a>.</p>
   </dd>
   
-  <dt id='DataTypeIRI'><span class="SVG-Term">&lt;IRI&gt;</span></dt>
+  <dt id='DataTypeIRI'>&lt;IRI&gt;</dt>
   <dd>
     <p>
       An Internationalized Resource Identifier (see <a>IRI</a>).
@@ -395,7 +395,7 @@
   </dd>
 
 
-  <dt id="DataTypeLength"><span class="SVG-Term">&lt;length&gt;</span></dt>
+  <dt id="DataTypeLength">&lt;length&gt;</dt>
   <dd>
 
     <p>A length is a distance measurement, given as a number along with a unit
@@ -448,7 +448,7 @@
   </dd>
   
 
-  <dt id="DataTypeListOfFamilyNames"><span class="SVG-Term">&lt;list-of-family-names&gt;</span></dt>
+  <dt id="DataTypeListOfFamilyNames">&lt;list-of-family-names&gt;</dt>
   <dd>
     <p>
       A &lt;list-of-family-names&gt; is a list of font family names using the same syntax
@@ -459,7 +459,7 @@
   </dd>
 
 <!--
-  <dt id="DataTypeListOfLanguageIDs"><span class="SVG-Term">&lt;list-of-language-ids&gt;</span></dt>
+  <dt id="DataTypeListOfLanguageIDs">&lt;list-of-language-ids&gt;</dt>
   <dd>
     <p>
       A &lt;list-of-language-ids&gt; is a comma separated list of
@@ -469,7 +469,7 @@
   </dd>
 -->
 
-  <dt id="DataTypeListOfStrings"><span class="SVG-Term">&lt;list-of-strings&gt;</span></dt>
+  <dt id="DataTypeListOfStrings">&lt;list-of-strings&gt;</dt>
   <dd>
     <p>
       A &lt;list-of-strings&gt; consists of a separated sequence of &lt;string&gt;s.
@@ -527,12 +527,12 @@
     or <a>SVGAnimatedLengthList</a> object.</p>
   </dd>
   
-  <dt id="DataTypeName"><span class="SVG-Term">&lt;name&gt;</span></dt>
+  <dt id="DataTypeName">&lt;name&gt;</dt>
   <dd>
     <p>A name, which is a string where a few characters of syntactic significance are disallowed.</p>
     <pre class="grammar"><span id="Name">name</span>  ::= [^,()#x20#x9#xD#xA] /* any char except ",", "(", ")" or wsp */</pre></dd>
   
-  <dt id='DataTypeNumber'><span class='SVG-Term'>&lt;number&gt;</span></dt>
+  <dt id='DataTypeNumber'>&lt;number&gt;</dt>
   <dd>
     <p>Real numbers are specified in one of two ways.  When used in a style sheet,
     a &lt;number&gt; is defined as follows:</p>
@@ -550,7 +550,7 @@
       <a>SVGAnimatedNumber</a>.</p>
   </dd>
 
-  <dt id='DataTypeNumberOptionalNumber'><span class='SVG-Term'>&lt;number-optional-number&gt;</span></dt>
+  <dt id='DataTypeNumberOptionalNumber'>&lt;number-optional-number&gt;</dt>
   <dd>
     <p>A pair of <a>&lt;number&gt;</a>s, where the second
     <a>&lt;number&gt;</a> is optional.</p>
@@ -562,7 +562,7 @@
     objects.</p>
   </dd>
 
-  <dt id="DataTypePaint"><span class='SVG-Term'>&lt;paint&gt;</span></dt>
+  <dt id="DataTypePaint">&lt;paint&gt;</dt>
   <dd>
     <p>The values for properties <a>'fill'</a> and <a>'stroke'</a>
     are specifications of the type of paint to use when filling or stroking
@@ -573,7 +573,7 @@
     <a>SVGPaint</a> objects.</p>
   </dd>
 
-  <dt id="DataTypePercentage"><span class='SVG-Term'>&lt;percentage&gt;</span></dt>
+  <dt id="DataTypePercentage">&lt;percentage&gt;</dt>
   <dd>
     <p>Percentages are specified as a number followed by a "%" character:</p>
     <pre class='grammar'><span id='Percentage'>percentage</span> ::= <a href='#Number'>number</a> "%"</pre>
@@ -589,7 +589,7 @@
     object.</p>
   </dd>
   
-  <dt id='DataTypeTime'><span class='SVG-Term'>&lt;time&gt;</span></dt>
+  <dt id='DataTypeTime'>&lt;time&gt;</dt>
   <dd>
     <p>A time value is a &lt;number&gt; immediately followed by a time unit
       identifier. The time unit identifiers are: </p>
@@ -603,7 +603,7 @@
       ([<a href='refs.html#ref-DOM2STYLE'>DOM2STYLE</a>], section 2.2).</p>
   </dd>
 
-  <dt id="DataTypeTransformList"><span class='SVG-Term'>&lt;transform-list&gt;</span></dt>
+  <dt id="DataTypeTransformList">&lt;transform-list&gt;</dt>
   <dd>
     <p>A &lt;transform-list&gt; is used to specify a list of coordinate system
     transformations.  A detailed description of the possible values for a
@@ -616,7 +616,7 @@
   </dd>
 
 <!--
-  <dt id="DataTypeURI"><span class='SVG-Term'>&lt;uri&gt;</span></dt>
+  <dt id="DataTypeURI">&lt;uri&gt;</dt>
   <dd>
     <p>A &lt;uri&gt; is a Uniform Resource Identifier reference.
     A URI is the address of a resource on the Web. For the specification of
@@ -628,7 +628,7 @@
   </dd>
 -->
   
-  <dt id="DataTypeXML-Name"><span class="SVG-Term">&lt;XML-Name&gt;</span></dt>
+  <dt id="DataTypeXML-Name">&lt;XML-Name&gt;</dt>
   <dd>
     <p>
       An XML name, as defined by the