* src/LyXAction.C: mark goto-clear-bookmark as working without buffer

[lyx.git] / src / tex2lyx / context.C

diff --git a/src/tex2lyx/context.C b/src/tex2lyx/context.C
index e094d6585d0f712e72d781bb6372abc93dd552dc..12404d9d12711564dbd08203c6a5500425e4223b 100644 (file)
--- a/src/tex2lyx/context.C
+++ b/src/tex2lyx/context.C
@@ -15,6 +15,9 @@
 #include "support/lstrings.h"
 #include "context.h"
 
+
+namespace lyx {
+
 using std::ostream;
 using std::endl;
 using std::string;
@@ -23,7 +26,7 @@ using std::string;
 namespace {
 
 void begin_layout(ostream & os, LyXLayout_ptr layout, Font const & font,
-                  Font const & normalfont)
+                 Font const & normalfont)
 {
        os << "\n\\begin_layout " << layout->name() << "\n";
        // FIXME: This is not enough for things like
@@ -51,8 +54,19 @@ void end_deeper(ostream & os)
 
 }
 
+
+bool operator==(Font const & f1, Font const & f2)
+{
+       return
+               f1.size == f2.size &&
+               f1.family == f2.family &&
+               f1.series == f2.series &&
+               f1.shape == f2.shape;
+}
+
+
 void output_font_change(ostream & os, Font const & oldfont,
-                        Font const & newfont)
+                       Font const & newfont)
 {
        if (oldfont.family != newfont.family)
                os << "\n\\family " << newfont.family << '\n';
@@ -66,6 +80,7 @@ void output_font_change(ostream & os, Font const & oldfont,
 
 
 Font Context::normalfont;
+bool Context::empty = true;
 
 
 Context::Context(bool need_layout_,
@@ -75,7 +90,7 @@ Context::Context(bool need_layout_,
        : need_layout(need_layout_),
          need_end_layout(false), need_end_deeper(false),
          has_item(false), deeper_paragraph(false),
-         textclass(textclass_),
+         new_layout_allowed(true), textclass(textclass_),
          layout(layout_), parent_layout(parent_layout_),
          font(font_)
 {
@@ -86,6 +101,14 @@ Context::Context(bool need_layout_,
 }
 
 
+Context::~Context()
+{
+       if (!extra_stuff.empty())
+               std::cerr << "Bug: Ignoring extra stuff '" << extra_stuff
+                         << '\'' << std::endl;
+}
+
+
 void Context::check_layout(ostream & os)
 {
        if (need_layout) {
@@ -104,8 +127,6 @@ void Context::check_layout(ostream & os)
                                }
                                begin_layout(os, layout, font, normalfont);
                                has_item = false;
-                               need_layout=false;
-                               need_end_layout = true;
                        } else {
                                // a standard paragraph in an
                                // enumeration. We have to recognize
@@ -113,22 +134,21 @@ void Context::check_layout(ostream & os)
                                if (!deeper_paragraph)
                                        begin_deeper(os);
                                begin_layout(os, textclass.defaultLayout(),
-                                            font, normalfont);
-                               need_layout=false;
-                               need_end_layout = true;
+                                            font, normalfont);
                                deeper_paragraph = true;
                        }
                } else {
                        // No list-like environment
                        begin_layout(os, layout, font, normalfont);
-                       need_layout=false;
-                       need_end_layout = true;
                }
+               need_layout = false;
+               need_end_layout = true;
                if (!extra_stuff.empty()) {
                        os << extra_stuff;
                        extra_stuff.erase();
                }
                os << "\n";
+               empty = false;
        }
 }
 
@@ -206,8 +226,16 @@ void Context::dump(ostream & os, string const & desc) const
                os << "has_item ";
        if (deeper_paragraph)
                os << "deeper_paragraph ";
+       if (new_layout_allowed)
+               os << "new_layout_allowed ";
        if (!extra_stuff.empty())
                os << "extrastuff=[" << extra_stuff << "] ";
-       os << "layout=" << layout->name();
-       os << " parent_layout=" << parent_layout->name() << "]" << endl;
+       os << "textclass=" << textclass.name()
+          << " layout=" << layout->name()
+          << " parent_layout=" << parent_layout->name() << "] font=["
+          << font.size << ' ' << font.family << ' ' << font.series << ' '
+          << font.shape << ']' << endl;
 }
+
+
+} // namespace lyx