X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Ftextutils.h;h=78e34cb4891cf4dc4e948d7fed6b411718e05ca2;hb=9c1142c88061ed357b8f15bc151707a07303f3ea;hp=7e9d9fc8e73a77c845017468fe80a07d312e984f;hpb=e7e92ec6609a97554e36833d799da03802881bcf;p=lyx.git

diff --git a/src/support/textutils.h b/src/support/textutils.h
index 7e9d9fc8e7..78e34cb489 100644
--- a/src/support/textutils.h
+++ b/src/support/textutils.h
@@ -5,7 +5,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Matthias Ettrich
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -15,92 +15,44 @@
 #ifndef TEXTUTILS_H
 #define TEXTUTILS_H
 
-/// return true if the char is a word separator
-inline
-bool IsSeparatorChar(char c)
-{
-	return (c == ' ');
-}
+#include "support/strfwd.h"
 
 
-/// return true if the char is a line separator
-inline
-bool IsLineSeparatorChar(char c)
-{
-	return (c == ' ');
-}
-
-
-/// return true if the char is "punctuation"
-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 == '\\'
-		);
-}
+namespace lyx {
 
+/// return true if the char is a line separator
+inline bool isLineSeparatorChar(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')
-		|| (c >= 'a' && c <= 'z')
-		|| (c >= 192)); // 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 & 127) >= ' ');
-}
-
-
-/// return true if the char is printable and not a space (masked to 7-bit ASCII)
-inline
-bool IsPrintableNonspace(unsigned char c)
-{
-	return IsPrintable(c) && (c != ' ');
-}
-
-
-/// completely pointless FIXME
-inline
-bool IsDigit(unsigned char ch)
-{
-	return ch >= '0' && ch <= '9';
-}
-
-
-/// return true if the char is alphanumeric
-inline
-bool IsLetterCharOrDigit(unsigned char ch)
-{
-	return IsLetterChar(ch) || IsDigit(ch);
-}
+bool isLetterChar(char_type c);
+
+/// return true if a char is lowercase
+bool isLower(char_type c);
+
+/// return whether \p c is an alphabetic character in the ASCII range
+bool isAlphaASCII(char_type c);
+
+/// return true if the char is printable
+bool isPrintable(char_type c);
+
+/// return true if the char is printable and not a space
+bool isPrintableNonspace(char_type c);
+
+/// return true if a unicode char is a space.
+bool isSpace(char_type c);
+
+/// return true if a unicode char is a numeral.
+bool isNumber(char_type c);
+
+/// return whether \p c is a digit in the ASCII range
+bool isDigitASCII(char_type c);
+
+/// return whether \p c is alpha or a digit in the ASCII range
+bool isAlnumASCII(char_type c);
+
+/// return whether \p c is in the ASCII range
+bool isASCII(char_type c);
+
+} // namespace lyx
 
 #endif // TEXTUTILS_H