X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FPDFOptions.cpp;h=7de277c3212162655a60fcd7b565c43dae64e35f;hb=90f7007a2e6c78ffd031e4636ff909ab1bc2ddec;hp=ecfc1d067c4425dcef0c3aab14ca8c2561f80f2e;hpb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;p=lyx.git

diff --git a/src/PDFOptions.cpp b/src/PDFOptions.cpp
index ecfc1d067c..7de277c321 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,6 +13,7 @@
 
 #include "PDFOptions.h"
 
+#include "Encoding.h"
 #include "Lexer.h"
 
 #include "support/convert.h"
@@ -20,6 +22,7 @@
 
 #include <sstream>
 #include <string>
+#include <algorithm>
 
 using namespace std;
 using namespace lyx::support;
@@ -86,79 +89,115 @@ void PDFOptions::writeFile(ostream & os) const
 }
 
 
-void PDFOptions::writeLaTeX(odocstream & os, bool hyperref_already_provided) const
+void PDFOptions::writeLaTeX(OutputParams & runparams, otexstream & os,
+			    bool hyperref_already_provided) const
 {
+	// FIXME Unicode
 	string opt;
+	string hyperset;
 	
 	// since LyX uses unicode, also set the PDF strings to unicode strings with the
 	// hyperref option "unicode"
-	opt += "unicode=true, ";
-	
-	// 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 + ',';
-	
+	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
-	string hyperset;
-	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;
+		// 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,",");
 	}
-	hyperset = rtrim(hyperset,",");
 
+	// 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;
+		}
+	}
 
 	// use in \\usepackage parameter as not all options can be handled inside \\hypersetup
 	if (!hyperref_already_provided) {
-		opt = rtrim(opt,",");
+		opt = rtrim(opt, ",");
 		opt = "\\usepackage[" + opt + "]\n {hyperref}\n";
 
 		if (!hyperset.empty())
-			opt += "\\hypersetup{" + hyperset + "}\n ";
-	} else
+			opt += "\\hypersetup{" + hyperset + "}\n";
+	} else {
 		// only in case hyperref is already loaded by the current text class
 		// try to put it into hyperset
 		//
-		// FIXME: this still does not fix the cases where hyperref is loaded
-		//        and the option is active only when part of usepackage parameter
-		//        (e.g. pdfusetitle).
-		{
-			opt = "\\hypersetup{" + opt + hyperset + "}\n ";
-		}
-	
-	// FIXME UNICODE
-	os << from_utf8(opt);
+		// 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";
+	}
 }