Forráskód Böngészése

Add some more TOC settings

Jakob Truelsen 15 éve
szülő
commit
5f507c7053
3 módosított fájl, 11 hozzáadás és 3 törlés
  1. 5 2
      src/arguments.cc
  2. 2 1
      src/commandlineparser.cc
  3. 4 0
      src/settings.hh

+ 5 - 2
src/arguments.cc

@@ -615,8 +615,6 @@ CommandLineParserPrivate::CommandLineParserPrivate(Global & s, QList<Page> & ps)
 #endif
 #endif
  	addarg("encoding", 0, "Set the default text encoding, for input", new QStrSetter(od.defaultEncoding,"encoding"));
  	addarg("encoding", 0, "Set the default text encoding, for input", new QStrSetter(od.defaultEncoding,"encoding"));
 
 
-
-
 	section("Headers And Footer Options");
 	section("Headers And Footer Options");
  	qthack(true);
  	qthack(true);
  	extended(true);
  	extended(true);
@@ -640,4 +638,9 @@ CommandLineParserPrivate::CommandLineParserPrivate(Global & s, QList<Page> & ps)
 	
 	
 	addarg("replace",0, "Replace [name] with value in header and footer (repeatable)", new MapSetter<>(od.replacements, "name", "value"));
 	addarg("replace",0, "Replace [name] with value in header and footer (repeatable)", new MapSetter<>(od.replacements, "name", "value"));
 
 
+	section("TOC Options");
+	mode(toc);
+ 	extended(true);
+ 	qthack(true);
+ 	addarg("xsl-style-sheet",0,"Use the supplied xsl style sheet for printing the table of content", new QStrSetter(od.tocXsl,"file"));
 }
 }

+ 2 - 1
src/commandlineparser.cc

@@ -354,8 +354,9 @@ void CommandLineParser::parseArguments(int argc, const char ** argv, bool fromSt
 			//Setup varius cover settings her
 			//Setup varius cover settings her
 			++arg;
 			++arg;
 		} else if (!strcmp(argv[arg],"toc")) {
 		} else if (!strcmp(argv[arg],"toc")) {
-			sections = d->page | d->toc;
 			++arg;
 			++arg;
+			sections = d->page | d->toc;
+			ps.isTableOfContent = true;
 		} else {
 		} else {
 			if (!strcmp(argv[arg],"page")) {
 			if (!strcmp(argv[arg],"page")) {
 				++arg;
 				++arg;

+ 4 - 0
src/settings.hh

@@ -273,6 +273,10 @@ struct Page {
 	bool includeInOutline;
 	bool includeInOutline;
 
 
 	bool pagesCount;
 	bool pagesCount;
+
+	bool isTableOfContent;
+
+	QString tocXsl;
 };
 };
 
 
 QPrinter::PageSize strToPageSize(const char * s, bool * ok=0);
 QPrinter::PageSize strToPageSize(const char * s, bool * ok=0);