MacOSX compile fix.

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

diff --git a/src/support/textutils.h b/src/support/textutils.h
index 36499cecc33e92ec52e1917324f725c63dc6b005..42bbb36c9a333701ed969468f192d823a7dba40b 100644 (file)
--- a/src/support/textutils.h
+++ b/src/support/textutils.h
@@ -1,122 +1,61 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- *      
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
+/**
+ * \file textutils.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * ====================================================== */
+ * \author Matthias Ettrich
+ * \author Lars Gullik Bjønnes
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
+// FIXME: I can think of a better name for this file ...
 
 #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 == ' ');
-}
-
-
-///
-inline
-bool IsHfillChar(char c) {
-       return (c == LyXParagraph::META_HFILL);
-}
-
+#include "support/types.h"
 
-///
+/// return true if the char is a line separator
 inline
-bool IsInsetChar(char c) {
-       return (c == LyXParagraph::META_INSET);
-}
-
-
-///
-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 == LyXParagraph::META_NEWLINE
-               );
+bool isLineSeparatorChar(lyx::char_type c)
+{
+       return c == ' ';
 }
 
 
-///
+/// return true if a char is alphabetical (including accented chars)
 inline
-bool IsLetterChar(unsigned char c) {
-       return ((c >= 'A' && c <= 'Z')
+bool isLetterChar(lyx::char_type c)
+{
+       return (c >= 'A' && c <= 'Z')
                || (c >= 'a' && c <= 'z')
-               || (c >= 192)); // in iso-8859-x these are accented chars
+               || (c >= 192 && c < 256); // in iso-8859-x these are accented chars
 }
 
 
-///
+/// return true if the char is printable (masked to 7-bit ASCII)
 inline
-bool IsPrintable(unsigned char c) {
-       return (c >= ' ');
+bool isPrintable(lyx::char_type c)
+{
+       return (c & 127) >= ' ';
 }
 
 
-///
+/// return true if the char is printable and not a space (masked to 7-bit ASCII)
 inline
-bool IsPrintableNonspace(unsigned char c) {
-       return (c > ' ');
+bool isPrintableNonspace(lyx::char_type c)
+{
+       return isPrintable(c) && c != ' ';
 }
 
-
-/// Word is not IsSeparator or IsKomma or IsHfill or IsFloat or IsInset. 
+/// return true if a unicode char is a digit.
 inline
-bool IsWordChar(unsigned char c) {
-       return !( IsSeparatorChar( c )
-                 || IsKommaChar( c )
-                 || IsHfillChar( c )
-                 || IsInsetChar( c ));
+bool isDigit(lyx::char_type ch)
+{
+       return ch >= '0' && ch <= '9';
 }
 
 
-///
-inline
-bool IsLetterCharOrDigit(char ch)
-{
-       return IsLetterChar(ch) || isdigit(ch);
-}
-#endif
+#endif // TEXTUTILS_H