#include "FloatList.h"
#include "Layout.h"
#include "LayoutFile.h"
-#include "Lexer.h"
#include "ModuleList.h"
#include "frontends/alert.h"
#include "support/FileName.h"
#include "support/filetools.h"
#include "support/gettext.h"
+#include "support/Lexer.h"
#include "support/lstrings.h"
#include "support/os.h"
#include "support/TempFile.h"
// You should also run the development/tools/updatelayouts.py script,
// to update the format of all of our layout files.
//
-int const LAYOUT_FORMAT = 95; // tcuvelier: DocBookRenderAsImage
+int const LAYOUT_FORMAT = 105; // spitz: ParskipHalf and ParskipFull class options
// Layout format for the current lyx file format. Controls which format is
opt_enginetype_("authoryear|numerical"), opt_fontsize_("10|11|12"),
opt_pagesize_("default|a4|a5|b5|letter|legal|executive"),
opt_pagestyle_("empty|plain|headings|fancy"), fontsize_format_("$$spt"), pagesize_("default"),
- pagesize_format_("$$spaper"), pagestyle_("default"), tablestyle_("default"),
- docbookroot_("article"), docbookforceabstract_(false),
+ pagesize_format_("$$spaper"), pagestyle_("default"), parskip_full_(""), parskip_half_(""),
+ tablestyle_("default"), docbookroot_("article"), docbookforceabstract_(false),
columns_(1), sides_(OneSide), secnumdepth_(3), tocdepth_(3), outputType_(LATEX),
outputFormat_("latex"), has_output_format_(false), defaultfont_(sane_font),
titletype_(TITLE_COMMAND_AFTER), titlename_("maketitle"),
case TC_PKGOPTS : {
lexrc.next();
string const pkg = lexrc.getString();
- lexrc.next();
+ lexrc.eatLine();
string const options = lexrc.getString();
- package_options_[pkg] = options;
+ package_options_[pkg] = trim(options, "\"");
break;
}
error = !readOutlinerName(lexrc);
break;
- case TC_TABLESTYLE:
+ case TC_TABLESTYLE:
lexrc.next();
tablestyle_ = rtrim(lexrc.getString());
break;
CO_PAGESIZE,
CO_PAGESIZE_FORMAT,
CO_PAGESTYLE,
+ CO_PARSKIP_FULL,
+ CO_PARSKIP_HALF,
CO_OTHER,
CO_END
};
{"other", CO_OTHER },
{"pagesize", CO_PAGESIZE },
{"pagesizeformat", CO_PAGESIZE_FORMAT },
- {"pagestyle", CO_PAGESTYLE }
+ {"pagestyle", CO_PAGESTYLE },
+ {"parskipfull", CO_PARSKIP_FULL },
+ {"parskiphalf", CO_PARSKIP_HALF }
};
lexrc.pushTable(classOptionsTags);
lexrc.next();
opt_pagestyle_ = rtrim(lexrc.getString());
break;
+ case CO_PARSKIP_FULL:
+ lexrc.next();
+ parskip_full_ = rtrim(lexrc.getString());
+ break;
+ case CO_PARSKIP_HALF:
+ lexrc.next();
+ parskip_half_ = rtrim(lexrc.getString());
+ break;
case CO_OTHER:
lexrc.next();
if (options_.empty())
FT_ALLOWS_SIDEWAYS,
FT_ALLOWS_WIDE,
FT_REQUIRES,
+ FT_PRETTYFORMAT,
FT_END
};
{ "listname", FT_LISTNAME },
{ "numberwithin", FT_WITHIN },
{ "placement", FT_PLACEMENT },
+ { "prettyformat", FT_PRETTYFORMAT },
{ "refprefix", FT_REFPREFIX },
{ "requires", FT_REQUIRES },
{ "style", FT_STYLE },
string type;
string within;
string required;
+ docstring prettyformat;
bool usesfloat = true;
bool ispredefined = false;
bool allowswide = true;
lexrc.next();
htmltag = lexrc.getString();
break;
+ case FT_PRETTYFORMAT:
+ lexrc.next();
+ prettyformat = lexrc.getDocString();
+ break;
case FT_DOCBOOKATTR:
lexrc.next();
docbookattr = lexrc.getString();
// each float has its own counter
counters_.newCounter(from_ascii(type), from_ascii(within),
docstring(), docstring(),
+ prettyformat.empty() ? bformat(_("%1$s ##"), _(name)) : prettyformat,
bformat(_("%1$s (Float)"), _(name)));
// also define sub-float counters
docstring const subtype = "sub-" + from_ascii(type);
counters_.newCounter(subtype, from_ascii(type),
"\\alph{" + subtype + "}", docstring(),
- bformat(_("Sub-%1$s (Float)"), _(name)));
+ prettyformat.empty() ? bformat(_("Sub-%1$s ##"), _(name)) : prettyformat,
+ bformat(_("Sub-%1$s (Float)"), _(name)));
}
return getout;
}