diff options
| author |   Pavel Sanda <ps@twin.jikos.cz> | 2018-02-21 18:47:43 +0100 |
|---|---|---|
| committer | Pavel Sanda <ps@twin.jikos.cz> | 2018-02-21 18:47:43 +0100 |
| commit | 77a7aeb62075af88c086453d314a4a97a58aa41d (patch) | |
| tree | 13caf158af9d4eed1c623f0a13ff830036b1402b | |
| parent | fix lyx digests (diff) | |
| download | rebutia-77a7aeb62075af88c086453d314a4a97a58aa41d.tar.gz rebutia-77a7aeb62075af88c086453d314a4a97a58aa41d.tar.bz2 rebutia-77a7aeb62075af88c086453d314a4a97a58aa41d.zip | |
lyx - update viewURL patch
| -rw-r--r-- | app-office/lyx/files/2.3.patches | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/app-office/lyx/files/2.3.patches b/app-office/lyx/files/2.3.patches index 26beade..a9b6c00 100644 --- a/app-office/lyx/files/2.3.patches +++ b/app-office/lyx/files/2.3.patches @@ -1,8 +1,8 @@ diff --git a/src/Format.cpp b/src/Format.cpp -index 050af14..7d495b7 100644 +index b7a8c20b94..f1c0ef4b4c 100644 --- a/src/Format.cpp +++ b/src/Format.cpp -@@ -260,6 +260,27 @@ void Formats::setEditor(string const & name, string const & command) +@@ -661,6 +661,27 @@ void Formats::setEditor(string const & name, string const & command) } @@ -11,7 +11,7 @@ index 050af14..7d495b7 100644 + if (!format) + return false; + -+ string command = libScriptSearch(format->viewer()); ++ string command = commandPrep(format->viewer()); + + if (!contains(command, token_from_format)) + command += ' ' + token_from_format; @@ -31,10 +31,10 @@ index 050af14..7d495b7 100644 string const & format_name) const { diff --git a/src/Format.h b/src/Format.h -index 445c11b..3737f4c 100644 +index cc383c0249..3f6a312913 100644 --- a/src/Format.h +++ b/src/Format.h -@@ -143,6 +143,8 @@ public: +@@ -187,6 +187,8 @@ public: void setViewer(std::string const & name, std::string const & command); /// void setEditor(std::string const & name, std::string const & command); @@ -44,26 +44,26 @@ index 445c11b..3737f4c 100644 bool view(Buffer const & buffer, support::FileName const & filename, std::string const & format_name) const; diff --git a/src/insets/InsetHyperlink.cpp b/src/insets/InsetHyperlink.cpp -index 42dd691..7a293ff 100644 +index afa49d4e35..17085d8c14 100644 --- a/src/insets/InsetHyperlink.cpp +++ b/src/insets/InsetHyperlink.cpp -@@ -100,7 +100,10 @@ bool InsetHyperlink::getStatus(Cursor & cur, FuncRequest const & cmd, +@@ -108,7 +108,10 @@ bool InsetHyperlink::getStatus(Cursor & cur, FuncRequest const & cmd, void InsetHyperlink::viewTarget() const { - if (getParam("type") == "file:") { + if (getParam("type").empty()) -+ formats.viewURL(getParam("target")); ++ theFormats().viewURL(getParam("target")); + + else if (getParam("type") == "file:") { FileName url = makeAbsPath(to_utf8(getParam("target")), buffer().filePath()); - string const format = formats.getFormatFromFile(url); - formats.view(buffer(), url, format); + string const format = theFormats().getFormatFromFile(url); + theFormats().view(buffer(), url, format); diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc -index a8cf62e..8086b7f 100644 +index 9acf334562..bd8046bd07 100644 --- a/lib/ui/stdcontext.inc +++ b/lib/ui/stdcontext.inc -@@ -601,6 +601,8 @@ Menuset +@@ -667,6 +667,8 @@ Menuset # Menu "context-hyperlink" Item "Settings...|S" "inset-settings" @@ -71,7 +71,7 @@ index a8cf62e..8086b7f 100644 + Item "Open Target...|O" "inset-edit" End - End + # Index: stdinsets.inc =================================================================== --- a/lib/layouts/stdinsets.inc (revision 28602) |