From 458c143e49687f567834f71695ddbd737286f405 Mon Sep 17 00:00:00 2001
From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sun, 26 Aug 2012 11:42:43 +0200
Subject: [PATCH] Fix forward search with okular

Implement a placeholder 2008f which points to the tex file with full path, since this is what okular expects nowadays.
---
 lib/doc/Additional.lyx         | 16 +++++++++++++++-
 lib/doc/de/Additional.lyx      | 20 +++++++++++++++++++-
 src/frontends/qt4/GuiPrefs.cpp |  4 ++--
 src/frontends/qt4/GuiView.cpp  |  3 +++
 4 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/lib/doc/Additional.lyx b/lib/doc/Additional.lyx
index a5ac28d44d..fbb1a215ed 100644
--- a/lib/doc/Additional.lyx
+++ b/lib/doc/Additional.lyx
@@ -7064,7 +7064,21 @@ $$t
 
 \end_inset
 
-: name of the (temporary) exported .tex file
+: name of the (temporary) exported .tex file (without path)
+\end_layout
+
+\begin_layout Itemize
+\noindent
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+$$f
+\end_layout
+
+\end_inset
+
+: name of the (temporary) exported .tex file (including path)
 \end_layout
 
 \begin_layout Itemize
diff --git a/lib/doc/de/Additional.lyx b/lib/doc/de/Additional.lyx
index 5a08ab05dd..0b7df2342f 100644
--- a/lib/doc/de/Additional.lyx
+++ b/lib/doc/de/Additional.lyx
@@ -7452,7 +7452,25 @@ $$t
 
 \end_inset
 
-: name of the (temporary) exported .tex file
+: name of the (temporary) exported .tex file (without path)
+\end_layout
+
+\begin_layout Itemize
+\noindent
+
+\lang english
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\lang english
+$$f
+\end_layout
+
+\end_inset
+
+: name of the (temporary) exported .tex file (including path)
 \end_layout
 
 \begin_layout Itemize
diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index 39f68412cd..236e4cc408 100644
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -407,13 +407,13 @@ PrefOutput::PrefOutput(GuiPreferences * form)
 	dviCB->addItem("");
 	dviCB->addItem("xdvi -sourceposition '$$n:\\ $$t' $$o");
 	dviCB->addItem("yap -1 -s \"$$n $$t\" $$o");
-	dviCB->addItem("okular --unique \"file:$$o#src:$$n $$t\"");
+	dviCB->addItem("okular --unique \"$$o#src:$$n $$f\"");
 	dviCB->addItem("synctex view -i $$n:0:$$t -o $$o -x \"evince -i %{page+1} $$o\"");
 	pdfCB->addItem("");
 	pdfCB->addItem("CMCDDE SUMATRA control [ForwardSearch(\\\"$$o\\\",\\\"$$t\\\",$$n,0,0,1)]");
 	pdfCB->addItem("SumatraPDF -reuse-instance $$o -forward-search $$t $$n");
 	pdfCB->addItem("synctex view -i $$n:0:$$t -o $$o -x \"xpdf -raise -remote $$t.tmp $$o %{page+1}\"");
-	pdfCB->addItem("okular --unique \"file:$$o#src:$$n $$t\"");
+	pdfCB->addItem("okular --unique \"$$o#src:$$n $$f\"");
 	pdfCB->addItem("synctex view -i $$n:0:$$t -o $$o -x \"evince -i %{page+1} $$o\"");
 	pdfCB->addItem("/Applications/Skim.app/Contents/SharedSupport/displayline $$n $$o $$t");
 }
diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index cb96595669..b460413612 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -3643,6 +3643,8 @@ void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
 					doc_buffer->absFileName(),
 						"tex")).mangledFileName()
 				: doc_buffer->latexName();
+			string const fulltexname = 
+				support::makeAbsPath(texname, doc_master->temppath()).absFileName();
 			string const mastername =
 				removeExtension(doc_master->latexName());
 			FileName const dviname(addName(path.absFileName(),
@@ -3678,6 +3680,7 @@ void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
 			string texrow = convert<string>(row);
 
 			command = subst(command, "$$n", texrow);
+			command = subst(command, "$$f", fulltexname);
 			command = subst(command, "$$t", texname);
 			command = subst(command, "$$o", outname);