From 45312bb884255d4e07d4658dd5750f4df0734666 Mon Sep 17 00:00:00 2001
From: fotis <fotis@unknown>
Date: Fri, 4 Aug 2000 09:01:23 +0000
Subject: [PATCH] fix: remove display-rule completely

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@193606 13f79535-47bb-0310-9956-ffa450edef68
---
 src/codegen/properties.xml                    | 52 ++++++++++++++++---
 .../apache/fop/fo/StandardElementMapping.java |  1 -
 2 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/src/codegen/properties.xml b/src/codegen/properties.xml
index 94f59617c..aecbad315 100644
--- a/src/codegen/properties.xml
+++ b/src/codegen/properties.xml
@@ -143,9 +143,9 @@
   <property>
     <name>rule-thickness</name>
     <class-name>RuleThickness</class-name>
-    <inherited>false</inherited>
+    <inherited>true</inherited>
     <datatype>Length</datatype>
-    <default>1pt</default>
+    <default>1.0pt</default>
   </property>
   <property>
     <name>page-width</name>
@@ -306,15 +306,15 @@
     <default>0pt</default>
   </property>
   <property>
-    <name>src</name>
-    <class-name>Src</class-name>
+    <name>href</name>
+    <class-name>HRef</class-name>
     <inherited>false</inherited>
     <datatype>String</datatype>
     <default></default> 
   </property>
   <property>
-    <name>href</name>
-    <class-name>HRef</class-name>
+    <name>src</name>
+    <class-name>Src</class-name>
     <inherited>false</inherited>
     <datatype>String</datatype>
     <default></default> 
@@ -881,6 +881,46 @@
 	</datatype>
 	<default>any</default> 
    </property>
+  <property>
+	<name>rule-style</name>
+	<class-name>RuleStyle</class-name>
+	<inherited>true</inherited>
+	<datatype>
+      <enumeration>
+        <value const="NONE">none</value>
+        <value const="DOTTED">dotted</value>
+        <value const="DASHED">dashed</value>
+        <value const="SOLID">solid</value>
+        <value const="DOUBLE">double</value>
+        <value const="GROOVE">groove</value>
+        <value const="RIDGE">ridge</value>
+      </enumeration>
+  </datatype>
+	<default>solid</default> 
+  </property>
+  <property>
+	<name>leader-pattern</name>
+	<class-name>LeaderPattern</class-name>
+	<inherited>true</inherited>
+	<datatype>
+      <enumeration>
+        <value const="SPACE">space</value>
+        <value const="RULE">rule</value>
+        <value const="DOTS">dots</value>
+        <value const="USECONTENT">use-content</value>
+      </enumeration>
+  </datatype>
+	<default>space</default> 
+  </property>
+
+  <!-- leader-length should have as datatype Length-Range, but it is not used anyway -->
+  <property>
+	<name>leader-length.optimum</name>
+	<class-name>LeaderLength</class-name>
+	<inherited>true</inherited>
+	<datatype>Length</datatype>
+	<default>12.0pt</default> 
+   </property>
 
 
 </property-list>
diff --git a/src/org/apache/fop/fo/StandardElementMapping.java b/src/org/apache/fop/fo/StandardElementMapping.java
index 9104b0fa0..ac4837c52 100644
--- a/src/org/apache/fop/fo/StandardElementMapping.java
+++ b/src/org/apache/fop/fo/StandardElementMapping.java
@@ -95,7 +95,6 @@ public class StandardElementMapping implements ElementMapping {
 			   DisplaySequence.maker()); 
 	builder.addMapping(uri, "inline-sequence",
 			   InlineSequence.maker()); 
-	builder.addMapping(uri, "display-rule", DisplayRule.maker()); 
   builder.addMapping(uri, "external-graphic",
                            ExternalGraphic.maker());
 	builder.addMapping(uri, "table", Table.maker());
-- 
2.39.5