Fix issue 426: Reenable --page-offset

src/lib/outline.cc

@@ -135,7 +135,7 @@ QString escape(QString str) {
 void OutlinePrivate::dumpChildren(QTextStream & stream, const QList<OutlineItem *> & items, int level) const {
 	foreach (OutlineItem * item, items) {
 		for (int i=0; i < level; ++i) stream << "  ";
-		stream << "<item title=\"" << escape(item->value) << "\" page=\"" << (item->page + prefixSum[item->document]) << "\" link=\"" << escape(item->anchor) << "\" backLink=\"" << escape(item->tocAnchor) << "\"";
+		stream << "<item title=\"" << escape(item->value) << "\" page=\"" << (item->page + prefixSum[item->document]+ settings.pageOffset) << "\" link=\"" << escape(item->anchor) << "\" backLink=\"" << escape(item->tocAnchor) << "\"";
 		if (item->children.empty())
 			stream << "/>" << endl;
 		else {
@@ -147,12 +147,15 @@ void OutlinePrivate::dumpChildren(QTextStream & stream, const QList<OutlineItem
 	}
 }
 
-void Outline::dump(QTextStream & stream, const QString & xsl) const {
-	d->prefixSum.clear();
-	d->prefixSum.push_back(0);
-	foreach (int x, d->documentPages)
-		d->prefixSum.push_back( d->prefixSum.back() + x );
+void OutlinePrivate::buildPrefixSum() {
+	prefixSum.clear();
+	prefixSum.push_back(0);
+	foreach (int x, documentPages)
+		prefixSum.push_back( prefixSum.back() + x);
+}
 
+void Outline::dump(QTextStream & stream, const QString & xsl) const {
+	d->buildPrefixSum();
 	stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl;
 	QString x = xsl;
 	if (!x.isEmpty())
@@ -278,12 +281,7 @@ void Outline::addEmptyWebPage() {
 }
 
 void OutlinePrivate::buildHFCache(OutlineItem * i, int level) {
-	if (prefixSum.empty()) {
-		prefixSum.push_back(0);
-		foreach (int x, documentPages)
-			prefixSum.push_back( prefixSum.back() + x );
-	}
-
+	buildPrefixSum();
 	if (level >= hfCache.size()) return;
 	foreach (OutlineItem * j, i->children) {
 		int page = j->page + prefixSum[j->document];

src/lib/outline_p.hh

@@ -66,6 +66,7 @@ public:
 
 	OutlinePrivate(const settings::PdfGlobal & settings);
 	~OutlinePrivate();
+	void buildPrefixSum();
 	void fillChildAnchors(OutlineItem * item, QHash<QString, QWebElement> & anchors);
 	void outlineChildren(OutlineItem * item, QPrinter * printer, int level);
 	void buildHFCache(OutlineItem * i, int level);

src/pdf/pdfarguments.cc

@@ -138,7 +138,7 @@ struct DefaultTocFunc {
 struct DefaultHeaderFunc {
 	bool operator()(const char **, CommandLineParserBase & p, char * page) {
 		reinterpret_cast<PdfObject*>(page)->header.left="[webpage]";
-		reinterpret_cast<PdfObject*>(page)->header.right="[page]/[toPdfObject]";
+		reinterpret_cast<PdfObject*>(page)->header.right="[page]/[topage]";
 		reinterpret_cast<PdfObject*>(page)->header.line=true;
 		static_cast<PdfCommandLineParser&>(p).globalSettings.margin.top = strToUnitReal("2cm");
 		return true;
@@ -266,8 +266,7 @@ PdfCommandLineParser::PdfCommandLineParser(PdfGlobal & s, QList<PdfObject> & ps)
 	addarg("disable-toc-back-links",0,"Do not link from section header to toc", new ConstSetter<bool>(od.toc.backLinks,false));
 
 	addPageLoadArgs(od.load);
-// 	addarg("page-offset",0,"Set the starting page number", new IntSetter(s.pageOffset,"offset",1));
-
+ 	addarg("page-offset",0,"Set the starting page number", new IntSetter(s.pageOffset,"offset",1));
 
 	section("Headers And Footer Options");
  	qthack(true);