The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit d3bcdb24cc6699dd418a5332ea061e2236118179
Author: Uwe Stöhr <[email protected]>
Date:   Mon Jun 25 22:58:21 2012 +0200

    tex2lyx/text.cpp: fix bug #8223
    
    LyX does not yet support \framebox without an option we therefore cannot 
use our parse_outer_box routine (this is only for supported boxes)

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index c28e436..beb37bd 100644
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -3954,8 +3954,17 @@ void parse_text(Parser & p, ostream & os, unsigned 
flags, bool outer,
                        } else {
                                string special = p.getFullOpt();
                                special += p.getOpt();
-                               parse_outer_box(p, os, FLAG_ITEM, outer,
-                                               context, t.cs(), special);
+                               // LyX does not yet support \framebox without 
any option
+                               if (!special.empty())
+                                       parse_outer_box(p, os, FLAG_ITEM, outer,
+                                                       context, t.cs(), 
special);
+                               else {
+                                       eat_whitespace(p, os, context, false);
+                                       handle_ert(os, "\\framebox{", context);
+                                       eat_whitespace(p, os, context, false);
+                                       parse_text(p, os, FLAG_ITEM, outer, 
context);
+                                       handle_ert(os, "}", context);
+                               }
                        }
                }
 

-----------------------------------------------------------------------

Summary of changes:
 src/tex2lyx/text.cpp |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to