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 89e1a5cf2781466969384b50530ce197a4830b4c..fa077d035a7cfbb67584daa87e2e815d3edf8582 100644 (file)
--- a/src/support/textutils.h
+++ b/src/support/textutils.h
@@ -4,59 +4,52 @@
  * 
  *           LyX, The Document Processor
  *      
- *         Copyright (C) 1995 Matthias Ettrich
+ *           Copyright 1995 Matthias Ettrich
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
 #ifndef TEXTUTILS_H
 #define TEXTUTILS_H
 
-#include <cctype>
-
-///
-inline bool IsNewlineChar(char c) {
-       return (c == LyXParagraph::META_NEWLINE);
-}
-
-
 ///
-inline bool IsSeparatorChar(char c) {
-       return (c == ' ' || c == LyXParagraph::META_PROTECTED_SEPARATOR);
+inline
+bool IsNewlineChar(char c) {
+       return (c == Paragraph::META_NEWLINE);
 }
 
 
 ///
-inline bool IsHfillChar(char c) {
-       return (c == LyXParagraph::META_HFILL);
+inline
+bool IsSeparatorChar(char c) {
+       return (c == ' ');
 }
 
 
 ///
-inline bool IsInsetChar(char c) {
-       return (c == LyXParagraph::META_INSET);
+inline
+bool IsHfillChar(char c) {
+       return (c == Paragraph::META_HFILL);
 }
 
 
 ///
-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);
+inline
+bool IsInsetChar(char c) {
+       return (c == Paragraph::META_INSET);
 }
 
 
 ///
-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 == ')'
@@ -80,14 +73,14 @@ inline bool IsKommaChar(char c) {
                || c == '^'
                || c == '/' 
                || c == '\\'
-               || c == LyXParagraph::META_NEWLINE
-               || c == LyXParagraph::META_PROTECTED_SEPARATOR
+               || c == Paragraph::META_NEWLINE
                );
 }
 
 
 ///
-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
@@ -95,24 +88,41 @@ inline bool IsLetterChar(unsigned char c) {
 
 
 ///
-inline bool IsPrintable(unsigned char c) {
-       return (c >= ' ');
+inline
+bool IsPrintable(unsigned char 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 ) ) ;
+inline
+bool IsWordChar(unsigned char 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)
+inline
+bool IsLetterCharOrDigit(unsigned char ch)
 {
-       return IsLetterChar(ch) || isdigit(ch);
+       return IsLetterChar(ch) || IsDigit(ch);
 }
 #endif