X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetLayout.cpp;h=f2b701dfb8057f81bb21b03d0242a519b9cc0ec4;hb=996505c2ae981187d34580633fca410972c2493d;hp=28707d33c1e99e404358c9bcb951f79d2db4ee8e;hpb=94bc5c30869334a17954026f6670e502bd7560b1;p=lyx.git diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp index 28707d33c1..f2b701dfb8 100644 --- a/src/insets/InsetLayout.cpp +++ b/src/insets/InsetLayout.cpp @@ -14,8 +14,7 @@ #include "InsetLayout.h" -#include "Color.h" -#include "Font.h" +#include "ColorSet.h" #include "Lexer.h" #include "TextClass.h" @@ -31,12 +30,14 @@ using std::vector; namespace lyx { InsetLayout::InsetLayout() : - name_(from_ascii("undefined")), labelstring_(from_ascii("UNDEFINED")), - decoration_(InsetLayout::Default), - font_(sane_font), labelfont_(sane_font), bgcolor_(Color_error), - multipar_(false), custompars_(false), forceplain_(true), + name_(from_ascii("undefined")), lyxtype_(STANDARD), + labelstring_(from_ascii("UNDEFINED")), decoration_(DEFAULT), + latextype_(NOLATEXTYPE), font_(sane_font), + labelfont_(sane_font), bgcolor_(Color_error), + htmlforcecss_ (false), htmlisblock_(true), + multipar_(true), custompars_(true), forceplain_(false), passthru_(false), needprotect_(false), freespacing_(false), - keepempty_(false), forceltr_(false) + keepempty_(false), forceltr_(false), intoc_(false) { labelfont_.setColor(Color_error); } @@ -46,31 +47,51 @@ namespace { InsetLayout::InsetDecoration translateDecoration(std::string const & str) { - if (str == "classic") - return InsetLayout::Classic; - if (str == "minimalistic") - return InsetLayout::Minimalistic; - if (str == "conglomerate") - return InsetLayout::Conglomerate; - return InsetLayout::Default; + if (support::compare_ascii_no_case(str, "classic") == 0) + return InsetLayout::CLASSIC; + if (support::compare_ascii_no_case(str, "minimalistic") == 0) + return InsetLayout::MINIMALISTIC; + if (support::compare_ascii_no_case(str, "conglomerate") == 0) + return InsetLayout::CONGLOMERATE; + return InsetLayout::DEFAULT; } +InsetLayout::InsetLaTeXType translateLaTeXType(std::string const & str) +{ + if (support::compare_ascii_no_case(str, "command") == 0) + return InsetLayout::COMMAND; + if (support::compare_ascii_no_case(str, "environment") == 0) + return InsetLayout::ENVIRONMENT; + if (support::compare_ascii_no_case(str, "none") == 0) + return InsetLayout::NOLATEXTYPE; + return InsetLayout::ILT_ERROR; } +} // namespace anon -bool InsetLayout::read(Lexer & lex, TextClass & tclass) -{ - name_ = support::subst(lex.getDocString(), '_', ' '); +bool InsetLayout::read(Lexer & lex, TextClass const & tclass) +{ enum { IL_BGCOLOR, IL_COPYSTYLE, + IL_COUNTER, IL_CUSTOMPARS, IL_DECORATION, IL_FONT, IL_FORCELTR, IL_FORCEPLAIN, IL_FREESPACING, + IL_HTMLTAG, + IL_HTMLATTR, + IL_HTMLFORCECSS, + IL_HTMLINNERTAG, + IL_HTMLINNERATTR, + IL_HTMLISBLOCK, + IL_HTMLLABEL, + IL_HTMLSTYLE, + IL_HTMLPREAMBLE, + IL_INTOC, IL_LABELFONT, IL_LABELSTRING, IL_LATEXNAME, @@ -90,6 +111,7 @@ bool InsetLayout::read(Lexer & lex, TextClass & tclass) LexerKeyword elementTags[] = { { "bgcolor", IL_BGCOLOR }, { "copystyle", IL_COPYSTYLE }, + { "counter", IL_COUNTER}, { "custompars", IL_CUSTOMPARS }, { "decoration", IL_DECORATION }, { "end", IL_END }, @@ -97,6 +119,16 @@ bool InsetLayout::read(Lexer & lex, TextClass & tclass) { "forceltr", IL_FORCELTR }, { "forceplain", IL_FORCEPLAIN }, { "freespacing", IL_FREESPACING }, + { "htmlattr", IL_HTMLATTR }, + { "htmlforcecss", IL_HTMLFORCECSS }, + { "htmlinnerattr", IL_HTMLINNERATTR}, + { "htmlinnertag", IL_HTMLINNERTAG}, + { "htmlisblock", IL_HTMLISBLOCK}, + { "htmllabel", IL_HTMLLABEL }, + { "htmlpreamble", IL_HTMLPREAMBLE }, + { "htmlstyle", IL_HTMLSTYLE }, + { "htmltag", IL_HTMLTAG }, + { "intoc", IL_INTOC }, { "keepempty", IL_KEEPEMPTY }, { "labelfont", IL_LABELFONT }, { "labelstring", IL_LABELSTRING }, @@ -115,7 +147,7 @@ bool InsetLayout::read(Lexer & lex, TextClass & tclass) FontInfo font = inherit_font; labelfont_ = inherit_font; - bgcolor_ = Color_background; + bgcolor_ = Color_none; bool getout = false; // whether we've read the CustomPars or ForcePlain tag // for issuing a warning in case MultiPars comes later @@ -132,12 +164,26 @@ bool InsetLayout::read(Lexer & lex, TextClass & tclass) break; } switch (le) { - case IL_LYXTYPE: - lex >> lyxtype_; + // FIXME + // Perhaps a more elegant way to deal with the next two would be the + // way this sort of thing is handled in Layout::read(), namely, by + // using the Lexer. + case IL_LYXTYPE: { + string lt; + lex >> lt; + lyxtype_ = translateLyXType(lt); + if (lyxtype_ == NOLYXTYPE) + LYXERR0("Unknown LyXType `" << lt << "'."); break; - case IL_LATEXTYPE: - lex >> latextype_; + } + case IL_LATEXTYPE: { + string lt; + lex >> lt; + latextype_ = translateLaTeXType(lt); + if (latextype_ == ILT_ERROR) + LYXERR0("Unknown LaTeXType `" << lt << "'."); break; + } case IL_LABELSTRING: lex >> labelstring_; break; @@ -158,6 +204,9 @@ bool InsetLayout::read(Lexer & lex, TextClass & tclass) case IL_FORCELTR: lex >> forceltr_; break; + case IL_INTOC: + lex >> intoc_; + break; case IL_MULTIPAR: lex >> multipar_; // the defaults for these depend upon multipar_ @@ -168,6 +217,9 @@ bool InsetLayout::read(Lexer & lex, TextClass & tclass) custompars_ = multipar_; forceplain_ = !multipar_; break; + case IL_COUNTER: + lex >> counter_; + break; case IL_CUSTOMPARS: lex >> custompars_; readCustomOrPlain = true; @@ -227,7 +279,34 @@ bool InsetLayout::read(Lexer & lex, TextClass & tclass) bgcolor_ = lcolor.getFromLyXName(tmp); break; case IL_PREAMBLE: - preamble_ = lex.getLongString("EndPreamble"); + preamble_ = from_utf8(lex.getLongString("EndPreamble")); + break; + case IL_HTMLTAG: + lex >> htmltag_; + break; + case IL_HTMLATTR: + lex >> htmlattr_; + break; + case IL_HTMLFORCECSS: + lex >> htmlforcecss_; + break; + case IL_HTMLINNERTAG: + lex >> htmlinnertag_; + break; + case IL_HTMLINNERATTR: + lex >> htmlinnerattr_; + break; + case IL_HTMLLABEL: + lex >> htmllabel_; + break; + case IL_HTMLISBLOCK: + lex >> htmlisblock_; + break; + case IL_HTMLSTYLE: + htmlstyle_ = from_utf8(lex.getLongString("EndHTMLStyle")); + break; + case IL_HTMLPREAMBLE: + htmlpreamble_ = from_utf8(lex.getLongString("EndPreamble")); break; case IL_REQUIRES: { lex.eatLine(); @@ -254,4 +333,93 @@ bool InsetLayout::read(Lexer & lex, TextClass & tclass) return true; } + +InsetLayout::InsetLyXType translateLyXType(std::string const & str) +{ + + if (support::compare_ascii_no_case(str, "charstyle") == 0) + return InsetLayout::CHARSTYLE; + if (support::compare_ascii_no_case(str, "custom") == 0) + return InsetLayout::CUSTOM; + if (support::compare_ascii_no_case(str, "element") == 0) + return InsetLayout::ELEMENT; + if (support::compare_ascii_no_case(str, "end") == 0) + return InsetLayout::END; + if (support::compare_ascii_no_case(str, "standard") == 0) + return InsetLayout::STANDARD; + return InsetLayout::NOLYXTYPE; +} + + +string const & InsetLayout::htmltag() const +{ + if (htmltag_.empty()) + htmltag_ = multipar_ ? "div" : "span"; + return htmltag_; +} + + +string const & InsetLayout::htmlattr() const +{ + if (htmlattr_.empty()) + htmlattr_ = "class=\"" + defaultCSSClass() + "\""; + return htmlattr_; +} + + +string const & InsetLayout::htmlinnerattr() const +{ + if (htmlinnerattr_.empty()) + htmlinnerattr_ = "class=\"" + defaultCSSClass() + "_inner\""; + return htmlinnerattr_; +} + + +string InsetLayout::defaultCSSClass() const +{ + if (!defaultcssclass_.empty()) + return defaultcssclass_; + string d; + string n = to_utf8(name()); + string::const_iterator it = n.begin(); + string::const_iterator en = n.end(); + for (; it != en; ++it) { + if (!isalpha(*it)) + d += "_"; + else if (islower(*it)) + d += *it; + else + d += support::lowercase(*it); + } + // are there other characters we need to remove? + defaultcssclass_ = d; + return defaultcssclass_; +} + + +void InsetLayout::makeDefaultCSS() const +{ + if (!htmldefaultstyle_.empty()) + return; + docstring const mainfontCSS = font_.asCSS(); + if (!mainfontCSS.empty()) + htmldefaultstyle_ = + from_ascii(htmltag() + "." + defaultCSSClass() + " {\n") + + mainfontCSS + from_ascii("\n}\n"); +} + + +docstring InsetLayout::htmlstyle() const +{ + if (!htmlstyle_.empty() && !htmlforcecss_) + return htmlstyle_; + if (htmldefaultstyle_.empty()) + makeDefaultCSS(); + docstring retval = htmldefaultstyle_; + if (!htmlstyle_.empty()) + retval += '\n' + htmlstyle_ + '\n'; + return retval; +} + + } //namespace lyx