* GuiView.cpp:

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 6522bbfe72095bb71172cf7c1109e7b5873fac1e..4a56d9669778fa686109db6ca801b22a4548dc7f 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -802,6 +802,8 @@ void Paragraph::Private::latexSpecialChar(
        }
 
        if (runparams.verbatim) {
+               // FIXME UNICODE: This can fail if c cannot
+               // be encoded in the current encoding.
                os.put(c);
                return;
        }
@@ -874,7 +876,6 @@ void Paragraph::Private::latexSpecialChar(
                break;
 
        default:
-
                // LyX, LaTeX etc.
                if (latexSpecialPhrase(os, i, column, runparams))
                        return;
@@ -923,11 +924,8 @@ bool Paragraph::Private::latexSpecialT1(char_type const c, odocstream & os,
                // but we should avoid ligatures
                if (i + 1 >= int(text_.size()) || text_[i + 1] != c)
                        return true;
-               os << "\\,{}";
-               column += 3;
-               // Alternative code:
-               //os << "\\textcompwordmark{}";
-               //column += 19;
+               os << "\\textcompwordmark{}";
+               column += 19;
                return true;
        case '|':
                os.put(c);
@@ -943,37 +941,19 @@ bool Paragraph::Private::latexSpecialTypewriter(char_type const c, odocstream &
 {
        switch (c) {
        case '-':
+               // within \ttfamily, "--" is merged to "-" (no endash)
+               // so we avoid this rather irritating ligature
                if (i + 1 < int(text_.size()) && text_[i + 1] == '-') {
-                       // "--" in Typewriter mode -> "-{}-"
                        os << "-{}";
                        column += 2;
                } else
                        os << '-';
                return true;
 
-       // I assume this is hack treating typewriter as verbatim
-       // FIXME UNICODE: This can fail if c cannot be encoded
-       // in the current encoding.
-
-       case '\0':
-               return true;
-
-       // Those characters are not directly supported.
-       case '\\':
-       case '\"':
-       case '$': case '&':
-       case '%': case '#': case '{':
-       case '}': case '_':
-       case '~':
-       case '^':
-       case '*': case '[':
-       case ' ':
-               return false;
-
+       // everything else has to be checked separately
+       // (depending on the encoding)
        default:
-               // With Typewriter font, these characters exist.
-               os.put(c);
-               return true;
+               return false;
        }
 }
 
@@ -1625,12 +1605,12 @@ void Paragraph::setBeginOfBody()
 }
 
 
-bool Paragraph::forceEmptyLayout() const
+bool Paragraph::forcePlainLayout() const
 {
        Inset const * const inset = inInset();
        if (!inset)
                return true;
-       return inset->forceEmptyLayout();
+       return inset->forcePlainLayout();
 }
 
 
@@ -1643,12 +1623,12 @@ bool Paragraph::allowParagraphCustomization() const
 }
 
 
-bool Paragraph::useEmptyLayout() const
+bool Paragraph::usePlainLayout() const
 {
        Inset const * const inset = inInset();
        if (!inset)
                return false;
-       return inset->useEmptyLayout();
+       return inset->usePlainLayout();
 }
 
 
@@ -1842,7 +1822,7 @@ bool Paragraph::latex(BufferParams const & bparams,
 
        bool return_value = false;
 
-       bool asdefault = forceEmptyLayout();
+       bool asdefault = forcePlainLayout();
 
        Layout const & style = asdefault ?
                bparams.documentClass().emptyLayout() :
@@ -1974,8 +1954,8 @@ bool Paragraph::latex(BufferParams const & bparams,
 
                // Switch file encoding if necessary (and allowed)
                if (!runparams.verbatim && 
-                   runparams.encoding->package() == Encoding::none &&
-                   font.language()->encoding()->package() == Encoding::none) {
+                   runparams.encoding->package() != Encoding::none &&
+                   font.language()->encoding()->package() != Encoding::none) {
                        pair<bool, int> const enc_switch = switchEncoding(os, bparams,
                                        runparams, *(font.language()->encoding()));
                        if (enc_switch.first) {
@@ -2059,7 +2039,7 @@ bool Paragraph::latex(BufferParams const & bparams,
                        }
                }
 
-               // Set the encoding to that returned from simpleTeXSpecialChars (see
+               // Set the encoding to that returned from latexSpecialChar (see
                // comment for encoding member in OutputParams.h)
                runparams.encoding = rp.encoding;
        }
@@ -2268,6 +2248,24 @@ bool Paragraph::isLetter(pos_type pos) const
 }
 
 
+bool Paragraph::isChar(pos_type pos) const
+{
+       if (Inset const * inset = getInset(pos))
+               return inset->isChar();
+       char_type const c = d->text_[pos];
+       return !isLetterChar(c) && !isDigit(c) && !lyx::isSpace(c);
+}
+
+
+bool Paragraph::isSpace(pos_type pos) const
+{
+       if (Inset const * inset = getInset(pos))
+               return inset->isSpace();
+       char_type const c = d->text_[pos];
+       return lyx::isSpace(c);
+}
+
+
 Language const *
 Paragraph::getParLanguage(BufferParams const & bparams) const
 {
@@ -2367,9 +2365,9 @@ void Paragraph::setLayout(Layout const & layout)
 }
 
 
-void Paragraph::setEmptyOrDefaultLayout(DocumentClass const & tclass)
+void Paragraph::setPlainOrDefaultLayout(DocumentClass const & tclass)
 {
-       if (useEmptyLayout())
+       if (usePlainLayout())
                setLayout(tclass.emptyLayout());
        else
                setLayout(tclass.defaultLayout());