Add a bunch of c_str() for string stream uses; remove lyxfunc symbol-insert.

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

diff --git a/src/support/textutils.h b/src/support/textutils.h
index a50a762baf7f422041d5eb98f268db8b398a6fbd..20dd4d7751857990ae615e9882fba02b03ea6ddf 100644 (file)
--- a/src/support/textutils.h
+++ b/src/support/textutils.h
@@ -4,7 +4,8 @@
  * 
  *           LyX, The Document Processor
  *      
- *         Copyright (C) 1995 Matthias Ettrich
+ *           Copyright 1995 Matthias Ettrich
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 
@@ -21,17 +22,10 @@ bool IsNewlineChar(char c) {
 
 
 ///
-#if 0
-inline
-bool IsSeparatorChar(char c) {
-       return (c == ' ' || c == LyXParagraph::META_PROTECTED_SEPARATOR);
-}
-#else
 inline
 bool IsSeparatorChar(char c) {
        return (c == ' ');
 }
-#endif
 
 
 ///
@@ -48,6 +42,7 @@ bool IsInsetChar(char c) {
 }
 
 
+#ifndef NEW_INSETS
 ///
 inline
 bool IsFloatChar(char c) {
@@ -59,6 +54,7 @@ bool IsFloatChar(char c) {
                || c == LyXParagraph::META_WIDE_FIG
                || c == LyXParagraph::META_WIDE_TAB);
 }
+#endif
 
 
 ///
@@ -95,9 +91,6 @@ bool IsKommaChar(char c) {
                || c == '/' 
                || c == '\\'
                || c == LyXParagraph::META_NEWLINE
-#if 0
-               || c == LyXParagraph::META_PROTECTED_SEPARATOR
-#endif
                );
 }
 
@@ -118,14 +111,23 @@ bool IsPrintable(unsigned char c) {
 }
 
 
+///
+inline
+bool IsPrintableNonspace(unsigned char c) {
+       return (c > ' ');
+}
+
+
 /// Word is not IsSeparator or IsKomma or IsHfill or IsFloat or IsInset. 
 inline
 bool IsWordChar(unsigned char c) {
-       return !( IsSeparatorChar( c ) 
-                 || IsKommaChar( c )  
-                 || IsHfillChar( c )  
-                 || IsFloatChar( c )  
-                 || IsInsetChar( c ) ) ;
+       return !( IsSeparatorChar( c )
+                 || IsKommaChar( c )
+                 || IsHfillChar( c )
+#ifndef NEW_INSETS
+                 || IsFloatChar( c )
+#endif
+                 || IsInsetChar( c ));
 }