X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Ftextutils.h;h=78e34cb4891cf4dc4e948d7fed6b411718e05ca2;hb=8d640dc77608bedddb5b00982c23665584f52d21;hp=fe07ee7c2c910930b191b415fa7932b09cb10309;hpb=ce3b1fa997fd9451d627d0eae03f8a8336a1c696;p=lyx.git

diff --git a/src/support/textutils.h b/src/support/textutils.h
index fe07ee7c2c..78e34cb489 100644
--- a/src/support/textutils.h
+++ b/src/support/textutils.h
@@ -5,9 +5,9 @@
  * 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
+ * Full author contact details are available in file CREDITS.
  */
 
 // FIXME: I can think of a better name for this file ...
@@ -15,119 +15,44 @@
 #ifndef TEXTUTILS_H
 #define TEXTUTILS_H
 
-/// return true if the char is a meta-character newline
-inline
-bool IsNewlineChar(char c)
-{
-	return (c == Paragraph::META_NEWLINE);
-}
+#include "support/strfwd.h"
 
 
-/// return true if the char is a word separator
-inline
-bool IsSeparatorChar(char c)
-{
-	return (c == ' ');
-}
-
+namespace lyx {
 
 /// return true if the char is a line separator
-inline
-bool IsLineSeparatorChar(char c)
-{
-	return (c == ' ');
-}
-
-
-/// return true if the char is a meta-character for an inset
-inline
-bool IsInsetChar(char c)
-{
-	return (c == Paragraph::META_INSET);
-}
-
-
-/// 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 == '\\'
-		|| c == Paragraph::META_NEWLINE
-		);
-}
-
+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 != ' ');
-}
-
-
-/// return true if the char forms part of a word
-inline
-bool IsWordChar(unsigned char c)
-{
-	return !(IsSeparatorChar(c)
-		  || IsKommaChar(c)
-		  || IsInsetChar(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