Fix footnote output in description item

[lyx.git] / src / mathed / InsetMathHull.cpp

diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index 38cdd26427ee63c5b34adcfbb5c7cdbabd7e4088..78175f3f70d524f1145829c77afc17dbe2f07e05 100644 (file)
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -35,8 +35,8 @@
 #include "LaTeXFeatures.h"
 #include "LyXRC.h"
 #include "MacroTable.h"
-#include "MathMacro.h"
-#include "MathMacroTemplate.h"
+#include "InsetMathMacro.h"
+#include "InsetMathMacroTemplate.h"
 #include "MetricsInfo.h"
 #include "output_xhtml.h"
 #include "Paragraph.h"
@@ -126,14 +126,14 @@ namespace {
                if (os.strikeoutMath()) {
                        if (os.ulemCmd() == WriteStream::UNDERLINE)
                                os << "\\raisebox{-\\belowdisplayshortskip}{"
-                                     "\\lyxmathsout{\\parbox[b]{\\columnwidth}{";
+                                     "\\lyxmathsout{\\parbox[b]{\\linewidth}{";
                        else
-                               os << "\\lyxmathsout{\\parbox{\\columnwidth}{";
+                               os << "\\lyxmathsout{\\parbox{\\linewidth}{";
                } else if (os.ulemCmd() == WriteStream::UNDERLINE)
                        os << "\\raisebox{-\\belowdisplayshortskip}{"
-                             "\\parbox[b]{\\columnwidth}{";
+                             "\\parbox[b]{\\linewidth}{";
                else if (os.ulemCmd() == WriteStream::STRIKEOUT)
-                       os << "\\parbox{\\columnwidth}{";
+                       os << "\\parbox{\\linewidth}{";
        }
 
 
@@ -151,7 +151,7 @@ namespace {
        }
 
 
-} // end anon namespace
+} // namespace
 
 
 HullType hullType(docstring const & s)
@@ -280,7 +280,7 @@ void InsetMathHull::setBuffer(Buffer & buffer)
 namespace {
        const char * counters_to_save[] = {"section", "chapter"};
        unsigned int const numcnts = sizeof(counters_to_save)/sizeof(char *);
-}
+} // namespace
 
 
 void InsetMathHull::updateBuffer(ParIterator const & it, UpdateType utype)
@@ -558,13 +558,14 @@ void InsetMathHull::metrics(MetricsInfo & mi, Dimension & dim) const
        }
 
        if (numberedType()) {
-               Changer dummy = mi.base.changeFontSet("mathbf");
+               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)));
 
                if (l)
-                       dim.wid += 30 + l;
+                       // Value was hardcoded to 30 pixels
+                       dim.wid += Length(0.3, Length::IN).inPixels(mi.base) + l;
        }
 
        // reserve some space for marker.
@@ -644,18 +645,36 @@ void InsetMathHull::draw(PainterInfo & pi, int x, int y) const
        Changer dummy2 = pi.base.font.changeStyle(display() ? LM_ST_DISPLAY
                                                            : LM_ST_TEXT);
 
-       InsetMathGrid::draw(pi, x + 1, y);
+       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 += Length(0.3, Length::IN).inPixels(pi.base) + l;
+       }
+
+       InsetMathGrid::draw(pi, xmath + 1, y);
        drawMarkers2(pi, x, y);
 
        if (numberedType()) {
-               int const xx = x + colinfo_.back().offset_ + colinfo_.back().width_ + 20;
+               Changer dummy = pi.base.changeFontSet("mathrm");
                for (row_type row = 0; row < nrows(); ++row) {
                        int const yy = y + rowinfo_[row].offset_;
-                       Changer dummy = pi.base.changeFontSet("mathrm");
                        docstring const nl = nicelabel(row);
-                       pi.draw(xx, yy, nl);
+                       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);
+                       }
                }
        }
+
        // drawing change line
        if (canPaintChange(*bv))
                pi.change_.paintCue(pi, x + 1, y + 1 - dim.asc,
@@ -733,8 +752,8 @@ void InsetMathHull::usedMacros(MathData const & md, DocIterator const & pos,
        MacroNameSet::iterator const end = macros.end();
 
        for (size_t i = 0; i < md.size(); ++i) {
-               MathMacro const * mi = md[i].nucleus()->asMacro();
-               MathMacroTemplate const * mt = md[i].nucleus()->asMacroTemplate();
+               InsetMathMacro const * mi = md[i].nucleus()->asMacro();
+               InsetMathMacroTemplate const * mt = md[i].nucleus()->asMacroTemplate();
                InsetMathScript const * si = md[i].nucleus()->asScriptInset();
                InsetMathFracBase const * fi = md[i].nucleus()->asFracBaseInset();
                InsetMathGrid const * gi = md[i].nucleus()->asGridInset();
@@ -823,7 +842,7 @@ void InsetMathHull::preparePreview(DocIterator const & pos,
                endfont += '}';
        }
        if (lsize != "normalsize" && !prefixIs(lsize, "error"))
-               setfont += from_ascii("\\" + lsize + '\n'); 
+               setfont += from_ascii("\\" + lsize + '\n');
 
        docstring setcnt;
        if (forexport && haveNumbers()) {
@@ -993,12 +1012,31 @@ Inset::DisplayType InsetMathHull::display() const
        case hullEquation:
        case hullMultline:
        case hullGather:
-               return AlignCenter;
+               if (buffer().params().is_math_indent)
+                       return AlignLeft;
+               else
+                       return AlignCenter;
        }
        // avoid warning
        return AlignCenter;
 }
 
+
+int InsetMathHull::indent(BufferView const & bv) const
+{
+       // FIXME: set this in the textclass. This value is what the article class uses.
+       static Length default_indent(2.5, Length::EM);
+       if (display() != Inline && buffer().params().is_math_indent) {
+               Length const & len = buffer().params().getMathIndent();
+               if (len.empty())
+                       return bv.inPixels(default_indent);
+               else
+                       return bv.inPixels(len);
+       } else
+               return Inset::indent(bv);
+}
+
+
 bool InsetMathHull::numberedType() const
 {
        switch (type_) {
@@ -1982,7 +2020,7 @@ bool allowDisplayMath(Cursor const & cur)
        return tmpcur.getStatus(cmd, status) && status.enabled();
 }
 
-}
+} // namespace
 
 
 bool InsetMathHull::getStatus(Cursor & cur, FuncRequest const & cmd,
@@ -2210,7 +2248,7 @@ void InsetMathHull::revealCodes(Cursor & cur) const
        if (!cur.inMathed())
                return;
        odocstringstream os;
-       cur.info(os);
+       cur.info(os, false);
        cur.message(os.str());
 /*
        // write something to the minibuffer