Ignore ligature breaks and hyphenations during simple search (fixes #1468).

[lyx.git] / src / Layout.cpp

diff --git a/src/Layout.cpp b/src/Layout.cpp
index 7f4925a8c3798d55518d18e7da37eabd4f942973..5ba77ce1c6d0c67a0c8983d6f4c4231b6b5ed5a9 100644 (file)
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -23,8 +23,9 @@
 #include "support/lassert.h"
 #include "support/lstrings.h"
 #include "support/Messages.h"
-
 #include "support/regex.h"
+#include "support/textutils.h"
+
 
 using namespace std;
 using namespace lyx::support;
@@ -183,7 +184,7 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
                { "htmllabel",      LT_HTMLLABEL },
                { "htmllabelattr",  LT_HTMLLABELATTR },
                { "htmllabelfirst", LT_HTMLLABELFIRST },
-               { "htmlpremable",   LT_HTMLPREAMBLE },
+               { "htmlpreamble",   LT_HTMLPREAMBLE },
                { "htmlstyle",      LT_HTMLSTYLE },
                { "htmltag",        LT_HTMLTAG },
                { "htmltitle",      LT_HTMLTITLE },
@@ -997,7 +998,7 @@ string Layout::defaultCSSClass() const
        docstring::const_iterator en = name().end();
        for (; it != en; ++it) {
                char_type const c = *it;
-               if (c >= 0x80 || !isalnum(c)) {
+               if (!isAlphaASCII(c)) {
                        if (d.empty())
                                // make sure we don't start with an underscore,
                                // as that sometimes causes problems.