* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-2000 The LyX Team.
+ * Copyright 1995-2001 The LyX Team.
*
* ====================================================== */
#ifndef TEXTUTILS_H
#define TEXTUTILS_H
-#include <cctype>
-
///
inline
bool IsNewlineChar(char c) {
- return (c == LyXParagraph::META_NEWLINE);
+ return (c == Paragraph::META_NEWLINE);
}
///
inline
bool IsHfillChar(char c) {
- return (c == LyXParagraph::META_HFILL);
+ return (c == Paragraph::META_HFILL);
}
///
inline
bool IsInsetChar(char c) {
- return (c == LyXParagraph::META_INSET);
+ return (c == Paragraph::META_INSET);
}
-#ifndef NEW_INSETS
-///
-inline
-bool IsFloatChar(char c) {
- 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);
-}
-#endif
-
-
///
inline
bool IsLineSeparatorChar(char c) {
|| c == '^'
|| c == '/'
|| c == '\\'
- || c == LyXParagraph::META_NEWLINE
+ || c == Paragraph::META_NEWLINE
);
}
///
inline
bool IsPrintable(unsigned char c) {
- return (c >= ' ');
+ return ((c & 127) >= ' ');
}
///
inline
bool IsPrintableNonspace(unsigned char c) {
- return (c > ' ');
+ return IsPrintable(c) && (c != ' ');
}
return !( IsSeparatorChar( c )
|| IsKommaChar( c )
|| IsHfillChar( c )
-#ifndef NEW_INSETS
- || IsFloatChar( c )
-#endif
|| IsInsetChar( c ));
}
///
inline
-bool IsLetterCharOrDigit(char ch)
+bool IsDigit(unsigned char ch)
+{
+ return ch >= '0' && ch <= '9';
+}
+
+
+///
+inline
+bool IsLetterCharOrDigit(unsigned char ch)
{
- return IsLetterChar(ch) || isdigit(ch);
+ return IsLetterChar(ch) || IsDigit(ch);
}
#endif