Attachment 76449 Details for Bug 62266 – Adds parabrk option to pdftotext

Adds parabrk option to pdftotext

pdftotext-paragraph-breaks.patch (text/plain), 5.44 KB, created by Andrew Gallant on 2013-03-12 22:42:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Gallant

Created: 2013-03-12 22:42:05 UTC

Size: 5.44 KB

patch

obsolete

>diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc
>index 6efdd0c..012700b 100644
>--- a/poppler/GlobalParams.cc
>+++ b/poppler/GlobalParams.cc
>@@ -616,6 +616,7 @@ GlobalParams::GlobalParams(const char *customPopplerDataDir)
>   textEOL = eolUnix;
> #endif
>   textPageBreaks = gTrue;
>+  textParagraphBreaks = gFalse;
>   textKeepTinyChars = gFalse;
>   enableFreeType = gTrue;
>   antialias = gTrue;
>@@ -1668,6 +1669,15 @@ GBool GlobalParams::getTextPageBreaks() {
>   return pageBreaks;
> }
> 
>+GBool GlobalParams::getTextParagraphBreaks() {
>+  GBool paragraphBreaks;
>+
>+  lockGlobalParams;
>+  paragraphBreaks = textParagraphBreaks;
>+  unlockGlobalParams;
>+  return paragraphBreaks;
>+}
>+
> GBool GlobalParams::getTextKeepTinyChars() {
>   GBool tiny;
> 
>@@ -2059,6 +2069,12 @@ void GlobalParams::setTextPageBreaks(GBool pageBreaks) {
>   unlockGlobalParams;
> }
> 
>+void GlobalParams::setTextParagraphBreaks(GBool paragraphBreaks) {
>+  lockGlobalParams;
>+  textParagraphBreaks = paragraphBreaks;
>+  unlockGlobalParams;
>+}
>+
> void GlobalParams::setTextKeepTinyChars(GBool keep) {
>   lockGlobalParams;
>   textKeepTinyChars = keep;
>diff --git a/poppler/GlobalParams.h b/poppler/GlobalParams.h
>index bc11684..0c3ae8d 100644
>--- a/poppler/GlobalParams.h
>+++ b/poppler/GlobalParams.h
>@@ -173,6 +173,7 @@ public:
>   GooString *getTextEncodingName();
>   EndOfLineKind getTextEOL();
>   GBool getTextPageBreaks();
>+  GBool getTextParagraphBreaks();
>   GBool getTextKeepTinyChars();
>   GBool getEnableFreeType();
>   GBool getAntialias();
>@@ -227,6 +228,7 @@ public:
>   void setTextEncoding(char *encodingName);
>   GBool setTextEOL(char *s);
>   void setTextPageBreaks(GBool pageBreaks);
>+  void setTextParagraphBreaks(GBool paragraphBreaks);
>   void setTextKeepTinyChars(GBool keep);
>   GBool setEnableFreeType(char *s);
>   GBool setDisableFreeTypeHinting(char *s);
>@@ -329,6 +331,7 @@ private:
>   EndOfLineKind textEOL;	// type of EOL marker to use for text
> 				//   output
>   GBool textPageBreaks;		// insert end-of-page markers?
>+  GBool textParagraphBreaks; // attempt to insert extra new lines between paragraphs?
>   GBool textKeepTinyChars;	// keep all characters in text output
>   GBool enableFreeType;		// FreeType enable flag
>   GBool disableFreeTypeHinting;	// FreeType disable hinting flag
>diff --git a/poppler/TextOutputDev.cc b/poppler/TextOutputDev.cc
>index 3ff9b70..3d35ece 100644
>--- a/poppler/TextOutputDev.cc
>+++ b/poppler/TextOutputDev.cc
>@@ -4820,6 +4820,7 @@ void TextPage::dump(void *outputStream, TextOutputFunc outputFunc,
>   char space[8], eol[16], eop[8];
>   int spaceLen, eolLen, eopLen;
>   GBool pageBreaks;
>+  GBool paragraphBreaks;
>   GooString *s;
>   double delta;
>   int col, i, j, d, n;
>@@ -4844,27 +4845,33 @@ void TextPage::dump(void *outputStream, TextOutputFunc outputFunc,
>   }
>   eopLen = uMap->mapUnicode(0x0c, eop, sizeof(eop));
>   pageBreaks = globalParams->getTextPageBreaks();
>+  paragraphBreaks = globalParams->getTextParagraphBreaks();
> 
>   //~ writing mode (horiz/vert)
> 
>   // output the page in raw (content stream) order
>   if (rawOrder) {
>-
>     for (word = rawWords; word; word = word->next) {
>       s = new GooString();
>       dumpFragment(word->text, word->len, uMap, s);
>       (*outputFunc)(outputStream, s->getCString(), s->getLength());
>       delete s;
>-      if (word->next &&
>-	  fabs(word->next->base - word->base) <
>-	    maxIntraLineDelta * word->fontSize &&
>-	  word->next->xMin >
>-	    word->xMax - minDupBreakOverlap * word->fontSize) {
>-	if (word->next->xMin > word->xMax + minWordSpacing * word->fontSize) {
>-	  (*outputFunc)(outputStream, space, spaceLen);
>-	}
>+      if (word->next
>+          && fabs(word->next->base - word->base)
>+             < maxIntraLineDelta * word->fontSize
>+          && word->next->xMin
>+             > word->xMax - minDupBreakOverlap * word->fontSize) {
>+        if (word->next->xMin > word->xMax + minWordSpacing * word->fontSize) {
>+          (*outputFunc)(outputStream, space, spaceLen);
>+        }
>       } else {
>-	(*outputFunc)(outputStream, eol, eolLen);
>+        (*outputFunc)(outputStream, eol, eolLen);
>+        if (paragraphBreaks
>+            && word->next
>+            && fabs(word->next->base - word->base)
>+               > maxLineSpacingDelta * word->fontSize) {
>+          (*outputFunc)(outputStream, eol, eolLen);
>+        }
>       }
>     }
> 
>diff --git a/utils/pdftotext.cc b/utils/pdftotext.cc
>index a170f1b..3f8d443 100644
>--- a/utils/pdftotext.cc
>+++ b/utils/pdftotext.cc
>@@ -74,6 +74,7 @@ static GBool htmlMeta = gFalse;
> static char textEncName[128] = "";
> static char textEOL[16] = "";
> static GBool noPageBreaks = gFalse;
>+static GBool paragraphBreaks = gFalse;
> static char ownerPassword[33] = "\001";
> static char userPassword[33] = "\001";
> static GBool quiet = gFalse;
>@@ -112,6 +113,8 @@ static const ArgDesc argDesc[] = {
>    "output end-of-line convention (unix, dos, or mac)"},
>   {"-nopgbrk", argFlag,     &noPageBreaks,  0,
>    "don't insert page breaks between pages"},
>+  {"-parabrk", argFlag,     &paragraphBreaks,  0,
>+   "attempt to insert empty lines between paragraphs with -raw"},
>   {"-bbox", argFlag,     &bbox,  0,
>    "output bounding box for each word and page size to html.  Sets -htmlmeta"},
>   {"-opw",     argString,   ownerPassword,  sizeof(ownerPassword),
>@@ -215,6 +218,9 @@ int main(int argc, char *argv[]) {
>   if (noPageBreaks) {
>     globalParams->setTextPageBreaks(gFalse);
>   }
>+  if (paragraphBreaks) {
>+    globalParams->setTextParagraphBreaks(gTrue);
>+  }
>   if (quiet) {
>     globalParams->setErrQuiet(quiet);
>   }

Actions: View

Attachments on bug 62266: 76449

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.