iText 5.4.5

Changelog: http://itextpdf.com/changelog/545
Release Notes: http://itextpdf.com/release/iText545
Download: https://github.com/itext/itextpdf/releases/tag/5.4.5

Author: Bruno Lowagie

itext/pom.xml

@@ -52,7 +52,6 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.UUID;
 
 /**
  * This is the smallest significant part of text that can be added to a

itext/src/main/java/com/itextpdf/text/Chunk.java

@@ -47,7 +47,6 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.UUID;
 
 import com.itextpdf.text.error_messages.MessageLocalization;
 import com.itextpdf.text.pdf.PdfName;

itext/src/main/java/com/itextpdf/text/Document.java

@@ -51,7 +51,6 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.UUID;
 
 /**
  * A <CODE>List</CODE> contains several <CODE>ListItem</CODE>s.

itext/src/main/java/com/itextpdf/text/List.java

@@ -48,7 +48,6 @@
 import com.itextpdf.text.pdf.interfaces.IAccessibleElement;
 
 import java.util.HashMap;
-import java.util.UUID;
 
 public class ListBody implements IAccessibleElement {
 

itext/src/main/java/com/itextpdf/text/ListBody.java

@@ -44,11 +44,6 @@
  package com.itextpdf.text;
 
 import com.itextpdf.text.pdf.PdfName;
-import com.itextpdf.text.pdf.PdfObject;
-import com.itextpdf.text.pdf.interfaces.IAccessibleElement;
-
-import java.util.HashMap;
-import java.util.UUID;
 
 public class ListLabel extends ListBody {
 

itext/src/main/java/com/itextpdf/text/ListLabel.java

@@ -50,7 +50,6 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.UUID;
 
 /**
  * A <CODE>Paragraph</CODE> is a series of <CODE>Chunk</CODE>s and/or <CODE>Phrases</CODE>.
@@ -83,9 +82,6 @@ public class Paragraph extends Phrase implements Indentable, Spaceable, IAccessi
 	/** The alignment of the text. */
     protected int alignment = Element.ALIGN_UNDEFINED;
 
-    /** The text leading that is multiplied by the biggest font size in the line. */
-    protected float multipliedLeading = 0;
-
     /** The indentation of this paragraph on the left side. */
     protected float indentationLeft;
 
@@ -202,7 +198,6 @@ public Paragraph(Phrase phrase) {
         if (phrase instanceof Paragraph) {
         	Paragraph p = (Paragraph)phrase;
         	setAlignment(p.alignment);
-        	setLeading(phrase.getLeading(), p.multipliedLeading);
         	setIndentationLeft(p.getIndentationLeft());
         	setIndentationRight(p.getIndentationRight());
         	setFirstLineIndent(p.getFirstLineIndent());
@@ -237,6 +232,7 @@ public Paragraph cloneShallow(boolean spacingBefore) {
         if (accessibleAttributes != null)
             copy.accessibleAttributes = new HashMap<PdfName, PdfObject>(accessibleAttributes);
         copy.setTabSettings(getTabSettings());
+        copy.setKeepTogether(getKeepTogether());
     	return copy;
     }
 
@@ -356,38 +352,6 @@ public void setAlignment(int alignment) {
         this.alignment = alignment;
     }
 
-    /**
-     * @see com.itextpdf.text.Phrase#setLeading(float)
-     */
-    @Override
-    public void setLeading(float fixedLeading) {
-        this.leading = fixedLeading;
-        this.multipliedLeading = 0;
-    }
-
-    /**
-     * Sets the variable leading. The resultant leading will be
-     * multipliedLeading*maxFontSize where maxFontSize is the
-     * size of the biggest font in the line.
-     * @param multipliedLeading the variable leading
-     */
-    public void setMultipliedLeading(float multipliedLeading) {
-        this.leading = 0;
-        this.multipliedLeading = multipliedLeading;
-    }
-
-    /**
-     * Sets the leading fixed and variable. The resultant leading will be
-     * fixedLeading+multipliedLeading*maxFontSize where maxFontSize is the
-     * size of the biggest font in the line.
-     * @param fixedLeading the fixed leading
-     * @param multipliedLeading the variable leading
-     */
-    public void setLeading(float fixedLeading, float multipliedLeading) {
-        this.leading = fixedLeading;
-        this.multipliedLeading = multipliedLeading;
-    }
-
     /* (non-Javadoc)
 	 * @see com.itextpdf.text.Indentable#setIndentationLeft(float)
 	 */
@@ -453,31 +417,6 @@ public int getAlignment() {
         return alignment;
     }
 
-    /**
-     * Gets the variable leading
-     * @return the leading
-     */
-    public float getMultipliedLeading() {
-        return multipliedLeading;
-    }
-
-    /**
-     * Gets the total leading.
-     * This method is based on the assumption that the
-     * font of the Paragraph is the font of all the elements
-     * that make part of the paragraph. This isn't necessarily
-     * true.
-     * @return the total leading (fixed and multiplied)
-     */
-    public float getTotalLeading() {
-    	float m = font == null ?
-    			Font.DEFAULTSIZE * multipliedLeading : font.getCalculatedLeading(multipliedLeading);
-    	if (m > 0 && !hasLeading()) {
-    		return m;
-    	}
-    	return getLeading() + m;
-    }
-
 	/* (non-Javadoc)
 	 * @see com.itextpdf.text.Indentable#getIndentationLeft()
 	 */

itext/src/main/java/com/itextpdf/text/Paragraph.java

@@ -47,8 +47,8 @@
 import com.itextpdf.text.error_messages.MessageLocalization;
 import com.itextpdf.text.pdf.HyphenationEvent;
 
-import java.util.*;
-import java.util.List;
+import java.util.ArrayList;
+import java.util.Collection;
 
 /**
  * A <CODE>Phrase</CODE> is a series of <CODE>Chunk</CODE>s.
@@ -86,6 +86,9 @@ public class Phrase extends ArrayList<Element> implements TextElementArray {
 	/** This is the leading of this phrase. */
     protected float leading = Float.NaN;
 
+    /** The text leading that is multiplied by the biggest font size in the line. */
+    protected float multipliedLeading = 0;
+
     /** This is the font of this phrase. */
     protected Font font;
 
@@ -116,7 +119,7 @@ public Phrase() {
     public Phrase(final Phrase phrase) {
         super();
         this.addAll(phrase);
-        leading = phrase.getLeading();
+        setLeading(phrase.getLeading(), phrase.getMultipliedLeading());
         font = phrase.getFont();
         tabSettings = phrase.getTabSettings();
         setHyphenation(phrase.getHyphenation());
@@ -435,13 +438,34 @@ protected void addSpecial(final Element object) {
     // other methods that change the member variables
 
     /**
-     * Sets the leading of this phrase.
-     *
-     * @param	leading		the new leading
+     * Sets the leading fixed and variable. The resultant leading will be
+     * fixedLeading+multipliedLeading*maxFontSize where maxFontSize is the
+     * size of the biggest font in the line.
+     * @param fixedLeading the fixed leading
+     * @param multipliedLeading the variable leading
      */
+    public void setLeading(final float fixedLeading, final float multipliedLeading) {
+        this.leading = fixedLeading;
+        this.multipliedLeading = multipliedLeading;
+    }
 
-    public void setLeading(final float leading) {
-        this.leading = leading;
+    /**
+     * @see com.itextpdf.text.Phrase#setLeading(float)
+     */
+    public void setLeading(final float fixedLeading) {
+        this.leading = fixedLeading;
+        this.multipliedLeading = 0;
+    }
+
+    /**
+     * Sets the variable leading. The resultant leading will be
+     * multipliedLeading*maxFontSize where maxFontSize is the
+     * size of the biggest font in the line.
+     * @param multipliedLeading the variable leading
+     */
+    public void setMultipliedLeading(final float multipliedLeading) {
+        this.leading = 0;
+        this.multipliedLeading = multipliedLeading;
     }
 
     /**
@@ -466,8 +490,29 @@ public float getLeading() {
         return leading;
     }
 
+    /**
+     * Gets the variable leading
+     * @return the leading
+     */
+    public float getMultipliedLeading() {
+        return multipliedLeading;
+    }
+
+    /**
+     * Gets the total leading.
+     * This method is based on the assumption that the
+     * font of the Paragraph is the font of all the elements
+     * that make part of the paragraph. This isn't necessarily
+     * true.
+     * @return the total leading (fixed and multiplied)
+     */
     public float getTotalLeading() {
-        return getLeading();
+        float m = font == null ?
+                Font.DEFAULTSIZE * multipliedLeading : font.getCalculatedLeading(multipliedLeading);
+        if (m > 0 && !hasLeading()) {
+            return m;
+        }
+        return getLeading() + m;
     }
 
     /**

itext/src/main/java/com/itextpdf/text/Phrase.java

@@ -173,7 +173,8 @@ protected Section() {
     protected Section(final Paragraph title, final int numberDepth) {
         this.numberDepth = numberDepth;
         this.title = title;
-        title.setRole(new PdfName("H" + numberDepth));
+        if (title != null)
+            title.setRole(new PdfName("H" + numberDepth));
     }
 
     // implementation of the Element-methods

itext/src/main/java/com/itextpdf/text/Section.java

@@ -66,7 +66,7 @@ public final class Version {
 	 * This String contains the version number of this iText release.
 	 * For debugging purposes, we request you NOT to change this constant.
 	 */
-	private String release = "5.4.4";
+	private String release = "5.4.5";
 
 	/**
 	 * The license key.