small changes read changelog

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

diff --git a/src/support/textutils.h b/src/support/textutils.h
index e54a6aedb1a932b1e2cffc80f9e851882efa4bb5..fa077d035a7cfbb67584daa87e2e815d3edf8582 100644 (file)
--- a/src/support/textutils.h
+++ b/src/support/textutils.h
@@ -5,66 +5,49 @@
  *           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);
 }
 
 
-//
+///
 inline
 bool IsSeparatorChar(char c) {
        return (c == ' ');
 }
 
 
-//
+///
 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);
-}
-
-
-#ifndef NEW_INSETS
-//
-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);
 }
-#endif
 
 
-//
+///
 inline
 bool IsLineSeparatorChar(char c) {
        return (c == ' ');
 }
 
 
-//
+///
 inline
 bool IsKommaChar(char c) {
        return (c == ',' 
@@ -90,12 +73,12 @@ bool IsKommaChar(char c) {
                || c == '^'
                || c == '/' 
                || c == '\\'
-               || c == LyXParagraph::META_NEWLINE
+               || c == Paragraph::META_NEWLINE
                );
 }
 
 
-//
+///
 inline
 bool IsLetterChar(unsigned char c) {
        return ((c >= 'A' && c <= 'Z')
@@ -104,37 +87,42 @@ bool IsLetterChar(unsigned char c) {
 }
 
 
-//
+///
 inline
 bool IsPrintable(unsigned char c) {
-       return (c >= ' ');
+       return ((c & 127) >= ' ');
 }
 
 
-//
+///
 inline
 bool IsPrintableNonspace(unsigned char c) {
-       return (c > ' ');
+       return IsPrintable(c) && (c != ' ');
 }
 
 
-// Word is not IsSeparator or IsKomma or IsHfill or IsFloat or IsInset. 
+/// 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 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