commit 7aab315c81baca658366ad1048ef962161b0ce7a
Author: Georg Baum <[email protected]>
Date: Sat Jan 3 20:51:02 2015 +0100
Fix parsing of verbatim options (bug #9113)
Parser::verbatimOption() did swallow backslashes previously. The similar
code
in Parser::verbatim_item() was already correct.
diff --git a/src/tex2lyx/Parser.cpp b/src/tex2lyx/Parser.cpp
index 7a9fff1..69e3460 100644
--- a/src/tex2lyx/Parser.cpp
+++ b/src/tex2lyx/Parser.cpp
@@ -704,7 +704,7 @@ string Parser::verbatimOption()
putback();
res += '{' + verbatim_item() + '}';
} else
- res += t.cs();
+ res += t.asInput();
}
}
return res;
diff --git a/src/tex2lyx/test/test-insets.lyx.lyx
b/src/tex2lyx/test/test-insets.lyx.lyx
index ce41adc..1291f7c 100644
--- a/src/tex2lyx/test/test-insets.lyx.lyx
+++ b/src/tex2lyx/test/test-insets.lyx.lyx
@@ -709,6 +709,28 @@ key "gur+04"
\begin_inset CommandInset bibitem
LatexCommand bibitem
+label "Möstl et~al.(2010)"
+key "Mostl2010"
+
+\end_inset
+
+ Gürkan, M.
+\begin_inset space ~
+
+\end_inset
+
+A., Freitag, M., & Rasio, F.
+\begin_inset space ~
+
+\end_inset
+
+A. 2004, ApJ, 604, 632
+\end_layout
+
+\begin_layout Bibliography
+
+\begin_inset CommandInset bibitem
+LatexCommand bibitem
label "{{Gürkan et~al.}(2004)}"
key "gur+04"
diff --git a/src/tex2lyx/test/test-insets.tex b/src/tex2lyx/test/test-insets.tex
index e6249fc..162ebd8 100644
--- a/src/tex2lyx/test/test-insets.tex
+++ b/src/tex2lyx/test/test-insets.tex
@@ -141,6 +141,8 @@ From bug 7306:
\citet{gur+04} have demonstrated that authors should not have umlauts
in their names. It's OK to use them in the man\"{u}script, though.
\begin{thebibliography}{References}
+\bibitem[M\"{o}stl et~al.(2010)]{Mostl2010} G�rkan, M.~A., Freitag,
+M., \& Rasio, F.~A. 2004, ApJ, 604, 632
\bibitem[{{G\"{u}rkan et~al.}(2004)}]{gur+04} G�rkan, M.~A., Freitag,
M., \& Rasio, F.~A. 2004, ApJ, 604, 632\end{thebibliography}
diff --git a/status.21x b/status.21x
index 37416eb..cd72404 100644
--- a/status.21x
+++ b/status.21x
@@ -190,6 +190,8 @@ What's new
- Parse post command argument insets (bug 8473).
+- Parse parsing of verbatim options containing commands (bug 9113).
+
* ADVANCED FIND AND REPLACE