lyxserver cleanup patch + andre's small patches

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

diff --git a/src/support/textutils.h b/src/support/textutils.h
index 4c07ee308d2dde3499dde6782931517300e87cf3..fa077d035a7cfbb67584daa87e2e815d3edf8582 100644 (file)
--- a/src/support/textutils.h
+++ b/src/support/textutils.h
@@ -5,60 +5,38 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
 #ifndef TEXTUTILS_H
 #define TEXTUTILS_H
 
-#include <cctype>
-
 ///
 inline
 bool IsNewlineChar(char c) {
-       return (c == LyXParagraph::META_NEWLINE);
+       return (c == Paragraph::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);
+       return (c == Paragraph::META_HFILL);
 }
 
 
 ///
 inline
 bool IsInsetChar(char c) {
-       return (c == LyXParagraph::META_INSET);
-}
-
-
-///
-inline
-bool IsFloatChar(char c) {
-       return (c == LyXParagraph::META_FOOTNOTE
-               || c == LyXParagraph::META_MARGIN
-               || c == LyXParagraph::META_FIG
-               || c == LyXParagraph::META_TAB
-               || c == LyXParagraph::META_ALGORITHM
-               || c == LyXParagraph::META_WIDE_FIG
-               || c == LyXParagraph::META_WIDE_TAB);
+       return (c == Paragraph::META_INSET);
 }
 
 
@@ -95,10 +73,7 @@ bool IsKommaChar(char c) {
                || c == '^'
                || c == '/' 
                || c == '\\'
-               || c == LyXParagraph::META_NEWLINE
-#if 0
-               || c == LyXParagraph::META_PROTECTED_SEPARATOR
-#endif
+               || c == Paragraph::META_NEWLINE
                );
 }
 
@@ -115,25 +90,39 @@ bool IsLetterChar(unsigned char c) {
 ///
 inline
 bool IsPrintable(unsigned char c) {
-       return (c >= ' ');
+       return ((c & 127) >= ' ');
+}
+
+
+///
+inline
+bool IsPrintableNonspace(unsigned char c) {
+       return IsPrintable(c) && (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 )
+                 || IsInsetChar( c ));
+}
+
+
+///
+inline
+bool IsDigit(unsigned char ch)
+{
+       return ch >= '0' && ch <= '9';
 }
 
 
 ///
 inline
-bool IsLetterCharOrDigit(char ch)
+bool IsLetterCharOrDigit(unsigned char ch)
 {
-       return IsLetterChar(ch) || isdigit(ch);
+       return IsLetterChar(ch) || IsDigit(ch);
 }
 #endif