Attachment 56583 Details for Bug 45572 – patch for the outlines unicode bug only

[patch] patch for the outlines unicode bug only

0001-Proper-unicode-support-when-dumping-PDF-outline.patch (text/plain), 8.32 KB, created by Igor Slepchin on 2012-02-03 13:43:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Igor Slepchin

Created: 2012-02-03 13:43:16 UTC

Size: 8.32 KB

patch

obsolete

>From 05ef85c7452582675dfc123fa9c256b7fb5da6e0 Mon Sep 17 00:00:00 2001
>From: Igor Slepchin <igor.slepchin@gmail.com>
>Date: Thu, 2 Feb 2012 18:08:50 -0500
>Subject: [PATCH] Proper unicode support when dumping PDF outline.
>
>---
> utils/HtmlOutputDev.cc |  195 ++++++++++++++++++++++++++----------------------
> utils/HtmlOutputDev.h  |    5 +-
> utils/pdftohtml.cc     |    2 +-
> 3 files changed, 109 insertions(+), 93 deletions(-)
>
>diff --git a/utils/HtmlOutputDev.cc b/utils/HtmlOutputDev.cc
>index c1447ad..e2328a5 100644
>--- a/utils/HtmlOutputDev.cc
>+++ b/utils/HtmlOutputDev.cc
>@@ -62,6 +62,8 @@
> #include "HtmlOutputDev.h"
> #include "HtmlFonts.h"
> #include "HtmlUtils.h"
>+#include "Outline.h"
>+#include "PDFDoc.h"
> 
> #define DEBUG __FILE__ << ": " << __LINE__ << ": DEBUG: "
> 
>@@ -1583,17 +1585,26 @@ void HtmlOutputDev::dumpMetaVars(FILE *file)
>   }
> }
> 
>-GBool HtmlOutputDev::dumpDocOutline(Catalog* catalog)
>+GBool HtmlOutputDev::dumpDocOutline(PDFDoc* doc)
> { 
>+#ifdef DISABLE_OUTLINE
>+	return gFalse;
>+#endif
>+
> 	FILE * output = NULL;
> 	GBool bClose = gFalse;
>+	Catalog *catalog = doc->getCatalog();
> 
> 	if (!ok || xml)
>-    	return gFalse;
>+                return gFalse;
>   
>-	Object *outlines = catalog->getOutline();
>-  	if (!outlines->isDict())
>-    	return gFalse;
>+	Outline *outline = doc->getOutline();
>+	if (!outline)
>+		return gFalse;
>+
>+	GooList *outlines = outline->getItems();
>+	if (!outlines)
>+		return gFalse;
>   
> 	if (!complexMode && !xml)
>   	{
>@@ -1615,7 +1626,17 @@ GBool HtmlOutputDev::dumpDocOutline(Catalog* catalog)
> 				return gFalse;
> 			delete str;
> 			bClose = gTrue;
>-     		fputs("<HTML xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"\" xml:lang=\"\">\n<HEAD>\n<TITLE>Document Outline</TITLE>\n</HEAD>\n<BODY>\n", output);
>+
>+			char *htmlEncoding =
>+				HtmlOutputDev::mapEncodingToHtml(globalParams->getTextEncodingName());
>+
>+			fprintf(output, "<HTML xmlns=\"http://www.w3.org/1999/xhtml\" " \
>+                                "lang=\"\" xml:lang=\"\">\n"            \
>+                                "<HEAD>\n"                              \
>+                                "<TITLE>Document Outline</TITLE>\n"     \
>+                                "<META http-equiv=\"Content-Type\" content=\"text/html; " \
>+                                "charset=%s\"/>\n"                      \
>+                                "</HEAD>\n<BODY>\n", htmlEncoding);
> 		}
> 	}
>  
>@@ -1631,95 +1652,89 @@ GBool HtmlOutputDev::dumpDocOutline(Catalog* catalog)
>   	return done;
> }
> 
>-GBool HtmlOutputDev::newOutlineLevel(FILE *output, Object *node, Catalog* catalog, int level)
>+GBool HtmlOutputDev::newOutlineLevel(FILE *output, GooList *outlines, Catalog* catalog, int level)
> {
>-  Object curr, next;
>-  GBool atLeastOne = gFalse;
>-  
>-  if (node->dictLookup("First", &curr)->isDict()) {
>-    if (level == 1)
>+	GBool atLeastOne = gFalse;
>+
>+	if (level == 1)
> 	{
> 		fputs("<A name=\"outline\"></a>", output);
> 		fputs("<h1>Document Outline</h1>\n", output);
> 	}
>-    fputs("<ul>",output);
>-    do {
>-      // get title, give up if not found
>-      Object title;
>-      if (curr.dictLookup("Title", &title)->isNull()) {
>-		title.free();
>-		break;
>-      }
>-      GooString *titleStr = new GooString(title.getString());
>-      title.free();
>-
>-      // get corresponding link
>-      // Note: some code duplicated from HtmlOutputDev::getLinkDest().
>-      GooString *linkName = NULL;;
>-      Object dest;
>-      if (!curr.dictLookup("Dest", &dest)->isNull()) {
>-		LinkGoTo *link = new LinkGoTo(&dest);
>-		LinkDest *linkdest=NULL;
>-		if (link->getDest()!=NULL)
>-			linkdest=link->getDest()->copy();
>-		else if (link->getNamedDest()!=NULL)
>-			linkdest=catalog->findDest(link->getNamedDest());
>-			
>-		delete link;
>-		if (linkdest) { 
>-	  		int page;
>-	  		if (linkdest->isPageRef()) {
>-	    		Ref pageref=linkdest->getPageRef();
>-	    		page=catalog->findPage(pageref.num,pageref.gen);
>-	  		} else {
>-	    		page=linkdest->getPageNum();
>-	  		}
>-	  		delete linkdest;
>-
>-			/* 			complex 	simple
>-			frames		file-4.html	files.html#4
>-			noframes	file.html#4	file.html#4
>-	   		*/
>-	  		linkName=basename(Docname);
>-	  		GooString *str=GooString::fromInt(page);
>-	  		if (noframes) {
>-	    		linkName->append(".html#");
>-				linkName->append(str);
>-	  		} else {
>-    			if( complexMode ) {
>-	   		   		linkName->append("-");
>-	      			linkName->append(str);
>-	      			linkName->append(".html");
>-	    		} else {
>-	      			linkName->append("s.html#");
>-	      			linkName->append(str);
>-	    		}
>-	  		}
>-			delete str;
>+	fputs("<ul>",output);
>+
>+	for (int i = 0; i < outlines->getLength(); i++)
>+	{
>+		OutlineItem *item = (OutlineItem*)outlines->get(i);
>+		GooString *titleStr = HtmlFont::HtmlFilter(item->getTitle(),
>+							   item->getTitleLength());
>+
>+		// get corresponding link
>+		GooString *linkName = NULL;;
>+		LinkAction *action = item->getAction();
>+		LinkGoTo *link = NULL;
>+		Object dest;
>+		if (action && action->getKind() == actionGoTo)
>+			link = dynamic_cast<LinkGoTo*>(action);
>+		if (link && link->isOk()) {
>+			LinkDest *linkdest=NULL;
>+			if (link->getDest()!=NULL)
>+				linkdest=link->getDest()->copy();
>+			else if (link->getNamedDest()!=NULL)
>+				linkdest=catalog->findDest(link->getNamedDest());
>+
>+			if (linkdest) {
>+				int page;
>+				if (linkdest->isPageRef()) {
>+					Ref pageref=linkdest->getPageRef();
>+					page=catalog->findPage(pageref.num,pageref.gen);
>+				} else {
>+					page=linkdest->getPageNum();
>+				}
>+				delete linkdest;
>+
>+				/*		complex		simple
>+				frames		file-4.html	files.html#4
>+				noframes	file.html#4	file.html#4
>+				*/
>+				linkName=basename(Docname);
>+				GooString *str=GooString::fromInt(page);
>+				if (noframes) {
>+					linkName->append(".html#");
>+					linkName->append(str);
>+				} else {
>+					if( complexMode ) {
>+						linkName->append("-");
>+						linkName->append(str);
>+						linkName->append(".html");
>+					} else {
>+						linkName->append("s.html#");
>+						linkName->append(str);
>+					}
>+				}
>+				delete str;
>+			}
> 		}
>-      }
>-      dest.free();
>-
>-      fputs("<li>",output);
>-      if (linkName)
>-		fprintf(output,"<A href=\"%s\">", linkName->getCString());
>-      fputs(titleStr->getCString(),output);
>-      if (linkName) {
>-		fputs("</A>",output);
>-		delete linkName;
>-      }
>-      fputs("\n",output);
>-      delete titleStr;
>-      atLeastOne = gTrue;
>-
>-      newOutlineLevel(output, &curr, catalog, level+1);
>-      curr.dictLookup("Next", &next);
>-      curr.free();
>-      curr = next;
>-    } while(curr.isDict());
>-    fputs("</ul>",output);
>-  }
>-  curr.free();
>+		dest.free();
>+
>+		fputs("<li>",output);
>+		if (linkName)
>+			fprintf(output,"<A href=\"%s\">", linkName->getCString());
>+		fputs(titleStr->getCString(),output);
>+		if (linkName) {
>+			fputs("</A>",output);
>+			delete linkName;
>+		}
>+		fputs("\n",output);
>+		delete titleStr;
>+		atLeastOne = gTrue;
>+
>+		item->open();
>+		if (item->hasKids())
>+			newOutlineLevel(output, item->getKids(), catalog, level+1);
>+		item->close();
>+	}
>+	fputs("</ul>",output);
> 
>-  return atLeastOne;
>+	return atLeastOne;
> }
>diff --git a/utils/HtmlOutputDev.h b/utils/HtmlOutputDev.h
>index 474e3af..d018899 100644
>--- a/utils/HtmlOutputDev.h
>+++ b/utils/HtmlOutputDev.h
>@@ -58,6 +58,7 @@
> 
> class GfxState;
> class GooString;
>+class PDFDoc;
> //------------------------------------------------------------------------
> // HtmlString
> //------------------------------------------------------------------------
>@@ -298,7 +299,7 @@ public:
>   int getPageWidth() { return maxPageWidth; }
>   int getPageHeight() { return maxPageHeight; }
> 
>-  GBool dumpDocOutline(Catalog* catalog);
>+  GBool dumpDocOutline(PDFDoc* catalog);
> 
> private:
>   // convert encoding into a HTML standard, or encoding->getCString if not
>@@ -308,7 +309,7 @@ private:
>   GooString* getLinkDest(AnnotLink *link,Catalog *catalog);
>   void dumpMetaVars(FILE *);
>   void doFrame(int firstPage);
>-  GBool newOutlineLevel(FILE *output, Object *node, Catalog* catalog, int level = 1);
>+  GBool newOutlineLevel(FILE *output, GooList *outlines, Catalog* catalog, int level = 1);
> 
>   FILE *fContentsFrame;
>   FILE *page;                   // html file
>diff --git a/utils/pdftohtml.cc b/utils/pdftohtml.cc
>index fa00ae1..94ad1f3 100644
>--- a/utils/pdftohtml.cc
>+++ b/utils/pdftohtml.cc
>@@ -404,7 +404,7 @@ int main(int argc, char *argv[]) {
> 		      gTrue, gFalse, gFalse);
>   	if (!xml)
> 	{
>-		htmlOut->dumpDocOutline(doc->getCatalog());
>+		htmlOut->dumpDocOutline(doc);
> 	}
>   }
>   
>-- 
>1.7.7.6
>

Actions: View | Splinter Review

Attachments on bug 45572: 56557 | 56583 | 56585 | 56586

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.