Changeset 3653 for print

Timestamp:

11/05/10 09:59:48 (19 months ago)

Author:

jeichar

Message:

Revert "Patch for controlling line spacing"

This reverts commit aaf15d0c1e081083d69ff6e0f4cabf99c058d092.

Location:

print/trunk

Files:

• docs/configuration.txt (modified) (2 diffs)
• src/main/java/org/mapfish/print/PDFUtils.java (modified) (3 diffs)
• src/main/java/org/mapfish/print/config/layout/TextBlock.java (modified) (3 diffs)

print/trunk/docs/configuration.txt

@@ -276 +276 @@
   ?         vertAlign: middle
   ?         backgroundColor: #FFFFFF
-  ?         lineSpacing: 1.0
             text: 'Blahblah'
 
@@ -286 +285 @@
 * Identity-H (horizontal UTF-8)
 * Identity-V (vertical UTF-8)
-* MacRoman
+* MacRoman 
 
 The "font" must refer to a standard PDF font or a `declared font <server_side_configuration.html#Fonts-definition>`_.
-
-A lineSpacing of 1.0 represents 1 character height with regard to the selected font 
 
 Image block

print/trunk/src/main/java/org/mapfish/print/PDFUtils.java

@@ -184 +184 @@
     private static final Pattern VAR_REGEXP = Pattern.compile("\\$\\{([^}]+)\\}");
 
-    public static String renderString(RenderingContext context, PJsonObject params, String val,
-                                      com.lowagie.text.Font font) throws BadElementException {
-        StringBuilder result = new StringBuilder();
+    public static Phrase renderString(RenderingContext context, PJsonObject params, String val, com.lowagie.text.Font font) throws BadElementException {
+        Phrase result = new Phrase();
         while (true) {
             Matcher matcher = VAR_REGEXP.matcher(val);
             if (matcher.find()) {
-                result.append(val.substring(0, matcher.start()));
+                result.add(val.substring(0, matcher.start()));
                 final String value;
                 final String varName = matcher.group(1);
                 if (varName.equals("pageTot")) {
-                    result.append(context.getCustomBlocks().getOrCreateTotalPagesBlock(font));
+                    result.add(context.getCustomBlocks().getOrCreateTotalPagesBlock(font));
                 } else {
                     value = getContextValue(context, params, varName);
-                    result.append(value);
+                    result.add(value);
                 }
                 val = val.substring(matcher.end());
@@ -204 +203 @@
             }
         }
-        result.append(val);
-        return result.toString();
+        result.add(val);
+        return result;
     }
 
@@ -347 +346 @@
                     cell[0] = new PdfPCell((PdfPTable) element);
                 } else {
-                    cell[0] = new PdfPCell();
-                    // add in composite mode to keep leading/margin/etc of element
-                    cell[0].addElement(element);
-                    // avoid leading before first line
-                    cell[0].setUseAscender(true);
+                    final Phrase phrase = new Phrase();
+                    phrase.add(element);
+                    cell[0] = new PdfPCell(phrase);
                 }
                 cell[0].setBorder(PdfPCell.NO_BORDER);

print/trunk/src/main/java/org/mapfish/print/config/layout/TextBlock.java

@@ -36 +36 @@
 public class TextBlock extends FontBlock {
     private String text = "";
-    private double lineSpacing = 1.0;
 
     public void render(PJsonObject params, PdfElement target, final RenderingContext context) throws DocumentException {
@@ -43 +42 @@
         final Font pdfFont = getPdfFont();
         paragraph.setFont(pdfFont);
-        paragraph.setLeading(0f, (float)lineSpacing);
 
-        final String text = PDFUtils.renderString(context, params, this.text, pdfFont);
+        final Phrase text = PDFUtils.renderString(context, params, this.text, pdfFont);
         paragraph.add(text);
 
@@ -65 +63 @@
         if (text == null) throw new InvalidValueException("text", "null");
     }
-    
-    public void setLineSpacing(double lineSpacing) {
-        this.lineSpacing = lineSpacing;
-    }
-    
 }