X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2FContext.cpp;h=c565a960856242e919435128a012462918683b4f;hb=5e290e4bf9fb8e7d94912dd0126751d5f6649859;hp=5112401b08ad408fa0dafdf6b72bc72875282f0e;hpb=766eb3f02c69ef3fea1845b53a153bfbe9e5f55a;p=lyx.git diff --git a/src/tex2lyx/Context.cpp b/src/tex2lyx/Context.cpp index 5112401b08..c565a96085 100644 --- a/src/tex2lyx/Context.cpp +++ b/src/tex2lyx/Context.cpp @@ -81,16 +81,17 @@ Context::Context(bool need_layout_, TeXFont const & font_) : need_layout(need_layout_), need_end_layout(false), need_end_deeper(false), - has_item(false), deeper_paragraph(false), + has_item(false), in_list_preamble(false), deeper_paragraph(false), new_layout_allowed(true), merging_hyphens_allowed(true), textclass(textclass_), layout(layout_), parent_layout(parent_layout_), - font(font_), rotlongtable(false) + font(font_), tablerotation(0), in_table_cell(false), cell_align('c') { if (!layout) layout = &textclass.defaultLayout(); if (!parent_layout) parent_layout = &textclass.defaultLayout(); + pass_thru_cmds.clear(); } @@ -115,7 +116,7 @@ void Context::begin_layout(ostream & os, Layout const * const & l) // FIXME: This is not enough for things like // \\Huge par1 \\par par2 // FIXME: If the document language is not english this outputs a - // superflous language change. Fortunately this is only file format + // superfluous language change. Fortunately this is only file format // bloat and does not change the TeX export of LyX. output_font_change(os, normalfont, font); } @@ -140,9 +141,9 @@ void Context::check_layout(ostream & os) begin_layout(os, layout); has_item = false; } else { - // a standard paragraph in an - // enumeration. We have to recognize - // that this may require a begin_deeper. + // A standard paragraph in a list. + // We have to recognize that this + // may require a begin_deeper. if (!deeper_paragraph) begin_deeper(os); begin_layout(os, &textclass.defaultLayout());