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 7a9fff137265009a5b6a991e4d65c3bcd5741745..69e3460f459de17c1ccc6f15b564eeac8589af69 100644 (file)
--- 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 d0622bdffa03fb97221afeddcd327f3d51c5eede..39798fb6e53466610f9b28b7322c708f95875e4e 100644 (file)
--- a/src/tex2lyx/test/test-insets.lyx.lyx
+++ b/src/tex2lyx/test/test-insets.lyx.lyx
@@ -707,6 +707,28 @@ key "gur+04"
 
 \begin_layout Bibliography
 
+\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)}"

diff --git a/src/tex2lyx/test/test-insets.tex b/src/tex2lyx/test/test-insets.tex
index e6249fc6655977232c64eca76ba6cab06ed96f9b..162ebd843a8da38cd278c0519fca26c060fe72c6 100644 (file)
--- 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}