FO output: xrefs to <para/> always include page number

Index: common/olink.xsl
===================================================================
--- common/olink.xsl	(revision 663)
+++ common/olink.xsl	(working copy)
@@ -1229,7 +1229,8 @@
                          or contains($xrefstyle, 'Page')))
                 and ( $insert.xref.page.number = 'yes' 
                    or $insert.xref.page.number = '1')
-                or local-name($target) = 'para'">
+		or ( local-name($target) = 'para'
+                    and $insert.xref.page.number.para = 'yes')">
     <xsl:apply-templates select="$target" mode="page.citation">
       <xsl:with-param name="id" select="$linkend"/>
     </xsl:apply-templates>
Index: fo/param.xsl
===================================================================
--- fo/param.xsl	(revision 663)
+++ fo/param.xsl	(working copy)
@@ -396,7 +396,9 @@
 <xsl:param name="index.range.separator"/>
 <xsl:param name="index.term.separator"/>
 <xsl:param name="insert.link.page.number">no</xsl:param>
+<xsl:param name="insert.link.page.number.para">yes</xsl:param>
 <xsl:param name="insert.xref.page.number">no</xsl:param>
+<xsl:param name="insert.xref.page.number.para">yes</xsl:param>
 <xsl:attribute-set name="itemizedlist.properties" use-attribute-sets="list.block.properties">
 </xsl:attribute-set>
 <xsl:attribute-set name="itemizedlist.label.properties">
Index: fo/xref.xsl
===================================================================
--- fo/xref.xsl	(revision 663)
+++ fo/xref.xsl	(working copy)
@@ -143,7 +143,7 @@
                   and ( $insert.xref.page.number = 'yes' 
                      or $insert.xref.page.number = '1')
                   or (local-name($target) = 'para' and
-		      $xrefstyle = '')">
+		      $xrefstyle = '' and $insert.xref.page.number.para = 'yes')">
       <xsl:apply-templates select="$target" mode="page.citation">
         <xsl:with-param name="id" select="$target/@id|$target/@xml:id"/>
       </xsl:apply-templates>
@@ -926,7 +926,8 @@
                        or contains($xrefstyle, 'Page')))
                   or ( $insert.link.page.number = 'yes' 
                      or $insert.link.page.number = '1')
-                  or local-name($target) = 'para'">
+                  or ( local-name($target) = 'para'
+                     and $insert.link.page.number.para = 'yes')">
       <xsl:apply-templates select="$target" mode="page.citation">
         <xsl:with-param name="id" select="$linkend"/>
       </xsl:apply-templates>