more changes read the ChangeLog

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

diff --git a/src/support/textutils.h b/src/support/textutils.h
index 87369e7933ed0ce660be3971cf6ab63588493546..e54a6aedb1a932b1e2cffc80f9e851882efa4bb5 100644 (file)
--- a/src/support/textutils.h
+++ b/src/support/textutils.h
@@ -42,6 +42,7 @@ bool IsInsetChar(char c) {
 }
 
 
+#ifndef NEW_INSETS
 //
 inline
 bool IsFloatChar(char c) {
@@ -53,6 +54,7 @@ bool IsFloatChar(char c) {
                || c == LyXParagraph::META_WIDE_FIG
                || c == LyXParagraph::META_WIDE_TAB);
 }
+#endif
 
 
 //
@@ -119,11 +121,13 @@ bool IsPrintableNonspace(unsigned char 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 ));
 }