REPORT-11624 Excel和Word导出的html解析(third部分)

fine-itext-old/src/com/fr/third/com/lowagie/text/Chunk.java

@@ -49,16 +49,18 @@
 
 package com.fr.third.com.lowagie.text;
 
-import java.awt.Color;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-
 import com.fr.third.com.lowagie.text.pdf.HyphenationEvent;
 import com.fr.third.com.lowagie.text.pdf.PdfAction;
 import com.fr.third.com.lowagie.text.pdf.PdfAnnotation;
 import com.fr.third.com.lowagie.text.pdf.PdfContentByte;
 import com.fr.third.com.lowagie.text.pdf.draw.DrawInterface;
+import sun.font.FontDesignMetrics;
+
+import java.awt.Color;
+import java.awt.FontMetrics;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
 
 /**
  * This is the smallest significant part of text that can be added to a
@@ -394,9 +396,9 @@ public class Chunk implements Element {
 		if (getImage() != null) {
 			return getImage().getScaledWidth();
 		}
-		return font.getCalculatedBaseFont(true).getWidthPoint(getContent(),
+		java.awt.Font awtFont =  new java.awt.Font(font.getFontName(), font.getStyle(), (int)font.getSize());
-				font.getCalculatedSize())
+		FontMetrics metrics = FontDesignMetrics.getMetrics(awtFont);
-				* getHorizontalScaling();
+		return metrics.stringWidth(getContent())* getHorizontalScaling();
 	}
 
 	// attributes
@@ -441,7 +443,7 @@ public class Chunk implements Element {
 	 * @return this <CODE>Chunk</CODE>
 	 */
 
-	private Chunk setAttribute(String name, Object obj) {
+	public Chunk setAttribute(String name, Object obj) {
 		if (attributes == null)
 			attributes = new HashMap();
 		attributes.put(name, obj);
@@ -590,18 +592,18 @@ public class Chunk implements Element {
 	/**
 	 * Sets the color of the background <CODE>Chunk</CODE>.
 	 *
-	 * @param color
+	 * @param background
 	 *            the color of the background
 	 * @return this <CODE>Chunk</CODE>
 	 */
-	public Chunk setBackground(Color color) {
+	public Chunk setBackground(String  background) {
-		return setBackground(color, 0, 0, 0, 0);
+		return setBackground(background, 0, 0, 0, 0);
 	}
 
 	/**
 	 * Sets the color and the size of the background <CODE>Chunk</CODE>.
 	 *
-	 * @param color
+	 * @param background
 	 *            the color of the background
 	 * @param extraLeft
 	 *            increase the size of the rectangle in the left
@@ -613,9 +615,9 @@ public class Chunk implements Element {
 	 *            increase the size of the rectangle in the top
 	 * @return this <CODE>Chunk</CODE>
 	 */
-	public Chunk setBackground(Color color, float extraLeft, float extraBottom,
+	public Chunk setBackground(String background, float extraLeft, float extraBottom,
                                                             float extraRight, float extraTop) {
-		return setAttribute(BACKGROUND, new Object[] { color,
+		return setAttribute(BACKGROUND, new Object[] { background,
 				new float[] { extraLeft, extraBottom, extraRight, extraTop } });
 	}
 
@@ -843,7 +845,7 @@ public class Chunk implements Element {
 	}
 
 	/**
-	 * @see com.fr.third.com.lowagie.text.Element#isContent()
+	 * @see Element#isContent()
 	 * @since	iText 2.0.8
 	 */
 	public boolean isContent() {
@@ -851,7 +853,7 @@ public class Chunk implements Element {
 	}
 
 	/**
-	 * @see com.fr.third.com.lowagie.text.Element#isNestable()
+	 * @see Element#isNestable()
 	 * @since	iText 2.0.8
 	 */
 	public boolean isNestable() {

fine-itext-old/src/com/fr/third/com/lowagie/text/Font.java

@@ -350,35 +350,7 @@ public class Font implements Comparable {
 	 * @return the familyname
 	 */
 	public String getFamilyname() {
-		String tmp = "unknown";
+		return getFontName();
-		switch (getFamily()) {
-			case Font.COURIER:
-				return FontFactory.COURIER;
-			case Font.HELVETICA:
-				return FontFactory.HELVETICA;
-			case Font.TIMES_ROMAN:
-				return FontFactory.TIMES_ROMAN;
-			case Font.SYMBOL:
-				return FontFactory.SYMBOL;
-			case Font.ZAPFDINGBATS:
-				return FontFactory.ZAPFDINGBATS;
-			default:
-				if (baseFont != null) {
-					String[][] names = baseFont.getFamilyFontName();
-					for (int i = 0; i < names.length; i++) {
-						if ("0".equals(names[i][2])) {
-							return names[i][3];
-						}
-						if ("1033".equals(names[i][2])) {
-							tmp = names[i][3];
-						}
-						if ("".equals(names[i][2])) {
-							tmp = names[i][3];
-						}
-					}
-				}
-		}
-		return tmp;
 	}
 
 	/**
@@ -389,9 +361,10 @@ public class Font implements Comparable {
 	 *            A <CODE>String</CODE> representing a certain font-family.
 	 */
 	public void setFamily(String family) {
-		this.family = getFamilyIndex(family);
+		this.fontName = family;
 	}
 
+
 	/**
 	 * Translates a <CODE>String</CODE> -value of a certain family into the
 	 * index that is used for this family in this class.

fine-itext-old/src/com/fr/third/com/lowagie/text/Image.java

@@ -49,15 +49,6 @@
 
 package com.fr.third.com.lowagie.text;
 
-import java.awt.Graphics2D;
-import java.awt.color.ICC_Profile;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Constructor;
-import java.net.MalformedURLException;
-import java.net.URL;
-
 import com.fr.third.com.lowagie.text.pdf.PRIndirectReference;
 import com.fr.third.com.lowagie.text.pdf.PdfArray;
 import com.fr.third.com.lowagie.text.pdf.PdfContentByte;
@@ -79,6 +70,15 @@ import com.fr.third.com.lowagie.text.pdf.codec.JBIG2Image;
 import com.fr.third.com.lowagie.text.pdf.codec.PngImage;
 import com.fr.third.com.lowagie.text.pdf.codec.TiffImage;
 
+import java.awt.Graphics2D;
+import java.awt.color.ICC_Profile;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Constructor;
+import java.net.MalformedURLException;
+import java.net.URL;
+
 /**
  * An <CODE>Image</CODE> is the representation of a graphic element (JPEG, PNG
  * or GIF) that has to be inserted into the document
@@ -218,6 +218,16 @@ public abstract class Image extends Rectangle {
 
 	// image from file or URL
 
+	private String srcString = "";
+
+	public String getSrcString() {
+		return srcString;
+	}
+
+	public void setSrcString(String srcString) {
+		this.srcString = srcString;
+	}
+
 	/**
 	 * Constructs an <CODE>Image</CODE> -object, using an <VAR>url </VAR>.
 	 *
@@ -321,6 +331,8 @@ public abstract class Image extends Rectangle {
 			}
 			throw new IOException(url.toString()
 					+ " is not a recognized imageformat.");
+		}catch (Exception e){
+			return null;
 		}finally {
 			if (is != null) {
 				is.close();
@@ -913,6 +925,7 @@ public abstract class Image extends Rectangle {
 		super(image);
 		this.type = image.type;
 		this.url = image.url;
+		this.srcString = image.srcString;
 		this.rawData = image.rawData;
 		this.bpc = image.bpc;
 		this.template = image.template;
@@ -989,7 +1002,7 @@ public abstract class Image extends Rectangle {
 	}
 
 	/**
-	 * @see com.fr.third.com.lowagie.text.Element#isNestable()
+	 * @see Element#isNestable()
 	 * @since	iText 2.0.8
 	 */
 	public boolean isNestable() {

fine-itext-old/src/com/fr/third/com/lowagie/text/List.java

@@ -49,11 +49,11 @@
 
 package com.fr.third.com.lowagie.text;
 
+import com.fr.third.com.lowagie.text.factories.RomanAlphabetFactory;
+
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import com.fr.third.com.lowagie.text.factories.RomanAlphabetFactory;
-
 /**
  * A <CODE>List</CODE> contains several <CODE>ListItem</CODE>s.
  * <P>
@@ -127,6 +127,15 @@ public class List implements TextElementArray {
     protected boolean lettered = false;
     /** Indicates if the listsymbols are lowercase or uppercase. */
     protected boolean lowercase = false;
+
+    public ArrayList getList() {
+        return list;
+    }
+
+    public void setList(ArrayList list) {
+        this.list = list;
+    }
+
     /** Indicates if the indentation has to be set automatically. */
     protected boolean autoindent = false;
     /** Indicates if the indentation of all the items has to be aligned. */
@@ -243,7 +252,7 @@ public class List implements TextElementArray {
      * @return	a type
      */
     public int type() {
-        return Element.LIST;
+        return LIST;
     }
 
     /**
@@ -287,8 +296,8 @@ public class List implements TextElementArray {
             item.setIndentationRight(0);
             return list.add(item);
         }
-        else if (o instanceof List) {
+        else if (o instanceof com.fr.third.com.lowagie.text.List) {
-            List nested = (List) o;
+            com.fr.third.com.lowagie.text.List nested = (com.fr.third.com.lowagie.text.List) o;
             nested.setIndentationLeft(nested.getIndentationLeft() + symbolIndent);
             first--;
             return list.add(nested);
@@ -534,7 +543,7 @@ public class List implements TextElementArray {
         return symbolIndent;
     }
     /**
-	 * @see com.fr.third.com.lowagie.text.Element#isContent()
+     * @see Element#isContent()
      * @since	iText 2.0.8
      */
     public boolean isContent() {
@@ -542,7 +551,7 @@ public class List implements TextElementArray {
     }
 
     /**
-	 * @see com.fr.third.com.lowagie.text.Element#isNestable()
+     * @see Element#isNestable()
      * @since	iText 2.0.8
      */
     public boolean isNestable() {

fine-itext-old/src/com/fr/third/com/lowagie/text/Paragraph.java

@@ -49,6 +49,8 @@
 
 package com.fr.third.com.lowagie.text;
 
+import java.util.HashMap;
+
 /**
  * A <CODE>Paragraph</CODE> is a series of <CODE>Chunk</CODE>s and/or <CODE>Phrases</CODE>.
  * <P>
@@ -78,7 +80,7 @@ public class Paragraph extends Phrase {
     // membervariables
 
 	/** The alignment of the text. */
-    protected int alignment = Element.ALIGN_UNDEFINED;
+    protected int alignment = ALIGN_UNDEFINED;
 
     /** The text leading that is multiplied by the biggest font size in the line. */
     protected float multipliedLeading = 0;
@@ -106,6 +108,22 @@ public class Paragraph extends Phrase {
 
     protected String background;
 
+    protected HashMap attributes = new HashMap();
+
+    public HashMap getAttributes() {
+        return attributes;
+    }
+
+    public void setAttributes(HashMap attributes) {
+        this.attributes = attributes;
+    }
+
+    public void setAttribute(String name, Object obj) {
+        if (attributes == null)
+            attributes = new HashMap();
+        attributes.put(name, obj);
+    }
+
     // constructors
 
     /**
@@ -215,7 +233,7 @@ public class Paragraph extends Phrase {
      * @return	a type
      */
     public int type() {
-        return Element.PARAGRAPH;
+        return PARAGRAPH;
     }
 
     // methods
@@ -270,26 +288,26 @@ public class Paragraph extends Phrase {
      */
     public void setAlignment(String alignment) {
         if (ElementTags.ALIGN_CENTER.equalsIgnoreCase(alignment)) {
-            this.alignment = Element.ALIGN_CENTER;
+            this.alignment = ALIGN_CENTER;
             return;
         }
         if (ElementTags.ALIGN_RIGHT.equalsIgnoreCase(alignment)) {
-            this.alignment = Element.ALIGN_RIGHT;
+            this.alignment = ALIGN_RIGHT;
             return;
         }
         if (ElementTags.ALIGN_JUSTIFIED.equalsIgnoreCase(alignment)) {
-            this.alignment = Element.ALIGN_JUSTIFIED;
+            this.alignment = ALIGN_JUSTIFIED;
             return;
         }
         if (ElementTags.ALIGN_JUSTIFIED_ALL.equalsIgnoreCase(alignment)) {
-            this.alignment = Element.ALIGN_JUSTIFIED_ALL;
+            this.alignment = ALIGN_JUSTIFIED_ALL;
             return;
         }
-        this.alignment = Element.ALIGN_LEFT;
+        this.alignment = ALIGN_LEFT;
     }
     
     /**
-     * @see com.fr.third.com.lowagie.text.Phrase#setLeading(float)
+     * @see Phrase#setLeading(float)
      */
     public void setLeading(float fixedLeading) {
         this.leading = fixedLeading;

fine-itext-old/src/com/fr/third/com/lowagie/text/factories/ElementFactory.java

@@ -135,7 +135,7 @@ public class ElementFactory {
 		}
 		value = attributes.getProperty(ElementTags.BACKGROUNDCOLOR);
 		if (value != null) {
-			chunk.setBackground(Markup.decodeColor(value));
+			chunk.setBackground(value);
 		}
 		return chunk;
 	}

fine-itext-old/src/com/fr/third/com/lowagie/text/html/CSS.java

@@ -0,0 +1,200 @@
+package com.fr.third.com.lowagie.text.html;
+
+/**
+ * @author kerry
+ * @date 2018/5/11
+ */
+public class CSS {
+    public final class Value {
+        private Value(){};
+        public static final String THIN = "thin";
+        public static final String MEDIUM = "medium";
+        public static final String THICK = "thick";
+        public static final String NONE = "none";
+        public static final String HIDDEN = "hidden";
+        public static final String DOTTED = "dotted";
+        public static final String DASHED = "dashed";
+        public static final String SOLID = "solid";
+        public static final String DOUBLE = "double";
+        public static final String GROOVE = "groove";
+        public static final String RIDGE = "ridge";
+        public static final String INSET = "inset";
+        public static final String OUTSET = "outset";
+        public static final String LEFT = "left";
+        public static final String CENTER = "center";
+        public static final String JUSTIFY = "justify";
+        public static final String BOTTOM = "bottom";
+        public static final String TOP = "top";
+        public static final String RIGHT = "right";
+        public static final String REPEAT = "repeat";
+        public static final String NO_REPEAT = "no-repeat";
+        public static final String REPEAT_X = "repeat-x";
+        public static final String REPEAT_Y = "repeat-y";
+        public static final String FIXED = "fixed";
+        public static final String SCROLL = "scroll";
+        public static final String DISC = "disc";
+        public static final String SQUARE = "square";
+        public static final String CIRCLE = "circle";
+        public static final String DECIMAL = "decimal";
+        public static final String LOWER_ROMAN = "lower-roman";
+        public static final String UPPER_ROMAN = "upper-roman";
+        public static final String LOWER_GREEK = "lower-greek";
+        public static final String UPPER_GREEK = "upper-greek";
+        public static final String LOWER_ALPHA = "lower-alpha";
+        public static final String UPPER_ALPHA = "upper-alpha";
+        public static final String LOWER_LATIN = "lower-latin";
+        public static final String UPPER_LATIN = "upper-latin";
+        public static final String INSIDE = "inside";
+        public static final String OUTSIDE = "outside";
+        public static final String INHERIT = "inherit";
+        public static final String UNDERLINE = "underline";
+        public static final String BOLD = "bold";
+        public static final String ITALIC = "italic";
+        public static final String OBLIQUE = "oblique";
+        public static final String SUPER = "super";
+        public static final String SUB = "sub";
+        public static final String TEXT_TOP = "text-top";
+        public static final String TEXT_BOTTOM = "text-bottom";
+        public static final String LINE_THROUGH = "line-through";
+        public static final String RELATIVE = "relative";
+        public static final String HIDE = "hide";
+        public static final String XX_SMALL = "xx-small";
+        public static final String X_SMALL = "x-small";
+        public static final String SMALL = "small";
+        public static final String LARGE = "large";
+        public static final String X_LARGE = "x-large";
+        public static final String XX_LARGE = "xx-large";
+        public static final String SMALLER = "smaller";
+        public static final String LARGER = "larger";
+        public static final String PX = "px";
+        public static final String IN = "in";
+        public static final String CM = "cm";
+        public static final String MM = "mm";
+        public static final String PT = "pt";
+        public static final String PC = "pc";
+        public static final String PERCENTAGE = "%";
+        public static final String EM = "em";
+        public static final String EX = "ex";
+        public static final String ALWAYS = "always";
+        public static final String AVOID = "avoid";
+        public static final String ABSOLUTE = "absolute";
+        public static final String AUTO = "auto";
+        public static final String INLINE = "inline";
+        public static final String BLOCK = "block";
+        public static final String SEPARATE = "separate";
+        public static final String COLLAPSE = "collapse";
+        public static final String RTL = "rtl";
+        public static final String LTR = "ltr";
+        public static final String INLINE_BLOCK = "inline-block";
+        public static final String INLINE_TABLE = "inline-table";
+        public static final String LIST_ITEM = "list-item";
+        public static final String RUN_IN = "run-in";
+        public static final String TABLE = "table";
+        public static final String TABLE_CAPTION = "table-caption";
+        public static final String TABLE_CELL = "table-cell";
+        public static final String TABLE_COLUMN_GROUP = "table-column-group";
+        public static final String TABLE_COLUMN = "table-column";
+        public static final String TABLE_FOOTER_GROUP = "table-footer-group";
+        public static final String TABLE_HEADER_GROUP = "table-header-group";
+        public static final String TABLE_ROW = "table-row";
+        public static final String TABLE_ROW_GROUP = "table-row-group";
+    }
+
+    public final class Property {
+
+        private Property() {};
+        public static final String BACKGROUND = "background";
+        public static final String BACKGROUND_IMAGE = "background-image";
+        public static final String BACKGROUND_REPEAT = "background-repeat";
+        public static final String BACKGROUND_ATTACHMENT = "background-attachment";
+        public static final String BACKGROUND_POSITION = "background-position";
+        public static final String BACKGROUND_COLOR = "background-color";
+        public static final String BACKGROUND_SIZE = "background-size";
+        public static final String LIST_STYLE = "list-style";
+        public static final String LIST_STYLE_TYPE = "list-style-type";
+        public static final String LIST_STYLE_POSITION = "list-style-position";
+        public static final String LIST_STYLE_IMAGE = "list-style-image";
+        public static final String MARGIN = "margin";
+        public static final String TOP = "top";
+        public static final String MARGIN_LEFT = "margin-left";
+        public static final String MARGIN_RIGHT = "margin-right";
+        public static final String MARGIN_TOP = "margin-top";
+        public static final String MARGIN_BOTTOM = "margin-bottom";
+        public static final String BORDER = "border";
+        public static final String BORDER_LEFT = "border-left";
+        public static final String BORDER_TOP = "border-top";
+        public static final String BORDER_RIGHT = "border-right";
+        public static final String BORDER_BOTTOM = "border-bottom";
+        public static final String BORDER_WIDTH = "border-width";
+        public static final String BORDER_STYLE = "border-style";
+        public static final String BORDER_COLOR = "border-color";
+        public static final String BORDER_COLLAPSE = "border-collapse";
+        public static final String BORDER_SPACING = "border-spacing";
+        public static final String BORDER_TOP_WIDTH = "border-top-width";
+        public static final String BORDER_BOTTOM_WIDTH = "border-bottom-width";
+        public static final String BORDER_LEFT_WIDTH = "border-left-width";
+        public static final String BORDER_RIGHT_WIDTH = "border-right-width";
+        public static final String BORDER_TOP_COLOR = "border-top-color";
+        public static final String BORDER_BOTTOM_COLOR = "border-bottom-color";
+        public static final String BORDER_LEFT_COLOR = "border-left-color";
+        public static final String BORDER_RIGHT_COLOR = "border-right-color";
+        public static final String BORDER_TOP_STYLE = "border-top-style";
+        public static final String BORDER_BOTTOM_STYLE = "border-bottom-style";
+        public static final String BORDER_LEFT_STYLE = "border-left-style";
+        public static final String BORDER_RIGHT_STYLE = "border-right-style";
+        public static final String PADDING = "padding";
+        public static final String PADDING_TOP = "padding-top";
+        public static final String PADDING_BOTTOM = "padding-bottom";
+        public static final String PADDING_LEFT = "padding-left";
+        public static final String PADDING_RIGHT = "padding-right";
+        public static final String FONT = "font";
+        public static final String FONT_WEIGHT = "font-weight";
+        public static final String FONT_SIZE = "font-size";
+        public static final String FONT_STYLE = "font-style";
+        public static final String FONT_FAMILY = "font-family";
+        public static final String TEXT_DECORATION = "text-decoration";
+        public static final String COLOR = "color";
+        public static final String TAB_INTERVAL = "tab-interval";
+        public static final String XFA_TAB_COUNT = "xfa-tab-count";
+        public static final String XFA_FONT_HORIZONTAL_SCALE = "xfa-font-horizontal-scale";
+        public static final String XFA_FONT_VERTICAL_SCALE = "xfa-font-vertical-scale";
+        public static final String BEFORE = "before";
+        public static final String AFTER = "after";
+        public static final String HEIGHT = "height";
+        public static final String WIDTH = "width";
+        public static final String LETTER_SPACING = "letter-spacing";
+        public static final String VERTICAL_ALIGN = "vertical-align";
+        public static final String LINE_HEIGHT = "line-height";
+        public static final String TEXT_ALIGN = "text-align";
+        public static final String TEXT_VALIGN = "text-valign";
+        public static final String TEXT_INDENT = "text-indent";
+        public static final String POSITION = "position";
+        public static final String EMPTY_CELLS = "empty-cells";
+        public static final String CELLPADDING = "cellpadding";
+        //deprecated
+        public static final String CELLPADDING_LEFT = "cellpadding-left";
+        public static final String CELLPADDING_TOP = "cellpadding-top";
+        public static final String CELLPADDING_RIGHT = "cellpadding-right";
+        public static final String CELLPADDING_BOTTOM = "cellpadding-bottom";
+
+        public static final String CAPTION_SIDE = "caption-side";
+        public static final String TAB_STOPS = "tab-stops";
+        public static final String XFA_TAB_STOPS = "xfa-tab-stops";
+        public static final String PAGE_BREAK_BEFORE = "page-break-before";
+        public static final String PAGE_BREAK_INSIDE = "page-break-inside";
+        public static final String PAGE_BREAK_AFTER = "page-break-after";
+        public static final String REPEAT_HEADER = "repeat-header";
+        public static final String REPEAT_FOOTER = "repeat-footer";
+        public static final String LEFT = "left";
+        public static final String DISPLAY = "display";
+        public static final String MIN_WIDTH = "min-width";
+        public static final String MAX_WIDTH = "max-width";
+        public static final String MIN_HEIGHT = "min-height";
+        public static final String MAX_HEIGHT = "max-height";
+        public static final String RIGHT = "right";
+        public static final String BOTTOM = "bottom";
+        public static final String FLOAT = "float";
+        public static final String DIRECTION = "direction";
+    }
+
+}

fine-itext-old/src/com/fr/third/com/lowagie/text/html/CSSUtils.java

@@ -0,0 +1,108 @@
+package com.fr.third.com.lowagie.text.html;
+
+import com.fr.third.com.lowagie.text.html.CSS;
+import com.fr.third.com.lowagie.text.html.WebColors;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author kerry
+ * @date 2018/4/9
+ */
+public class CSSUtils {
+
+
+    private static final Set<String> backgroundPositions = new HashSet<String>(
+            Arrays.asList(new String[] { CSS.Value.LEFT, CSS.Value.CENTER, CSS.Value.BOTTOM, CSS.Value.TOP, CSS.Value.RIGHT }));
+
+    public static Map<String, String> processBackground(final String background) {
+        Map<String, String> rules = new HashMap<String, String>();
+        String[] styles = splitComplexCssStyle(background);
+        for(String style : styles) {
+            if (style.contains("url(")) {
+                rules.put(CSS.Property.BACKGROUND_IMAGE, style);
+            } else if (style.equalsIgnoreCase(CSS.Value.REPEAT)
+                    || style.equalsIgnoreCase(CSS.Value.NO_REPEAT)
+                    || style.equalsIgnoreCase(CSS.Value.REPEAT_X)
+                    || style.equalsIgnoreCase(CSS.Value.REPEAT_Y)) {
+                rules.put(CSS.Property.BACKGROUND_REPEAT, style);
+            } else if (style.equalsIgnoreCase(CSS.Value.FIXED) || style.equalsIgnoreCase(CSS.Value.SCROLL)) {
+                rules.put(CSS.Property.BACKGROUND_ATTACHMENT, style);
+            } else if (backgroundPositions.contains(style)) {
+                if(rules.get(CSS.Property.BACKGROUND_POSITION) == null) {
+                    rules.put(CSS.Property.BACKGROUND_POSITION, style);
+                } else {
+                    style = style.concat(" "+rules.get(CSS.Property.BACKGROUND_POSITION));
+                    rules.put(CSS.Property.BACKGROUND_POSITION, style);
+                }
+            } else if (isNumericValue(style) || isMetricValue(style) || isRelativeValue(style)) {
+                if(rules.get(CSS.Property.BACKGROUND_POSITION) == null) {
+                    rules.put(CSS.Property.BACKGROUND_POSITION, style);
+                } else {
+                    style = style.concat(" "+rules.get(CSS.Property.BACKGROUND_POSITION));
+                    rules.put(CSS.Property.BACKGROUND_POSITION, style);
+                }
+            } else if(style.contains("rgb(") || style.contains("rgba(")  || style.contains("#") || WebColors.NAMES.containsKey(style.toLowerCase())) {
+                rules.put(CSS.Property.BACKGROUND_COLOR, style);
+            }
+        }
+        return rules;
+    }
+    public static String[] splitComplexCssStyle(String s) {
+        s = s.replaceAll("\\s*,\\s*", ",") ;
+        return s.split("\\s");
+    }
+
+
+    public static boolean isMetricValue(final String value) {
+        return value.contains(CSS.Value.PX) || value.contains(CSS.Value.IN) || value.contains(CSS.Value.CM)
+                || value.contains(CSS.Value.MM) || value.contains(CSS.Value.PC) || value.contains(CSS.Value.PT);
+
+    }
+
+    public static boolean isRelativeValue(final String value) {
+        return value.contains(CSS.Value.PERCENTAGE) || value.contains(CSS.Value.EM) || value.contains(CSS.Value.EX);
+
+    }
+
+    public static boolean isNumericValue(final String value) {
+        return value.matches("^-?\\d\\d*\\.\\d*$") || value.matches("^-?\\d\\d*$") || value.matches("^-?\\.\\d\\d*$");
+
+    }
+
+
+    public static String extractUrl(final String url) {
+        String str = null;
+        if (url.startsWith("url")) {
+            String urlString = url.substring(3).trim().replace("(", "").replace(")", "").trim();
+            if (urlString.startsWith("'") && urlString.endsWith("'")) {
+                str = urlString.substring(urlString.indexOf("'")+1, urlString.lastIndexOf("'"));
+            } else if ( urlString.startsWith("\"") && urlString.endsWith("\"") ) {
+                str = urlString.substring(urlString.indexOf('"')+1, urlString.lastIndexOf('"'));
+            } else {
+                str = urlString;
+            }
+        } else {
+            str = url;
+        }
+        return str;
+    }
+
+    public static Float parseFloat(String str){
+        float result = 0.0f;
+        try {
+            if(str.endsWith("px") || str.endsWith("pt")){
+                result = Float.parseFloat(str.substring(0, str.length() - 2));
+            }else{
+                result = Float.parseFloat(str);
+            }
+        }catch (NumberFormatException e){
+
+        }
+        return result;
+    }
+}

fine-itext-old/src/com/fr/third/com/lowagie/text/html/IndentAttribute.java

@@ -0,0 +1,55 @@
+package com.fr.third.com.lowagie.text.html;
+
+/**
+ * @author kerry
+ * @date 2018/5/9
+ */
+public class IndentAttribute {
+    private float top = 0.0f;
+    private float bottom = 0.0f;
+    private float left = 0.0f;
+    private float right = 0.0f;
+
+    public float getTop() {
+        return top;
+    }
+
+    public void setTop(float top) {
+        this.top = top;
+    }
+
+    public float getBottom() {
+        return bottom;
+    }
+
+    public void setBottom(float bottom) {
+        this.bottom = bottom;
+    }
+
+    public float getLeft() {
+        return left;
+    }
+
+    public void setLeft(float left) {
+        this.left = left;
+    }
+
+    public float getRight() {
+        return right;
+    }
+
+    public void setRight(float right) {
+        this.right = right;
+    }
+
+    public IndentAttribute(float top, float left, float bottom, float right){
+        this.top = top;
+        this.left = left;
+        this.bottom = bottom;
+        this.right = right;
+    }
+
+    public IndentAttribute(){
+
+    }
+}

fine-itext-old/src/com/fr/third/com/lowagie/text/html/Markup.java

@@ -54,7 +54,6 @@ package com.fr.third.com.lowagie.text.html;
 
 import java.awt.Color;
 import java.util.Properties;
-import java.util.StringTokenizer;
 
 /**
  * A class that contains all the possible tagnames and their attributes.
@@ -441,29 +440,45 @@ public class Markup {
 		Properties result = new Properties();
 		if (string == null)
 			return result;
-		StringTokenizer keyValuePairs = new StringTokenizer(string, ";");
-		StringTokenizer keyValuePair;
 		String key;
 		String value;
-		while (keyValuePairs.hasMoreTokens()) {
+		//换种方式解析，style中background里面也有可能会有;符号
-			keyValuePair = new StringTokenizer(keyValuePairs.nextToken(), ":");
+		String[] styles = string.split(";");
-			if (keyValuePair.hasMoreTokens())
+		for (String s : styles) {
-				key = keyValuePair.nextToken().trim();
+			String[] part = s.split(":",2);
-			else
+			if (part.length == 2) {
-				continue;
+				key = stripDoubleSpacesAndTrim(part[0]).toLowerCase();
-			if (keyValuePair.hasMoreTokens())
+				value = stripDoubleSpacesAndTrim(part[1]);
-				value = keyValuePair.nextToken().trim();
+				if (value.startsWith("\"") || value.startsWith("\'") )
-			else
-				continue;
-			if (value.startsWith("\""))
 					value = value.substring(1);
-			if (value.endsWith("\""))
+				if (value.endsWith("\"") || value.endsWith("\'"))
 					value = value.substring(0, value.length() - 1);
 				result.setProperty(key.toLowerCase(), value);
 			}
+		}
 		return result;
 	}
 
+	public static String stripDoubleSpacesAndTrim(final String str) {
+		char[] charArray = str.toCharArray();
+		if (str.contains("  ")) {
+			StringBuilder builder = new StringBuilder();
+			for (int i = 0; i < charArray.length; i++) {
+				char c = charArray[i];
+				if (c != ' ') {
+					builder.append(c);
+				} else {
+					if (i + 1 < charArray.length && charArray[i + 1] != ' ') {
+						builder.append(' ');
+					}
+				}
+			}
+			return builder.toString().trim();
+		} else {
+			return String.valueOf(charArray).trim();
+		}
+	}
+
 	/**
 	 * Removes the comments sections of a String.
 	 *

fine-itext-old/src/com/fr/third/com/lowagie/text/html/ParseIndentAttrUtils.java

@@ -0,0 +1,84 @@
+package com.fr.third.com.lowagie.text.html;
+
+import com.fr.third.com.lowagie.text.html.CSS;
+import com.fr.third.com.lowagie.text.html.IndentAttribute;
+import com.fr.third.com.lowagie.text.html.Markup;
+
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * @author kerry
+ * @date 2018/5/14
+ */
+public class ParseIndentAttrUtils {
+    public static IndentAttribute parseSpace(String indent){
+        String[] a = indent.split(" ");
+        if(a.length == 0){
+            return new IndentAttribute();
+        }
+        float indentTop = Markup.parseLength(a[0]);
+        if(a.length == 1){
+            return new IndentAttribute(indentTop, indentTop, indentTop, indentTop);
+        }
+        float indentLeft = Markup.parseLength(a[1]);
+        if(a.length == 2){
+            return new IndentAttribute(indentTop, indentLeft, indentTop, indentLeft);
+        }
+        float indentBottom = Markup.parseLength(a[2]);
+        if(a.length == 3){
+            return new IndentAttribute(indentTop, indentLeft, indentBottom, indentLeft);
+        }
+        float indentRight = Markup.parseLength(a[3]);
+        return new IndentAttribute(indentTop, indentLeft, indentBottom, indentRight);
+    }
+
+    public static IndentAttribute parsePaddingAttribute(Map map){
+        if (map == null){
+            return new IndentAttribute();
+        }
+        IndentAttribute indentAttribute = new IndentAttribute();
+        Iterator iter = map.entrySet().iterator();
+        while (iter.hasNext()) {
+            Map.Entry entry = (Map.Entry) iter.next();
+            String key = (String) entry.getKey();
+            if (CSS.Property.PADDING_LEFT.equals(key)) {
+                indentAttribute.setLeft(Markup.parseLength((String) entry.getValue()));
+            } else if (CSS.Property.PADDING_RIGHT.equals(key)) {
+                indentAttribute.setRight(Markup.parseLength((String) entry.getValue()));
+            } else if (CSS.Property.PADDING_TOP.equals(key)) {
+                indentAttribute.setTop(Markup.parseLength((String) entry.getValue()));
+            } else if (CSS.Property.PADDING_BOTTOM.equals(key)) {
+                indentAttribute.setBottom(Markup.parseLength((String) entry.getValue()));
+            }
+        }
+        return indentAttribute;
+    }
+
+    public static IndentAttribute parseMarginAttribute(Map map){
+        IndentAttribute indentAttribute = new IndentAttribute();
+        Iterator iter = map.entrySet().iterator();
+        while (iter.hasNext()) {
+            Map.Entry entry = (Map.Entry) iter.next();
+            String key = (String) entry.getKey();
+            float val = Markup.parseLength((String) entry.getValue());
+            if (CSS.Property.MARGIN_LEFT.equals(key)) {
+                indentAttribute.setLeft(val);
+            } else if (CSS.Property.MARGIN_RIGHT.equals(key)) {
+                indentAttribute.setRight(val);
+            } else if (CSS.Property.MARGIN_TOP.equals(key)) {
+                indentAttribute.setTop(val);
+            } else if (CSS.Property.MARGIN_BOTTOM.equals(key)) {
+                indentAttribute.setBottom(val);
+            }
+        }
+        return indentAttribute;
+    }
+
+    public static void createIndent(StringBuffer stringBuffer, String attr, IndentAttribute indentAttribute){
+        stringBuffer.append(attr).append("-").append("left").append(":").append(indentAttribute.getLeft()).append("px;")
+                .append(attr).append("-").append("right").append(":").append(indentAttribute.getRight()).append("px;")
+                .append(attr).append("-").append("top").append(":").append(indentAttribute.getTop()).append("px;")
+                .append(attr).append("-").append("bottom").append(":").append(indentAttribute.getBottom()).append("px;");
+    }
+}

fine-itext-old/src/com/fr/third/com/lowagie/text/html/WebColors.java

@@ -221,7 +221,7 @@ public class WebColors extends HashMap {
 	 */
 	public static Color getRGBColor(String name)
 			throws IllegalArgumentException {
-		int[] c = { 0, 0, 0, 0 };
+		int[] c = { 0, 0, 0, 255 };
 		if (name.startsWith("#")) {
 			if (name.length() == 4) {
 				c[0] = Integer.parseInt(name.substring(1, 2), 16) * 16;
@@ -258,6 +258,6 @@ public class WebColors extends HashMap {
 			throw new IllegalArgumentException("Color '" + name
 					+ "' not found.");
 		c = (int[]) NAMES.get(name);
-		return new Color(c[0], c[1], c[2], c[3]);
+		return new Color(c[0], c[1], c[2], 255);
 	}
 }

fine-itext-old/src/com/fr/third/com/lowagie/text/html/simpleparser/ChainedProperties.java

@@ -75,6 +75,13 @@ public class ChainedProperties {
 		return null;
 	}
 
+	public String getLastChainProperty(String key){
+		Object obj[] = (Object[]) chain.get(chain.size()-1);
+		HashMap prop = (HashMap) obj[1];
+		return (String) prop.get(key);
+	}
+
+
 	public boolean hasProperty(String key) {
 		for (int k = chain.size() - 1; k >= 0; --k) {
 			Object obj[] = (Object[]) chain.get(k);
@@ -85,6 +92,66 @@ public class ChainedProperties {
 		return false;
 	}
 
+
+	public String getPropertyFromChain (String tag, String key) {
+		//块级元素不继承行内元素属性
+		if(HtmlConstants.BLOCK_ELEMENTS.contains(tag)){
+			for (int k = chain.size() - 1; k >= 0; --k) {
+				Object obj[] = (Object[]) chain.get(k);
+				if(HtmlConstants.INLINE_ELEMENTS.contains(obj[0])){
+					continue;
+				}
+				HashMap prop = (HashMap) obj[1];
+				String ret = (String) prop.get(key);
+				if (ret != null)
+					return ret;
+			}
+		}else{
+			for (int k = chain.size() - 1; k >= 0; --k) {
+				Object obj[] = (Object[]) chain.get(k);
+				if(HtmlConstants.BLOCK_ELEMENTS.contains(obj[0])){
+					return null;
+				}
+				HashMap prop = (HashMap) obj[1];
+				String ret = (String) prop.get(key);
+				if (ret != null)
+					return ret;
+			}
+		}
+
+		return null;
+	}
+
+
+	public boolean hasPropertyInChain(String tag, String key) {
+		if (HtmlConstants.BLOCK_ELEMENTS.contains(tag)) {
+			for (int k = chain.size() - 1; k >= 0; --k) {
+				Object obj[] = (Object[]) chain.get(k);
+				if( HtmlConstants.INLINE_ELEMENTS.contains(obj[0])){
+					continue;
+				}
+				HashMap prop = (HashMap) obj[1];
+				if (prop.containsKey(key))
+					return true;
+			}
+		} else {
+			for (int k = chain.size() - 1; k >= 0; --k) {
+				Object obj[] = (Object[]) chain.get(k);
+				if( HtmlConstants.BLOCK_ELEMENTS.contains(obj[0])){
+					return false;
+				}
+				HashMap prop = (HashMap) obj[1];
+				if (prop.containsKey(key))
+					return true;
+			}
+		}
+
+
+		return false;
+	}
+
+
+
 	public void addToChain(String key, HashMap prop) {
 		// adjust the font size
 		String value = (String) prop.get(ElementTags.SIZE);

fine-itext-old/src/com/fr/third/com/lowagie/text/html/simpleparser/FactoryProperties.java

@@ -50,12 +50,6 @@
 
 package com.fr.third.com.lowagie.text.html.simpleparser;
 
-import java.awt.Color;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.StringTokenizer;
-
 import com.fr.third.com.lowagie.text.Chunk;
 import com.fr.third.com.lowagie.text.Element;
 import com.fr.third.com.lowagie.text.ElementTags;
@@ -64,12 +58,19 @@ import com.fr.third.com.lowagie.text.FontFactory;
 import com.fr.third.com.lowagie.text.FontFactoryImp;
 import com.fr.third.com.lowagie.text.ListItem;
 import com.fr.third.com.lowagie.text.Paragraph;
-import com.fr.third.com.lowagie.text.html.Markup;
 import com.fr.third.com.lowagie.text.html.HtmlTags;
-import com.fr.third.com.lowagie.text.pdf.BaseFont;
+import com.fr.third.com.lowagie.text.html.IndentAttribute;
+import com.fr.third.com.lowagie.text.html.Markup;
+import com.fr.third.com.lowagie.text.html.ParseIndentAttrUtils;
 import com.fr.third.com.lowagie.text.pdf.HyphenationAuto;
 import com.fr.third.com.lowagie.text.pdf.HyphenationEvent;
 
+import java.awt.Color;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.StringTokenizer;
+
 /**
  *
  * @author  psoares
@@ -85,16 +86,24 @@ public class FactoryProperties {
 	public Chunk createChunk(String text, ChainedProperties props) {
 		Font font = getFont(props);
 		float size = font.getSize();
-		size /= 2;
+		size /= 3;
 		Chunk ck = new Chunk(text, font);
 		if (props.hasProperty("sub"))
 			ck.setTextRise(-size);
 		else if (props.hasProperty("sup"))
 			ck.setTextRise(size);
 		ck.setHyphenation(getHyphenation(props));
+		if(props.hasProperty("background")){
+			ck.setBackground(props.getProperty("background"));
+		}
+		for(String padding : HtmlConstants.PADDING){
+			if(props.hasPropertyInChain("span", padding)){
+				String ss = props.getPropertyFromChain("span", padding);
+				ck.setAttribute(padding, ss);
+			}
+		}
 		return ck;
 	}
-
 	private static void setParagraphLeading(Paragraph p, String leading) {
 		if (leading == null) {
 			p.setLeading(0, 1.5f);
@@ -126,6 +135,34 @@ public class FactoryProperties {
 			else if (value.equalsIgnoreCase("justify"))
 				p.setAlignment(Element.ALIGN_JUSTIFIED);
 		}
+		if(props.hasPropertyInChain("div", "background")){
+			p.setBackground(props.getPropertyFromChain("div", "background"));
+		}
+		if(props.hasProperty("line-height")){
+			p.setAttribute("line-height", props.getProperty("line-height"));
+		}
+		for(String margin : HtmlConstants.MARGIN){
+			if(props.hasPropertyInChain("div", margin)){
+				String ss = props.getPropertyFromChain("div", margin);
+				p.setAttribute(margin, ss);
+			}
+		}
+		for(String padding : HtmlConstants.PADDING){
+			if(props.hasPropertyInChain("div", padding)){
+				String ss = props.getPropertyFromChain("div", padding);
+				p.setAttribute(padding, ss);
+			}
+		}
+
+		if(props.hasPropertyInChain("div", "text-indent")){
+			String ss = props.getPropertyFromChain("div", "text-indent");
+			p.setFirstLineIndent(Markup.parseLength(ss));
+		}
+		if(props.hasPropertyInChain("div", "width")){
+			String ss = props.getPropertyFromChain("div", "width");
+			p.setAttribute("width", ss);
+		}
+
 		p.setHyphenation(getHyphenation(props));
 		setParagraphLeading(p, props.getProperty("leading"));
 		value = props.getProperty("before");
@@ -191,10 +228,7 @@ public class FactoryProperties {
 		if (value != null)
 			size = Float.parseFloat(value);
 		Color color = Markup.decodeColor(props.getProperty("color"));
-		String encoding = props.getProperty("encoding");
+		return new Font(face, size, style, color);
-		if (encoding == null)
-			encoding = BaseFont.WINANSI;
-		return fontImp.getFont(face, encoding, true, size, style, color);
 	}
 
 	/**
@@ -309,13 +343,22 @@ public class FactoryProperties {
 				else {
 					h.put("leading", v + ",0");
 				}
-			} else if (key.equals(Markup.CSS_KEY_TEXTALIGN)) {
+			} else if (key.equals(Markup.CSS_KEY_PADDING)) {
+				String ss = prop.getProperty(key).trim().toLowerCase();
+				IndentAttribute indentAttribute = ParseIndentAttrUtils.parseSpace(ss);
+				h.put(Markup.CSS_KEY_PADDINGTOP, indentAttribute.getTop() + "px");
+				h.put(Markup.CSS_KEY_PADDINGLEFT,  indentAttribute.getLeft() + "px");
+				h.put(Markup.CSS_KEY_PADDINGBOTTOM, indentAttribute.getBottom() + "px");
+				h.put(Markup.CSS_KEY_PADDINGRIGHT, indentAttribute.getRight() + "px");
+			}
+			else if (key.equals(Markup.CSS_KEY_TEXTALIGN)) {
 				String ss = prop.getProperty(key).trim().toLowerCase();
 				h.put("align", ss);
 			}
 		}
 	}
 
+
 	/**
 	 * New method contributed by Lubos Strapko
 	 * @param h
@@ -380,12 +423,17 @@ public class FactoryProperties {
 					return;
 				}
 				h.put("leading", v + ",0");
+				h.put("line-height", ss);
 			} else if (key.equals(Markup.CSS_KEY_TEXTALIGN)) {
 				String ss = prop.getProperty(key).trim().toLowerCase();
 				h.put("align", ss);
-			} else if (key.equals(Markup.CSS_KEY_PADDINGLEFT)) {
+			} else if (key.equals(Markup.CSS_KEY_BGCOLOR)) {
 				String ss = prop.getProperty(key).trim().toLowerCase();
-				h.put("indent", Float.toString(Markup.parseLength(ss)));
+				h.put("background", ss);
+			}
+			else{
+				String ss = prop.getProperty(key).trim();
+				h.put(key, ss);
 			}
 		}
 	}

fine-itext-old/src/com/fr/third/com/lowagie/text/html/simpleparser/HTMLWorker.java

@@ -50,16 +50,6 @@
 
 package com.fr.third.com.lowagie.text.html.simpleparser;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Stack;
-import java.util.StringTokenizer;
-
-import com.fr.third.com.lowagie.text.html.HtmlTags;
-import com.fr.third.com.lowagie.text.html.Markup;
 import com.fr.third.com.lowagie.text.Chunk;
 import com.fr.third.com.lowagie.text.DocListener;
 import com.fr.third.com.lowagie.text.DocumentException;
@@ -69,15 +59,32 @@ import com.fr.third.com.lowagie.text.ExceptionConverter;
 import com.fr.third.com.lowagie.text.FontFactoryImp;
 import com.fr.third.com.lowagie.text.HeaderFooter;
 import com.fr.third.com.lowagie.text.Image;
+import com.fr.third.com.lowagie.text.List;
 import com.fr.third.com.lowagie.text.ListItem;
 import com.fr.third.com.lowagie.text.Paragraph;
 import com.fr.third.com.lowagie.text.Phrase;
 import com.fr.third.com.lowagie.text.Rectangle;
 import com.fr.third.com.lowagie.text.TextElementArray;
+import com.fr.third.com.lowagie.text.html.CSSUtils;
+import com.fr.third.com.lowagie.text.html.HtmlTags;
+import com.fr.third.com.lowagie.text.html.Markup;
 import com.fr.third.com.lowagie.text.pdf.PdfPTable;
 import com.fr.third.com.lowagie.text.pdf.draw.LineSeparator;
 import com.fr.third.com.lowagie.text.xml.simpleparser.SimpleXMLDocHandler;
 import com.fr.third.com.lowagie.text.xml.simpleparser.SimpleXMLParser;
+import sun.misc.BASE64Decoder;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Stack;
+import java.util.StringTokenizer;
 
 public class HTMLWorker implements SimpleXMLDocHandler, DocListener {
 
@@ -176,11 +183,16 @@ public class HTMLWorker implements SimpleXMLDocHandler, DocListener {
 		cprops.addToChain("body", h);
 	}
 
+
 	public void startElement(String tag, HashMap h) {
 		if (!tagsSupported.containsKey(tag))
 			return;
 		try {
 			style.applyStyle(tag, h);
+			if(tag.equals("p")){
+				h.put(Markup.CSS_KEY_MARGINTOP, "16px");
+				h.put(Markup.CSS_KEY_MARGINBOTTOM, "16px");
+			}
 			String follow = (String) FactoryProperties.followTags.get(tag);
 			if (follow != null) {
 				HashMap prop = new HashMap();
@@ -285,6 +297,14 @@ public class HTMLWorker implements SimpleXMLDocHandler, DocListener {
 						}
 					}
 				}
+				//处理base64编码图片
+				if(src.startsWith("data")){
+					BASE64Decoder decoder = new BASE64Decoder();
+					String[] srcArray = src.split(",");
+					String base64string = srcArray[srcArray.length -1];
+					byte[] bytes = decoder.decodeBuffer(base64string);
+					img = Image.getInstance(bytes);
+				}
 				if (img == null) {
 					if (!src.startsWith("http")) {
 						String path = cprops.getProperty("image_path");
@@ -294,6 +314,10 @@ public class HTMLWorker implements SimpleXMLDocHandler, DocListener {
 					}
 					img = Image.getInstance(src);
 				}
+				if(img == null){
+					return;
+				}
+				img.setSrcString(src);
 				String align = (String) h.get("align");
 				String width = (String) h.get("width");
 				String height = (String) h.get("height");
@@ -342,12 +366,22 @@ public class HTMLWorker implements SimpleXMLDocHandler, DocListener {
 						document.add(img);
 					cprops.removeChain(tag);
 				} else {
+					Chunk ck = new Chunk(img, 0, 0);
+					if(cprops.hasPropertyInChain("img", "padding-left")){
+						String ss = cprops.getPropertyFromChain("img", "padding-left");
+						ck.setAttribute("padding-left", Float.toString(Markup.parseLength(ss)));
+					}
+					if(cprops.hasPropertyInChain("img", "padding-right")){
+						String ss = cprops.getPropertyFromChain("img", "padding-right");
+						ck.setAttribute("padding-right", Float.toString(Markup.parseLength(ss)));
+					}
 					cprops.removeChain(tag);
 					if (currentParagraph == null) {
 						currentParagraph = FactoryProperties
 								.createParagraph(cprops);
 					}
-					currentParagraph.add(new Chunk(img, 0, 0));
+
+					currentParagraph.add(ck);
 				}
 				return;
 			}
@@ -366,7 +400,7 @@ public class HTMLWorker implements SimpleXMLDocHandler, DocListener {
 					endElement(HtmlTags.LISTITEM);
 				skipText = true;
 				cprops.addToChain(tag, h);
-				com.fr.third.com.lowagie.text.List list = new com.fr.third.com.lowagie.text.List(false);
+				List list = new List(false);
 				try{
 					list.setIndentationLeft(new Float(cprops.getProperty("indent")).floatValue());
 				}catch (Exception e) {
@@ -381,7 +415,7 @@ public class HTMLWorker implements SimpleXMLDocHandler, DocListener {
 					endElement(HtmlTags.LISTITEM);
 				skipText = true;
 				cprops.addToChain(tag, h);
-				com.fr.third.com.lowagie.text.List list = new com.fr.third.com.lowagie.text.List(true);
+				List list = new List(true);
 				try{
 					list.setIndentationLeft(new Float(cprops.getProperty("indent")).floatValue());
 				}catch (Exception e) {
@@ -443,6 +477,30 @@ public class HTMLWorker implements SimpleXMLDocHandler, DocListener {
 		}
 	}
 
+
+	public BufferedImage GetBufferedImage(String base64string)
+	{
+		BufferedImage image = null;
+		try {
+			InputStream stream = BaseToInputStream(base64string);
+			image = ImageIO.read(stream);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return image;
+	}
+
+	public  InputStream BaseToInputStream(String base64string){
+		ByteArrayInputStream stream = null;
+		try {
+			BASE64Decoder decoder = new BASE64Decoder();
+			byte[] bytes1 = decoder.decodeBuffer(base64string);
+			stream = new ByteArrayInputStream(bytes1);
+		} catch (Exception e) {
+		}
+		return stream;
+	}
+
 	public void endElement(String tag) {
 		if (!tagsSupported.containsKey(tag))
 			return;
@@ -510,7 +568,7 @@ public class HTMLWorker implements SimpleXMLDocHandler, DocListener {
 				if (stack.empty())
 					return;
 				Object obj = stack.pop();
-				if (!(obj instanceof com.fr.third.com.lowagie.text.List)) {
+				if (!(obj instanceof List)) {
 					stack.push(obj);
 					return;
 				}
@@ -536,12 +594,12 @@ public class HTMLWorker implements SimpleXMLDocHandler, DocListener {
 					return;
 				}
 				Object list = stack.pop();
-				if (!(list instanceof com.fr.third.com.lowagie.text.List)) {
+				if (!(list instanceof List)) {
 					stack.push(list);
 					return;
 				}
 				ListItem item = (ListItem) obj;
-				((com.fr.third.com.lowagie.text.List) list).add(item);
+				((List) list).add(item);
 				ArrayList cks = item.getChunks();
 				if (!cks.isEmpty())
 					item.getListSymbol()
@@ -588,6 +646,8 @@ public class HTMLWorker implements SimpleXMLDocHandler, DocListener {
 				if (pendingTD)
 					endElement("td");
 				pendingTR = false;
+				String rowHeightPx = cprops.getLastChainProperty("height");
+
 				cprops.removeChain("tr");
 				ArrayList cells = new ArrayList();
 				IncTable table = null;
@@ -601,8 +661,13 @@ public class HTMLWorker implements SimpleXMLDocHandler, DocListener {
 						break;
 					}
 				}
+				float rowHeight = 0.0f;
+				if(rowHeightPx!=null){
+					rowHeight = CSSUtils.parseFloat(rowHeightPx);
+				}
 				table.addCols(cells);
-				table.endRow();
+				table.endRow(rowHeight);
+
 				stack.push(table);
 				skipText = true;
 				return;
@@ -705,7 +770,7 @@ public class HTMLWorker implements SimpleXMLDocHandler, DocListener {
 	}
 
 	/**
-     * @see com.fr.third.com.lowagie.text.DocListener#setMarginMirroring(boolean)
+     * @see DocListener#setMarginMirroring(boolean)
 	 * @since	2.1.6
 	 */
 	public boolean setMarginMirroringTopBottom(boolean marginMirroring) {

fine-itext-old/src/com/fr/third/com/lowagie/text/html/simpleparser/HtmlConstants.java

@@ -0,0 +1,45 @@
+package com.fr.third.com.lowagie.text.html.simpleparser;
+
+import com.fr.third.com.lowagie.text.html.HtmlTags;
+import com.fr.third.com.lowagie.text.html.Markup;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author kerry
+ * @date 2018/5/2
+ */
+public class HtmlConstants {
+    //块级元素集合
+    public static final List<String> BLOCK_ELEMENTS = new ArrayList<String>();
+    //行内元素集合
+    public static final List<String> INLINE_ELEMENTS = new ArrayList<String>();
+    //支持解析的属性
+    public static final List<String> PADDING = new ArrayList<String>();
+    public static final List<String> MARGIN = new ArrayList<String>();
+    static {
+        BLOCK_ELEMENTS.add(HtmlTags.DIV);
+        BLOCK_ELEMENTS.add(HtmlTags.UNORDEREDLIST);
+        BLOCK_ELEMENTS.add(HtmlTags.PARAGRAPH);
+        BLOCK_ELEMENTS.add(HtmlTags.ORDEREDLIST);
+        BLOCK_ELEMENTS.add(HtmlTags.TABLE);
+        INLINE_ELEMENTS.add(HtmlTags.SPAN);
+        INLINE_ELEMENTS.add(HtmlTags.IMAGE);
+        INLINE_ELEMENTS.add(HtmlTags.STRONG);
+        INLINE_ELEMENTS.add(HtmlTags.ANCHOR);
+        INLINE_ELEMENTS.add(HtmlTags.SUB);
+        INLINE_ELEMENTS.add(HtmlTags.SUP);
+        INLINE_ELEMENTS.add(HtmlTags.I);
+        INLINE_ELEMENTS.add(HtmlTags.U);
+        INLINE_ELEMENTS.add(HtmlTags.EM);
+        PADDING.add(Markup.CSS_KEY_PADDINGLEFT);
+        PADDING.add(Markup.CSS_KEY_PADDINGRIGHT);
+        PADDING.add(Markup.CSS_KEY_PADDINGTOP);
+        PADDING.add(Markup.CSS_KEY_PADDINGBOTTOM);
+        MARGIN.add(Markup.CSS_KEY_MARGINLEFT);
+        MARGIN.add(Markup.CSS_KEY_MARGINRIGHT);
+        MARGIN.add(Markup.CSS_KEY_MARGINTOP);
+        MARGIN.add(Markup.CSS_KEY_MARGINBOTTOM);
+    }
+}

fine-itext-old/src/com/fr/third/com/lowagie/text/html/simpleparser/IncCell.java

@@ -48,13 +48,17 @@
 package com.fr.third.com.lowagie.text.html.simpleparser;
 
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 
 import com.fr.third.com.lowagie.text.Element;
 import com.fr.third.com.lowagie.text.ElementListener;
-import com.fr.third.com.lowagie.text.Phrase;
 import com.fr.third.com.lowagie.text.TextElementArray;
+import com.fr.third.com.lowagie.text.html.CSSUtils;
 import com.fr.third.com.lowagie.text.html.Markup;
 import com.fr.third.com.lowagie.text.pdf.PdfPCell;
+import com.fr.third.com.lowagie.text.Phrase;
+
 /**
  *
  * @author  psoares
@@ -94,14 +98,52 @@ public class IncCell implements TextElementArray {
         value = props.getProperty("border");
         float border = 0;
         if (value != null)
-            border = Float.parseFloat(value);
+            border = CSSUtils.parseFloat(value);
         cell.setBorderWidth(border);
         value = props.getProperty("cellpadding");
         if (value != null)
-            cell.setPadding(Float.parseFloat(value));
+            cell.setPadding(CSSUtils.parseFloat(value));
         cell.setUseDescender(true);
         value = props.getProperty("bgcolor");
         cell.setBackgroundColor(Markup.decodeColor(value));
+        //解析td上声明的width
+        value = props.getLastChainProperty("width");
+        if(value != null){
+            cell.setStyleWidth(CSSUtils.parseFloat(value));
+        }
+        //解析td上声明的height
+        value = props.getLastChainProperty("height");
+        if(value != null){
+            cell.setStyleHeight(CSSUtils.parseFloat(value));
+        }
+        //解析background相关属性并保存到cell对象
+        Map<String, String> backgroundRules = new HashMap<String, String>();
+        value = props.getLastChainProperty("background-size");
+        if(value!=null){
+            backgroundRules.put("background-size", value);
+        }
+        value = props.getLastChainProperty("background");
+        if(value!=null){
+            Map<String, String> backgroundStyles = CSSUtils.processBackground(value);
+            backgroundRules.putAll(backgroundStyles);
+        }
+        value = props.getLastChainProperty("background-color");
+        if(value!=null){
+            backgroundRules.put("background-color", value);
+        }
+        value = props.getLastChainProperty("background-position");
+        if(value!=null){
+            backgroundRules.put("background-position", value);
+        }
+        value = props.getLastChainProperty("background-repeat");
+        if(value!=null){
+            backgroundRules.put("background-repeat", value);
+        }
+        value = props.getLastChainProperty("background-image");
+        if(value!=null){
+            backgroundRules.put("background-image", value);
+        }
+        cell.setBackground(backgroundRules);
     }
 
     public boolean add(Object o) {
@@ -128,7 +170,7 @@ public class IncCell implements TextElementArray {
     }
 
     /**
-	 * @see com.fr.third.com.lowagie.text.Element#isContent()
+     * @see Element#isContent()
      * @since	iText 2.0.8
      */
     public boolean isContent() {
@@ -136,7 +178,7 @@ public class IncCell implements TextElementArray {
     }
 
     /**
-	 * @see com.fr.third.com.lowagie.text.Element#isNestable()
+     * @see Element#isNestable()
      * @since	iText 2.0.8
      */
     public boolean isNestable() {

fine-itext-old/src/com/fr/third/com/lowagie/text/html/simpleparser/IncTable.java

@@ -51,8 +51,12 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 
-import com.fr.third.com.lowagie.text.pdf.PdfPCell;
+import com.fr.third.com.lowagie.text.html.CSSUtils;
+import com.fr.third.com.lowagie.text.html.Markup;
+import com.fr.third.com.lowagie.text.pdf.BorderStyle;
 import com.fr.third.com.lowagie.text.pdf.PdfPTable;
+import com.fr.third.com.lowagie.text.pdf.PdfPCell;
+import com.fr.third.com.lowagie.text.pdf.TableProperties;
 
 /**
  *
@@ -62,6 +66,8 @@ public class IncTable {
     private HashMap props = new HashMap();
     private ArrayList rows = new ArrayList();
     private ArrayList cols;
+
+    private ArrayList<Float> rowHeights = new ArrayList<Float>();
     /** Creates a new instance of IncTable */
     public IncTable(HashMap props) {
         this.props.putAll(props);
@@ -80,7 +86,8 @@ public class IncTable {
             cols.addAll(ncols);
     }
 
-    public void endRow() {
+    public void endRow(float rowHeight) {
+        rowHeights.add(rowHeight);
         if (cols != null) {
             Collections.reverse(cols);
             rows.add(cols);
@@ -97,18 +104,44 @@ public class IncTable {
             return new PdfPTable(1);
         int ncol = 0;
         ArrayList c0 = (ArrayList)rows.get(0);
+        ArrayList<Float> colWidths = new ArrayList<Float>();
         for (int k = 0; k < c0.size(); ++k) {
-            ncol += ((PdfPCell)c0.get(k)).getColspan();
+            PdfPCell pCell =  ((PdfPCell)c0.get(k));
+            int cellCols = pCell.getColspan();
+            ncol += cellCols;
+            if(cellCols > 1){
+                for(int a = 0; a < cellCols ; a++){
+                    colWidths.add(pCell.getStyleWidth()/cellCols);
+                }
+            }else {
+                colWidths.add(pCell.getStyleWidth());
+            }
         }
+
         PdfPTable table = new PdfPTable(ncol);
+        try {
+            TableProperties tableProperties = parseTableProperties();
+            table.setTableProperties(tableProperties);
             String width = (String)props.get("width");
             if (width == null)
                 table.setWidthPercentage(100);
             else {
                 if (width.endsWith("%"))
-                table.setWidthPercentage(Float.parseFloat(width.substring(0, width.length() - 1)));
+                    table.setWidthPercentage(CSSUtils.parseFloat(width));
                 else {
-                table.setTotalWidth(Float.parseFloat(width));
+                    //解析单元格宽度
+                    float totalWidth = CSSUtils.parseFloat(width);
+                    float[] floats = new float[colWidths.size()];
+                    for (int a = 0; a < colWidths.size(); a++){
+                        floats[a] = colWidths.get(a);
+                    }
+                    //解析px数值
+                    table.setTotalWidth(totalWidth);
+                    try {
+                        table.setWidths(floats);
+                    }catch (Exception e){
+                        e.printStackTrace();
+                    }
                     table.setLockedWidth(true);
                 }
             }
@@ -118,6 +151,41 @@ public class IncTable {
                     table.addCell((PdfPCell)col.get(k));
                 }
             }
+            //调整行高
+            for(int a = 0; a < rowHeights.size(); a++){
+                table.getRow(a).setStyleHeight(rowHeights.get(a));
+            }
+
+        }catch (Exception e){
+            e.printStackTrace();
+        }
         return table;
     }
+
+    public TableProperties parseTableProperties(){
+        TableProperties tableProperties = new TableProperties();
+        BorderStyle borderStyle = new BorderStyle();
+        tableProperties.setBorderStyle(borderStyle);
+        String value = (String)props.get("border");
+        if(value != null){
+            borderStyle.setBorderWidth(CSSUtils.parseFloat(value));
+        }
+        value = (String)props.get("border-color");
+        if(value != null){
+            borderStyle.setBorderColor(Markup.decodeColor(value));
+        }
+        value = (String)props.get("border-collapse");
+        if(value != null){
+            tableProperties.setCollapse(value.equals("collapse"));
+        }
+        value = (String)props.get("cellspacing");
+        if(value != null){
+            tableProperties.setCellspacing(CSSUtils.parseFloat(value));
+        }
+        value = (String)props.get("cellpadding");
+        if(value != null){
+            tableProperties.setCellpadding(CSSUtils.parseFloat(value));
+        }
+        return tableProperties;
+    }
 }

fine-itext-old/src/com/fr/third/com/lowagie/text/pdf/BorderStyle.java

@@ -0,0 +1,58 @@
+package com.fr.third.com.lowagie.text.pdf;
+
+import com.fr.third.com.lowagie.text.DocumentException;
+import com.fr.third.com.lowagie.text.html.CSSUtils;
+import com.fr.third.com.lowagie.text.html.Markup;
+
+import java.awt.Color;
+
+public class BorderStyle {
+    private float borderWidth = 0.0f;
+    private Color borderColor = Color.black;
+    private String borderPattern = "solid";
+
+    public float getBorderWidth() {
+        return borderWidth;
+    }
+
+    public void setBorderWidth(float borderWidth) {
+        this.borderWidth = borderWidth;
+    }
+
+    public Color getBorderColor() {
+        return borderColor;
+    }
+
+    public void setBorderColor(Color borderColor) {
+        this.borderColor = borderColor;
+    }
+
+    public String getBorderPattern() {
+        return borderPattern;
+    }
+
+    public void setBorderPattern(String borderPattern) {
+        this.borderPattern = borderPattern;
+    }
+
+    public BorderStyle() {
+
+    }
+
+    public BorderStyle(int borderWidth, String borderPattern, Color borderColor) {
+        this.borderWidth = borderWidth;
+        this.borderPattern = borderPattern;
+        this.borderWidth = borderWidth;
+    }
+
+    public static BorderStyle parseBorderStyle(String borderString) throws DocumentException {
+        BorderStyle borderStyle = new BorderStyle();
+        String[] borderPros = borderString.split(" ");
+        borderStyle.setBorderWidth(CSSUtils.parseFloat(borderPros[0]));
+        borderStyle.setBorderPattern(borderPros[1]);
+        borderStyle.setBorderColor(Markup.decodeColor(borderPros[2]));
+        return borderStyle;
+
+    }
+
+}

fine-itext-old/src/com/fr/third/com/lowagie/text/pdf/PdfPCell.java

@@ -50,15 +50,17 @@
 package com.fr.third.com.lowagie.text.pdf;
 
 import java.util.List;
+import java.util.Map;
 
+import com.fr.Container;
 import com.fr.third.com.lowagie.text.Chunk;
 import com.fr.third.com.lowagie.text.DocumentException;
 import com.fr.third.com.lowagie.text.Element;
 import com.fr.third.com.lowagie.text.ExceptionConverter;
 import com.fr.third.com.lowagie.text.Image;
-import com.fr.third.com.lowagie.text.Phrase;
 import com.fr.third.com.lowagie.text.Rectangle;
 import com.fr.third.com.lowagie.text.pdf.events.PdfPCellEventForwarder;
+import com.fr.third.com.lowagie.text.Phrase;
 
 /**
  * A cell in a PdfPTable.
@@ -66,6 +68,36 @@ import com.fr.third.com.lowagie.text.pdf.events.PdfPCellEventForwarder;
 
 public class PdfPCell extends Rectangle {
 
+    private float styleWidth = 0.0f;
+    private float styleHeight = 0.0f;
+
+    public float getStyleHeight() {
+        return styleHeight;
+    }
+
+    public void setStyleHeight(float styleHeight) {
+        this.styleHeight = styleHeight;
+    }
+
+    public float getStyleWidth() {
+        return styleWidth;
+    }
+
+    public Map<String, String> background ;
+
+    public Map<String, String>  getBackground() {
+        return background;
+    }
+
+    public void setBackground(Map<String, String>  background) {
+        this.background = background;
+    }
+
+    public void setStyleWidth(float styleWidth) {
+        this.styleWidth = styleWidth;
+    }
+
+
     private ColumnText column = new ColumnText(null);
 
     /** Vertical alignment of the cell. */
@@ -256,6 +288,9 @@ public class PdfPCell extends Rectangle{
         column = ColumnText.duplicate(cell.column);
         useBorderPadding = cell.useBorderPadding;
         rotation = cell.rotation;
+        background = cell.background;
+        styleWidth = cell.styleWidth;
+        styleHeight = cell.styleHeight;
     }
 
     /**
@@ -1010,4 +1045,14 @@ public class PdfPCell extends Rectangle{
             height = getMinimumHeight();
         return height;
     }
+
+    private Container container;
+
+    public Container getContainer() {
+        return container;
+    }
+
+    public void addContent(Container container){
+        this.container = container;
+    }
 }

fine-itext-old/src/com/fr/third/com/lowagie/text/pdf/PdfPRow.java

@@ -51,9 +51,9 @@ package com.fr.third.com.lowagie.text.pdf;
 
 import java.awt.Color;
 
+import com.fr.third.com.lowagie.text.ExceptionConverter;
 import com.fr.third.com.lowagie.text.DocumentException;
 import com.fr.third.com.lowagie.text.Element;
-import com.fr.third.com.lowagie.text.ExceptionConverter;
 import com.fr.third.com.lowagie.text.Image;
 import com.fr.third.com.lowagie.text.Rectangle;
 
@@ -76,6 +76,16 @@ public class PdfPRow {
 
 	protected float widths[];
 
+	private float styleHeight;
+
+	public float getStyleHeight() {
+		return styleHeight;
+	}
+
+	public void setStyleHeight(float styleHeight) {
+		this.styleHeight = styleHeight;
+	}
+
 	/**
 	 * extra heights that needs to be added to a cell because of rowspans.
 	 * @since	2.1.6
@@ -179,37 +189,23 @@ public class PdfPRow {
 	 */
 	public float calculateHeights() {
 		maxHeight = 0;
-		// @change
+		for (int k = 0; k < cells.length; ++k) {
-		int rowSpan = Integer.MAX_VALUE;
-		boolean hasAboveRowSpan = false;
-		float max_height = 0.0f;
-		for (int k = 0; k < cells.length;) {
 			PdfPCell cell = cells[k];
 			float height = 0;
 			if (cell == null) {
-				hasAboveRowSpan = true;
-				k++;
 				continue;
 			}
 			else {
-				height = cell.getMaxHeight();
+				height = cell.getStyleHeight() == 0 ? cell.getContainer().getHeight() : cell.getStyleHeight();
-				if (cell.getRowspan() == rowSpan && height > max_height) {
+				if ((height > maxHeight) && (cell.getRowspan() == 1))
-					max_height = height;
+					maxHeight = height;
-				} else if (cell.getRowspan() < rowSpan) {
-					rowSpan = cell.getRowspan();
-					max_height = height;
-				}
-				k += cell.getColspan();
 			}
 		}
 		calculated = true;
-		// carl:假如有格子是从属于一个rowSpan的格子，而这个格子的主格不在这一行（当然这样的假设建立在格子是满的情况下。）
+		return maxHeight = Math.max(styleHeight, maxHeight);
-		if (!hasAboveRowSpan || rowSpan == 1) {
-			maxHeight = max_height;
-		}
-		return maxHeight;
 	}
 
+
 	/**
 	 * Writes the border and background of one cell in the row.
 	 *

fine-itext-old/src/com/fr/third/com/lowagie/text/pdf/PdfPTable.java

@@ -53,21 +53,24 @@ import java.util.ArrayList;
 
 import com.fr.third.com.lowagie.text.DocumentException;
 import com.fr.third.com.lowagie.text.Element;
+import com.fr.third.com.lowagie.text.LargeElement;
 import com.fr.third.com.lowagie.text.ElementListener;
 import com.fr.third.com.lowagie.text.Image;
-import com.fr.third.com.lowagie.text.LargeElement;
 import com.fr.third.com.lowagie.text.Phrase;
 import com.fr.third.com.lowagie.text.Rectangle;
 import com.fr.third.com.lowagie.text.pdf.events.PdfPTableEventForwarder;
+import com.fr.third.com.lowagie.text.pdf.BorderStyle;
+import com.fr.third.com.lowagie.text.pdf.TableProperties;
 
 /**
  * This is a table that can be put at an absolute position but can also
  * be added to the document as the class <CODE>Table</CODE>.
  * In the last case when crossing pages the table always break at full rows; if a
  * row is bigger than the page it is dropped silently to avoid infinite loops.
- * <P>
+ * <p>
  * A PdfPTableEvent can be associated to the table to do custom drawing
  * when the table is rendered.
+ *
  * @author Paulo Soares (psoares@consiste.pt)
  */
 
@@ -102,7 +105,15 @@ public class PdfPTable implements LargeElement{
     protected float relativeWidths[];
     protected float absoluteWidths[];
     protected PdfPTableEvent tableEvent;
+    private TableProperties tableProperties;
 
+    public TableProperties getTableProperties() {
+        return tableProperties;
+    }
+
+    public void setTableProperties(TableProperties tableProperties) {
+        this.tableProperties = tableProperties;
+    }
 
     /**
      * Holds value of property headerRows.
@@ -125,6 +136,7 @@ public class PdfPTable implements LargeElement{
     private boolean skipFirstHeader = false;
     /**
      * Holds value of property skipLastFooter.
+     *
      * @since 2.1.6
      */
     private boolean skipLastFooter = false;
@@ -188,6 +200,7 @@ public class PdfPTable implements LargeElement{
 
     /**
      * Keeps track of the completeness of the current row.
+     *
      * @since 2.1.6
      */
     protected boolean rowCompleted = true;
@@ -296,6 +309,7 @@ public class PdfPTable implements LargeElement{
         horizontalAlignment = sourceTable.horizontalAlignment;
         keepTogether = sourceTable.keepTogether;
         complete = sourceTable.complete;
+        tableProperties = sourceTable.tableProperties;
     }
 
     /**
@@ -313,7 +327,7 @@ public class PdfPTable implements LargeElement{
         absoluteWidths = new float[relativeWidths.length];
         totalHeight = 0;
         calculateWidths();
-        calculateHeights(true);
+//        calculateHeights(true);
     }
 
     /**
@@ -338,10 +352,14 @@ public class PdfPTable implements LargeElement{
             return;
         float total = 0;
         int numCols = getNumberOfColumns();
+        BorderStyle borderStyle = tableProperties.getBorderStyle();
+        float borderWidth = tableProperties.isCollapse() ? borderStyle.getBorderWidth() / 2 : borderStyle.getBorderWidth();
+        float cellspacing = tableProperties.getCellspacing();
+        float cellpadding = tableProperties.getCellpadding();
         for (int k = 0; k < numCols; ++k)
             total += relativeWidths[k];
         for (int k = 0; k < numCols; ++k)
-            absoluteWidths[k] = totalWidth * relativeWidths[k] / total;
+            absoluteWidths[k] = (totalWidth - cellspacing * (numCols + 1) - numCols * 2 * (borderWidth + cellpadding) - 2 * borderWidth) * relativeWidths[k] / total;
     }
 
     /**
@@ -355,7 +373,11 @@ public class PdfPTable implements LargeElement{
         this.totalWidth = totalWidth;
         totalHeight = 0;
         calculateWidths();
-        calculateHeights(true);
+//        calculateHeights(true);
+        for (int k = 0; k < rows.size(); ++k) {
+            PdfPRow row = (PdfPRow) rows.get(k);
+            row.setWidths(absoluteWidths);
+        }
     }
 
     /**
@@ -415,9 +437,14 @@ public class PdfPTable implements LargeElement{
         if (totalWidth <= 0)
             return 0;
         totalHeight = 0;
+        BorderStyle borderStyle = tableProperties.getBorderStyle();
+        float borderWidth = tableProperties.isCollapse() ? borderStyle.getBorderWidth() / 2 : borderStyle.getBorderWidth();
+        float cellspacing = tableProperties.getCellspacing();
+        float cellpadding = tableProperties.getCellpadding();
         for (int k = 0; k < rows.size(); ++k) {
             totalHeight += getRowHeight(k, firsttime);
         }
+        totalHeight += (rows.size() + 1) * 2 * borderWidth + cellpadding * 2 * rows.size() + (rows.size() + 1) * cellspacing;
         return totalHeight;
     }
 
@@ -487,7 +514,7 @@ public class PdfPTable implements LargeElement{
             PdfPRow row = new PdfPRow(currentRow);
             if (totalWidth > 0) {
                 row.setWidths(absoluteWidths);
-                totalHeight += row.getMaxHeights();
+//                totalHeight += row.getMaxHeights();
             }
             rows.add(row);
             currentRow = new PdfPCell[numCols];
@@ -504,6 +531,7 @@ public class PdfPTable implements LargeElement{
     /**
      * When updating the row index, cells with rowspan should be taken into account.
      * This is what happens in this method.
+     *
      * @since 2.1.6
      */
     private void skipColsWithRowspanAbove() {
@@ -516,6 +544,7 @@ public class PdfPTable implements LargeElement{
 
     /**
      * Checks if there are rows above belonging to a rowspan.
+     *
      * @param    currRow    the current row to check
      * @param    currCol    the current column to check
      * @return true if there's a cell above that belongs to a rowspan
@@ -618,7 +647,7 @@ public class PdfPTable implements LargeElement{
      * @param canvases an array of 4 <CODE>PdfContentByte</CODE> obtained from
      *                 <CODE>beginWrittingRows()</CODE>
      * @return the y coordinate position of the bottom of the last row
-     * @see #beginWritingRows(com.fr.third.com.lowagie.text.pdf.PdfContentByte)
+     * @see #beginWritingRows(PdfContentByte)
      */
     public float writeSelectedRows(int rowStart, int rowEnd, float xPos, float yPos, PdfContentByte[] canvases) {
         return writeSelectedRows(0, -1, rowStart, rowEnd, xPos, yPos, canvases);
@@ -642,7 +671,7 @@ public class PdfPTable implements LargeElement{
      * @param canvases an array of 4 <CODE>PdfContentByte</CODE> obtained from
      *                 <CODE>beginWritingRows()</CODE>
      * @return the y coordinate position of the bottom of the last row
-     * @see #beginWritingRows(com.fr.third.com.lowagie.text.pdf.PdfContentByte)
+     * @see #beginWritingRows(PdfContentByte)
      */
     public float writeSelectedRows(int colStart, int colEnd, int rowStart, int rowEnd, float xPos, float yPos, PdfContentByte[] canvases) {
         if (totalWidth <= 0)
@@ -835,6 +864,7 @@ public class PdfPTable implements LargeElement{
     public float getRowHeight(int idx) {
         return getRowHeight(idx, false);
     }
+
     /**
      * Gets the height of a particular row.
      *
@@ -863,8 +893,6 @@ public class PdfPTable implements LargeElement{
             }
             tmprow = (PdfPRow) rows.get(idx - rs);
             cell = tmprow.getCells()[i];
-        	// @change null就不继续了，这个版本没考虑到rowSpan和colSpan都大于1的情况
-        	if (cell == null) break;
             float tmp = 0;
             if (cell.getRowspan() == rs + 1) {
                 tmp = cell.getMaxHeight();
@@ -884,9 +912,9 @@ public class PdfPTable implements LargeElement{
      * Gets the maximum height of a cell in a particular row (will only be different
      * from getRowHeight is one of the cells in the row has a rowspan > 1).
      *
+     * @return the height of a particular row including rowspan
      * @param    rowIndex    the row index
      * @param    cellIndex    the cell index
-     * @return the height of a particular row including rowspan
      * @since 2.1.6
      */
     public float getRowspanHeight(int rowIndex, int cellIndex) {
@@ -1037,16 +1065,16 @@ public class PdfPTable implements LargeElement{
     }
 
     /**
-	 * @see com.fr.third.com.lowagie.text.Element#isContent()
      * @since iText 2.0.8
+     * @see Element#isContent()
      */
     public boolean isContent() {
         return true;
     }
 
     /**
-	 * @see com.fr.third.com.lowagie.text.Element#isNestable()
      * @since iText 2.0.8
+     * @see Element#isNestable()
      */
     public boolean isNestable() {
         return true;
@@ -1062,8 +1090,7 @@ public class PdfPTable implements LargeElement{
     public boolean process(ElementListener listener) {
         try {
             return listener.add(this);
-        }
+        } catch (DocumentException de) {
-        catch(DocumentException de) {
             return false;
         }
     }
@@ -1128,6 +1155,7 @@ public class PdfPTable implements LargeElement{
 
     /**
      * Gets an arraylist with a selection of rows.
+     *
      * @param    start    the first row in the selection
      * @param    end the first row that isn't part of the selection
      * @return a selection of rows
@@ -1176,6 +1204,7 @@ public class PdfPTable implements LargeElement{
 
     /**
      * Calculates the extra height needed in a row because of rowspans.
+     *
      * @param    start    the index of the start row (the one to adjust)
      * @param    end        the index of the end row on the page
      * @since 2.1.6
@@ -1199,7 +1228,9 @@ public class PdfPTable implements LargeElement{
         return row;
     }
 
-    /** Sets the table event for this table.
+    /**
+     * Sets the table event for this table.
+     *
      * @param event the table event for this table
      */
     public void setTableEvent(PdfPTableEvent event) {
@@ -1259,8 +1290,7 @@ public class PdfPTable implements LargeElement{
                 else
                     widths[n++] = row.getEventWidth(xPos);
             }
-        }
+        } else {
-        else {
             int numCols = getNumberOfColumns();
             float width[] = new float[numCols + 1];
             width[0] = xPos;
@@ -1540,7 +1570,7 @@ public class PdfPTable implements LargeElement{
 
     /**
      * @since iText 2.0.8
-	 * @see com.fr.third.com.lowagie.text.LargeElement#flushContent()
+     * @see LargeElement#flushContent()
      */
     public void flushContent() {
         deleteBodyRows();
@@ -1549,7 +1579,7 @@ public class PdfPTable implements LargeElement{
 
     /**
      * @since iText 2.0.8
-	 * @see com.fr.third.com.lowagie.text.LargeElement#isComplete()
+     * @see LargeElement#isComplete()
      */
     public boolean isComplete() {
         return complete;
@@ -1557,9 +1587,11 @@ public class PdfPTable implements LargeElement{
 
     /**
      * @since iText 2.0.8
-	 * @see com.fr.third.com.lowagie.text.LargeElement#setComplete(boolean)
+     * @see LargeElement#setComplete(boolean)
      */
     public void setComplete(boolean complete) {
         this.complete = complete;
     }
+
+
 }

fine-itext-old/src/com/fr/third/com/lowagie/text/pdf/TableProperties.java

@@ -0,0 +1,54 @@
+package com.fr.third.com.lowagie.text.pdf;
+
+import com.fr.third.com.lowagie.text.pdf.BorderStyle;
+
+/**
+ * 描述table的属性类
+ * 包括cellspacing、cellpadding、border等
+ */
+public class TableProperties {
+    private BorderStyle borderStyle = new BorderStyle();
+    private float cellspacing = 2.0f;
+    private float cellpadding = 1.0f;
+    private boolean collapse = false;
+
+    public BorderStyle getBorderStyle() {
+        return borderStyle;
+    }
+
+    public void setBorderStyle(BorderStyle borderStyle) {
+        this.borderStyle = borderStyle;
+    }
+
+    public float getCellspacing() {
+        return isCollapse() ? 0 : cellspacing;
+    }
+
+    public void setCellspacing(float cellspacing) {
+        this.cellspacing = cellspacing;
+    }
+
+    public float getCellpadding() {
+        return cellpadding;
+    }
+
+    public void setCellpadding(float cellpadding) {
+        this.cellpadding = cellpadding;
+    }
+
+    public boolean isCollapse() {
+        return collapse;
+    }
+
+    public void setCollapse(boolean collapse) {
+        this.collapse = collapse;
+    }
+
+    public String toHtmlString(){
+        StringBuffer sb = new StringBuffer();
+        sb.append("cellspacing").append("=").append(cellspacing).append(" ");
+        sb.append("cellpadding").append("=").append(cellpadding).append(" ");
+        sb.append("border").append("=").append(borderStyle.getBorderWidth()).append(" ");
+        return sb.toString();
+    }
+}

fine-itext-old/src/com/fr/third/com/lowagie/text/rtf/text/RtfChunk.java

@@ -59,6 +59,7 @@ import com.fr.third.com.lowagie.text.rtf.RtfElement;
 import com.fr.third.com.lowagie.text.rtf.document.RtfDocument;
 import com.fr.third.com.lowagie.text.rtf.style.RtfColor;
 import com.fr.third.com.lowagie.text.rtf.style.RtfFont;
+import com.fr.third.v2.lowagie.text.html.Markup;
 
 
 /**
@@ -126,7 +127,7 @@ public class RtfChunk extends RtfElement {
             this.superSubScript = ((Float)chunk.getAttributes().get(Chunk.SUBSUPSCRIPT)).floatValue();
         }
         if(chunk.getAttributes() != null && chunk.getAttributes().get(Chunk.BACKGROUND) != null) {
-            this.background = new RtfColor(this.document, (Color) ((Object[]) chunk.getAttributes().get(Chunk.BACKGROUND))[0]);
+            this.background = new RtfColor(this.document, Markup.decodeColor((String)((Object[]) chunk.getAttributes().get(Chunk.BACKGROUND))[0]));
         }
         font = new RtfFont(doc, chunk.getFont());
         content = chunk.getContent();