Fix <embeddedLabel/>, add <i/> as a valid <para/> child.

<embeddedLabel/> was skipping the content, resulting in <i>:</i>.  Oops.

And since <embeddedLabel/> generates <i/>, validation was failing within
<para/>, so add it.

diff --git a/mcs/tools/mdoc/Resources/monodoc-ecma.xsd b/mcs/tools/mdoc/Resources/monodoc-ecma.xsd
index dc3971b0c6b04984f8a0177104db4a9ab95e2700..ed63ed9c675b0b75f455266aeb41f1e596e39de9 100644 (file)
--- a/mcs/tools/mdoc/Resources/monodoc-ecma.xsd
+++ b/mcs/tools/mdoc/Resources/monodoc-ecma.xsd
@@ -488,6 +488,7 @@ add masterdoc support?
     <xs:complexType mixed="true">
       <xs:choice minOccurs="0" maxOccurs="unbounded">
         <xs:element ref="block" />
+        <xs:element ref="i" />
         <xs:element ref="format" />
         <xs:element ref="see" />
         <xs:element ref="geq" />

diff --git a/mcs/tools/mdoc/Resources/msitomsx.xsl b/mcs/tools/mdoc/Resources/msitomsx.xsl
index ff5b3037501df86abead6feb30ed5b6e5b89e05d..9399e264601e50992cf02a5ab3065ae5db9c218f 100644 (file)
--- a/mcs/tools/mdoc/Resources/msitomsx.xsl
+++ b/mcs/tools/mdoc/Resources/msitomsx.xsl
@@ -241,7 +241,7 @@
 
   <xsl:template match="authoring:embeddedLabel">
     <i>
-      <xsl:value-of select="*" />
+      <xsl:value-of select="." />
       <xsl:text>:</xsl:text>
     </i>
   </xsl:template>