#include "Encoding.h"
#include "Lexer.h"
+#include "texstream.h"
#include "support/convert.h"
#include "support/debug.h"
return;
if (!title.empty() )
- os << "\\pdf_title \"" << title << "\"\n";
+ os << "\\pdf_title " << Lexer::quoteString(title) << '\n';
if (!author.empty())
- os << "\\pdf_author \"" << author << "\"\n";
+ os << "\\pdf_author " << Lexer::quoteString(author) << '\n';
if (!subject.empty())
- os << "\\pdf_subject \"" << subject << "\"\n";
+ os << "\\pdf_subject " << Lexer::quoteString(subject) << '\n';
if (!keywords.empty())
- os << "\\pdf_keywords \"" << keywords << "\"\n";
+ os << "\\pdf_keywords " << Lexer::quoteString(keywords) << '\n';
os << "\\pdf_bookmarks " << convert<string>(bookmarks) << '\n';
os << "\\pdf_pagemode " << pagemode << '\n';
if (!quoted_options.empty())
- os << "\\pdf_quoted_options \"" << quoted_options << "\"\n";
+ os << "\\pdf_quoted_options " << Lexer::quoteString(quoted_options) << '\n';
}
-int PDFOptions::writeLaTeX(OutputParams & runparams, odocstream & os,
+void PDFOptions::writeLaTeX(OutputParams & runparams, otexstream & os,
bool hyperref_already_provided) const
{
- int lines = 0;
// FIXME Unicode
string opt;
string hyperset;
// only use the hyperref settings if hyperref is enabled by the user
// see bug #7052
- if(use_hyperref) {
+ if (use_hyperref) {
// try to extract author and title from document when none is
// explicitly given
if (pdfusetitle && title.empty() && author.empty())
opt += "pdfborder={0 0 ";
opt += (pdfborder ? '0' : '1');
opt += "},";
+ if (pdfborder)
+ opt += "pdfborderstyle={},";
opt += "backref=" + backref + ',';
opt += "colorlinks=" + convert<string>(colorlinks) + ',';
if (!pagemode.empty())
hyperset += quoted_options;
}
hyperset = rtrim(hyperset,",");
-
}
// check if the hyperref settings use an encoding that exceeds
bool need_unicode = false;
if (enc) {
for (size_t n = 0; n < hs.size(); ++n) {
- if (enc->latexChar(hs[n], true) != docstring(1, hs[n]))
+ if (!enc->encodable(hs[n]))
need_unicode = true;
}
}
// 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{" + opt + hyperset + "}\n";
+ opt = "\\hypersetup{" + rtrim(opt + hyperset, ",") + "}\n";
}
- lines = int(count(opt.begin(), opt.end(), '\n'));
-
- // hyperref expects utf8!
- if (need_unicode && enc && enc->iconvName() != "UTF-8"
- &&!runparams.isFullUnicode()) {
- os << "\\inputencoding{utf8}\n"
- << setEncoding("UTF-8");
- ++lines;
+ // hyperref expects LICR macros for non-ASCII chars.
+ // Usually, "(lua)inputenc" converts the input to LICR, with XeTeX utf-8 works, too.
+ // As hyperref provides good coverage for \inputencoding{utf8}, we can try
+ // this if the current input encoding does not support a character.
+ // FIXME: don't use \inputencoding if "inputenc" is not loaded (#9839).
+ if (need_unicode && enc && enc->iconvName() != "UTF-8") {
+ if (runparams.flavor != OutputParams::XETEX)
+ os << "\\inputencoding{utf8}\n";
+ os << setEncoding("UTF-8");
}
- // if hyperref is loaded by the document class and hyperset is empty,
- // nothing must be output, see bug #7048
- if (!(hyperref_already_provided && hyperset.empty()))
+ // 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";
- ++lines;
+ if (need_unicode && enc && enc->iconvName() != "UTF-8") {
+ os << setEncoding(enc->iconvName());
+ if (runparams.flavor != OutputParams::XETEX)
+ os << "\\inputencoding{" << from_ascii(enc->latexName()) << "}\n";
}
- return lines;
}
if (token == "\\use_hyperref") {
lex >> use_hyperref;
} else if (token == "\\pdf_title") {
- lex >> title;
+ if (lex.isOK()) {
+ lex.next(true);
+ title = lex.getString();
+ }
} else if (token == "\\pdf_author") {
- lex >> author;
+ if (lex.isOK()) {
+ lex.next(true);
+ author = lex.getString();
+ }
} else if (token == "\\pdf_subject") {
- lex >> subject;
+ if (lex.isOK()) {
+ lex.next(true);
+ subject = lex.getString();
+ }
} else if (token == "\\pdf_keywords") {
- lex >> keywords;
+ if (lex.isOK()) {
+ lex.next(true);
+ keywords = lex.getString();
+ }
} else if (token == "\\pdf_bookmarks") {
lex >> bookmarks;
} else if (token == "\\pdf_bookmarksnumbered") {
} else if (token == "\\pdf_pagemode") {
lex >> pagemode;
} else if (token == "\\pdf_quoted_options") {
- lex >> quoted_options;
+ if (lex.isOK()) {
+ lex.next(true);
+ quoted_options = lex.getString();
+ }
} else {
return token;
}
// check the string from UI
-string PDFOptions::quoted_options_check(string const str) const
+string PDFOptions::quoted_options_check(string const & str) const
{
return subst(str, "\n", "");
}
projects / lyx.git / blobdiff