X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLayout.cpp;h=3c1a9bd955515d321e847e1a7c408a50e59de9f8;hb=62af7ee772f16f154225d2d0b65d77f4376b6001;hp=005acb22581fddc7a122312216e812cfdc023c23;hpb=8a703573ea9718a06c94522e40671d46f0b83522;p=lyx.git diff --git a/src/Layout.cpp b/src/Layout.cpp index 005acb2258..3c1a9bd955 100644 --- a/src/Layout.cpp +++ b/src/Layout.cpp @@ -74,6 +74,8 @@ enum LayoutTags { LT_LATEXTYPE, LT_LEFTDELIM, LT_LEFTMARGIN, + LT_NEED_CPROTECT, + LT_NEED_MBOXPROTECT, LT_NEED_PROTECT, LT_NEWLINE, LT_NEXTNOINDENT, @@ -130,6 +132,8 @@ Layout::Layout() intitle = false; inpreamble = false; needprotect = false; + needcprotect = false; + needmboxprotect = false; keepempty = false; font = inherit_font; labelfont = inherit_font; @@ -242,6 +246,8 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass) { "leftdelim", LT_LEFTDELIM }, { "leftmargin", LT_LEFTMARGIN }, { "margin", LT_MARGIN }, + { "needcprotect", LT_NEED_CPROTECT }, + { "needmboxprotect", LT_NEED_MBOXPROTECT }, { "needprotect", LT_NEED_PROTECT }, { "newline", LT_NEWLINE }, { "nextnoindent", LT_NEXTNOINDENT }, @@ -374,6 +380,7 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass) latexargs_.clear(); itemargs_.clear(); postcommandargs_.clear(); + listpreamble_.clear(); } break; @@ -393,6 +400,14 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass) lex >> needprotect; break; + case LT_NEED_CPROTECT: + lex >> needcprotect; + break; + + case LT_NEED_MBOXPROTECT: + lex >> needmboxprotect; + break; + case LT_KEEPEMPTY: lex >> keepempty; break; @@ -597,25 +612,25 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass const & tclass) } case LT_AUTONESTS: { - docstring const autonest = - subst(subst(subst(lex.getLongString(from_ascii("EndAutoNests")), - from_ascii("\n"), docstring()), - from_ascii(" "), docstring()), - from_ascii("\t"), docstring()); + docstring autonest = lex.getLongString(from_ascii("EndAutoNests")); + autonest = subst(autonest, from_ascii("\n"), docstring()); + autonest = subst(autonest, from_ascii("\t"), docstring()); + autonest = subst(autonest, from_ascii("\""), docstring()); + autonest = subst(autonest, '_', ' '); vector const autonests = - getVectorFromString(autonest); + getVectorFromString(autonest, from_ascii(","), false, true); autonests_.insert(autonests.begin(), autonests.end()); break; } case LT_AUTONESTEDBY: { - docstring const autonest = - subst(subst(subst(lex.getLongString(from_ascii("EndIsAutoNestedBy")), - from_ascii("\n"), docstring()), - from_ascii(" "), docstring()), - from_ascii("\t"), docstring()); + docstring autonest = lex.getLongString(from_ascii("EndIsAutoNestedBy")); + autonest = subst(autonest, from_ascii("\n"), docstring()); + autonest = subst(autonest, from_ascii("\t"), docstring()); + autonest = subst(autonest, from_ascii("\""), docstring()); + autonest = subst(autonest, '_', ' '); vector const autonests = - getVectorFromString(autonest); + getVectorFromString(autonest, from_ascii(","), false, true); autonested_by_.insert(autonests.begin(), autonests.end()); break; } @@ -998,18 +1013,22 @@ void Layout::readArgument(Lexer & lex) latexarg arg; // writeArgument() makes use of these default values arg.mandatory = false; + arg.nodelims = false; arg.autoinsert = false; arg.insertcotext = false; + arg.insertonnewline = false; bool error = false; bool finished = false; arg.font = inherit_font; arg.labelfont = inherit_font; arg.is_toc_caption = false; arg.passthru = PT_INHERITED; + arg.free_spacing = false; string id; lex >> id; bool const itemarg = prefixIs(id, "item:"); bool const postcmd = prefixIs(id, "post:"); + bool const listpreamble = prefixIs(id, "listpreamble:"); while (!finished && lex.isOK() && !error) { lex.next(); @@ -1059,6 +1078,9 @@ void Layout::readArgument(Lexer & lex) } else if (tok == "decoration") { lex.next(); arg.decoration = lex.getString(); + } else if (tok == "newlinecmd") { + lex.next(); + arg.newlinecmd = lex.getString(); } else if (tok == "font") { arg.font = lyxRead(lex, arg.font); } else if (tok == "labelfont") { @@ -1078,6 +1100,9 @@ void Layout::readArgument(Lexer & lex) } else if (tok == "istoccaption") { lex.next(); arg.is_toc_caption = lex.getBool(); + } else if (tok == "freespacing") { + lex.next(); + arg.free_spacing = lex.getBool(); } else { lex.printError("Unknown tag"); error = true; @@ -1089,7 +1114,11 @@ void Layout::readArgument(Lexer & lex) itemargs_[id] = arg; else if (postcmd) postcommandargs_[id] = arg; - else + else if (listpreamble) { + // list preamble has no delimiters by default + arg.nodelims = true; + listpreamble_[id] = arg; + } else latexargs_[id] = arg; } @@ -1125,6 +1154,8 @@ void writeArgument(ostream & os, string const & id, Layout::latexarg const & arg os << "\t\tRequires \"" << arg.requires << "\"\n"; if (!arg.decoration.empty()) os << "\t\tDecoration \"" << arg.decoration << "\"\n"; + if (!arg.newlinecmd.empty()) + os << "\t\tNewlineCmd \"" << arg.newlinecmd << "\"\n"; if (arg.font != inherit_font) lyxWrite(os, arg.font, "Font", 2); if (arg.labelfont != inherit_font) @@ -1142,6 +1173,8 @@ void writeArgument(ostream & os, string const & id, Layout::latexarg const & arg } if (!arg.pass_thru_chars.empty()) os << "\t\tPassThruChars \"" << to_utf8(arg.pass_thru_chars) << "\"\n"; + if (arg.free_spacing) + os << "\t\tFreeSpacing " << arg.free_spacing << "\n"; os << "\tEndArgument\n"; } @@ -1211,7 +1244,12 @@ void Layout::write(ostream & os) const for (LaTeXArgMap::const_iterator it = postcommandargs_.begin(); it != postcommandargs_.end(); ++it) writeArgument(os, it->first, it->second); + for (LaTeXArgMap::const_iterator it = listpreamble_.begin(); + it != listpreamble_.end(); ++it) + writeArgument(os, it->first, it->second); os << "\tNeedProtect " << needprotect << "\n" + "\tNeedCProtect " << needcprotect << "\n" + "\tNeedMBoxProtect " << needmboxprotect << "\n" "\tKeepEmpty " << keepempty << '\n'; if (labelfont == font) lyxWrite(os, font, "Font", 1); @@ -1426,14 +1464,14 @@ void Layout::write(ostream & os) const os << "\n\tEndAutoNests\n"; } if (!autonested_by_.empty()) { - os << "\tIsAutoNestedBy\n\t"; + os << "\tIsAutoNestedBy\n\t\t"; for (set::const_iterator it = autonested_by_.begin(); it != autonested_by_.end(); ++it) { if (it != autonested_by_.begin()) os << ','; os << to_utf8(*it); } - os << "\n\tIsAutoNestedBy\n"; + os << "\n\tEndIsAutoNestedBy\n"; } if (refprefix.empty()) os << "\tRefPrefix OFF\n"; @@ -1471,7 +1509,7 @@ void Layout::write(ostream & os) const bool Layout::hasArgs() const { return !latexargs_.empty() || !postcommandargs_.empty() || - !itemargs_.empty(); + !itemargs_.empty() || !listpreamble_.empty(); } @@ -1480,6 +1518,8 @@ Layout::LaTeXArgMap Layout::args() const LaTeXArgMap args = latexargs_; if (!postcommandargs_.empty()) args.insert(postcommandargs_.begin(), postcommandargs_.end()); + if (!listpreamble_.empty()) + args.insert(listpreamble_.begin(), listpreamble_.end()); if (!itemargs_.empty()) args.insert(itemargs_.begin(), itemargs_.end()); return args;