1 files changed, 8 insertions, 6 deletions
diff --git a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/component.xsl b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/component.xsl
index 66ce157e0..007f27f9c 100644
--- a/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/component.xsl
+++ b/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/component.xsl
@@ -37,11 +37,13 @@
 
   <xsl:element name="h{$level+1}" namespace="http://www.w3.org/1999/xhtml">
     <xsl:attribute name="class">title</xsl:attribute>
-    <xsl:call-template name="anchor">
-      <xsl:with-param name="node" select="$node"/>
-      <xsl:with-param name="conditional" select="0"/>
-    </xsl:call-template>
-    <xsl:apply-templates select="$node" mode="object.title.markup">
+    <xsl:if test="$generate.id.attributes = 0">
+      <xsl:call-template name="anchor">
+	<xsl:with-param name="node" select="$node"/>
+	<xsl:with-param name="conditional" select="0"/>
+      </xsl:call-template>
+    </xsl:if>
+      <xsl:apply-templates select="$node" mode="object.title.markup">
       <xsl:with-param name="allow-anchors" select="1"/>
     </xsl:apply-templates>
   </xsl:element>
@@ -350,7 +352,7 @@
   </div>
 </xsl:template>
 
-<xsl:template match="article/title" mode="titlepage.mode" priority="2">
+<xsl:template match="article/title|article/articleinfo/title" mode="titlepage.mode" priority="2">
   <xsl:call-template name="component.title">
     <xsl:with-param name="node" select="ancestor::article[1]"/>
   </xsl:call-template>