Updates boxable official

build.gradle

@@ -26,10 +26,11 @@ repositories {
 }
 
 dependencies {
-	compile 'org.apache.pdfbox:pdfbox:2.0.0-RC2'
-	compile 'org.slf4j:slf4j-api:1.7.10'
-	compile 'com.google.guava:guava:18.0'
-	compile 'org.apache.commons:commons-csv:1.2'
+	compile 'org.apache.pdfbox:pdfbox:2.0.3'
+	compile 'org.slf4j:slf4j-api:1.7.21'
+	compile 'com.google.guava:guava:20.0'
+	compile 'org.apache.commons:commons-csv:1.4'
+	compile group: 'org.jsoup', name: 'jsoup', version: '1.9.2'
 	testCompile 'junit:junit:4.12'
 	testCompile 'commons-io:commons-io:2.4'
 }

pom.xml

@@ -12,7 +12,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.dhorions</groupId>
     <artifactId>boxable</artifactId>
-    <version>1.4</version>
+    <version>1.5</version>
     <packaging>jar</packaging>
 
     <name>Boxable, a high-level API to creates table on top of Apache Pdfbox</name>
@@ -56,6 +56,12 @@
             <version>2.4</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+            <version>1.9.2</version>
+            <type>jar</type>
+        </dependency>
     </dependencies>
     <distributionManagement>
   <snapshotRepository>

src/main/java/be/quodlibet/boxable/Cell.java

@@ -4,14 +4,17 @@
  */
 package be.quodlibet.boxable;
 
-import be.quodlibet.boxable.line.LineStyle;
-import be.quodlibet.boxable.text.WrappingFunction;
 import java.awt.Color;
 import java.io.IOException;
+
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.font.PDFont;
 import org.apache.pdfbox.pdmodel.font.PDType1Font;
 
+import be.quodlibet.boxable.line.LineStyle;
+import be.quodlibet.boxable.text.WrappingFunction;
+import be.quodlibet.boxable.utils.FontUtils;
+
 public class Cell<T extends PDPage> {
 
 	private float width;
@@ -103,6 +106,11 @@ public class Cell<T extends PDPage> {
 			throw new IllegalArgumentException(
 					"Cell Width=" + getWidth() + " can't be bigger than row width=" + row.getWidth());
 		}
+		//check if we have new default font
+		if(!FontUtils.getDefaultfonts().isEmpty()){
+			font = FontUtils.getDefaultfonts().get("font");
+			fontBold = FontUtils.getDefaultfonts().get("fontBold");
+		}
 		this.text = text == null ? "" : text;
 		this.align = align;
 		this.valign = valign;

src/main/java/be/quodlibet/boxable/Paragraph.java

@@ -73,12 +73,18 @@ public Paragraph(String text, PDFont font, float fontSize, float width, final Ho
 			final Color color, final TextType textType, WrappingFunction wrappingFunction) {
 		this(text, font, fontSize, width, align, color, textType, wrappingFunction, 1);
 	}
-	
+
 	public Paragraph(String text, PDFont font, float fontSize, float width, final HorizontalAlignment align,
 			final Color color, final TextType textType, WrappingFunction wrappingFunction, float lineSpacing) {
 		this.color = color;
 		this.text = text;
 		this.font = font;
+		// check if we have different default font for italic and bold text
+		if(!FontUtils.getDefaultfonts().isEmpty()){
+			fontBold = FontUtils.getDefaultfonts().get("fontBold");
+			fontBoldItalic = FontUtils.getDefaultfonts().get("fontBoldItalic");
+			fontItalic = FontUtils.getDefaultfonts().get("fontItalic");
+		}
 		this.fontSize = fontSize;
 		this.width = width;
 		this.textType = textType;
@@ -118,7 +124,7 @@ public List<String> getLines() {
 					if (token.getData().equals("ol")) {
 						numberOfOrderedLists++;
 						if(listLevel > 1){
-							stack.add(new HTMLListNode(orderListElement-1, stack.isEmpty() ? String.valueOf("1.") : stack.peek().getValue() + String.valueOf(orderListElement-1) + "."));
+							stack.add(new HTMLListNode(orderListElement-1, stack.isEmpty() ? String.valueOf(orderListElement-1)+"." : stack.peek().getValue() + String.valueOf(orderListElement-1) + "."));
 						}
 						orderListElement = 1;
 
@@ -163,8 +169,8 @@ public List<String> getLines() {
 					if (token.getData().equals("ol")) {
 						numberOfOrderedLists--;
 						// reset elements
-						orderListElement = stack.peek().getOrderingNumber()+1;
-						if(numberOfOrderedLists > 1){
+						if(numberOfOrderedLists>0){
+							orderListElement = stack.peek().getOrderingNumber()+1;
 							stack.pop();
 						}
 					}
@@ -177,9 +183,6 @@ public List<String> getLines() {
 						lineCounter++;
 					}
 				} else if (isListElement(token)) {
-					if(!getAlign().equals(HorizontalAlignment.LEFT)) {
-						listLevel = 0;
-					}
 					// wrap at last wrap point?
 					if (textInLine.width() + sinceLastWrapPoint.trimmedWidth() > width) {
 						// this is our line
@@ -265,11 +268,8 @@ public List<String> getLines() {
 					}
 					// wrapping at last wrap point
 					if (listElement) {
-						if(!getAlign().equals(HorizontalAlignment.LEFT)) {
-							listLevel = 0;
-						}
 						if (numberOfOrderedLists>0) {
-							String tab = getAlign().equals(HorizontalAlignment.LEFT) ? indentLevel(DEFAULT_TAB*Math.max(listLevel - 1, 0)) : indentLevel(DEFAULT_TAB);
+							String tab = getAlign().equals(HorizontalAlignment.LEFT) ? indentLevel(DEFAULT_TAB*Math.max(listLevel - 1, 0)) + indentLevel(DEFAULT_TAB) : indentLevel(DEFAULT_TAB);
 							String orderingNumber = stack.isEmpty() ? String.valueOf(orderListElement) + "." : stack.peek().getValue() + "." + String.valueOf(orderListElement-1) + ".";
 							try {
 								textInLine.push(currentFont, fontSize, new Token(TokenType.PADDING,
@@ -280,7 +280,7 @@ public List<String> getLines() {
 						} else {
 							try {
 								// if it's not left aligned then ignore list and list element and deal with it as normal text where <li> mimic <br> behavior
-								String tabBullet = getAlign().equals(HorizontalAlignment.LEFT) ? indentLevel(DEFAULT_TAB*Math.max(listLevel - 1, 0)) + indentLevel(BULLET_SPACE)  : indentLevel(DEFAULT_TAB);
+								String tabBullet = getAlign().equals(HorizontalAlignment.LEFT) ? indentLevel(DEFAULT_TAB*Math.max(listLevel - 1, 0)) + indentLevel(DEFAULT_TAB_AND_BULLET)  : indentLevel(DEFAULT_TAB);
 								textInLine.push(currentFont, fontSize, new Token(TokenType.PADDING,
 										String.valueOf(font.getStringWidth(tabBullet) / 1000 * getFontSize())));
 							} catch (IOException e) {
@@ -343,14 +343,11 @@ public List<String> getLines() {
 						lineCounter++;
 					}
 				} else if (isListElement(token)) {
-					if(!getAlign().equals(HorizontalAlignment.LEFT)) {
-						listLevel = 0;
-					}
 					listElement = true;
 					// token padding, token bullet
 					try {
 						// if it's not left aligned then ignore list and list element and deal with it as normal text where <li> mimic <br> behaviour
-						String tab = getAlign().equals(HorizontalAlignment.LEFT) ? indentLevel(DEFAULT_TAB*Math.max(listLevel - 1, 0)) : indentLevel(DEFAULT_TAB);
+						String tab = getAlign().equals(HorizontalAlignment.LEFT) ? indentLevel(DEFAULT_TAB*Math.max(listLevel - 1, 0)) + indentLevel(DEFAULT_TAB) : indentLevel(DEFAULT_TAB);
 						textInLine.push(currentFont, fontSize, new Token(TokenType.PADDING,
 								String.valueOf(font.getStringWidth(tab) / 1000 * getFontSize())));
 						if (numberOfOrderedLists>0) {
@@ -365,9 +362,7 @@ public List<String> getLines() {
 							orderListElement++;
 						} else {
 							// if it's unordered list then just move by bullet character (take care of alignment!)
-							if(getAlign().equals(HorizontalAlignment.LEFT)){
-								textInLine.push(currentFont, fontSize, new Token(TokenType.BULLET, " "));
-							} 
+							textInLine.push(currentFont, fontSize, new Token(TokenType.BULLET, " "));
 						}
 					} catch (IOException e) {
 						e.printStackTrace();
@@ -381,6 +376,32 @@ public List<String> getLines() {
 					maxLineWidth = Math.max(maxLineWidth, textInLine.trimmedWidth());
 					textInLine.reset();
 					lineCounter++;
+					if(listLevel>0){
+						// preserve current indent
+						try {
+							if (numberOfOrderedLists>0) {
+								String tab = getAlign().equals(HorizontalAlignment.LEFT) ? indentLevel(DEFAULT_TAB*Math.max(listLevel - 1, 0)) : indentLevel(DEFAULT_TAB);
+								// if it's ordering list then move depending on your: ordering number + ". "
+								String orderingNumber;
+								if(listLevel > 1){
+									orderingNumber = stack.peek().getValue() + String.valueOf(orderListElement) + ". "; 
+								} else {
+									orderingNumber = String.valueOf(orderListElement) + ". ";
+								}
+								String tabAndOrderingNumber = tab + orderingNumber;
+								textInLine.push(currentFont, fontSize, new Token(TokenType.PADDING, String.valueOf(font.getStringWidth(tabAndOrderingNumber) / 1000 * getFontSize())));
+								orderListElement++;
+							} else {
+								if(getAlign().equals(HorizontalAlignment.LEFT)){
+									String tab = indentLevel(DEFAULT_TAB*Math.max(listLevel - 1, 0)) + indentLevel(DEFAULT_TAB) + indentLevel(BULLET_SPACE);
+									textInLine.push(currentFont, fontSize, new Token(TokenType.PADDING,
+											String.valueOf(font.getStringWidth(tab) / 1000 * getFontSize())));
+								}
+							}
+						} catch (IOException e) {
+							e.printStackTrace();
+						}
+					}
 				}
 				break;
 			case TEXT:
@@ -493,15 +514,15 @@ private boolean isList(final Token token) {
 	}
 
 	private static String indentLevel(int numberOfSpaces) {
-		//String builder is efficient at concatenating strings together
+		// String builder is efficient at concatenating strings together
 		StringBuilder sb = new StringBuilder();
 
-		//Loop as many times as specified; each time add a space to the string
+		// Loop as many times as specified; each time add a space to the string
 		for (int i = 0; i < numberOfSpaces; i++) {
 			sb.append(" ");
 		}
 
-		//Return the string
+		// Return the string
 		return sb.toString();
 	}
 
@@ -575,10 +596,10 @@ public float write(final PDPageContentStream stream, float cursorX, float cursor
 	}
 
 	public float getHeight() {
-		if(getLines().size() == 0){
+		if (getLines().size() == 0) {
 			return 0;
 		} else {
-			return (getLines().size()-1)*getLineSpacing()*getFontHeight() + getFontHeight();
+			return (getLines().size() - 1) * getLineSpacing() * getFontHeight() + getFontHeight();
 		}
 	}
 
@@ -597,7 +618,8 @@ public float getFontWidth() {
 
 	/**
 	 * @deprecated This method will be removed in a future release
-	 * @param width Paragraph's width
+	 * @param width
+	 *            Paragraph's width
 	 * @return {@link Paragraph} with designated width
 	 */
 	@Deprecated
@@ -608,8 +630,10 @@ public Paragraph withWidth(int width) {
 
 	/**
 	 * @deprecated This method will be removed in a future release
-	 * @param font {@link PDFont} for {@link Paragraph}
-	 * @param fontSize font size for {@link Paragraph}
+	 * @param font
+	 *            {@link PDFont} for {@link Paragraph}
+	 * @param fontSize
+	 *            font size for {@link Paragraph}
 	 * @return {@link Paragraph} with designated font and font size
 	 */
 	@Deprecated
@@ -621,8 +645,10 @@ public Paragraph withFont(PDFont font, int fontSize) {
 
 	/**
 	 * /**
+	 * 
 	 * @deprecated This method will be removed in a future release
-	 * @param color {@code int} rgb value for color
+	 * @param color
+	 *            {@code int} rgb value for color
 	 * @return Paragraph's {@link Color}
 	 */
 	@Deprecated
@@ -634,7 +660,7 @@ public Paragraph withColor(int color) {
 	/**
 	 * @deprecated This method will be replaced by
 	 *             {@code public Color getColor()} in a future release
-	 * @return Paragraph's {@link Color} 
+	 * @return Paragraph's {@link Color}
 	 */
 	@Deprecated
 	public int getColor() {

src/main/java/be/quodlibet/boxable/Row.java

@@ -8,6 +8,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDOutlineItem;
 
@@ -58,7 +59,7 @@ public Cell<T> createCell(float width, String value) {
 
 	/**
 	 * <p>
-	 * Creates a image cell with provided width and {@link Image}
+	 * Creates an image cell with provided width and {@link Image}
 	 * </p>
 	 * 
 	 * @param width
@@ -81,6 +82,30 @@ public Cell<T> createImageCell(float width, Image img, HorizontalAlignment align
 		return cell;
 	}
 
+	/**
+	 * <p>
+	 * Creates a table cell with provided width and table data
+	 * </p>
+	 * 
+	 * @param width
+	 *            Table width
+	 * @param tableData
+	 *            Table's data (HTML table tags)
+	 * @param doc
+	 *            {@link PDDocument} where this table will be drawn
+	 * @param page
+	 *            {@link PDPage} where this table cell will be drawn
+	 * @param yStart
+	 *            Y position from which table will be drawn
+	 * @return
+	 */
+	public TableCell<T> createTableCell(float width, String tableData, PDDocument doc, PDPage page, float yStart, float pageTopMargin, float pageBottomMargin) {
+		TableCell<T> cell = new TableCell<T>(this, width, tableData, true, doc, page, yStart, pageTopMargin, pageBottomMargin);
+		setBorders(cell, cells.isEmpty());
+		cells.add(cell);
+		return cell;
+	}
+
 	/**
 	 * <p>
 	 * Creates a cell with provided width, cell value, horizontal and vertical
@@ -148,6 +173,17 @@ void removeTopBorders() {
 		}
 	}
 
+	/**
+	 * <p>
+	 * Remove all borders of cells.
+	 * </p>
+	 */
+	void removeAllBorders() {
+		for (final Cell<T> cell : cells) {
+			cell.setBorderStyle(null);;
+		}
+	}
+
 	/**
 	 * <p>
 	 * Gets maximal height of the cells in current row therefore row's height.