Account for old versions of Pygments

[lyx.git] / src / TextMetrics.cpp

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index bb38914149b06c9b1a1ba6b534f51d63f6894598..f38c78d3ea7d98e6799d17a41898eafe8bba1049 100644 (file)
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -26,7 +26,6 @@
 #include "CoordCache.h"
 #include "Cursor.h"
 #include "CutAndPaste.h"
-#include "HSpace.h"
 #include "InsetList.h"
 #include "Language.h"
 #include "Layout.h"
@@ -421,10 +420,21 @@ bool TextMetrics::redoParagraph(pit_type const pit)
                                parPos.pos()++;
                }
 
+               // If there is an end of paragraph marker, its size should be
+               // substracted to the available width. The logic here is
+               // almost the same as in breakRow, remember keep them in sync.
+               int eop = 0;
+               if (lyxrc.paragraph_markers && ii->pos + 1 == par.size()
+                   && size_type(pit + 1) < text_->paragraphs().size()) {
+                       Font f(text_->layoutFont(pit));
+                       // ¶ U+00B6 PILCROW SIGN
+                       eop = theFontMetrics(f).width(char_type(0x00B6));
+               }
+
                // do the metric calculation
                Dimension dim;
                int const w = max_width_ - leftMargin(max_width_, pit, ii->pos)
-                       - right_margin;
+                       - right_margin - eop;
                Font const & font = ii->inset->inheritFont() ?
                        displayFont(pit, ii->pos) : bufferfont;
                MacroContext mc(&buffer, parPos);
@@ -480,19 +490,21 @@ bool TextMetrics::redoParagraph(pit_type const pit)
        // specially tailored for the main text.
        // Top and bottom margin of the document (only at top-level)
        if (text_->isMainText()) {
+               // original value was 20px, which is 0.2in at 100dpi
+               int const margin = Length(0.2, Length::IN).inPixels(0);
                if (pit == 0) {
-                       pm.rows().front().dimension().asc += 20;
+                       pm.rows().front().dimension().asc += margin;
                        /* coverity thinks that we should update pm.dim().asc
                         * below, but all the rows heights are actually counted as
                         * part of the paragraph metric descent see loop above).
                         */
                        // coverity[copy_paste_error]
-                       pm.dim().des += 20;
+                       pm.dim().des += margin;
                }
                ParagraphList const & pars = text_->paragraphs();
                if (pit + 1 == pit_type(pars.size())) {
-                       pm.rows().back().dimension().des += 20;
-                       pm.dim().des += 20;
+                       pm.rows().back().dimension().des += margin;
+                       pm.dim().des += margin;
                }
        }
 
@@ -626,15 +638,25 @@ void TextMetrics::computeRowMetrics(Row & row, int width) const
                                row.dimension().wid += w;
                        }
                        break;
+               case LYX_ALIGN_LEFT:
+                       // a displayed inset that is flushed
+                       if (Inset const * inset = par.getInset(row.pos()))
+                               row.left_margin += inset->indent(*bv_);
+                       break;
                case LYX_ALIGN_RIGHT:
-                       row.left_margin += w;
-                       row.dimension().wid += w;
+                       if (Inset const * inset = par.getInset(row.pos())) {
+                               int const new_w = max(w - inset->indent(*bv_), 0);
+                               row.left_margin += new_w;
+                               row.dimension().wid += new_w;
+                       } else {
+                               row.left_margin += w;
+                               row.dimension().wid += w;
+                       }
                        break;
                case LYX_ALIGN_CENTER:
                        row.dimension().wid += w / 2;
                        row.left_margin += w / 2;
                        break;
-               case LYX_ALIGN_LEFT:
                case LYX_ALIGN_NONE:
                case LYX_ALIGN_LAYOUT:
                case LYX_ALIGN_SPECIAL:
@@ -922,7 +944,8 @@ bool TextMetrics::breakRow(Row & row, int const right_margin) const
        row.finalizeLast();
        row.endpos(i);
 
-       // End of paragraph marker
+       // End of paragraph marker. The logic here is almost the
+       // same as in redoParagraph, remember keep them in sync.
        ParagraphList const & pars = text_->paragraphs();
        if (lyxrc.paragraph_markers && !need_new_row
            && i == end && size_type(row.pit() + 1) < pars.size()) {
@@ -1356,7 +1379,9 @@ Inset * TextMetrics::editXY(Cursor & cur, int x, int y,
 
        // Try to descend recursively inside the inset.
        Inset * edited = inset->editXY(cur, x, y);
-       if (edited == inset && cur.pos() == it->pos) {
+       // FIXME: it is not clear that the test on position is needed
+       // Remove it if/when semantics of editXY is clarified
+       if (cur.text() == text_ && cur.pos() == it->pos) {
                // non-editable inset, set cursor after the inset if x is
                // nearer to that position (bug 9628)
                bool bound = false; // is modified by getPosNearX