* add PreBabelPreamble to Language definition (fixes #4786).

[lyx.git] / src / ParagraphMetrics.cpp

diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index 36d850b1d9f867d9bee153852a94d03fb47cf189..0a90fb69252449976b930bce5b4a54d82ad0bf3b 100644 (file)
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -4,13 +4,13 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Asger Alstrup
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Jean-Marc Lasgouttes
  * \author Angus Leeming
  * \author John Levon
- * \author André Pönitz
+ * \author André Pönitz
  * \author Dekel Tsur
- * \author Jürgen Vigna
+ * \author Jürgen Vigna
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -24,8 +24,6 @@
 #include "BufferView.h"
 #include "Counters.h"
 #include "Encoding.h"
-#include "support/debug.h"
-#include "support/gettext.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
 #include "Layout.h"
@@ -33,7 +31,6 @@
 #include "LyXRC.h"
 #include "Row.h"
 #include "OutputParams.h"
-#include "paragraph_funcs.h"
 #include "sgml.h"
 #include "TextClass.h"
 #include "TexRow.h"
@@ -42,14 +39,15 @@
 #include "frontends/FontMetrics.h"
 
 #include "insets/InsetBibitem.h"
-#include "insets/InsetOptArg.h"
+#include "insets/InsetArgument.h"
 
+#include "support/lassert.h"
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/textutils.h"
-#include "support/convert.h"
-#include "support/unicode.h"
 
-#include <boost/bind.hpp>
+#include "support/bind.h"
 #include <boost/crc.hpp>
 
 #include <algorithm>
@@ -63,9 +61,9 @@ using namespace lyx::support;
 namespace lyx {
 
 
-ParagraphMetrics::ParagraphMetrics(Paragraph const & par): position_(-1), par_(&par)
-{
-}
+ParagraphMetrics::ParagraphMetrics(Paragraph const & par) :
+       position_(-1), par_(&par)
+{}
 
 
 ParagraphMetrics & ParagraphMetrics::operator=(
@@ -103,9 +101,10 @@ size_t ParagraphMetrics::computeRowSignature(Row const & row,
        }
 
        Dimension const & d = row.dimension();
-       char_type const b[] = { row.sel_beg, row.sel_end, d.wid, d.asc, d.des};
-       // Each of the variable to process is 4 bytes: 4x5 = 20
-       crc.process_bytes(b, 20);
+       char_type const b[] = { row.sel_beg, row.sel_end, 
+               row.begin_margin_sel, row.end_margin_sel, d.wid, d.asc, d.des};
+       // Each of the variable to process is 4 bytes: 4x7 = 28
+       crc.process_bytes(b, 28);
 
        return crc.checksum();
 }
@@ -137,7 +136,7 @@ void ParagraphMetrics::setInsetDimension(Inset const * inset,
 
 Row & ParagraphMetrics::getRow(pos_type pos, bool boundary)
 {
-       BOOST_ASSERT(!rows().empty());
+       LASSERT(!rows().empty(), /**/);
 
        // If boundary is set we should return the row on which
        // the character before is inside.
@@ -156,7 +155,7 @@ Row & ParagraphMetrics::getRow(pos_type pos, bool boundary)
 
 Row const & ParagraphMetrics::getRow(pos_type pos, bool boundary) const
 {
-       BOOST_ASSERT(!rows().empty());
+       LASSERT(!rows().empty(), /**/);
 
        // If boundary is set we should return the row on which
        // the character before is inside.
@@ -175,7 +174,7 @@ Row const & ParagraphMetrics::getRow(pos_type pos, bool boundary) const
 
 size_t ParagraphMetrics::pos2row(pos_type pos) const
 {
-       BOOST_ASSERT(!rows().empty());
+       LASSERT(!rows().empty(), /**/);
 
        RowList::const_iterator rit = rows_.end();
        RowList::const_iterator const begin = rows_.begin();
@@ -196,15 +195,15 @@ void ParagraphMetrics::dump() const
        }
 }
 
-int ParagraphMetrics::rightMargin(Buffer const & buffer) const
+int ParagraphMetrics::rightMargin(BufferView const & bv) const
 {
-       BufferParams const & params = buffer.params();
-       TextClass const & tclass = params.getTextClass();
+       BufferParams const & params = bv.buffer().params();
+       DocumentClass const & tclass = params.documentClass();
        frontend::FontMetrics const & fm = theFontMetrics(params.getFont());
        int const r_margin =
-               lyx::rightMargin()
+               bv.rightMargin()
                + fm.signedWidth(tclass.rightmargin())
-               + fm.signedWidth(par_->layout()->rightmargin)
+               + fm.signedWidth(par_->layout().rightmargin)
                * 4 / (par_->getDepth() + 4);
 
        return r_margin;
@@ -214,11 +213,14 @@ int ParagraphMetrics::rightMargin(Buffer const & buffer) const
 int ParagraphMetrics::singleWidth(pos_type pos, Font const & font) const
 {
        // The most special cases are handled first.
-       if (par_->isInset(pos))
-               return insetDimension(par_->getInset(pos)).wid;
+       if (Inset const * inset = par_->getInset(pos))
+               return insetDimension(inset).wid;
 
        char_type c = par_->getChar(pos);
 
+       if (c == '\t')
+               return 4 * theFontMetrics(font).width(' ');
+       
        if (!isPrintable(c))
                return theFontMetrics(font).width(c);
 
@@ -227,12 +229,13 @@ int ParagraphMetrics::singleWidth(pos_type pos, Font const & font) const
                if (language->lang() == "arabic_arabtex" ||
                        language->lang() == "arabic_arabi" ||
                        language->lang() == "farsi") {
-                               if (Encodings::isComposeChar_arabic(c))
+                               if (Encodings::isArabicComposeChar(c))
                                        return 0;
                                c = par_->transformChar(c, pos);
                } else if (language->lang() == "hebrew" &&
-                       Encodings::isComposeChar_hebrew(c))
-                       return 0;
+                               Encodings::isHebrewComposeChar(c)) {
+                       return 0;       
+               }
        }
        return theFontMetrics(font).width(c);
 }
@@ -243,7 +246,7 @@ bool ParagraphMetrics::hfillExpansion(Row const & row, pos_type pos) const
        if (!par_->isHfill(pos))
                return false;
 
-       BOOST_ASSERT(pos >= row.pos() && pos < row.endpos());
+       LASSERT(pos >= row.pos() && pos < row.endpos(), /**/);
 
        // expand at the end of a row only if there is another hfill on the same row
        if (pos == row.endpos() - 1) {
@@ -260,7 +263,7 @@ bool ParagraphMetrics::hfillExpansion(Row const & row, pos_type pos) const
        }
 
        // do not expand in some labels
-       if (par_->layout()->margintype != MARGIN_MANUAL && pos < par_->beginOfBody())
+       if (par_->layout().margintype != MARGIN_MANUAL && pos < par_->beginOfBody())
                return false;
 
        // if there is anything between the first char of the row and