X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FPDFOptions.cpp;h=222be517e836779ad9502d8f9815ef3117d3eaaa;hb=7e69ac220dd958b57ec40f198355c7e0ba8d720e;hp=ab8a0cf785745f3938cf259239be231708364e69;hpb=9b13535e778b97471153a4e68baf94c915ceed03;p=lyx.git

diff --git a/src/PDFOptions.cpp b/src/PDFOptions.cpp
index ab8a0cf785..222be517e8 100644
--- a/src/PDFOptions.cpp
+++ b/src/PDFOptions.cpp
@@ -4,6 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Pavel Sanda
+ * \author Jürgen Spitzmüller
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -12,20 +13,22 @@
 
 #include "PDFOptions.h"
 
+#include "Encoding.h"
+#include "Lexer.h"
+
 #include "support/convert.h"
+#include "support/debug.h"
 #include "support/lstrings.h"
-#include "debug.h"
-#include "Lexer.h"
 
 #include <sstream>
 #include <string>
+#include <algorithm>
 
-namespace lyx {
+using namespace std;
+using namespace lyx::support;
 
+namespace lyx {
 
-using std::ostream;
-using std::ostringstream;
-using std::string;
 
 const string PDFOptions::pagemode_fullscreen("FullScreen");
 
@@ -47,14 +50,14 @@ bool PDFOptions::empty() const
 		&& pdfborder == x.pdfborder
 		&& colorlinks == x.colorlinks
 		&& backref == x.backref
-		&& pagebackref == x.pagebackref ;
+		&& pdfusetitle == x.pdfusetitle;
 }
 
+
 void PDFOptions::writeFile(ostream & os) const
 {
 	os << "\\use_hyperref " << convert<string>(use_hyperref) << '\n';
-	os << "\\pdf_store_options " << convert<string>(store_options) << '\n';
-	if (!use_hyperref && !store_options)
+	if (!use_hyperref && empty())
 		return;
 	
 	if (!title.empty() )
@@ -70,13 +73,13 @@ void PDFOptions::writeFile(ostream & os) const
 	os << "\\pdf_bookmarks " << convert<string>(bookmarks) << '\n';
 	os << "\\pdf_bookmarksnumbered " << convert<string>(bookmarksnumbered) << '\n';
 	os << "\\pdf_bookmarksopen " << convert<string>(bookmarksopen) << '\n';
-	os << "\\pdf_bookmarksopenlevel \"" << bookmarksopenlevel << "\"\n";
+	os << "\\pdf_bookmarksopenlevel " << bookmarksopenlevel << '\n';
 	
 	os << "\\pdf_breaklinks "  << convert<string>(breaklinks)  << '\n';
 	os << "\\pdf_pdfborder "   << convert<string>(pdfborder)   << '\n';
 	os << "\\pdf_colorlinks "  << convert<string>(colorlinks)  << '\n';
-	os << "\\pdf_backref "     << convert<string>(backref)     << '\n';
-	os << "\\pdf_pagebackref " << convert<string>(pagebackref) << '\n';
+	os << "\\pdf_backref "     << backref << '\n';
+	os << "\\pdf_pdfusetitle " << convert<string>(pdfusetitle) << '\n';
 	
 	if (!pagemode.empty())
 		os << "\\pdf_pagemode " << pagemode << '\n';
@@ -85,59 +88,116 @@ void PDFOptions::writeFile(ostream & os) const
 		os << "\\pdf_quoted_options \"" << quoted_options << "\"\n";
 }
 
-void PDFOptions::writeLaTeX(odocstringstream &os) const
+
+void PDFOptions::writeLaTeX(OutputParams & runparams, otexstream & os,
+			    bool hyperref_already_provided) const
 {
-	if (!use_hyperref)
-		return;
-	
+	// FIXME Unicode
 	string opt;
+	string hyperset;
 	
-	opt = "\\usepackage[";
 	// since LyX uses unicode, also set the PDF strings to unicode strings with the
 	// hyperref option "unicode"
-	opt += "unicode=true,\n ";
-	if (!title.empty())
-		opt += "pdftitle={"   + title + "},\n ";
-	if (!author.empty())
-		opt += "pdfauthor={"  + author + "},\n ";
-	if (!subject.empty())
-		opt += "pdfsubject={" + subject + "},\n ";
-	if (!keywords.empty())
-		opt += "pdfkeywords={" + keywords + "},\n ";
-	// try to extract author and title from document when none is
-	// explicitely given
-	if (title.empty() && author.empty())
-		opt += "pdfusetitle,\n ";
-	opt += "bookmarks=" + convert<string>(bookmarks) + ',';
-	if (bookmarks) {
-		opt += "bookmarksnumbered=" + convert<string>(bookmarksnumbered) + ',';
-		opt += "bookmarksopen=" + convert<string>(bookmarksopen) + ',';
-	
-		if (bookmarksopen)
-			opt += "bookmarksopenlevel=" + convert<string>(bookmarksopenlevel) + ',';
+	opt += "unicode=true,";
+
+	// only use the hyperref settings if hyperref is enabled by the user
+	// see bug #7052
+	if (use_hyperref) {
+		// try to extract author and title from document when none is
+		// explicitly given
+		if (pdfusetitle && title.empty() && author.empty())
+			opt += "pdfusetitle,";
+		opt += "\n ";
+		opt += "bookmarks=" + convert<string>(bookmarks) + ',';
+		if (bookmarks) {
+			opt += "bookmarksnumbered=" + convert<string>(bookmarksnumbered) + ',';
+			opt += "bookmarksopen=" + convert<string>(bookmarksopen) + ',';
+			if (bookmarksopen)
+				opt += "bookmarksopenlevel="
+				+ convert<string>(bookmarksopenlevel) + ',';
+		}
+		opt += "\n ";
+		opt += "breaklinks=" + convert<string>(breaklinks) + ',';
+		opt += "pdfborder={0 0 ";
+		opt += (pdfborder ? '0' : '1');
+		opt += "},";
+		opt += "backref=" + backref + ',';
+		opt += "colorlinks=" + convert<string>(colorlinks) + ',';
+		if (!pagemode.empty())
+			opt += "pdfpagemode=" + pagemode + ',';
+
+		// load the pdftitle etc. as hypersetup, otherwise you'll get
+		// LaTeX-errors when using non-latin characters
+		if (!title.empty())
+			hyperset += "pdftitle={" + title + "},";
+		if (!author.empty())			
+			hyperset += "\n pdfauthor={" + author + "},";
+		if (!subject.empty())
+			hyperset += "\n pdfsubject={" + subject + "},";
+		if (!keywords.empty())
+			hyperset += "\n pdfkeywords={" + keywords + "},";
+		if (!quoted_options.empty()){
+			hyperset += "\n ";
+			hyperset += quoted_options;
+		}
+		hyperset = rtrim(hyperset,",");
 	}
-	opt += "\n ";
-	opt += "breaklinks="     + convert<string>(breaklinks) + ',';
 
-	opt += "pdfborder={0 0 " ;
-	opt += (pdfborder ?'0':'1');
-	opt += "},";
+	// check if the hyperref settings use an encoding that exceeds
+	// ours. If so, we have to switch to utf8.
+	Encoding const * const enc = runparams.encoding;
+	docstring const hs = from_utf8(hyperset);
+	bool need_unicode = false;
+	if (enc) {
+		for (size_t n = 0; n < hs.size(); ++n) {
+			if (!enc->encodable(hs[n]))
+				need_unicode = true;
+		}
+	}
 
-	opt += "backref="        + convert<string>(backref) + ',';
-	opt += "pagebackref="    + convert<string>(pagebackref) + ',';
-	opt += "\n ";
-	opt += "colorlinks="     + convert<string>(colorlinks) + ',';
-	if (!pagemode.empty())
-		opt += "pdfpagemode=" + pagemode + ',';
-	if (!quoted_options.empty()){
-		opt += "\n ";
-		opt += quoted_options_get();
+	// use in \\usepackage parameter as not all options can be handled inside \\hypersetup
+	if (!hyperref_already_provided) {
+		opt = rtrim(opt, ",");
+		opt = "\\usepackage[" + opt + "]\n {hyperref}\n";
+
+		if (!hyperset.empty())
+			opt += "\\hypersetup{" + hyperset + "}\n";
+	} else {
+		// only in case hyperref is already loaded by the current text class
+		// try to put it into hyperset
+		//
+		// FIXME: rename in this case the PDF settings dialog checkbox
+		//  label from "Use Hyperref" to "Customize Hyperref Settings"
+		//  as discussd in bug #6293
+		opt = "\\hypersetup{" + rtrim(opt + hyperset, ",") + "}\n";
+	}
+
+	// hyperref expects utf8!
+	if (need_unicode && enc && enc->iconvName() != "UTF-8"
+	    &&!runparams.isFullUnicode()) {
+		os << "\\inputencoding{utf8}\n"
+		   << setEncoding("UTF-8");
+	}
+	// If hyperref is loaded by the document class, we output
+	// \hypersetup \AtBeginDocument if hypersetup is not (yet)
+	// defined. In this case, the class loads hyperref late
+	// (see bug #7048).
+	if (hyperref_already_provided && !opt.empty()) {
+		os << "\\ifx\\hypersetup\\undefined\n"
+		   << "  \\AtBeginDocument{%\n    "
+		   << from_utf8(opt)
+		   << "  }\n"
+		   << "\\else\n  "
+		   << from_utf8(opt)
+		   << "\\fi\n";
+	} else
+		os << from_utf8(opt);
+
+	if (need_unicode && enc && enc->iconvName() != "UTF-8"
+	    &&!runparams.isFullUnicode()) {
+		os << setEncoding(enc->iconvName())
+		   << "\\inputencoding{" << from_ascii(enc->latexName()) << "}\n";
 	}
-	opt = support::rtrim(opt,",");
-	opt += "]\n {hyperref}\n";
-	
-	// FIXME UNICODE
-	os << from_utf8(opt);
 }
 
 
@@ -169,14 +229,12 @@ string PDFOptions::readToken(Lexer &lex, string const & token)
 		lex >> colorlinks;
 	} else if (token == "\\pdf_backref") {
 		lex >> backref;
-	} else if (token == "\\pdf_pagebackref") {
-		lex >> pagebackref;
+	} else if (token == "\\pdf_pdfusetitle") {
+		lex >> pdfusetitle;
 	} else if (token == "\\pdf_pagemode") {
 		lex >> pagemode;
 	} else if (token == "\\pdf_quoted_options") {
 		lex >> quoted_options;
-	} else if (token == "\\pdf_store_options") {
-		lex >> store_options;
 	} else {
 		return token;
 	}
@@ -184,13 +242,14 @@ string PDFOptions::readToken(Lexer &lex, string const & token)
 }
 
 
-//prepared for check
-string PDFOptions::quoted_options_get() const
+// check the string from UI
+string PDFOptions::quoted_options_check(string const & str) const
 {
-	return quoted_options;
+	return subst(str, "\n", "");
 }
 
-// Keep implicit hyperref settings
+
+// set implicit settings for hyperref
 void PDFOptions::clear()
 {
 	use_hyperref            = false;
@@ -205,11 +264,10 @@ void PDFOptions::clear()
 	breaklinks              = false;
 	pdfborder               = false;
 	colorlinks              = false;
-	backref                 = false;
-	pagebackref             = false;
+	backref                 = "false";
 	pagemode.clear();
 	quoted_options.clear();
-	store_options           = false;
+	pdfusetitle             = true;  //in contrast with hyperref
 }
 
 } // namespace lyx