PDFBOX-1529: fix bugs for top and bottom margins

git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1922742 13f79535-47bb-0310-9956-ffa450edef68

Author: THausherr

tools/src/main/java/org/apache/pdfbox/tools/TextToPDF.java

@@ -330,7 +330,7 @@ public void createPDFFromText( PDDocument doc, Reader text ) throws IOException
                 }
                 while (lineIndex < lineWords.length && lengthIfUsingNextWord < maxStringLength);
 
-                if (y < margin)
+                if (y - lineHeight < margin)
                 {
                     // We have crossed the end-of-page boundary and need to extend the
                     // document by another page.
@@ -344,7 +344,7 @@ public void createPDFFromText( PDDocument doc, Reader text ) throws IOException
                     contentStream = new PDPageContentStream(doc, page);
                     contentStream.setFont(font, fontSize);
                     contentStream.beginText();
-                    y = page.getMediaBox().getHeight() - margin + lineHeight;
+                    y = page.getMediaBox().getHeight() - margin;
                     contentStream.newLineAtOffset(margin, y);
                 }
 
@@ -364,7 +364,7 @@ public void createPDFFromText( PDDocument doc, Reader text ) throws IOException
                     contentStream = new PDPageContentStream(doc, page);
                     contentStream.setFont(font, fontSize);
                     contentStream.beginText();
-                    y = page.getMediaBox().getHeight() - margin + lineHeight;
+                    y = page.getMediaBox().getHeight() - margin;
                     contentStream.newLineAtOffset(margin, y);
                 }
             }