#include "FloatList.h"
#include "FuncStatus.h"
#include "gettext.h"
-#include "Color.h"
+#include "Language.h"
#include "LaTeXFeatures.h"
#include "Lexer.h"
#include "FuncRequest.h"
#include "MetricsInfo.h"
+#include "ParagraphParameters.h"
#include "frontends/FontMetrics.h"
#include "frontends/Painter.h"
namespace lyx {
-using graphics::PreviewLoader;
-
using std::endl;
-using std::string;
using std::max;
-using std::min;
using std::ostream;
+using std::string;
InsetCollapsable::CollapseStatus InsetCollapsable::status() const
{
switch (decoration()) {
case Classic:
- if (status_ == Open || autoOpen_) {
+ if (status() == Open) {
if (openinlined_)
return LeftButton;
else
return ButtonOnly;
case Minimalistic:
- return NoButton;
+ return status() == Open ? NoButton : ButtonOnly ;
case Conglomerate:
- return status_ == Open ? SubLabel : Corners;
+ return status() == Open ? SubLabel : Corners ;
}
// dummy return value to shut down a warning,
{
setAutoBreakRows(true);
setDrawFrame(true);
- setFrameColor(Color::collapsableframe);
- setButtonLabel();
- // Fallback for lacking inset layout item
- layout_.bgcolor = Color::background;
+ setFrameColor(Color_collapsableframe);
}
status_(rhs.status_),
openinlined_(rhs.openinlined_),
autoOpen_(rhs.autoOpen_),
- textdim_(rhs.textdim_),
// the sole purpose of this copy constructor
mouse_hover_(false)
{
void InsetCollapsable::setLayout(BufferParams const & bp)
{
+ // FIXME: put this in the InsetLayout parsing?
+ // Fallback for lacking inset layout background
+ layout_.bgcolor = Color_background;
+
layout_ = getLayout(bp);
+
+ // FIXME: put this in the InsetLayout parsing?
+ layout_.labelfont.realize(sane_font);
+
+ setButtonLabel();
}
if (!token_found)
status_ = isOpen() ? Open : Collapsed;
- setButtonLabel();
+ setLayout(buf.params());
+
+ // Force default font, if so requested
+ // This avoids paragraphs in buffer language that would have a
+ // foreign language after a document language change, and it ensures
+ // that all new text in ERT and similar gets the "latex" language,
+ // since new text inherits the language from the last position of the
+ // existing text. As a side effect this makes us also robust against
+ // bugs in LyX that might lead to font changes in ERT in .lyx files.
+ resetParagraphsFont();
}
}
-bool InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
{
autoOpen_ = mi.base.bv->cursor().isInside(this);
- mi.base.textwidth -= (int) (1.5 * TEXT_TO_INSET_OFFSET);
- switch (decoration()) {
- case Minimalistic:
+ FontInfo tmpfont = mi.base.font;
+ mi.base.font = layout_.font;
+ mi.base.font.realize(tmpfont);
+
+ switch (geometry()) {
+ case NoButton:
InsetText::metrics(mi, dim);
break;
- case Conglomerate:
+ case Corners:
InsetText::metrics(mi, dim);
- if (status() == Open) {
- // consider width of the inset label
- Font font(layout_.labelfont);
- font.realize(Font(Font::ALL_SANE));
- font.decSize();
- font.decSize();
- int w = 0;
- int a = 0;
- int d = 0;
- docstring s = layout_.labelstring;
- theFontMetrics(font).rectText(s, w, a, d);
- dim.wid = max(dim.wid, w);
- }
- if (status() == Open)
- dim.des += ascent();
- else {
- dim.des -= 3;
- dim.asc -= 3;
- }
+ dim.des -= 3;
+ dim.asc -= 1;
break;
- case Classic:
+ case SubLabel: {
+ InsetText::metrics(mi, dim);
+ // consider width of the inset label
+ FontInfo font(layout_.labelfont);
+ font.realize(sane_font);
+ font.decSize();
+ font.decSize();
+ int w = 0;
+ int a = 0;
+ int d = 0;
+ docstring s = layout_.labelstring;
+ theFontMetrics(font).rectText(s, w, a, d);
+ dim.des += a + d;
+ break;
+ }
+ case TopButton:
+ case LeftButton:
+ case ButtonOnly:
dim = dimensionCollapsed();
if (geometry() == TopButton
|| geometry() == LeftButton) {
- InsetText::metrics(mi, textdim_);
- // This expression should not contain mi.base.texwidth
- openinlined_ = !hasFixedWidth()
- && textdim_.wid < 0.5 * mi.base.bv->workWidth();
+ Dimension textdim;
+ InsetText::metrics(mi, textdim);
+ openinlined_ = (textdim.wid + dim.wid) < mi.base.textwidth;
if (openinlined_) {
- // Correct for button width, and re-fit
- mi.base.textwidth -= dim.wid;
- InsetText::metrics(mi, textdim_);
- dim.wid += textdim_.wid;
- dim.des = max(dim.des - textdim_.asc + dim.asc, textdim_.des);
- dim.asc = textdim_.asc;
+ // Correct for button width.
+ dim.wid += textdim.wid;
+ dim.des = max(dim.des - textdim.asc + dim.asc, textdim.des);
+ dim.asc = textdim.asc;
} else {
- dim.des += textdim_.height() + TEXT_TO_BOTTOM_OFFSET;
- dim.wid = max(dim.wid, textdim_.wid);
- if (hasFixedWidth())
- dim.wid = max(dim.wid, mi.base.textwidth);
+ dim.des += textdim.height() + TEXT_TO_INSET_OFFSET;
+ dim.wid = max(dim.wid, textdim.wid);
}
}
break;
}
- dim.asc += TEXT_TO_INSET_OFFSET;
- dim.des += TEXT_TO_INSET_OFFSET;
- dim.wid += (int) (1.5 * TEXT_TO_INSET_OFFSET);
- mi.base.textwidth += (int) (1.5 * TEXT_TO_INSET_OFFSET);
- bool const changed = dim_ != dim;
- dim_ = dim;
- return changed;
+
+ mi.base.font = tmpfont;
}
void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
{
autoOpen_ = pi.base.bv->cursor().isInside(this);
- text_.background_color_ = backgroundColor();
- const int xx = x + TEXT_TO_INSET_OFFSET;
+ ColorCode const old_color = pi.background_color;
+ pi.background_color = backgroundColor();
+
+ FontInfo tmpfont = pi.base.font;
+ pi.base.font = layout_.font;
+ pi.base.font.realize(tmpfont);
// Draw button first -- top, left or only
Dimension dimc = dimensionCollapsed();
- int const top = y - ascent() + TEXT_TO_INSET_OFFSET;
- if (decoration() == Classic) {
- button_dim.x1 = xx + 0;
- button_dim.x2 = xx + dimc.width();
- button_dim.y1 = top;
- button_dim.y2 = top + dimc.height();
-
- pi.pain.buttonText(xx, top + dimc.asc, layout_.labelstring, layout_.labelfont, mouse_hover_);
+
+ if (geometry() == TopButton ||
+ geometry() == LeftButton ||
+ geometry() == ButtonOnly) {
+ button_dim.x1 = x + 0;
+ button_dim.x2 = x + dimc.width();
+ button_dim.y1 = y - dimc.asc;
+ button_dim.y2 = y + dimc.des;
+
+ pi.pain.buttonText(x, y, layout_.labelstring, layout_.labelfont, mouse_hover_);
+ } else {
+ button_dim.x1 = 0;
+ button_dim.y1 = 0;
+ button_dim.x2 = 0;
+ button_dim.y2 = 0;
}
+ Dimension const textdim = InsetText::dimension(*pi.base.bv);
+ int const baseline = y;
int textx, texty;
switch (geometry()) {
case LeftButton:
- textx = xx + dimc.width();
- texty = top + textdim_.asc;
+ textx = x + dimc.width();
+ texty = baseline;
InsetText::draw(pi, textx, texty);
break;
case TopButton:
- textx = xx;
- texty = top + dimc.height() + textdim_.asc;
+ textx = x;
+ texty = baseline + dimc.des + textdim.asc;
InsetText::draw(pi, textx, texty);
break;
case ButtonOnly:
break;
case NoButton:
- textx = xx;
- texty = y + textdim_.asc;
+ textx = x;
+ texty = baseline;
InsetText::draw(pi, textx, texty);
break;
case SubLabel:
case Corners:
- textx = xx;
- texty = y + textdim_.asc;
+ textx = x;
+ texty = baseline;
const_cast<InsetCollapsable *>(this)->setDrawFrame(false);
InsetText::draw(pi, textx, texty);
const_cast<InsetCollapsable *>(this)->setDrawFrame(true);
- int desc = InsetText::descent();
- if (status() == Open)
- desc -= ascent();
- else
+ int desc = textdim.descent();
+ if (geometry() == Corners)
desc -= 3;
- pi.pain.line(x, y + desc - 4, x, y + desc,
+ const int xx1 = x + TEXT_TO_INSET_OFFSET - 1;
+ const int xx2 = x + textdim.wid - TEXT_TO_INSET_OFFSET + 1;
+ pi.pain.line(xx1, y + desc - 4,
+ xx1, y + desc,
layout_.labelfont.color());
if (internalStatus() == Open)
- pi.pain.line(x, y + desc,
- x + dim_.wid - 3, y + desc,
+ pi.pain.line(xx1, y + desc,
+ xx2, y + desc,
layout_.labelfont.color());
else {
// Make status_ value visible:
- pi.pain.line(x, y + desc,
- x + 4, y + desc,
+ pi.pain.line(xx1, y + desc,
+ xx1 + 4, y + desc,
layout_.labelfont.color());
- pi.pain.line(x + dim_.wid - 7, y + desc,
- x + dim_.wid -3, y + desc,
+ pi.pain.line(xx2 - 4, y + desc,
+ xx2, y + desc,
layout_.labelfont.color());
}
- pi.pain.line(x + dim_.wid - 3, y + desc, x + dim_.wid - 3, y + desc - 4,
+ pi.pain.line(x + textdim.wid - 3, y + desc, x + textdim.wid - 3, y + desc - 4,
layout_.labelfont.color());
- // the label of the charstyle. Can be toggled.
- if (status() == Open) {
- Font font(layout_.labelfont);
- font.realize(Font(Font::ALL_SANE));
+ // the label below the text. Can be toggled.
+ if (geometry() == SubLabel) {
+ FontInfo font(layout_.labelfont);
+ font.realize(sane_font);
font.decSize();
font.decSize();
int w = 0;
int a = 0;
int d = 0;
- // FIXME UNICODE
docstring s = layout_.labelstring;
theFontMetrics(font).rectText(s, w, a, d);
- pi.pain.rectText(x + (dim_.wid - w) / 2, y + desc + a,
- s, font, Color::none, Color::none);
+ int const ww = max(textdim.wid, w);
+ pi.pain.rectText(x + (ww - w) / 2, y + desc + a,
+ s, font, Color_none, Color_none);
+ desc += d;
}
// a visual cue when the cursor is inside the inset
Cursor & cur = pi.base.bv->cursor();
if (cur.isInside(this)) {
- y -= ascent();
+ y -= textdim.asc;
y += 3;
- pi.pain.line(x, y + 4, x, y, layout_.labelfont.color());
- pi.pain.line(x + 4, y, x, y, layout_.labelfont.color());
- pi.pain.line(x + dim_.wid - 3, y + 4, x + dim_.wid - 3, y,
+ pi.pain.line(xx1, y + 4, xx1, y, layout_.labelfont.color());
+ pi.pain.line(xx1 + 4, y, xx1, y, layout_.labelfont.color());
+ pi.pain.line(xx2, y + 4, xx2, y,
layout_.labelfont.color());
- pi.pain.line(x + dim_.wid - 7, y, x + dim_.wid - 3, y,
+ pi.pain.line(xx2 - 4, y, xx2, y,
layout_.labelfont.color());
}
break;
}
- setPosCache(pi, x, y);
-}
-
+ pi.background_color = old_color;
-void InsetCollapsable::drawSelection(PainterInfo & pi, int x, int y) const
-{
- x += TEXT_TO_INSET_OFFSET;
- switch (geometry()) {
- case LeftButton:
- x += dimensionCollapsed().wid;
- InsetText::drawSelection(pi, x, y);
- break;
- case TopButton:
- y += dimensionCollapsed().des + textdim_.asc;
- InsetText::drawSelection(pi, x, y);
- break;
- case ButtonOnly:
- break;
- case NoButton:
- case SubLabel:
- case Corners:
- InsetText::drawSelection(pi, x, y);
- break;
- }
+ pi.base.font = tmpfont;
}
void InsetCollapsable::cursorPos(BufferView const & bv,
CursorSlice const & sl, bool boundary, int & x, int & y) const
{
+ if (geometry() == ButtonOnly)
+ status_ = Open;
BOOST_ASSERT(geometry() != ButtonOnly);
InsetText::cursorPos(bv, sl, boundary, x, y);
+ Dimension const textdim = InsetText::dimension(bv);
switch (geometry()) {
case LeftButton:
x += dimensionCollapsed().wid;
break;
- case TopButton:
- y += dimensionCollapsed().height() - ascent()
- + TEXT_TO_INSET_OFFSET + textdim_.asc;
+ case TopButton: {
+ y += dimensionCollapsed().des + textdim.asc;
break;
+ }
case NoButton:
case SubLabel:
case Corners:
// Cannot get here
break;
}
- x += TEXT_TO_INSET_OFFSET;
}
docstring label;
pos_type const max_length = 15;
pos_type const p_siz = paragraphs().begin()->size();
- pos_type const n = min(max_length, p_siz);
+ pos_type const n = std::min(max_length, p_siz);
pos_type i = 0;
pos_type j = 0;
for (; i < n && j < p_siz; ++j) {
//lyxerr << "InsetCollapsable: edit xy" << endl;
if (geometry() == ButtonOnly
|| (button_dim.contains(x, y)
- && decoration() != Minimalistic))
+ && geometry() != NoButton))
return this;
cur.push(*this);
return InsetText::editXY(cur, x, y);
case LFUN_MOUSE_PRESS:
if (cmd.button() == mouse_button::button1
&& hitButton(cmd)
- && decoration() != Minimalistic) {
+ && geometry() != NoButton) {
// reset selection if necessary (see bug 3060)
if (cur.selection())
cur.bv().cursor().clearSelection();
cur.dispatched();
break;
}
- if (decoration() == Minimalistic)
+ if (geometry() == NoButton)
InsetText::doDispatch(cur, cmd);
else if (geometry() != ButtonOnly
&& !hitButton(cmd))
case LFUN_MOUSE_MOTION:
case LFUN_MOUSE_DOUBLE:
case LFUN_MOUSE_TRIPLE:
- if (decoration() == Minimalistic)
+ if (geometry() == NoButton)
InsetText::doDispatch(cur, cmd);
else if (geometry() != ButtonOnly
&& !hitButton(cmd))
case LFUN_MOUSE_RELEASE:
if (cmd.button() == mouse_button::button3) {
- if (decoration() == Conglomerate) {
+ // There is no button to right click:
+ if (geometry() == Corners ||
+ geometry() == SubLabel ||
+ geometry() == NoButton) {
if (internalStatus() == Open)
setStatus(cur, Collapsed);
else
}
}
- if (decoration() == Minimalistic) {
+ if (geometry() == NoButton) {
// The mouse click has to be within the inset!
InsetText::doDispatch(cur, cmd);
break;
cur.dispatched();
break;
+ case LFUN_PASTE:
+ case LFUN_CLIPBOARD_PASTE:
+ case LFUN_PRIMARY_SELECTION_PASTE: {
+ InsetText::doDispatch(cur, cmd);
+ // Since we can only store plain text, we must reset all
+ // attributes.
+ // FIXME: Change only the pasted paragraphs
+
+ resetParagraphsFont();
+ break;
+ }
+
default:
+ if (layout_.forceltr) {
+ // Force any new text to latex_language
+ // FIXME: This should only be necessary in constructor, but
+ // new paragraphs that are created by pressing enter at the
+ // start of an existing paragraph get the buffer language
+ // and not latex_language, so we take this brute force
+ // approach.
+ cur.current_font.setLanguage(latex_language);
+ cur.real_current_font.setLanguage(latex_language);
+ }
InsetText::doDispatch(cur, cmd);
break;
}
}
+bool InsetCollapsable::allowMultiPar() const
+{
+ return layout_.multipar;
+}
+
+
+void InsetCollapsable::resetParagraphsFont()
+{
+ Font font;
+ font.fontInfo() = sane_font;
+ if (layout_.forceltr)
+ font.setLanguage(latex_language);
+ if (layout_.passthru) {
+ ParagraphList::iterator par = paragraphs().begin();
+ ParagraphList::iterator const end = paragraphs().end();
+ while (par != end) {
+ par->resetFonts(font);
+ par->params().clear();
+ ++par;
+ }
+ }
+}
+
+
bool InsetCollapsable::getStatus(Cursor & cur, FuncRequest const & cmd,
FuncStatus & flag) const
{
switch (cmd.action) {
+ // suppress these
+ case LFUN_ACCENT_ACUTE:
+ case LFUN_ACCENT_BREVE:
+ case LFUN_ACCENT_CARON:
+ case LFUN_ACCENT_CEDILLA:
+ case LFUN_ACCENT_CIRCLE:
+ case LFUN_ACCENT_CIRCUMFLEX:
+ case LFUN_ACCENT_DOT:
+ case LFUN_ACCENT_GRAVE:
+ case LFUN_ACCENT_HUNGARIAN_UMLAUT:
+ case LFUN_ACCENT_MACRON:
+ case LFUN_ACCENT_OGONEK:
+ case LFUN_ACCENT_SPECIAL_CARON:
+ case LFUN_ACCENT_TIE:
+ case LFUN_ACCENT_TILDE:
+ case LFUN_ACCENT_UMLAUT:
+ case LFUN_ACCENT_UNDERBAR:
+ case LFUN_ACCENT_UNDERDOT:
+ case LFUN_APPENDIX:
+ case LFUN_BIBITEM_INSERT:
+ case LFUN_BOX_INSERT:
+ case LFUN_BRANCH_INSERT:
+ case LFUN_BREAK_LINE:
+ case LFUN_CAPTION_INSERT:
+ case LFUN_CLEARPAGE_INSERT:
+ case LFUN_CLEARDOUBLEPAGE_INSERT:
+ case LFUN_DEPTH_DECREMENT:
+ case LFUN_DEPTH_INCREMENT:
+ case LFUN_DOTS_INSERT:
+ case LFUN_END_OF_SENTENCE_PERIOD_INSERT:
+ case LFUN_ENVIRONMENT_INSERT:
+ case LFUN_ERT_INSERT:
+ case LFUN_FILE_INSERT:
+ case LFUN_FLEX_INSERT:
+ case LFUN_FLOAT_INSERT:
+ case LFUN_FLOAT_LIST:
+ case LFUN_FLOAT_WIDE_INSERT:
+ case LFUN_FONT_BOLD:
+ case LFUN_FONT_TYPEWRITER:
+ case LFUN_FONT_DEFAULT:
+ case LFUN_FONT_EMPH:
+ case LFUN_FONT_FREE_APPLY:
+ case LFUN_FONT_FREE_UPDATE:
+ case LFUN_FONT_NOUN:
+ case LFUN_FONT_ROMAN:
+ case LFUN_FONT_SANS:
+ case LFUN_FONT_FRAK:
+ case LFUN_FONT_ITAL:
+ case LFUN_FONT_SIZE:
+ case LFUN_FONT_STATE:
+ case LFUN_FONT_UNDERLINE:
+ case LFUN_FOOTNOTE_INSERT:
+ case LFUN_HFILL_INSERT:
+ case LFUN_HYPERLINK_INSERT:
+ case LFUN_HYPHENATION_POINT_INSERT:
+ case LFUN_INDEX_INSERT:
+ case LFUN_INDEX_PRINT:
+ case LFUN_INSET_INSERT:
+ case LFUN_LABEL_GOTO:
+ case LFUN_LABEL_INSERT:
+ case LFUN_LIGATURE_BREAK_INSERT:
+ case LFUN_LINE_INSERT:
+ case LFUN_PAGEBREAK_INSERT:
+ case LFUN_LAYOUT:
+ case LFUN_LAYOUT_PARAGRAPH:
+ case LFUN_LAYOUT_TABULAR:
+ case LFUN_MARGINALNOTE_INSERT:
+ case LFUN_MATH_DISPLAY:
+ case LFUN_MATH_INSERT:
+ case LFUN_MATH_MATRIX:
+ case LFUN_MATH_MODE:
+ case LFUN_MENU_OPEN:
+ case LFUN_MENU_SEPARATOR_INSERT:
+ case LFUN_NOACTION:
+ case LFUN_NOMENCL_INSERT:
+ case LFUN_NOMENCL_PRINT:
+ case LFUN_NOTE_INSERT:
+ case LFUN_NOTE_NEXT:
+ case LFUN_OPTIONAL_INSERT:
+ case LFUN_PARAGRAPH_PARAMS:
+ case LFUN_PARAGRAPH_PARAMS_APPLY:
+ case LFUN_PARAGRAPH_SPACING:
+ case LFUN_PARAGRAPH_UPDATE:
+ case LFUN_REFERENCE_NEXT:
+ case LFUN_SERVER_GOTO_FILE_ROW:
+ case LFUN_SERVER_NOTIFY:
+ case LFUN_SERVER_SET_XY:
+ case LFUN_SPACE_INSERT:
+ case LFUN_TABULAR_INSERT:
+ case LFUN_TOC_INSERT:
+ case LFUN_WRAP_INSERT:
+ if (layout_.passthru) {
+ flag.enabled(false);
+ return true;
+ } else
+ return InsetText::getStatus(cur, cmd, flag);
case LFUN_INSET_TOGGLE:
if (cmd.argument() == "open" || cmd.argument() == "close" ||
flag.enabled(false);
return true;
+ case LFUN_LANGUAGE:
+ flag.enabled(!layout_.forceltr);
+ return InsetText::getStatus(cur, cmd, flag);
+
+ case LFUN_BREAK_PARAGRAPH:
+ case LFUN_BREAK_PARAGRAPH_SKIP:
+ flag.enabled(layout_.multipar);
+ return true;
+
default:
return InsetText::getStatus(cur, cmd, flag);
}
}
-void InsetCollapsable::setLabelFont(Font const & font)
-{
- layout_.labelfont = font;
-}
-
docstring InsetCollapsable::floatName(string const & type, BufferParams const & bp) const
{
FloatList const & floats = bp.getTextClass().floats();
return Minimalistic;
if (layout_.decoration == "conglomerate")
return Conglomerate;
- if (name() == from_ascii("CharStyle"))
+ if (name() == from_ascii("Flex"))
return Conglomerate;
return Classic;
}
if (!layout_.latexname.empty()) {
if (layout_.latextype == "command") {
// FIXME UNICODE
+ if (runparams.moving_arg)
+ os << "\\protect";
os << '\\' << from_utf8(layout_.latexname);
if (!layout_.latexparam.empty())
os << from_utf8(layout_.latexparam);
os << from_utf8(layout_.latexparam);
}
}
- int i = InsetText::latex(buf, os, runparams);
- if (!layout_.latexname.empty())
+ OutputParams rp = runparams;
+ if (layout_.passthru)
+ rp.verbatim = true;
+ if (layout_.needprotect)
+ rp.moving_arg = true;
+ int i = InsetText::latex(buf, os, rp);
+ if (!layout_.latexname.empty()) {
if (layout_.latextype == "command") {
os << "}";
} else if (layout_.latextype == "environment") {
os << "\n\\end{" << from_utf8(layout_.latexname) << "}\n";
i += 4;
}
+ }
return i;
}
void InsetCollapsable::validate(LaTeXFeatures & features) const
{
// Force inclusion of preamble snippet in layout file
- features.addPreambleSnippet(layout_.preamble);
+ features.require(layout_.name);
InsetText::validate(features);
}
projects / lyx.git / blobdiff