* LaTeXFeatures.cpp (getI18nPreamble):

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 582a39f1abb1d48f5ef2fd51b608be71431aab2e..e8cc2fa162efd181a0986cb8b279ec0ec1cf0a65 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -112,7 +112,7 @@ public:
                if (range_.first > pos) {
                        range_.first += offset;
                        range_.last += offset;
-               } else if (range_.last > pos) {
+               } else if (range_.last >= pos) {
                        range_.last += offset;
                }
        }
@@ -2850,6 +2850,14 @@ bool Paragraph::isWordSeparator(pos_type pos) const
        if (pos == size())
                return true;
        char_type const c = d->text_[pos];
+       // if we have a hard hyphen (no en- or emdash),
+       // we pass this to the spell checker
+       if (c == '-') {
+               int j = pos + 1;
+               if ((j == size() || d->text_[j] != '-')
+                   && (pos == 0 || d->text_[pos - 1] != '-'))
+                       return false;
+       }
        // We want to pass the ' and escape chars to the spellchecker
        static docstring const quote = from_utf8(lyxrc.spellchecker_esc_chars + '\'');
        return (!isLetterChar(c) && !isDigitASCII(c) && !contains(quote, c));