From: fotis <fotis@unknown>
Date: Mon, 24 Jul 2000 15:43:35 +0000 (+0000)
Subject: externalgraphic replaces graphic tags in former xsl versions
X-Git-Tag: pre-columns~319
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a8c824d62e0beb10a57e8b3daf3c2f860881cac3;p=xmlgraphics-fop.git

externalgraphic replaces graphic tags in former xsl versions


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@193558 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/examples/fo/images.fo b/docs/examples/fo/images.fo
index a1b9d43b8..c7c210526 100644
--- a/docs/examples/fo/images.fo
+++ b/docs/examples/fo/images.fo
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <fo:root font-family="Times Roman" font-size="12pt" text-align="justify" xmlns:fo="http://www.w3.org/1999/XSL/Format">
+
 <fo:layout-master-set>
 <fo:simple-page-master master-name="right"
 	margin-top="75pt" margin-bottom="25pt" margin-left="100pt" margin-right="50pt">
@@ -38,8 +39,8 @@
 
 <fo:flow>
 <fo:block font-size="18pt" font-weight="bold">1. FOP test for images</fo:block><fo:block id="N2531">
-<fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">A GIF image in FOP</fo:block><fo:block><fo:inline-graphic href="file:../graphics/xml_feather.gif"/>
-</fo:block></fo:block><fo:block id="N2545"><fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">A JPEG image in FOP</fo:block><fo:block><fo:inline-graphic href="file:../graphics/fop.jpg"/></fo:block></fo:block><fo:block id="N2559"><fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em"/>
+<fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">A GIF image in FOP</fo:block><fo:block><fo:external-graphic src="file:../graphics/xml_feather.gif"/>
+</fo:block></fo:block><fo:block id="N2545"><fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">A JPEG image in FOP</fo:block><fo:block><fo:external-graphic src="file:../graphics/fop.jpg"/></fo:block></fo:block><fo:block id="N2559"><fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em"/>
           This section is only required to show that the layout still works.
       </fo:block>
 	  </fo:flow>
diff --git a/src/org/apache/fop/fo/PropertyListBuilder.java b/src/org/apache/fop/fo/PropertyListBuilder.java
index 5385ef98a..47a19f92a 100644
--- a/src/org/apache/fop/fo/PropertyListBuilder.java
+++ b/src/org/apache/fop/fo/PropertyListBuilder.java
@@ -105,7 +105,7 @@ public class PropertyListBuilder {
 	propertyTable.put("break-before",BreakBefore.maker());
 	propertyTable.put("break-after",BreakAfter.maker());
 	propertyTable.put("text-indent",TextIndent.maker());
-	propertyTable.put("href",HRef.maker());
+	propertyTable.put("src",Src.maker());
 	propertyTable.put("column-width",ColumnWidth.maker());
 	propertyTable.put("keep-with-next",KeepWithNext.maker());
 	propertyTable.put("background-color",BackgroundColor.maker());
@@ -114,7 +114,7 @@ public class PropertyListBuilder {
 	propertyTable.put("padding-left",PaddingLeft.maker());
 	propertyTable.put("padding-right",PaddingRight.maker());
 	propertyTable.put("external-destination",ExternalDestination.maker());
-        propertyTable.put("internal-destination",InternalDestination.maker());
+	propertyTable.put("internal-destination",InternalDestination.maker());
 	propertyTable.put("x",SVGLengthProperty.maker());
 	propertyTable.put("y",SVGLengthProperty.maker());
 	propertyTable.put("x1",SVGLengthProperty.maker());
diff --git a/src/org/apache/fop/fo/StandardElementMapping.java b/src/org/apache/fop/fo/StandardElementMapping.java
index 94236ca96..bec383323 100644
--- a/src/org/apache/fop/fo/StandardElementMapping.java
+++ b/src/org/apache/fop/fo/StandardElementMapping.java
@@ -96,10 +96,8 @@ public class StandardElementMapping implements ElementMapping {
 	builder.addMapping(uri, "inline-sequence",
 			   InlineSequence.maker()); 
 	builder.addMapping(uri, "display-rule", DisplayRule.maker()); 
-	builder.addMapping(uri, "display-graphic",
-			   DisplayGraphic.maker());  
-        builder.addMapping(uri, "inline-graphic",
-                           InlineGraphic.maker());
+  builder.addMapping(uri, "external-graphic",
+                           ExternalGraphic.maker());
 	builder.addMapping(uri, "table", Table.maker());
 	builder.addMapping(uri, "table-column", TableColumn.maker());
 	builder.addMapping(uri, "table-body", TableBody.maker());