From be2ddf63e564995c9141235090fd897d5d6665dd Mon Sep 17 00:00:00 2001
From: Mauritz Jeanson <mj@johanneberg.com>
Date: Wed, 12 Dec 2007 20:07:57 +0000
Subject: [PATCH] Moved declaration of comment.block.parents entity to
 common/entities.ent.

---
 xsl/common/entities.ent | 15 ++++++++++++++-
 xsl/fo/inline.xsl       | 13 ++-----------
 xsl/html/inline.xsl     |  3 ++-
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/xsl/common/entities.ent b/xsl/common/entities.ent
index 17f69d824..a7632aa1a 100644
--- a/xsl/common/entities.ent
+++ b/xsl/common/entities.ent
@@ -3,7 +3,7 @@
      ********************************************************************
      
      This file contains common entity declarations used for
-     sorting by various templates.
+     sorting (and other things) by various templates.
 
      This file is part of the XSL DocBook Stylesheet distribution.
      See ../README or http://docbook.sf.net/release/xsl/current/ for
@@ -45,3 +45,16 @@
   </xsl:call-template>
 </xsl:variable>
 '>
+
+<!-- Entity used in html/inline.xsl and fo/inline.xsl -->
+<!ENTITY comment.block.parents "parent::answer|parent::appendix|parent::article|parent::bibliodiv|
+                                parent::bibliography|parent::blockquote|parent::caution|parent::chapter|
+                                parent::glossary|parent::glossdiv|parent::important|parent::index|
+                                parent::indexdiv|parent::listitem|parent::note|parent::orderedlist|
+                                parent::partintro|parent::preface|parent::procedure|parent::qandadiv|
+                                parent::qandaset|parent::question|parent::refentry|parent::refnamediv|
+                                parent::refsect1|parent::refsect2|parent::refsect3|parent::refsection|
+                                parent::refsynopsisdiv|parent::sect1|parent::sect2|parent::sect3|parent::sect4|
+                                parent::sect5|parent::section|parent::setindex|parent::sidebar|
+                                parent::simplesect|parent::taskprerequisites|parent::taskrelated|
+                                parent::tasksummary|parent::warning">
\ No newline at end of file
diff --git a/xsl/fo/inline.xsl b/xsl/fo/inline.xsl
index 229bbfb40..e99478bd8 100644
--- a/xsl/fo/inline.xsl
+++ b/xsl/fo/inline.xsl
@@ -1,16 +1,7 @@
 <?xml version='1.0'?>
 <!DOCTYPE xsl:stylesheet [
-  <!ENTITY comment.block.parents "parent::answer|parent::appendix|parent::article|parent::bibliodiv|
-                                  parent::bibliography|parent::blockquote|parent::caution|parent::chapter|
-                                  parent::glossary|parent::glossdiv|parent::important|parent::index|
-                                  parent::indexdiv|parent::listitem|parent::note|parent::orderedlist|
-                                  parent::partintro|parent::preface|parent::procedure|parent::qandadiv|
-                                  parent::qandaset|parent::question|parent::refentry|parent::refnamediv|
-                                  parent::refsect1|parent::refsect2|parent::refsect3|parent::refsection|
-                                  parent::refsynopsisdiv|parent::sect1|parent::sect2|parent::sect3|parent::sect4|
-                                  parent::sect5|parent::section|parent::setindex|parent::sidebar|
-                                  parent::simplesect|parent::taskprerequisites|parent::taskrelated|
-                                  parent::tasksummary|parent::warning">
+<!ENTITY % common.entities SYSTEM "../common/entities.ent">
+%common.entities;
 ]>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
diff --git a/xsl/html/inline.xsl b/xsl/html/inline.xsl
index ddc4b157a..e2c18ff18 100644
--- a/xsl/html/inline.xsl
+++ b/xsl/html/inline.xsl
@@ -1,6 +1,7 @@
 <?xml version='1.0'?>
 <!DOCTYPE xsl:stylesheet [
-  <!ENTITY comment.block.parents "parent::answer|parent::appendix|parent::article|parent::bibliodiv|parent::bibliography|parent::blockquote|parent::caution|parent::chapter|parent::glossary|parent::glossdiv|parent::important|parent::index|parent::indexdiv|parent::listitem|parent::note|parent::orderedlist|parent::partintro|parent::preface|parent::procedure|parent::qandadiv|parent::qandaset|parent::question|parent::refentry|parent::refnamediv|parent::refsect1|parent::refsect2|parent::refsect3|parent::refsection|parent::refsynopsisdiv|parent::sect1|parent::sect2|parent::sect3|parent::sect4|parent::sect5|parent::section|parent::setindex|parent::sidebar|parent::simplesect|parent::taskprerequisites|parent::taskrelated|parent::tasksummary|parent::warning">
+<!ENTITY % common.entities SYSTEM "../common/entities.ent">
+%common.entities;
 ]>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:xlink='http://www.w3.org/1999/xlink'
-- 
2.50.1