#include <config.h>
#include "Layout.h"
-#include "Encoding.h"
#include "FontInfo.h"
#include "Language.h"
#include "Lexer.h"
#include "support/lassert.h"
#include "support/lstrings.h"
#include "support/Messages.h"
-#include "support/regex.h"
#include "support/textutils.h"
enum LayoutTags {
LT_ALIGN = 1,
LT_ALIGNPOSSIBLE,
+ LT_ARGUMENT,
LT_MARGIN,
LT_BOTTOMSEP,
LT_CATEGORY,
LT_FREE_SPACING,
LT_PASS_THRU,
LT_PARBREAK_IS_NEWLINE,
+ LT_ITEMCOMMAND,
LT_ITEMSEP,
LT_KEEPEMPTY,
LT_LABEL_BOTTOMSEP,
LT_ENDLABELTYPE,
LT_LATEXNAME,
LT_LATEXPARAM,
- LT_OPTARGS,
LT_LATEXTYPE,
+ LT_LEFTDELIM,
LT_LEFTMARGIN,
LT_NEED_PROTECT,
LT_NEWLINE,
LT_HTMLTITLE,
LT_SPELLCHECK,
LT_REFPREFIX,
- LT_REQARGS,
+ LT_RESETARGS,
+ LT_RIGHTDELIM,
LT_INTITLE // keep this last!
};
htmlforcecss_ = false;
htmltitle_ = false;
spellcheck = true;
- optargs = 0;
- reqargs = 0;
+ itemcommand_ = "item";
}
LexerKeyword layoutTags[] = {
{ "align", LT_ALIGN },
{ "alignpossible", LT_ALIGNPOSSIBLE },
+ { "argument", LT_ARGUMENT },
{ "babelpreamble", LT_BABELPREAMBLE },
{ "bottomsep", LT_BOTTOMSEP },
{ "category", LT_CATEGORY },
{ "innertag", LT_INNERTAG },
{ "inpreamble", LT_INPREAMBLE },
{ "intitle", LT_INTITLE },
+ { "itemcommand", LT_ITEMCOMMAND },
{ "itemsep", LT_ITEMSEP },
{ "itemtag", LT_ITEMTAG },
{ "keepempty", LT_KEEPEMPTY },
{ "latexname", LT_LATEXNAME },
{ "latexparam", LT_LATEXPARAM },
{ "latextype", LT_LATEXTYPE },
+ { "leftdelim", LT_LEFTDELIM },
{ "leftmargin", LT_LEFTMARGIN },
{ "margin", LT_MARGIN },
{ "needprotect", LT_NEED_PROTECT },
{ "newline", LT_NEWLINE },
{ "nextnoindent", LT_NEXTNOINDENT },
{ "obsoletedby", LT_OBSOLETEDBY },
- { "optionalargs", LT_OPTARGS },
{ "parbreakisnewline", LT_PARBREAK_IS_NEWLINE },
{ "parindent", LT_PARINDENT },
{ "parsep", LT_PARSEP },
{ "passthru", LT_PASS_THRU },
{ "preamble", LT_PREAMBLE },
{ "refprefix", LT_REFPREFIX },
- { "requiredargs", LT_REQARGS },
{ "requires", LT_REQUIRES },
+ { "resetargs", LT_RESETARGS },
+ { "rightdelim", LT_RIGHTDELIM },
{ "rightmargin", LT_RIGHTMARGIN },
{ "spacing", LT_SPACING },
{ "spellcheck", LT_SPELLCHECK },
lex >> toclevel;
break;
- case LT_OPTARGS:
- lex >> optargs;
+ case LT_RESETARGS:
+ bool reset;
+ lex >> reset;
+ if (reset) {
+ latexargs_.clear();
+ itemargs_.clear();
+ postcommandargs_.clear();
+ }
break;
- case LT_REQARGS:
- lex >> reqargs;
+ case LT_ARGUMENT:
+ readArgument(lex);
break;
case LT_NEED_PROTECT:
latexparam_ = subst(latexparam_, """, "\"");
break;
+ case LT_LEFTDELIM:
+ lex >> leftdelim_;
+ leftdelim_ = support::subst(leftdelim_, from_ascii("<br/>"),
+ from_ascii("\n"));
+ break;
+
+ case LT_RIGHTDELIM:
+ lex >> rightdelim_;
+ rightdelim_ = support::subst(rightdelim_, from_ascii("<br/>"),
+ from_ascii("\n"));
+ break;
+
case LT_INNERTAG:
lex >> innertag_;
break;
lex >> itemtag_;
break;
+ case LT_ITEMCOMMAND:
+ lex >> itemcommand_;
+ break;
+
case LT_PREAMBLE:
preamble_ = from_utf8(lex.getLongString("EndPreamble"));
break;
enum {
LA_NO_LABEL = 1,
LA_MANUAL,
- LA_TOP_ENVIRONMENT,
- LA_CENTERED_TOP_ENVIRONMENT,
+ LA_ABOVE,
+ LA_CENTERED,
LA_STATIC,
LA_SENSITIVE,
- LA_COUNTER,
LA_ENUMERATE,
LA_ITEMIZE,
LA_BIBLIO
LexerKeyword labelTypeTags[] = {
- { "bibliography", LA_BIBLIO },
- { "centered_top_environment", LA_CENTERED_TOP_ENVIRONMENT },
- { "counter", LA_COUNTER },
- { "enumerate", LA_ENUMERATE },
- { "itemize", LA_ITEMIZE },
- { "manual", LA_MANUAL },
- { "no_label", LA_NO_LABEL },
- { "sensitive", LA_SENSITIVE },
- { "static", LA_STATIC },
- { "top_environment", LA_TOP_ENVIRONMENT }
+ { "above", LA_ABOVE },
+ { "bibliography", LA_BIBLIO },
+ { "centered", LA_CENTERED },
+ { "enumerate", LA_ENUMERATE },
+ { "itemize", LA_ITEMIZE },
+ { "manual", LA_MANUAL },
+ { "no_label", LA_NO_LABEL },
+ { "sensitive", LA_SENSITIVE },
+ { "static", LA_STATIC }
};
PushPopHelper pph(lex, labelTypeTags);
case LA_MANUAL:
labeltype = LABEL_MANUAL;
break;
- case LA_TOP_ENVIRONMENT:
- labeltype = LABEL_TOP_ENVIRONMENT;
+ case LA_ABOVE:
+ labeltype = LABEL_ABOVE;
break;
- case LA_CENTERED_TOP_ENVIRONMENT:
- labeltype = LABEL_CENTERED_TOP_ENVIRONMENT;
+ case LA_CENTERED:
+ labeltype = LABEL_CENTERED;
break;
case LA_STATIC:
labeltype = LABEL_STATIC;
case LA_SENSITIVE:
labeltype = LABEL_SENSITIVE;
break;
- case LA_COUNTER:
- labeltype = LABEL_COUNTER;
- break;
case LA_ENUMERATE:
labeltype = LABEL_ENUMERATE;
break;
}
-namespace {
-
-docstring const i18npreamble(Language const * lang, Encoding const & enc,
- docstring const & templ, bool const polyglossia)
+void Layout::readArgument(Lexer & lex)
{
- if (templ.empty())
- return templ;
-
- string preamble = polyglossia ?
- subst(to_utf8(templ), "$$lang", lang->polyglossia()) :
- subst(to_utf8(templ), "$$lang", lang->babel());
-
-#ifdef TEX2LYX
- // tex2lyx does not have getMessages()
- LASSERT(false, /**/);
- (void)enc;
-#else
- string const langenc = lang->encoding()->iconvName();
- string const texenc = lang->encoding()->latexName();
- string const bufenc = enc.iconvName();
- // First and second character of plane 15 (Private Use Area)
- char const s1[5] = {0xf3, 0xb0, 0x80, 0x80, 0x00}; // U+F0000
- char const s2[5] = {0xf3, 0xb0, 0x80, 0x81, 0x00}; // U+F0001
- // FIXME UNICODE
- // lyx::regex is not unicode-safe.
- // Should use QRegExp or (boost::u32regex, but that requires ICU)
- static regex const reg("_\\(([^\\)]+)\\)");
- smatch sub;
- while (regex_search(preamble, sub, reg)) {
- string const key = sub.str(1);
- string translated = to_utf8(lang->translateLayout(key));
- if (langenc != bufenc)
- translated = "\\inputencoding{" + texenc + "}"
- + string(s1) + langenc + string(s2) + translated
- + string(s1) + bufenc + string(s2);
- preamble = subst(preamble, sub.str(), translated);
+ latexarg arg;
+ arg.mandatory = false;
+ arg.autoinsert = false;
+ bool error = false;
+ bool finished = false;
+ arg.font = inherit_font;
+ arg.labelfont = inherit_font;
+ string id;
+ lex >> id;
+ bool const itemarg = prefixIs(id, "item:");
+ bool const postcmd = prefixIs(id, "post:");
+
+ while (!finished && lex.isOK() && !error) {
+ lex.next();
+ string const tok = ascii_lowercase(lex.getString());
+
+ if (tok.empty()) {
+ continue;
+ } else if (tok == "endargument") {
+ finished = true;
+ } else if (tok == "labelstring") {
+ lex.next();
+ arg.labelstring = lex.getDocString();
+ } else if (tok == "menustring") {
+ lex.next();
+ arg.menustring = lex.getDocString();
+ } else if (tok == "mandatory") {
+ lex.next();
+ arg.mandatory = lex.getBool();
+ } else if (tok == "autoinsert") {
+ lex.next();
+ arg.autoinsert = lex.getBool();
+ } else if (tok == "leftdelim") {
+ lex.next();
+ arg.ldelim = lex.getDocString();
+ arg.ldelim = support::subst(arg.ldelim, from_ascii("<br/>"),
+ from_ascii("\n"));
+ } else if (tok == "rightdelim") {
+ lex.next();
+ arg.rdelim = lex.getDocString();
+ arg.rdelim = support::subst(arg.rdelim, from_ascii("<br/>"),
+ from_ascii("\n"));
+ } else if (tok == "presetarg") {
+ lex.next();
+ arg.presetarg = lex.getDocString();
+ } else if (tok == "tooltip") {
+ lex.next();
+ arg.tooltip = lex.getDocString();
+ } else if (tok == "requires") {
+ lex.next();
+ arg.requires = lex.getString();
+ } else if (tok == "decoration") {
+ lex.next();
+ arg.decoration = lex.getString();
+ } else if (tok == "font") {
+ arg.font = lyxRead(lex, arg.font);
+ } else if (tok == "labelfont") {
+ arg.labelfont = lyxRead(lex, arg.labelfont);
+ } else {
+ lex.printError("Unknown tag");
+ error = true;
+ }
}
-#endif
- return from_utf8(preamble);
+ if (arg.labelstring.empty())
+ LYXERR0("Incomplete Argument definition!");
+ else if (itemarg)
+ itemargs_[id] = arg;
+ else if (postcmd)
+ postcommandargs_[id] = arg;
+ else
+ latexargs_[id] = arg;
}
+
+Layout::LaTeXArgMap Layout::args() const
+{
+ LaTeXArgMap args = latexargs_;
+ if (!postcommandargs_.empty())
+ args.insert(postcommandargs_.begin(), postcommandargs_.end());
+ if (!itemargs_.empty())
+ args.insert(itemargs_.begin(), itemargs_.end());
+ return args;
}
-docstring const Layout::langpreamble(Language const * lang,
- Encoding const & enc, bool const polyglossia) const
+int Layout::optArgs() const
{
- return i18npreamble(lang, enc, langpreamble_, polyglossia);
+ int nr = 0;
+ LaTeXArgMap::const_iterator it = latexargs_.begin();
+ for (; it != latexargs_.end(); ++it) {
+ if (!(*it).second.mandatory)
+ ++nr;
+ }
+ LaTeXArgMap::const_iterator iit = postcommandargs_.begin();
+ for (; iit != postcommandargs_.end(); ++iit) {
+ if (!(*iit).second.mandatory)
+ ++nr;
+ }
+ return nr;
}
-docstring const Layout::babelpreamble(Language const * lang,
- Encoding const & enc, bool const polyglossia) const
+int Layout::requiredArgs() const
{
- return i18npreamble(lang, enc, babelpreamble_, polyglossia);
+ int nr = 0;
+ LaTeXArgMap::const_iterator it = latexargs_.begin();
+ for (; it != latexargs_.end(); ++it) {
+ if ((*it).second.mandatory)
+ ++nr;
+ }
+ LaTeXArgMap::const_iterator iit = postcommandargs_.begin();
+ for (; iit != postcommandargs_.end(); ++iit) {
+ if (!(*iit).second.mandatory)
+ ++nr;
+ }
+ return nr;
}
string const & Layout::htmllabeltag() const
{
if (htmllabeltag_.empty()) {
- if (labeltype != LABEL_TOP_ENVIRONMENT &&
- labeltype != LABEL_CENTERED_TOP_ENVIRONMENT)
+ if (labeltype != LABEL_ABOVE &&
+ labeltype != LABEL_CENTERED)
htmllabeltag_ = "span";
else
htmllabeltag_ = "div";
}
-docstring Layout::htmlstyle() const {
+docstring Layout::htmlstyle() const
+{
if (!htmlstyle_.empty() && !htmlforcecss_)
return htmlstyle_;
if (htmldefaultstyle_.empty())
d = from_ascii("lyx_");
else
d += '_';
- } else if (islower(c))
+ } else if (isLower(c))
d += c;
else
// this is slow, so do it only if necessary
namespace {
- string makeMarginValue(char const * side, double d) {
- ostringstream os;
- os << "margin-" << side << ": " << d << "ex;\n";
- return os.str();
- }
+
+string makeMarginValue(char const * side, double d)
+{
+ ostringstream os;
+ os << "margin-" << side << ": " << d << "ex;\n";
+ return os.str();
+}
+
}
-void Layout::makeDefaultCSS() const {
+void Layout::makeDefaultCSS() const
+{
// this never needs to be redone, since reloading layouts will
// wipe out what we did before.
if (!htmldefaultstyle_.empty())
// label font
if (labelfont != font)
labelCSS = labelfont.asCSS() + from_ascii("\n");
- if (labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)
+ if (labeltype == LABEL_CENTERED)
labelCSS += from_ascii("text-align: center;\n");
if (!labelCSS.empty())