in addition to the changes mentioned in ChangeLog, there is the usual batch of whites...

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

diff --git a/src/support/textutils.h b/src/support/textutils.h
index 73d97cd59819db500362408bb1b604f2f9c0bd9d..89e1a5cf2781466969384b50530ce197a4830b4c 100644 (file)
--- a/src/support/textutils.h
+++ b/src/support/textutils.h
@@ -6,87 +6,113 @@
  *      
  *         Copyright (C) 1995 Matthias Ettrich
  *
- *======================================================*/
-#ifndef _TEXTUTILS_H
-#define _TEXTUTILS_H
+ * ====================================================== */
 
-#include "definitions.h"
+#ifndef TEXTUTILS_H
+#define TEXTUTILS_H
+
+#include <cctype>
 
 ///
 inline bool IsNewlineChar(char c) {
-       return (c == LYX_META_NEWLINE);
+       return (c == LyXParagraph::META_NEWLINE);
 }
+
+
 ///
 inline bool IsSeparatorChar(char c) {
-       return (c == ' ' || c == LYX_META_PROTECTED_SEPARATOR);
+       return (c == ' ' || c == LyXParagraph::META_PROTECTED_SEPARATOR);
 }
+
+
 ///
 inline bool IsHfillChar(char c) {
-       return (c == LYX_META_HFILL);
+       return (c == LyXParagraph::META_HFILL);
 }
+
+
 ///
 inline bool IsInsetChar(char c) {
-       return (c == LYX_META_INSET);
+       return (c == LyXParagraph::META_INSET);
 }
+
+
 ///
 inline bool IsFloatChar(char c) {
-       return (c == LYX_META_FOOTNOTE
-               || c == LYX_META_MARGIN
-               || c == LYX_META_FIG
-               || c == LYX_META_TAB
-               || c == LYX_META_ALGORITHM
-               || c == LYX_META_WIDE_FIG
-               || c == LYX_META_WIDE_TAB);
+       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 IsLineSeparatorChar(char c) {
        return (c == ' ');
 }
+
+
 ///
 inline bool IsKommaChar(char c) {
        return (c == ',' 
-               || c=='('
-               || c==')'
-               || c=='['
-               || c==']'
-               || c=='{'
-               || c=='}'
-               || c==';'
-               || c=='.'
-               || c==':'
-               || c=='-'
-               || c=='?'
-               || c=='!'
-               || c=='&'
-               || c=='@'
-               || c=='+'
-               || c=='-'
-               || c=='~'
-               || c=='#'
-               || c=='%'
-               || c=='^'
-               || c=='/' 
-               || c=='\\'
-               || c==LYX_META_NEWLINE
-               || c==LYX_META_PROTECTED_SEPARATOR
+               || c == '('
+               || c == ')'
+               || c == '['
+               || c == ']'
+               || c == '{'
+               || c == '}'
+               || c == ';'
+               || c == '.'
+               || c == ':'
+               || c == '-'
+               || c == '?'
+               || c == '!'
+               || c == '&'
+               || c == '@'
+               || c == '+'
+               || c == '-'
+               || c == '~'
+               || c == '#'
+               || c == '%'
+               || c == '^'
+               || c == '/' 
+               || c == '\\'
+               || c == LyXParagraph::META_NEWLINE
+               || c == LyXParagraph::META_PROTECTED_SEPARATOR
                );
 }
+
+
 ///
 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
+       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) {
-       return (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 ) ) ;
+           || IsKommaChar( c )  
+           || IsHfillChar( c )  
+           || IsFloatChar( c )  
+           || IsInsetChar( c ) ) ;
+}
+
+
+///
+inline bool IsLetterCharOrDigit(char ch)
+{
+       return IsLetterChar(ch) || isdigit(ch);
 }
 #endif