cvs commit: xml-fop/src/java/org/apache/fop/render/pdf PDFRenderer.java

[bckfnn]

bckfnn  2004/09/24 02:07:53

  Modified:src/java/org/apache/fop/render/pdf PDFRenderer.java
  Log:
  Style: fix indent.
  
  Revision  ChangesPath
  1.53  +6 -6  xml-fop/src/java/org/apache/fop/render/pdf/PDFRenderer.java
  
  Index: PDFRenderer.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/pdf/PDFRenderer.java,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- PDFRenderer.java  23 Sep 2004 13:56:27 -  1.52
  +++ PDFRenderer.java  24 Sep 2004 09:07:52 -  1.53
  @@ -864,12 +864,12 @@
   prevWordY = bl;
   textOpen = true;
   } else {
  -closeText();
  +closeText();
   
  -pdf.append(1 0 0 -1  + (rx / 1000f) +   + (bl / 1000f) +  Tm 
  +pdf.append(1 0 0 -1  + (rx / 1000f) +   + (bl / 1000f) +  Tm 
  + (ch.getTextLetterSpaceAdjust() / 1000f) +  Tc 
  + (ch.getTextWordSpaceAdjust() / 1000f) +  Tw [ + 
startText);
  -textOpen = true;
  +textOpen = true;
   }
   prevWordWidth = ch.getIPD();
   prevWordX = rx;
  @@ -936,12 +936,12 @@
   prevWordY = bl;
   textOpen = true;
   } else {
  -closeText();
  +closeText();
   
  -pdf.append(1 0 0 -1  + (rx / 1000f) +   + (bl / 1000f) +  Tm 
  +pdf.append(1 0 0 -1  + (rx / 1000f) +   + (bl / 1000f) +  Tm 
  + (text.getTextLetterSpaceAdjust() / 1000f) +  Tc 
  + (text.getTextWordSpaceAdjust() / 1000f) +  Tw [ + 
startText);
  -textOpen = true;
  +textOpen = true;
   }
   prevWordWidth = text.getIPD();
   prevWordX = rx;
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: xml-fop/src/java/org/apache/fop/render/pdf PDFRenderer.java

[bckfnn]

bckfnn  2004/09/24 02:10:27

  Modified:src/java/org/apache/fop/render/pdf PDFRenderer.java
  Log:
  Support url(...) function in image source.
  
  Revision  ChangesPath
  1.54  +1 -0  xml-fop/src/java/org/apache/fop/render/pdf/PDFRenderer.java
  
  Index: PDFRenderer.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/pdf/PDFRenderer.java,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- PDFRenderer.java  24 Sep 2004 09:07:52 -  1.53
  +++ PDFRenderer.java  24 Sep 2004 09:10:26 -  1.54
  @@ -1093,6 +1093,7 @@
   return;
   }
   
  +url = ImageFactory.getURL(url);
   ImageFactory fact = ImageFactory.getInstance();
   FopImage fopimage = fact.getImage(url, userAgent);
   if (fopimage == null) {
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: xml-fop/src/java/org/apache/fop/fo FOTreeBuilder.java

[bckfnn]

bckfnn  2004/09/24 03:31:22

  Modified:src/java/org/apache/fop/apps FOUserAgent.java
   src/java/org/apache/fop/fo FOTreeBuilder.java
  Log:
  Moved from element mapping class names to element mapping objects.
  This solves a potential problem where Class.forName() can't load the
  element mapping class because the element mapping is only available
  in a classloader below the one that loaded fop.jar.
  
  Revision  ChangesPath
  1.17  +4 -3  xml-fop/src/java/org/apache/fop/apps/FOUserAgent.java
  
  Index: FOUserAgent.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/FOUserAgent.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- FOUserAgent.java  11 Sep 2004 17:10:46 -  1.16
  +++ FOUserAgent.java  24 Sep 2004 10:31:22 -  1.17
  @@ -35,6 +35,7 @@
   import org.apache.commons.logging.LogFactory;
   
   // FOP
  +import org.apache.fop.fo.ElementMapping;
   import org.apache.fop.pdf.PDFEncryptionParams;
   import org.apache.fop.render.Renderer;
   
  @@ -113,11 +114,11 @@
* Add the element mapping with the given class name.
* @param mappingClassName the class name representing the element mapping.
*/
  -public void addElementMapping(String mappingClassName) {
  +public void addElementMapping(ElementMapping elementMapping) {
   if (additionalElementMappings == null) {
   additionalElementMappings = new ArrayList();
   }
  -additionalElementMappings.add(mappingClassName);
  +additionalElementMappings.add(elementMapping);
   }
   
   /**
  
  
  
  1.53  +1 -1  xml-fop/src/java/org/apache/fop/fo/FOTreeBuilder.java
  
  Index: FOTreeBuilder.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOTreeBuilder.java,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- FOTreeBuilder.java17 Sep 2004 21:27:36 -  1.52
  +++ FOTreeBuilder.java24 Sep 2004 10:31:22 -  1.53
  @@ -130,7 +130,7 @@
   
   if (addlEMs != null) {
   for (int i = 0; i  addlEMs.size(); i++) {
  -addElementMapping((String) addlEMs.get(i));
  +addElementMapping((ElementMapping) addlEMs.get(i));
   }
   }
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]