X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Ftextutils.h;h=78e34cb4891cf4dc4e948d7fed6b411718e05ca2;hb=bf56e2c8e1afa857cd5e313c19948040e41b8227;hp=3d70c69df121a5c60c435f3873fbed7b95f26f9d;hpb=a116e04b8b75b847bfcb5114cc4d92ce3cc2386a;p=lyx.git

diff --git a/src/support/textutils.h b/src/support/textutils.h
index 3d70c69df1..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,82 +15,43 @@
 #ifndef TEXTUTILS_H
 #define TEXTUTILS_H
 
-#include "support/types.h"
-
-#ifdef LIBC_WCTYPE_USES_UCS4
-// We can use the libc ctype functions because we unset the LC_CTYPE
-// category of the current locale in gettext.C
-#include <wctype.h>
-#else
-// Steal some code from somewhere else, e.g. glib (look at gunicode.h)
-// The code that we currently use does not really work.
-#endif
+#include "support/strfwd.h"
 
 
 namespace lyx {
 
 /// return true if the char is a line separator
-inline
-bool isLineSeparatorChar(char_type c)
-{
-	return c == ' ';
-}
-
+inline bool isLineSeparatorChar(char_type c) { return c == ' '; }
 
 /// return true if a char is alphabetical (including accented chars)
-inline
-bool isLetterChar(char_type c)
-{
-#ifdef LIBC_WCTYPE_USES_UCS4
-	return iswalpha(c);
-#else
-	// FIXME UNICODE This is wrong!
-	return (c >= 'A' && c <= 'Z')
-		|| (c >= 'a' && c <= 'z')
-		|| (c >= 192 && c < 256); // in iso-8859-x these are accented chars
-#endif
-}
+bool isLetterChar(char_type c);
 
+/// return true if a char is lowercase
+bool isLower(char_type c);
 
-/// return true if the char is printable
-inline
-bool isPrintable(char_type c)
-{
-#ifdef LIBC_WCTYPE_USES_UCS4
-	return iswprint(c);
-#else
-	// FIXME UNICODE This is wrong!
-	return (c & 127) >= ' ';
-#endif
-}
+/// 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
-inline
-bool isPrintableNonspace(char_type c)
-{
-#ifdef LIBC_WCTYPE_USES_UCS4
-	return iswprint(c) && !iswspace(c);
-#else
-	// FIXME UNICODE This is wrong!
-	return (c & 127) > ' ';
-#endif
-}
-
-
-/// return true if a unicode char is a digit.
-inline
-bool isDigit(char_type c)
-{
-#ifdef LIBC_WCTYPE_USES_UCS4
-	return iswdigit(c);
-#else
-	// FIXME UNICODE This is wrong!
-	return c >= '0' && c <= '9';
-#endif
-}
+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