small changes read ChangeLog

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

diff --git a/src/support/textutils.h b/src/support/textutils.h
index 89e1a5cf2781466969384b50530ce197a4830b4c..e54a6aedb1a932b1e2cffc80f9e851882efa4bb5 100644 (file)
--- a/src/support/textutils.h
+++ b/src/support/textutils.h
@@ -4,7 +4,8 @@
  * 
  *           LyX, The Document Processor
  *      
- *         Copyright (C) 1995 Matthias Ettrich
+ *           Copyright 1995 Matthias Ettrich
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 
@@ -13,32 +14,38 @@
 
 #include <cctype>
 
-///
-inline bool IsNewlineChar(char c) {
+//
+inline
+bool IsNewlineChar(char c) {
        return (c == LyXParagraph::META_NEWLINE);
 }
 
 
-///
-inline bool IsSeparatorChar(char c) {
-       return (c == ' ' || c == LyXParagraph::META_PROTECTED_SEPARATOR);
+//
+inline
+bool IsSeparatorChar(char c) {
+       return (c == ' ');
 }
 
 
-///
-inline bool IsHfillChar(char c) {
+//
+inline
+bool IsHfillChar(char c) {
        return (c == LyXParagraph::META_HFILL);
 }
 
 
-///
-inline bool IsInsetChar(char c) {
+//
+inline
+bool IsInsetChar(char c) {
        return (c == LyXParagraph::META_INSET);
 }
 
 
-///
-inline bool IsFloatChar(char c) {
+#ifndef NEW_INSETS
+//
+inline
+bool IsFloatChar(char c) {
        return (c == LyXParagraph::META_FOOTNOTE
                || c == LyXParagraph::META_MARGIN
                || c == LyXParagraph::META_FIG
@@ -47,16 +54,19 @@ inline bool IsFloatChar(char c) {
                || c == LyXParagraph::META_WIDE_FIG
                || c == LyXParagraph::META_WIDE_TAB);
 }
+#endif
 
 
-///
-inline bool IsLineSeparatorChar(char c) {
+//
+inline
+bool IsLineSeparatorChar(char c) {
        return (c == ' ');
 }
 
 
-///
-inline bool IsKommaChar(char c) {
+//
+inline
+bool IsKommaChar(char c) {
        return (c == ',' 
                || c == '('
                || c == ')'
@@ -81,37 +91,49 @@ inline bool IsKommaChar(char c) {
                || c == '/' 
                || c == '\\'
                || c == LyXParagraph::META_NEWLINE
-               || c == LyXParagraph::META_PROTECTED_SEPARATOR
                );
 }
 
 
-///
-inline bool IsLetterChar(unsigned char c) {
+//
+inline
+bool IsLetterChar(unsigned char c) {
        return ((c >= 'A' && c <= 'Z')
                || (c >= 'a' && c <= 'z')
                || (c >= 192)); // in iso-8859-x these are accented chars
 }
 
 
-///
-inline bool IsPrintable(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 IsWordChar(unsigned char c) {
-  return !( IsSeparatorChar( c ) 
-           || IsKommaChar( c )  
-           || IsHfillChar( c )  
-           || IsFloatChar( c )  
-           || IsInsetChar( c ) ) ;
+//
+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 )
+#ifndef NEW_INSETS
+                 || IsFloatChar( c )
+#endif
+                 || IsInsetChar( c ));
 }
 
 
-///
-inline bool IsLetterCharOrDigit(char ch)
+//
+inline
+bool IsLetterCharOrDigit(char ch)
 {
        return IsLetterChar(ch) || isdigit(ch);
 }