r37051 - lyx-devel/trunk/src/tex2lyx

[baum]

Author: baum
Date: Thu Dec 30 22:03:36 2010
New Revision: 37051
URL: http://www.lyx.org/trac/changeset/37051

Log:
Fix translation of \pagebreak and \linebreak with optional arguments.
Please don't add new features to tex2lyx without testing.
In this case, the test case was even provided in test-insets.tex.

Modified:
   lyx-devel/trunk/src/tex2lyx/text.cpp

Modified: lyx-devel/trunk/src/tex2lyx/text.cpp
==============================================================================
--- lyx-devel/trunk/src/tex2lyx/text.cpp        Thu Dec 30 21:38:47 2010        
(r37050)
+++ lyx-devel/trunk/src/tex2lyx/text.cpp        Thu Dec 30 22:03:36 2010        
(r37051)
@@ -2577,8 +2577,9 @@
                        }
                }
 
-               else if (t.cs() == "newline"
-                       || t.cs() == "linebreak") {
+               else if (t.cs() == "newline" ||
+                        (t.cs() == "linebreak" &&
+                         p.next_token().asInput() != "[")) {
                        context.check_layout(os);
                        begin_inset(os, "Newline ");
                        os << t.cs();
@@ -2764,9 +2765,10 @@
                }
 
                else if (t.cs() == "newpage" ||
-                       t.cs() == "pagebreak" ||
-                       t.cs() == "clearpage" ||
-                       t.cs() == "cleardoublepage") {
+                        (t.cs() == "pagebreak" &&
+                         p.next_token().asInput() != "[") ||
+                        t.cs() == "clearpage" ||
+                        t.cs() == "cleardoublepage") {
                        context.check_layout(os);
                        begin_inset(os, "Newpage ");
                        os << t.cs();