X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbuffer.C;h=1afe9c8d78cca04a004ed8fb34e7d1c301ad3eb3;hb=6bb95ff114bf81883cf7748a94d37570824597c0;hp=3e6a4e3a2b11cf6e0d61de0627490985655117af;hpb=f09619a7e8808cd083a980a4ca13dd64f330b054;p=lyx.git diff --git a/src/buffer.C b/src/buffer.C index 3e6a4e3a2b..1afe9c8d78 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -21,7 +21,6 @@ #include "buffer.h" #include "bufferlist.h" #include "lyx_main.h" -#include "lyx_gui_misc.h" #include "LyXAction.h" #include "lyxrc.h" #include "lyxlex.h" @@ -66,7 +65,6 @@ #include "insets/insettoc.h" #include "insets/insetparent.h" #include "insets/insetspecialchar.h" -#include "insets/figinset.h" #include "insets/insettext.h" #include "insets/insetert.h" #include "insets/insetgraphics.h" @@ -89,7 +87,6 @@ #include "support/filetools.h" #include "support/path.h" #include "support/os.h" -#include "support/syscall.h" #include "support/lyxlib.h" #include "support/FileInfo.h" #include "support/lyxmanip.h" @@ -131,7 +128,6 @@ using std::stack; using std::list; using lyx::pos_type; -using lyx::layout_type; using lyx::textclass_type; // all these externs should eventually be removed. @@ -149,7 +145,7 @@ extern int tex_code_break_column; Buffer::Buffer(string const & file, bool ronly) - : paragraph(0), lyx_clean(true), bak_clean(true), + : paragraph(0), niceFile(true), lyx_clean(true), bak_clean(true), unnamed(false), dep_clean(0), read_only(ronly), filename_(file), users(0) { @@ -300,7 +296,9 @@ std::stack ert_stack; ErtComp ert_comp; #endif +#ifdef WITH_WARNINGS #warning And _why_ is this here? (Lgb) +#endif int unknown_layouts; int unknown_tokens; @@ -335,6 +333,7 @@ bool Buffer::readLyXformat2(LyXLex & lex, Paragraph * par) if (!par) { par = new Paragraph; + par->layout(textclasslist[params.textclass].defaultLayoutName()); } else { // We are inserting into an existing document users->text->breakParagraph(users); @@ -407,7 +406,8 @@ void Buffer::insertErtContents(Paragraph * par, int & pos, bool set_inactive) if (!ert_comp.contents.empty()) { lyxerr[Debug::INSETS] << "ERT contents:\n'" << ert_comp.contents << "'" << endl; - Inset * inset = new InsetERT(ert_comp.contents, true); + Inset * inset = new InsetERT(params, params.language, + ert_comp.contents, true); par->insertInset(pos++, inset, ert_comp.font); ert_comp.contents.erase(); } @@ -434,7 +434,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, static int call_depth; ++call_depth; bool checkminipage = false; - static Paragraph * minipar; + static Paragraph * minipar = 0; static Paragraph * parBeforeMinipage; #endif #endif @@ -464,14 +464,23 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, insertErtContents(par, pos); #endif lex.eatLine(); - string const layoutname = lex.getString(); - //lyxerr << "Looking for layout '" - // << layoutname << "'!" << endl; + string layoutname = lex.getString(); - pair pp - = textclasslist.NumberOfLayout(params.textclass, layoutname); + LyXTextClass const & tclass = textclasslist[params.textclass]; - //lyxerr << "Result: " << pp.first << "/" << pp.second << endl; + if (layoutname.empty()) { + layoutname = tclass.defaultLayoutName(); + } + + bool hasLayout = tclass.hasLayout(layoutname); + if (!hasLayout) { + lyxerr << "Layout '" << layoutname << "' does not" + << " exist in textclass '" << tclass.name() + << "'." << endl; + lyxerr << "Trying to use default layout instead." + << endl; + layoutname = tclass.defaultLayoutName(); + } #ifndef NO_COMPABILITY if (compare_no_case(layoutname, "latex") == 0) { @@ -536,39 +545,15 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, first_par = par; else { par = new Paragraph(par); + par->layout(textclasslist[params.textclass].defaultLayoutName()); } pos = 0; - if (pp.first) { - par->layout = pp.second; -#ifndef NO_COMPABILITY - } else if (ert_comp.active) { - par->layout = 0; -#endif - } else { - // layout not found - // use default layout "Standard" (0) - //lyxerr << "Layout '" << layoutname - // << "' was not found!" << endl; - - par->layout = 0; - ++unknown_layouts; - string const s = _("Layout had to be changed from\n") - + layoutname + _(" to ") - + textclasslist.NameOfLayout(params.textclass, par->layout); - InsetError * new_inset = new InsetError(s); - par->insertInset(0, new_inset, - LyXFont(LyXFont::ALL_INHERIT, - params.language)); - } + par->layout(layoutname); // Test whether the layout is obsolete. LyXLayout const & layout = - textclasslist.Style(params.textclass, - par->layout); + textclasslist[params.textclass][par->layout()]; if (!layout.obsoleted_by().empty()) - par->layout = textclasslist - .NumberOfLayout(params.textclass, - layout.obsoleted_by()) - .second; + par->layout(layout.obsoleted_by()); par->params().depth(depth); font = LyXFont(LyXFont::ALL_INHERIT, params.language); if (file_format < 216 @@ -595,28 +580,28 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, stringstream old_float; if (tmptok == "footnote") { - inset = new InsetFoot; + inset = new InsetFoot(params); old_float << "collapsed true\n"; } else if (tmptok == "margin") { - inset = new InsetMarginal; + inset = new InsetMarginal(params); old_float << "collapsed true\n"; } else if (tmptok == "fig") { - inset = new InsetFloat("figure"); + inset = new InsetFloat(params, "figure"); old_float << "placement htbp\n" << "wide false\n" << "collapsed false\n"; } else if (tmptok == "tab") { - inset = new InsetFloat("table"); + inset = new InsetFloat(params, "table"); old_float << "placement htbp\n" << "wide false\n" << "collapsed false\n"; } else if (tmptok == "alg") { - inset = new InsetFloat("algorithm"); + inset = new InsetFloat(params, "algorithm"); old_float << "placement htbp\n" << "wide false\n" << "collapsed false\n"; } else if (tmptok == "wide-fig") { - inset = new InsetFloat("figure"); + inset = new InsetFloat(params, "figure"); //InsetFloat * tmp = new InsetFloat("figure"); //tmp->wide(true); //inset = tmp; @@ -624,7 +609,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, << "wide true\n" << "collapsed false\n"; } else if (tmptok == "wide-tab") { - inset = new InsetFloat("table"); + inset = new InsetFloat(params, "table"); //InsetFloat * tmp = new InsetFloat("table"); //tmp->wide(true); //inset = tmp; @@ -697,7 +682,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, string(_("LyX will not be able to produce output correctly."))); params.textclass = 0; } - if (!textclasslist.Load(params.textclass)) { + if (!textclasslist[params.textclass].load()) { // if the textclass wasn't loaded properly // we need to either substitute another // or stop loading the file. @@ -705,7 +690,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, // stop loading... ideas?? ARRae980418 Alert::alert(_("Textclass Loading Error!"), string(_("Can't load textclass ")) + - textclasslist.NameOfClass(params.textclass), + textclasslist[params.textclass].name(), _("-- substituting default")); params.textclass = 0; } @@ -1041,10 +1026,16 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, } } else if (token == "\\added_space_top") { lex.nextToken(); - par->params().spaceTop(VSpace(lex.getString())); + VSpace value = VSpace(lex.getString()); + if ((value.length().len().value() != 0) || + (value.kind() != VSpace::LENGTH)) + par->params().spaceTop(value); } else if (token == "\\added_space_bottom") { lex.nextToken(); - par->params().spaceBottom(VSpace(lex.getString())); + VSpace value = VSpace(lex.getString()); + if ((value.length().len().value() != 0) || + (value.kind() != VSpace::LENGTH)) + par->params().spaceBottom(value); #ifndef NO_COMPABILITY #ifndef NO_PEXTRA_REALLY } else if (token == "\\pextra_type") { @@ -1093,8 +1084,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, #endif } else if (token == "\\SpecialChar") { LyXLayout const & layout = - textclasslist.Style(params.textclass, - par->getLayout()); + textclasslist[params.textclass][par->layout()]; // Insets don't make sense in a free-spacing context! ---Kayvan if (layout.free_spacing || par->isFreeSpacing()) { @@ -1152,8 +1142,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, // Remove it later some time...introduced with fileformat // 2.16. (Lgb) LyXLayout const & layout = - textclasslist.Style(params.textclass, - par->getLayout()); + textclasslist[params.textclass][par->layout()]; if (layout.free_spacing || par->isFreeSpacing()) { par->insertChar(pos, ' ', font); @@ -1188,6 +1177,8 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, the_end_read = true; #ifndef NO_COMPABILITY #ifndef NO_PEXTRA_REALLY + if (minipar == par) + par = 0; minipar = parBeforeMinipage = 0; #endif #endif @@ -1244,7 +1235,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, if (checkminipage && (call_depth == 1)) { checkminipage = false; if (minipar && (minipar != par) && - (par->params().pextraType()==Paragraph::PEXTRA_MINIPAGE)) + (par->params().pextraType() == Paragraph::PEXTRA_MINIPAGE)) { lyxerr << "minipages in a row" << endl; if (par->params().pextraStartMinipage()) { @@ -1266,22 +1257,22 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, // create a new paragraph to insert the // minipages in the following case if (par->params().pextraStartMinipage() && - !par->params().pextraHfill()) - { + !par->params().pextraHfill()) { Paragraph * p = new Paragraph; - p->layout = 0; + p->layout(textclasslist[params.textclass].defaultLayoutName()); + p->previous(parBeforeMinipage); parBeforeMinipage->next(p); p->next(0); p->params().depth(parBeforeMinipage->params().depth()); parBeforeMinipage = p; } - InsetMinipage * mini = new InsetMinipage; + InsetMinipage * mini = new InsetMinipage(params); mini->pos(static_cast(par->params().pextraAlignment())); mini->pageWidth(LyXLength(par->params().pextraWidth())); if (!par->params().pextraWidthp().empty()) { lyxerr << "WP:" << mini->pageWidth().asString() << endl; - mini->pageWidth(LyXLength((par->params().pextraWidthp())+"%")); + mini->pageWidth(LyXLength((par->params().pextraWidthp())+"p%")); } Paragraph * op = mini->firstParagraph(); mini->inset.paragraph(par); @@ -1343,7 +1334,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, // a sequence of minipages // in its own paragraph. Paragraph * p = new Paragraph; - p->layout = 0; + p->layout(textclasslist[params.textclass].defaultLayoutName()); p->previous(par->previous()); p->next(0); p->params().depth(depth); @@ -1357,14 +1348,24 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, if (!first_par || (first_par == par)) first_par = p; - InsetMinipage * mini = new InsetMinipage; + InsetMinipage * mini = new InsetMinipage(params); mini->pos(static_cast(minipar->params().pextraAlignment())); mini->pageWidth(LyXLength(minipar->params().pextraWidth())); if (!par->params().pextraWidthp().empty()) { lyxerr << "WP:" << mini->pageWidth().asString() << endl; - mini->pageWidth(LyXLength((par->params().pextraWidthp())+"%")); + mini->pageWidth(LyXLength((par->params().pextraWidthp())+"p%")); } + + Paragraph * op = mini->firstParagraph(); mini->inset.paragraph(minipar); + // + // and free the old ones! + // + while(op) { + Paragraph * pp = op->next(); + delete op; + op = pp; + } // Insert the minipage last in the // previous paragraph. @@ -1387,11 +1388,11 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, void Buffer::insertStringAsLines(Paragraph *& par, pos_type & pos, LyXFont const & fn,string const & str) const { - LyXLayout const & layout = textclasslist.Style(params.textclass, - par->getLayout()); + LyXLayout const & layout = + textclasslist[params.textclass][par->layout()]; LyXFont font = fn; - (void)par->checkInsertChar(font); + par->checkInsertChar(font); // insert the string, don't insert doublespace bool space_inserted = true; for(string::const_iterator cit = str.begin(); @@ -1523,26 +1524,26 @@ void Buffer::readInset(LyXLex & lex, Paragraph *& par, true); alreadyread = true; } else if (tmptok == "Note") { - inset = new InsetNote; + inset = new InsetNote(params); } else if (tmptok == "Include") { - InsetCommandParams p( "Include" ); + InsetCommandParams p("Include"); inset = new InsetInclude(p, *this); } else if (tmptok == "ERT") { - inset = new InsetERT; + inset = new InsetERT(params); } else if (tmptok == "Tabular") { inset = new InsetTabular(*this); } else if (tmptok == "Text") { - inset = new InsetText; + inset = new InsetText(params); } else if (tmptok == "Foot") { - inset = new InsetFoot; + inset = new InsetFoot(params); } else if (tmptok == "Marginal") { - inset = new InsetMarginal; + inset = new InsetMarginal(params); } else if (tmptok == "Minipage") { - inset = new InsetMinipage; + inset = new InsetMinipage(params); } else if (tmptok == "Float") { lex.next(); string tmptok = lex.getString(); - inset = new InsetFloat(tmptok); + inset = new InsetFloat(params, tmptok); #if 0 } else if (tmptok == "List") { inset = new InsetList; @@ -1550,7 +1551,7 @@ void Buffer::readInset(LyXLex & lex, Paragraph *& par, inset = new InsetList; #endif } else if (tmptok == "Caption") { - inset = new InsetCaption; + inset = new InsetCaption(params); } else if (tmptok == "FloatList") { inset = new InsetFloatList; } @@ -1789,16 +1790,27 @@ bool Buffer::writeFile(string const & fname, bool flag) const } +namespace { + +pair const addDepth(int depth, int ldepth) +{ + int d = depth * 2; + if (ldepth > depth) + d += (ldepth - depth) * 2; + return make_pair(d, string(d, ' ')); +} + +} + + string const Buffer::asciiParagraph(Paragraph const * par, unsigned int linelen, bool noparbreak) const { ostringstream buffer; - ostringstream word; Paragraph::depth_type depth = 0; int ltype = 0; Paragraph::depth_type ltype_depth = 0; - string::size_type currlinelen = 0; bool ref_printed = false; // if (!par->previous()) { #if 0 @@ -1819,26 +1831,26 @@ string const Buffer::asciiParagraph(Paragraph const * par, #endif // First write the layout - string const tmp = textclasslist.NameOfLayout(params.textclass, par->layout); - if (tmp == "Itemize") { + string const & tmp = par->layout(); + if (compare_no_case(tmp, "itemize") == 0) { ltype = 1; ltype_depth = depth + 1; - } else if (tmp == "Enumerate") { + } else if (compare_no_case(tmp, "enumerate") == 0) { ltype = 2; ltype_depth = depth + 1; - } else if (contains(tmp, "ection")) { + } else if (contains(lowercase(tmp), "ection")) { ltype = 3; ltype_depth = depth + 1; - } else if (contains(tmp, "aragraph")) { + } else if (contains(lowercase(tmp), "aragraph")) { ltype = 4; ltype_depth = depth + 1; - } else if (tmp == "Description") { + } else if (compare_no_case(tmp, "description") == 0) { ltype = 5; ltype_depth = depth + 1; - } else if (tmp == "Abstract") { + } else if (compare_no_case(tmp, "abstract") == 0) { ltype = 6; ltype_depth = 0; - } else if (tmp == "Bibliography") { + } else if (compare_no_case(tmp, "bibliography") == 0) { ltype = 7; ltype_depth = 0; } else { @@ -1862,12 +1874,16 @@ string const Buffer::asciiParagraph(Paragraph const * par, // } // linelen <= 0 is special and means we don't have pargraph breaks + + string::size_type currlinelen = 0; + if (!noparbreak) { if (linelen > 0) buffer << "\n\n"; - for (Paragraph::depth_type j = 0; j < depth; ++j) - buffer << " "; - currlinelen = depth * 2; + + buffer << string(depth * 2, ' '); + currlinelen += depth * 2; + //-- // we should probably change to the paragraph language in the // gettext here (if possible) so that strings are outputted in @@ -1879,46 +1895,52 @@ string const Buffer::asciiParagraph(Paragraph const * par, case 5: // Description break; case 6: // Abstract - if (linelen > 0) + if (linelen > 0) { buffer << _("Abstract") << "\n\n"; - else - buffer << _("Abstract: "); + currlinelen = 0; + } else { + string const abst = _("Abstract: "); + buffer << abst; + currlinelen += abst.length(); + } break; case 7: // Bibliography if (!ref_printed) { - if (linelen > 0) + if (linelen > 0) { buffer << _("References") << "\n\n"; - else - buffer << _("References: "); + currlinelen = 0; + } else { + string const refs = _("References: "); + buffer << refs; + currlinelen += refs.length(); + } + ref_printed = true; } break; default: - buffer << par->params().labelString() << " "; - break; + { + string const parlab = par->params().labelString(); + buffer << parlab << " "; + currlinelen += parlab.length() + 1; + } + break; + } } - string s = buffer.str(); - if (s.rfind('\n') != string::npos) { - string dummy; - s = rsplit(buffer.str().c_str(), dummy, '\n'); - } - currlinelen = s.length(); + if (!currlinelen) { - for (Paragraph::depth_type j = 0; j < depth; ++j) - buffer << " "; - currlinelen = depth * 2; - if (ltype_depth > depth) { - for (Paragraph::depth_type j = ltype_depth; - j > depth; --j) - { - buffer << " "; - } - currlinelen += (ltype_depth-depth)*2; - } + pair p = addDepth(depth, ltype_depth); + buffer << p.second; + currlinelen += p.first; } - // this is to change the linebreak to do it by word a bit more intelligent - // hopefully! (only in the case where we have a max linelenght!) (Jug) + + // this is to change the linebreak to do it by word a bit more + // intelligent hopefully! (only in the case where we have a + // max linelenght!) (Jug) + + string word; + for (pos_type i = 0; i < par->size(); ++i) { char c = par->getUChar(params, i); switch (c) { @@ -1927,82 +1949,73 @@ string const Buffer::asciiParagraph(Paragraph const * par, Inset const * inset = par->getInset(i); if (inset) { if (linelen > 0) { - buffer << word.str(); - word.str(""); + buffer << word; + currlinelen += word.length(); + word.erase(); } if (inset->ascii(this, buffer, linelen)) { // to be sure it breaks paragraph currlinelen += linelen; } -#if 0 - else { - string dummy; - string const s = - rsplit(buffer.str().c_str(), - dummy, '\n'); - currlinelen = s.length(); - } -#endif } } break; case Paragraph::META_NEWLINE: if (linelen > 0) { - buffer << word.str() << "\n"; - word.str(""); - for (Paragraph::depth_type j = 0; - j < depth; ++j) - buffer << " "; - currlinelen = depth * 2; - if (ltype_depth > depth) { - for (Paragraph::depth_type j = ltype_depth; - j > depth; --j) - buffer << " "; - currlinelen += (ltype_depth - depth) * 2; - } + buffer << word << "\n"; + word.erase(); + + pair p = addDepth(depth, + ltype_depth); + buffer << p.second; + currlinelen = p.first; } break; case Paragraph::META_HFILL: - buffer << word.str() << "\t"; - currlinelen += word.str().length() + 1; - word.str(""); + buffer << word << "\t"; + currlinelen += word.length() + 1; + word.erase(); break; default: if (c == ' ') { - buffer << word.str() << ' '; - currlinelen += word.str().length() + 1; - word.str(""); + if (linelen > 0 && + currlinelen + word.length() > linelen - 10) { + buffer << "\n"; + pair p = + addDepth(depth, ltype_depth); + buffer << p.second; + currlinelen = p.first; + } + + buffer << word << ' '; + currlinelen += word.length() + 1; + word.erase(); + } else { if (c != '\0') { - word << c; + word.push_back(c); } else { lyxerr[Debug::INFO] << "writeAsciiFile: NULL char in structure." << endl; } if ((linelen > 0) && - (currlinelen+word.str().length()) > linelen) + (currlinelen + word.length()) > linelen) { buffer << "\n"; - for (Paragraph::depth_type j = 0; j < depth; ++j) - buffer << " "; - currlinelen = depth * 2; - if (ltype_depth > depth) { - for (Paragraph::depth_type j = ltype_depth; - j > depth; --j) - { - buffer << " "; - } - currlinelen += (ltype_depth-depth)*2; - } + + pair p = + addDepth(depth, ltype_depth); + buffer << p.second; + currlinelen = p.first; } } break; } } - buffer << word.str(); + buffer << word; return buffer.str().c_str(); } @@ -2038,22 +2051,19 @@ void Buffer::makeLaTeXFile(string const & fname, { lyxerr[Debug::LATEX] << "makeLaTeXFile..." << endl; - niceFile = nice; // this will be used by Insetincludes. - - tex_code_break_column = lyxrc.ascii_linelen; - - LyXTextClass const & tclass = - textclasslist.TextClass(params.textclass); - ofstream ofs(fname.c_str()); if (!ofs) { Alert::err_alert(_("Error: Cannot open file: "), fname); return; } + niceFile = nice; // this will be used by Insetincludes. + + tex_code_break_column = lyxrc.ascii_linelen; + // validate the buffer. lyxerr[Debug::LATEX] << " Validating buffer..." << endl; - LaTeXFeatures features(params, tclass.numLayouts()); + LaTeXFeatures features(params); validate(features); lyxerr[Debug::LATEX] << " Buffer validation done." << endl; @@ -2081,16 +2091,18 @@ void Buffer::makeLaTeXFile(string const & fname, // original_path is set. This is done for usual tex-file, but not // for nice-latex-file. (Matthias 250696) if (!only_body) { - if (!nice){ + if (!nice) { // code for usual, NOT nice-latex-file ofs << "\\batchmode\n"; // changed // from \nonstopmode texrow.newline(); } if (!original_path.empty()) { + string inputpath = os::external_path(original_path); + subst(inputpath, "~", "\\string~"); ofs << "\\makeatletter\n" << "\\def\\input@path{{" - << os::external_path(original_path) << "/}}\n" + << inputpath << "/}}\n" << "\\makeatother\n"; texrow.newline(); texrow.newline(); @@ -2099,6 +2111,8 @@ void Buffer::makeLaTeXFile(string const & fname, ofs << "\\documentclass"; + LyXTextClass const & tclass = textclasslist[params.textclass]; + ostringstream options; // the document class options. if (tokenPos(tclass.opt_fontsize(), @@ -2180,14 +2194,12 @@ void Buffer::makeLaTeXFile(string const & fname, } string strOptions(options.str().c_str()); - if (!strOptions.empty()){ + if (!strOptions.empty()) { strOptions = strip(strOptions, ','); ofs << '[' << strOptions << ']'; } - ofs << '{' - << textclasslist.LatexnameOfClass(params.textclass) - << "}\n"; + ofs << '{' << tclass.latexname() << "}\n"; texrow.newline(); // end of \documentclass defs @@ -2523,6 +2535,9 @@ void Buffer::makeLaTeXFile(string const & fname, lyxerr[Debug::INFO] << "Finished making latex file." << endl; lyxerr[Debug::INFO] << "Row count was " << texrow.rows()-1 << "." << endl; + + // we want this to be true outside previews (for insetexternal) + niceFile = true; } @@ -2544,7 +2559,7 @@ void Buffer::latexParagraphs(ostream & ofs, Paragraph * par, // any environment other then "Standard" to be valid! if ((in == 0) || !in->forceDefaultParagraphs(in)) { LyXLayout const & layout = - textclasslist.Style(params.textclass, par->layout); + textclasslist[params.textclass][par->layout()]; if (layout.intitle) { if (already_title) { @@ -2579,50 +2594,52 @@ void Buffer::latexParagraphs(ostream & ofs, Paragraph * par, bool Buffer::isLatex() const { - return textclasslist.TextClass(params.textclass).outputType() == LATEX; + return textclasslist[params.textclass].outputType() == LATEX; } bool Buffer::isLinuxDoc() const { - return textclasslist.TextClass(params.textclass).outputType() == LINUXDOC; + return textclasslist[params.textclass].outputType() == LINUXDOC; } bool Buffer::isLiterate() const { - return textclasslist.TextClass(params.textclass).outputType() == LITERATE; + return textclasslist[params.textclass].outputType() == LITERATE; } bool Buffer::isDocBook() const { - return textclasslist.TextClass(params.textclass).outputType() == DOCBOOK; + return textclasslist[params.textclass].outputType() == DOCBOOK; } bool Buffer::isSGML() const { - return textclasslist.TextClass(params.textclass).outputType() == LINUXDOC || - textclasslist.TextClass(params.textclass).outputType() == DOCBOOK; + LyXTextClass const & tclass = textclasslist[params.textclass]; + + return tclass.outputType() == LINUXDOC || + tclass.outputType() == DOCBOOK; } -void Buffer::sgmlOpenTag(ostream & os, Paragraph::depth_type depth, +void Buffer::sgmlOpenTag(ostream & os, Paragraph::depth_type, string const & latexname) const { if (!latexname.empty() && latexname != "!-- --") //os << "" << "<" << latexname << ">"; - os << string(depth, ' ') << "<" << latexname << ">\n"; + os << "<" << latexname << ">"; } -void Buffer::sgmlCloseTag(ostream & os, Paragraph::depth_type depth, +void Buffer::sgmlCloseTag(ostream & os, Paragraph::depth_type, string const & latexname) const { if (!latexname.empty() && latexname != "!-- --") //os << "" << "\n"; - os << string(depth, ' ') << "\n"; + os << ""; } @@ -2637,21 +2654,23 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) niceFile = nice; // this will be used by included files. - LyXTextClass const & tclass = - textclasslist.TextClass(params.textclass); - - LaTeXFeatures features(params, tclass.numLayouts()); + LaTeXFeatures features(params); + validate(features); texrow.reset(); - string top_element = textclasslist.LatexnameOfClass(params.textclass); + LyXTextClass const & tclass = textclasslist[params.textclass]; + + string top_element = tclass.latexname(); if (!body_only) { ofs << " environment_stack(5); while (par) { - LyXLayout const & style = - textclasslist.Style(params.textclass, - par->layout); + LyXLayout const & style = tclass[par->layout()]; // treat as a special case for compatibility with old code if (par->isInset(0)) { Inset * inset = par->getInset(0); Inset::Code lyx_code = inset->lyxCode(); - if (lyx_code == Inset::TOC_CODE){ + if (lyx_code == Inset::TOC_CODE) { string const temp = "toc"; sgmlOpenTag(ofs, depth, temp); @@ -2723,7 +2740,7 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) _("Error : Wrong depth for" " LatexType Command.\n")); - if (!environment_stack[depth].empty()){ + if (!environment_stack[depth].empty()) { sgmlCloseTag(ofs, depth, environment_stack[depth]); ofs << "

"; @@ -2804,6 +2821,9 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) ofs.close(); // How to check for successful close + + // we want this to be true outside previews (for insetexternal) + niceFile = true; } @@ -2856,7 +2876,7 @@ void operator|=(PAR_TAG & p1, PAR_TAG const & p2) inline void reset(PAR_TAG & p1, PAR_TAG const & p2) { - p1 = static_cast( p1 & ~p2); + p1 = static_cast(p1 & ~p2); } } // namespace anon @@ -2867,8 +2887,8 @@ void Buffer::simpleLinuxDocOnePar(ostream & os, Paragraph * par, Paragraph::depth_type /*depth*/) { - LyXLayout const & style = textclasslist.Style(params.textclass, - par->getLayout()); + LyXLayout const & style = + textclasslist[params.textclass][par->layout()]; string::size_type char_line_count = 5; // Heuristic choice ;-) // gets paragraph main font @@ -2981,7 +3001,7 @@ void Buffer::simpleLinuxDocOnePar(ostream & os, } list < PAR_TAG > temp; - while (!tag_state.empty() && tag_close ) { + while (!tag_state.empty() && tag_close) { PAR_TAG k = tag_state.top(); tag_state.pop(); os << ""; @@ -3079,22 +3099,22 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) niceFile = nice; // this will be used by Insetincludes. - LyXTextClass const & tclass = - textclasslist.TextClass(params.textclass); - - LaTeXFeatures features(params, tclass.numLayouts()); + LaTeXFeatures features(params); validate(features); texrow.reset(); - string top_element = textclasslist.LatexnameOfClass(params.textclass); + LyXTextClass const & tclass = textclasslist[params.textclass]; + string top_element = tclass.latexname(); if (!only_body) { ofs << "layout); + LyXLayout const & style = tclass[par->layout()]; // environment tag closing for (; depth > par->params().depth(); --depth) { @@ -3222,7 +3240,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) if (par->isInset(0)) { Inset * inset = par->getInset(0); Inset::Code lyx_code = inset->lyxCode(); - if (lyx_code == Inset::LABEL_CODE){ + if (lyx_code == Inset::LABEL_CODE) { command_name += " id=\""; command_name += (static_cast(inset))->getContents(); command_name += "\""; @@ -3246,7 +3264,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) } if (environment_stack[depth] != style.latexname()) { - if(environment_stack.size() == depth + 1) { + if (environment_stack.size() == depth + 1) { environment_stack.push_back("!-- --"); environment_inner.push_back("!-- --"); } @@ -3269,7 +3287,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) if (style.latextype == LATEX_ENVIRONMENT) { if (!style.latexparam().empty()) { - if(style.latexparam() == "CDATA") + if (style.latexparam() == "CDATA") ofs << ""; else sgmlCloseTag(ofs, depth + command_depth, @@ -3366,6 +3384,9 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) ofs.close(); // How to check for successful close + + // we want this to be true outside previews (for insetexternal) + niceFile = true; } @@ -3375,8 +3396,8 @@ void Buffer::simpleDocBookOnePar(ostream & os, { bool emph_flag = false; - LyXLayout const & style = textclasslist.Style(params.textclass, - par->getLayout()); + LyXLayout const & style = + textclasslist[params.textclass][par->layout()]; LyXFont font_old = style.labeltype == LABEL_MANUAL ? style.labelfont : style.font; @@ -3393,18 +3414,23 @@ void Buffer::simpleDocBookOnePar(ostream & os, if (font.emph() == LyXFont::ON) { os << ""; emph_flag = true; - }else if(i) { + } else if (i) { os << ""; emph_flag = false; } } - if ( par->isInset(i) ) { + if (par->isInset(i)) { Inset * inset = par->getInset(i); // don't print the inset in position 0 if desc_on == 3 (label) - if ( i || desc_on != 3) + if ( i || desc_on != 3) { + if(style.latexparam() == "CDATA") + os << "]]>"; inset->docbook(this, os); + if(style.latexparam() == "CDATA") + os << "getChar(i); string sgml_string; @@ -3412,7 +3438,7 @@ void Buffer::simpleDocBookOnePar(ostream & os, if (style.pass_thru) { os << c; - } else if(style.free_spacing || par->isFreeSpacing() || c != ' ') { + } else if (style.free_spacing || par->isFreeSpacing() || c != ' ') { os << sgml_string; } else if (desc_on ==1) { ++char_line_count; @@ -3432,9 +3458,9 @@ void Buffer::simpleDocBookOnePar(ostream & os, // resets description flag correctly if (desc_on == 1) { // not closed... - os << ""; + os << "\n "; } - if(style.free_spacing) os << '\n'; + if (style.free_spacing) os << '\n'; } @@ -3479,7 +3505,7 @@ int Buffer::runChktex() // if we removed error insets before we ran chktex or if we inserted // error insets after we ran chktex, this must be run: - if (removedErrorInsets || res){ + if (removedErrorInsets || res) { users->redraw(); users->fitCursor(); } @@ -3492,8 +3518,7 @@ int Buffer::runChktex() void Buffer::validate(LaTeXFeatures & features) const { Paragraph * par = paragraph; - LyXTextClass const & tclass = - textclasslist.TextClass(params.textclass); + LyXTextClass const & tclass = textclasslist[params.textclass]; // AMS Style is at document level if (params.use_amsmath || tclass.provides(LyXTextClass::amsmath)) @@ -3589,25 +3614,12 @@ Buffer::Lists const Buffer::getLists() const Lists l; Paragraph * par = paragraph; -#if 1 - std::pair const tmp = - textclasslist.NumberOfLayout(params.textclass, "Caption"); - bool const found = tmp.first; - textclass_type const cap = tmp.second; - -#else - // This is the prefered way to to this, but boost::tie can break - // some compilers - bool found; - textclass_type cap; - boost::tie(found, cap) = textclasslist - .NumberOfLayout(params.textclass, "Caption"); -#endif + LyXTextClass const & textclass = textclasslist[params.textclass]; + bool found = textclass.hasLayout("Caption"); + string const layout("Caption"); while (par) { - char const labeltype = - textclasslist.Style(params.textclass, - par->getLayout()).labeltype; + char const labeltype = textclass[par->layout()].labeltype; if (labeltype >= LABEL_COUNTER_CHAPTER && labeltype <= LABEL_COUNTER_CHAPTER + params.tocdepth) { @@ -3615,7 +3627,7 @@ Buffer::Lists const Buffer::getLists() const SingleList & item = l["TOC"]; int depth = max(0, labeltype - - textclasslist.TextClass(params.textclass).maxcounter()); + textclass.maxcounter()); item.push_back(TocItem(par, depth, par->asString(this, true))); } // For each paragrph, traverse its insets and look for @@ -3639,7 +3651,7 @@ Buffer::Lists const Buffer::getLists() const // the inset... Paragraph * tmp = il->inset.paragraph(); while (tmp) { - if (tmp->layout == cap) { + if (tmp->layout() == layout) { SingleList & item = l[type]; string const str = tostr(item.size()+1) + ". " + tmp->asString(this, false); @@ -3650,7 +3662,7 @@ Buffer::Lists const Buffer::getLists() const } } } else { - lyxerr << "caption not found" << endl; + lyxerr << "Caption not found" << endl; } par = par->next();