more changes read the ChangeLog

[lyx.git] / src / support / textutils.h

diff --git a/src/support/textutils.h b/src/support/textutils.h
index 4c07ee308d2dde3499dde6782931517300e87cf3..e54a6aedb1a932b1e2cffc80f9e851882efa4bb5 100644 (file)
--- a/src/support/textutils.h
+++ b/src/support/textutils.h
@@ -14,42 +14,36 @@
 
 #include <cctype>
 
-///
+//
 inline
 bool IsNewlineChar(char c) {
        return (c == LyXParagraph::META_NEWLINE);
 }
 
 
-///
-#if 0
-inline
-bool IsSeparatorChar(char c) {
-       return (c == ' ' || c == LyXParagraph::META_PROTECTED_SEPARATOR);
-}
-#else
+//
 inline
 bool IsSeparatorChar(char c) {
        return (c == ' ');
 }
-#endif
 
 
-///
+//
 inline
 bool IsHfillChar(char c) {
        return (c == LyXParagraph::META_HFILL);
 }
 
 
-///
+//
 inline
 bool IsInsetChar(char c) {
        return (c == LyXParagraph::META_INSET);
 }
 
 
-///
+#ifndef NEW_INSETS
+//
 inline
 bool IsFloatChar(char c) {
        return (c == LyXParagraph::META_FOOTNOTE
@@ -60,16 +54,17 @@ bool IsFloatChar(char c) {
                || c == LyXParagraph::META_WIDE_FIG
                || c == LyXParagraph::META_WIDE_TAB);
 }
+#endif
 
 
-///
+//
 inline
 bool IsLineSeparatorChar(char c) {
        return (c == ' ');
 }
 
 
-///
+//
 inline
 bool IsKommaChar(char c) {
        return (c == ',' 
@@ -96,14 +91,11 @@ bool IsKommaChar(char c) {
                || c == '/' 
                || c == '\\'
                || c == LyXParagraph::META_NEWLINE
-#if 0
-               || c == LyXParagraph::META_PROTECTED_SEPARATOR
-#endif
                );
 }
 
 
-///
+//
 inline
 bool IsLetterChar(unsigned char c) {
        return ((c >= 'A' && c <= 'Z')
@@ -112,25 +104,34 @@ bool IsLetterChar(unsigned char c) {
 }
 
 
-///
+//
 inline
 bool IsPrintable(unsigned char c) {
        return (c >= ' ');
 }
 
 
-/// Word is not IsSeparator or IsKomma or IsHfill or IsFloat or IsInset. 
+//
+inline
+bool IsPrintableNonspace(unsigned char c) {
+       return (c > ' ');
+}
+
+
+// Word is not IsSeparator or IsKomma or IsHfill or IsFloat or IsInset. 
 inline
 bool IsWordChar(unsigned char c) {
-       return !( IsSeparatorChar( c ) 
-                 || IsKommaChar( c )  
-                 || IsHfillChar( c )  
-                 || IsFloatChar( c )  
-                 || IsInsetChar( c ) ) ;
+       return !( IsSeparatorChar( c )
+                 || IsKommaChar( c )
+                 || IsHfillChar( c )
+#ifndef NEW_INSETS
+                 || IsFloatChar( c )
+#endif
+                 || IsInsetChar( c ));
 }
 
 
-///
+//
 inline
 bool IsLetterCharOrDigit(char ch)
 {