How about if we write a script to do some of this and stop doing it

[lyx.git] / src / PDFOptions.cpp

diff --git a/src/PDFOptions.cpp b/src/PDFOptions.cpp
index a4a4fcbe4b8abdba7b91eafa50457e4e8d6d4103..ff44a17ddbd09d37193591930b64d8720c9336bd 100644 (file)
--- a/src/PDFOptions.cpp
+++ b/src/PDFOptions.cpp
@@ -12,10 +12,11 @@
 
 #include "PDFOptions.h"
 
+#include "Lexer.h"
+
 #include "support/convert.h"
-#include "support/lstrings.h"
 #include "support/debug.h"
-#include "Lexer.h"
+#include "support/lstrings.h"
 
 #include <sstream>
 #include <string>
@@ -46,7 +47,6 @@ bool PDFOptions::empty() const
                && pdfborder == x.pdfborder
                && colorlinks == x.colorlinks
                && backref == x.backref
-               && pagebackref == x.pagebackref
                && pdfusetitle == x.pdfusetitle;
 }
 
@@ -75,8 +75,7 @@ void PDFOptions::writeFile(ostream & os) const
        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())
@@ -115,9 +114,7 @@ void PDFOptions::writeLaTeX(odocstream & os, bool hyperref_already_provided) con
        opt += (pdfborder ?'0':'1');
        opt += "},";
 
-       opt += "backref="        + convert<string>(backref) + ',';
-       opt += "pagebackref="    + convert<string>(pagebackref) + ',';
-       opt += "\n ";
+       opt += "backref=" + backref + ',';
        opt += "colorlinks="     + convert<string>(colorlinks) + ',';
        if (!pagemode.empty())
                opt += "pdfpagemode=" + pagemode + ',';
@@ -137,7 +134,7 @@ void PDFOptions::writeLaTeX(odocstream & os, bool hyperref_already_provided) con
                hyperset += "\n pdfkeywords={" + keywords + "},";
        if (!quoted_options.empty()){
                hyperset += "\n ";
-               hyperset += quoted_options_get();
+               hyperset += quoted_options;
        }
        hyperset = rtrim(hyperset,",");
 
@@ -193,8 +190,6 @@ 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") {
@@ -208,10 +203,10 @@ 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", "");
 }
 
 
@@ -230,8 +225,7 @@ void PDFOptions::clear()
        breaklinks              = false;
        pdfborder               = false;
        colorlinks              = false;
-       backref                 = false;
-       pagebackref             = false;
+       backref                 = "false";
        pagemode.clear();
        quoted_options.clear();
        pdfusetitle             = true;  //in contrast with hyperref