#include "output_xhtml.h"
#include "Paragraph.h"
#include "ParIterator.h"
-#include "sgml.h"
+#include "xml.h"
#include "TexRow.h"
#include "TextClass.h"
#include "TextPainter.h"
// writes a preamble for underlined or struck out math display
void writeMathdisplayPreamble(WriteStream & os)
{
- if (os.strikeoutMath()) {
- if (os.ulemCmd() == WriteStream::UNDERLINE)
- os << "\\raisebox{-\\belowdisplayshortskip}{"
- "\\lyxmathsout{\\parbox[b]{\\linewidth}{";
- else
- os << "\\lyxmathsout{\\parbox{\\linewidth}{";
- } else if (os.ulemCmd() == WriteStream::UNDERLINE)
+ if (os.strikeoutMath())
+ return;
+
+ if (os.ulemCmd() == WriteStream::UNDERLINE)
os << "\\raisebox{-\\belowdisplayshortskip}{"
"\\parbox[b]{\\linewidth}{";
else if (os.ulemCmd() == WriteStream::STRIKEOUT)
// writes a postamble for underlined or struck out math display
void writeMathdisplayPostamble(WriteStream & os)
{
- if (os.strikeoutMath()) {
- if (os.ulemCmd() == WriteStream::UNDERLINE)
- os << "}";
- os << "}}\\\\\n";
- } else if (os.ulemCmd() == WriteStream::UNDERLINE)
+ if (os.strikeoutMath())
+ return;
+
+ if (os.ulemCmd() == WriteStream::UNDERLINE)
os << "}}\\\\\n";
else if (os.ulemCmd() == WriteStream::STRIKEOUT)
os << "}\\\\\n";
static InsetLabel * dummy_pointer = 0;
InsetMathHull::InsetMathHull(Buffer * buf)
- : InsetMathGrid(buf, 1, 1), type_(hullNone), numbered_(1, NUMBER),
+ : InsetMathGrid(buf, 1, 1), type_(hullNone), numbered_(1, NONUMBER),
numbers_(1, empty_docstring()), label_(1, dummy_pointer),
preview_(new RenderPreview(this))
{
InsetMathHull::InsetMathHull(Buffer * buf, HullType type)
- : InsetMathGrid(buf, getCols(type), 1), type_(type), numbered_(1, NUMBER),
+ : InsetMathGrid(buf, getCols(type), 1), type_(type), numbered_(1, NONUMBER),
numbers_(1, empty_docstring()), label_(1, dummy_pointer),
preview_(new RenderPreview(this))
{
} // namespace
-void InsetMathHull::updateBuffer(ParIterator const & it, UpdateType utype)
+void InsetMathHull::updateBuffer(ParIterator const & it, UpdateType utype, bool const deleted)
{
if (!buffer_) {
//FIXME: buffer_ should be set at creation for this inset! Problem is
// now the labels
for (size_t i = 0; i != label_.size(); ++i) {
if (label_[i])
- label_[i]->updateBuffer(it, utype);
+ label_[i]->updateBuffer(it, utype, deleted);
}
// pass down
- InsetMathGrid::updateBuffer(it, utype);
+ InsetMathGrid::updateBuffer(it, utype, deleted);
}
namespace {
const int ERROR_FRAME_WIDTH = 2;
-bool previewTooSmall(MetricsBase const & mb, Dimension const & dim)
+bool previewTooSmall(Dimension const & dim)
{
- // Value was hardcoded to 10 pixels
- int const minval = mb.bv->zoomedPixels(10);
- return dim.width() <= minval && dim.height() <= minval;
+ return dim.width() <= 10 && dim.height() <= 10;
}
}
if (previewState(mi.base.bv)) {
preview_->metrics(mi, dim);
- if (previewTooSmall(mi.base, dim)) {
+ if (previewTooSmall(dim)) {
// preview image is too small
dim.wid += 2 * ERROR_FRAME_WIDTH;
dim.asc += 2 * ERROR_FRAME_WIDTH;
return;
}
- Changer dummy1 = mi.base.changeFontSet(standardFont());
- Changer dummy2 = mi.base.font.changeStyle(display() ? LM_ST_DISPLAY
- : LM_ST_TEXT);
-
- // let the cells adjust themselves
- InsetMathGrid::metrics(mi, dim);
+ {
+ Changer dummy1 = mi.base.changeFontSet(standardFont());
+ Changer dummy2 = mi.base.font.changeStyle(display() ? DISPLAY_STYLE
+ : TEXT_STYLE);
- if (display()) {
- dim.asc += display_margin;
- dim.des += display_margin;
+ // let the cells adjust themselves
+ InsetMathGrid::metrics(mi, dim);
}
+ // Check whether the numbering interferes with the equations
if (numberedType()) {
- Changer dummy = mi.base.changeFontSet("mathrm");
- int l = 0;
- for (row_type row = 0; row < nrows(); ++row)
- l = max(l, mathed_string_width(mi.base.font, nicelabel(row)));
+ BufferParams::MathNumber const math_number = buffer().params().getMathNumber();
+ int extra_offset = 0;
+ for (row_type row = 0; row < nrows(); ++row) {
+ rowinfo(row).offset[mi.base.bv] += extra_offset;
+ if (!numbered(row))
+ continue;
+ docstring const nl = nicelabel(row);
+ Dimension dimnl;
+ mathed_string_dim(mi.base.font, nl, dimnl);
+ int const ind = indent(*mi.base.bv);
+ int const x = ind ? ind : (mi.base.textwidth - dim.wid) / 2;
+ // for some reason metrics does not trigger at the
+ // same point as draw, and therefore we use >= instead of >
+ if ((math_number == BufferParams::LEFT && dimnl.wid >= x)
+ || (math_number == BufferParams::RIGHT
+ && dimnl.wid >= mi.base.textwidth - x - dim.wid)) {
+ extra_offset += dimnl.height();
+ }
+ }
+ dim.des += extra_offset;
+ }
+
- if (l)
- // Value was hardcoded to 30 pixels
- dim.wid += mi.base.bv->zoomedPixels(30) + l;
+ if (display()) {
+ dim.asc += display_margin;
+ dim.des += display_margin;
}
// reserve some space for marker.
BufferView const * const bv = pi.base.bv;
if (previewState(bv)) {
Dimension const dim = dimension(*pi.base.bv);
- if (previewTooSmall(pi.base, dim))
+ if (previewTooSmall(dim))
return Color_error;
return graphics::PreviewLoader::backgroundColor();
}
void InsetMathHull::drawBackground(PainterInfo & pi, int x, int y) const
{
Dimension const dim = dimension(*pi.base.bv);
- if (previewTooSmall(pi.base, dim)) {
+ if (previewTooSmall(dim)) {
pi.pain.fillRectangle(x, y - 2 * ERROR_FRAME_WIDTH,
dim.wid, dim.asc + dim.des, backgroundColor(pi));
return;
}
+ // If there are numbers, the margins around the (displayed)
+ // equation have to be cleared.
+ if (numberedType())
+ pi.pain.fillRectangle(pi.leftx, y - dim.asc,
+ pi.rightx - pi.leftx, dim.height(), pi.background_color);
pi.pain.fillRectangle(x + 1, y - dim.asc + 1, dim.wid - 2,
dim.asc + dim.des - 1, pi.backgroundColor(this));
}
if (previewState(bv)) {
// Do not draw change tracking cue if taken care of by RowPainter
// already.
- Changer dummy = !canPaintChange(*bv) ? make_change(pi.change_, Change())
+ Changer dummy = !canPaintChange(*bv) ? make_change(pi.change, Change())
: Changer();
- if (previewTooSmall(pi.base, dim)) {
+ if (previewTooSmall(dim)) {
// we have an extra frame
preview_->draw(pi, x + ERROR_FRAME_WIDTH, y);
} else {
return;
}
+ // First draw the numbers
ColorCode color = pi.selected && lyxrc.use_system_colors
? Color_selectiontext : standardColor();
bool const really_change_color = pi.base.font.color() == Color_none;
Changer dummy0 = really_change_color ? pi.base.font.changeColor(color)
: Changer();
- Changer dummy1 = pi.base.changeFontSet(standardFont());
- Changer dummy2 = pi.base.font.changeStyle(display() ? LM_ST_DISPLAY
- : LM_ST_TEXT);
-
- int xmath = x;
- BufferParams::MathNumber const math_number = buffer().params().getMathNumber();
- if (numberedType() && math_number == BufferParams::LEFT) {
- Changer dummy = pi.base.changeFontSet("mathrm");
- int l = 0;
- for (row_type row = 0; row < nrows(); ++row)
- l = max(l, mathed_string_width(pi.base.font, nicelabel(row)));
-
- if (l)
- // Value was hardcoded to 30 pixels
- xmath += pi.base.bv->zoomedPixels(30) + l;
- }
-
- InsetMathGrid::draw(pi, xmath + 1, y);
- drawMarkers(pi, x, y);
-
if (numberedType()) {
- Changer dummy = pi.base.changeFontSet("mathrm");
+ BufferParams::MathNumber const math_number = buffer().params().getMathNumber();
for (row_type row = 0; row < nrows(); ++row) {
- int const yy = y + rowinfo_[row].offset_;
+ int yy = y + rowinfo(row).offset[bv];
docstring const nl = nicelabel(row);
- if (math_number == BufferParams::LEFT)
- pi.draw(x, yy, nl);
- else {
- int l = mathed_string_width(pi.base.font, nl);
- pi.draw(x + dim.wid - l, yy, nl);
+ Dimension dimnl;
+ mathed_string_dim(pi.base.font, nl, dimnl);
+ if (math_number == BufferParams::LEFT) {
+ if (dimnl.wid > x - pi.leftx)
+ yy += rowinfo(row).descent + dimnl.asc;
+ pi.draw(pi.leftx, yy, nl);
+ } else {
+ if (dimnl.wid > pi.rightx - x - dim.wid)
+ yy += rowinfo(row).descent + dimnl.asc;
+ pi.draw(pi.rightx - dimnl.wid, yy, nl);
}
}
}
+ // Then the equations
+ Changer dummy1 = pi.base.changeFontSet(standardFont());
+ Changer dummy2 = pi.base.font.changeStyle(display() ? DISPLAY_STYLE
+ : TEXT_STYLE);
+ InsetMathGrid::draw(pi, x + 1, y);
+ drawMarkers(pi, x, y);
+
// drawing change line
- if (canPaintChange(*bv))
- pi.change_.paintCue(pi, x + 1, y + 1 - dim.asc,
- x + dim.wid, y + dim.des);
+ if (canPaintChange(*bv)) {
+ // like in metrics()
+ int const display_margin = display() ? pi.base.inPixels(Length(12, Length::PT)) : 0;
+ pi.change.paintCue(pi, x + 1, y + 1 - dim.asc + display_margin,
+ x + dim.wid, y + dim.des - display_margin);
+ }
}
+ bgcol + "}{\\ensuremath{\\mathtt{#1}}}}");
features.addPreambleSnippet(
from_ascii("\\newcommand{\\endregexp}{}"));
- } else if (outerDisplay() && features.inDeletedInset()
- && !features.mustProvide("ct-dvipost")) {
- features.require("ct-tikz-math-sout");
+ } else if (outerDisplay() && features.inDeletedInset()) {
+ features.require("tikz");
+ features.require("ct-tikz-object-sout");
}
// Validation is necessary only if not using AMS math.
}
+OutputParams::CtObject InsetMathHull::CtObject(OutputParams const & runparams) const
+{
+ OutputParams::CtObject res = OutputParams::CT_NORMAL;
+ switch(type_) {
+ case hullNone:
+ case hullSimple:
+ case hullAlignAt:
+ case hullXAlignAt:
+ case hullXXAlignAt:
+ case hullRegexp:
+ case hullUnknown:
+ break;
+
+ case hullEquation:
+ case hullEqnArray:
+ case hullAlign:
+ case hullFlAlign:
+ case hullGather:
+ case hullMultline: {
+ if (runparams.inulemcmd
+ && (!runparams.local_font || runparams.local_font->fontInfo().strikeout() != FONT_ON))
+ res = OutputParams::CT_UDISPLAYOBJECT;
+ else
+ res = OutputParams::CT_DISPLAYOBJECT;
+ break;
+ }
+ }
+ return res;
+}
+
+
void InsetMathHull::header_write(WriteStream & os) const
{
bool n = numberedType();
if (type_ == hullMultline) {
if (row + 1 == nrows()) {
numbered_[row] = NONUMBER;
- std::swap(label, label_[row]);
- std::swap(number, numbers_[row]);
+ swap(label, label_[row]);
+ swap(number, numbers_[row]);
} else
numbered = false;
}
return;
if (row + 1 == nrows())
--row;
- std::swap(numbered_[row], numbered_[row + 1]);
- std::swap(numbers_[row], numbers_[row + 1]);
- std::swap(label_[row], label_[row + 1]);
+ swap(numbered_[row], numbered_[row + 1]);
+ swap(numbers_[row], numbers_[row + 1]);
+ swap(label_[row], label_[row + 1]);
InsetMathGrid::swapRow(row);
}
if (nrows() <= 1 || !rowChangeOK())
return;
if (row + 1 == nrows() && type_ == hullMultline) {
- std::swap(numbered_[row - 1], numbered_[row]);
- std::swap(numbers_[row - 1], numbers_[row]);
- std::swap(label_[row - 1], label_[row]);
+ swap(numbered_[row - 1], numbered_[row]);
+ swap(numbers_[row - 1], numbers_[row]);
+ swap(label_[row - 1], label_[row]);
InsetMathGrid::delRow(row);
return;
}
docstring bname = name;
if (!label(0).empty())
- bname += " id='" + sgml::cleanID(buffer(), runparams, label(0)) + "'";
+ bname += " id='" + xml::cleanID(label(0)) + "'";
++ms.tab(); ms.cr(); ms.os() << '<' << bname << '>';
ms << from_ascii("<graphic fileref=\"eqn/");
if (!label(0).empty())
- ms << sgml::cleanID(buffer(), runparams, label(0));
+ ms << xml::cleanID(label(0));
else
- ms << sgml::uniqueID(from_ascii("anon"));
+ ms << xml::uniqueID(from_ascii("anon"));
if (runparams.flavor == OutputParams::XML)
ms << from_ascii("\"/>");
// this duplicates code from InsetMathGrid, but
// we need access here to number information,
// and we simply do not have that in InsetMathGrid.
-void InsetMathHull::mathmlize(MathStream & os) const
+void InsetMathHull::mathmlize(MathStream & ms) const
{
bool const havenumbers = haveNumbers();
bool const havetable = havenumbers || nrows() > 1 || ncols() > 1;
if (havetable)
- os << MTag("mtable");
+ ms << MTag("mtable");
char const * const celltag = havetable ? "mtd" : "mrow";
// FIXME There does not seem to be wide support at the moment
// for mlabeledtr, so we have to use just mtr for now.
char const * const rowtag = "mtr";
for (row_type row = 0; row < nrows(); ++row) {
if (havetable)
- os << MTag(rowtag);
+ ms << MTag(rowtag);
for (col_type col = 0; col < ncols(); ++col) {
- os << MTag(celltag)
+ ms << MTag(celltag)
<< cell(index(row, col))
<< ETag(celltag);
}
// fleqn?
if (havenumbers) {
- os << MTag("mtd");
+ ms << MTag("mtd");
docstring const & num = numbers_[row];
if (!num.empty())
- os << '(' << num << ')';
- os << ETag("mtd");
+ ms << '(' << num << ')';
+ ms << ETag("mtd");
}
if (havetable)
- os << ETag(rowtag);
+ ms << ETag(rowtag);
}
if (havetable)
- os << ETag("mtable");
+ ms << ETag("mtable");
}
}
-docstring InsetMathHull::xhtml(XHTMLStream & xs, OutputParams const & op) const
+docstring InsetMathHull::xhtml(XMLStream & xs, OutputParams const & op) const
{
BufferParams::MathOutput const mathtype =
buffer().masterBuffer()->params().html_math_output;
} catch (MathExportException const &) {}
if (success) {
if (getType() == hullSimple)
- xs << html::StartTag("math",
+ xs << xml::StartTag("math",
"xmlns=\"http://www.w3.org/1998/Math/MathML\"", true);
else
- xs << html::StartTag("math",
+ xs << xml::StartTag("math",
"display=\"block\" xmlns=\"http://www.w3.org/1998/Math/MathML\"", true);
- xs << XHTMLStream::ESCAPE_NONE
+ xs << XMLStream::ESCAPE_NONE
<< os.str()
- << html::EndTag("math");
+ << xml::EndTag("math");
}
} else if (mathtype == BufferParams::HTML) {
odocstringstream os;
} catch (MathExportException const &) {}
if (success) {
string const tag = (getType() == hullSimple) ? "span" : "div";
- xs << html::StartTag(tag, "class='formula'", true)
- << XHTMLStream::ESCAPE_NONE
+ xs << xml::StartTag(tag, "class='formula'", true)
+ << XMLStream::ESCAPE_NONE
<< os.str()
- << html::EndTag(tag);
+ << xml::EndTag(tag);
}
}
}
string const tag = (getType() == hullSimple) ? "span" : "div";
- xs << html::CR()
- << html::StartTag(tag, "style = \"text-align: center;\"")
- << html::CompTag("img", "src=\"" + filename + "\" alt=\"Mathematical Equation\"")
- << html::EndTag(tag)
- << html::CR();
+ xs << xml::CR()
+ << xml::StartTag(tag, "style = \"text-align: center;\"")
+ << xml::CompTag("img", "src=\"" + filename + "\" alt=\"Mathematical Equation\"")
+ << xml::EndTag(tag)
+ << xml::CR();
success = true;
}
}
// FIXME XHTML
// probably should allow for some kind of customization here
string const tag = (getType() == hullSimple) ? "span" : "div";
- xs << html::StartTag(tag, "class='math'")
+ xs << xml::StartTag(tag, "class='math'")
<< latex
- << html::EndTag(tag)
- << html::CR();
+ << xml::EndTag(tag)
+ << xml::CR();
}
return docstring();
}