Moved text conversion classes to separate bundle

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@10755 72102866-910b-0410-8b05-ffd578937521

.cvsignore

@@ -4,3 +4,4 @@ config.cache
 config.make
 gnustep-gui.spec
 gnustep-gui-debug.spec
+gui.make

ChangeLog

@@ -1,3 +1,13 @@
+2001-08-21  Adam Fedor  <[email protected]>
+
+	* Source/NSAttributedString.m (converter_bundles): New function
+	to find bundles that do text conversion.
+	(converter_class): Use it.
+	* Source/GNUmakefile: Update to remove Parsers files
+
+	* TextConverters/RTF/*: New files moved from Source/Parsers.
+	Builds bundle for RTF text conversion.
+
 2001-08-21  Pierre-Yves  <[email protected]>
 
 	* Source/NSTableColumn.m

GNUmakefile

@@ -43,7 +43,7 @@ include ./Version
 #
 # The list of subproject directories
 #
-SUBPROJECTS = Source Images Model Tools Panels PrinterTypes
+SUBPROJECTS = Source Images Model Tools Panels PrinterTypes TextConverters
 
 -include GNUmakefile.preamble
 

Source/GNUmakefile

@@ -38,9 +38,7 @@ include ../config.make
 LIBRARY_NAME = libgnustep-gui
 
 # The Objective-C source files to be compiled
-libgnustep-gui_C_FILES = \
-Parsers/rtfGrammer.tab.c \
-Parsers/rtfScanner.c
+libgnustep-gui_C_FILES =
 
 # The Objective-C source files to be compiled
 libgnustep-gui_OBJC_FILES = Functions.m \
@@ -156,9 +154,7 @@ GSFontInfo.m \
 GSTable.m \
 GSHbox.m \
 GSVbox.m \
-GSSimpleLayoutManager.m \
-Parsers/attributedStringConsumer.m \
-Parsers/RTFProducer.m
+GSSimpleLayoutManager.m 
 
 ifneq ($(FOUNDATION_LIB), fd)
 libgnustep-gui_OBJC_FILES += NSPasteboard.m

Source/GNUmakefile.postamble

@@ -35,11 +35,8 @@
 #   otherwise the normal makefile rules will not be performed.
 #
 
-./$(GNUSTEP_OBJ_DIR)/Parsers:
-	$(MKDIRS) ./$(GNUSTEP_OBJ_DIR)/Parsers
-
 # Things to do before compiling
-before-all:: ./$(GNUSTEP_OBJ_DIR)/Parsers
+# before-all:: 
 
 # Things to do after compiling
 # after-all::
@@ -78,9 +75,6 @@ after-distclean::
 #
 # GNUstep GUI Library specific targets
 
-Parsers/rtfGrammer.tab.c: Parsers/rtfGrammer.y
-	$(BISON) $(BISON_FLAGS) $<
-
 #
 # Make list of class names for DLL exports. I'm not sure how to make this
 # work with the correct dependencies, so for now it should be regenerated

Source/GNUmakefile.preamble

@@ -56,11 +56,6 @@ ifneq ($(BACKEND_BUNDLE),)
 ADDITIONAL_CPPFLAGS += -DBACKEND_BUNDLE=1
 endif
 
-
-BISON_FLAGS = -d -p GSRTF
-BISON = BISON_SIMPLE=Parsers/bison.simple bison
-
-
 # Additional flags to pass to the Objective-C compiler
 ADDITIONAL_OBJCFLAGS = -Wall
 

Source/NSAttributedString.m

@@ -30,6 +30,8 @@
 
 #include <Foundation/NSString.h>
 #include <Foundation/NSRange.h>
+#include <Foundation/NSBundle.h>
+#include <Foundation/NSFileManager.h>
 #include <AppKit/NSAttributedString.h>
 #include <AppKit/NSParagraphStyle.h>
 #include <AppKit/NSTextAttachment.h>
@@ -99,6 +101,62 @@ static inline void cache_init ()
     }
 }
 
+/* Return the class that handles format from the first bundle it finds */
+static 
+Class converter_bundles(NSString *format, BOOL producer)
+{
+  Class converter_class = Nil;
+  NSEnumerator *benum;
+  NSString *dpath;
+
+  /* Find the bundle paths */
+  benum = [NSStandardLibraryPaths() objectEnumerator];
+  while ((dpath = [benum nextObject]))
+    {
+      NSEnumerator *direnum;
+      NSString *path;
+      dpath = [dpath stringByAppendingPathComponent: @"Bundles"];
+      dpath = [dpath stringByAppendingPathComponent: @"TextConverters"];
+      if ([[NSFileManager defaultManager] fileExistsAtPath: dpath])
+	direnum = [[NSFileManager defaultManager] enumeratorAtPath: dpath];
+      else
+	direnum = nil;
+      while (direnum && (path = [direnum nextObject]))
+	{
+	  Class bclass;
+	  NSString *full_path;
+	  NSBundle *aBundle;
+	  if ([[path pathExtension] isEqual: @"bundle"] == NO)
+	    continue;
+	  full_path = [dpath stringByAppendingPathComponent: path];
+	  aBundle = [NSBundle bundleWithPath: full_path];
+	  if (aBundle && ((bclass = [aBundle principalClass])))
+	    {
+	      if ([bclass respondsToSelector: 
+			    @selector(classForFormat:producer:)])
+		{
+		  converter_class = (Class)[bclass classForFormat: format
+					                 producer: producer];
+		}
+	      else
+		{
+		  NSString *converter_name;
+		  if (producer)
+		    converter_name = [format stringByAppendingString: @"Producer"];
+		  else
+		    converter_name = [format stringByAppendingString: @"Consumer"];
+		  converter_class = [aBundle classNamed: converter_name];
+		}
+	    }	 
+	  if (converter_class)
+	    break;
+	}
+      if (converter_class)
+	break;
+    }
+  return converter_class;
+}
+
 /*
   Return a suitable converter for the text format supplied as argument.
   If producer is YES a class capable of writting that format is returned,
@@ -118,10 +176,9 @@ static Class converter_class(NSString *format, BOOL producer)
       found = [p_classes objectForKey: format];
       if (found == Nil)
         {
-	  if ([format isEqual: @"RTF"])
-	    found = NSClassFromString(@"RTFProducer");
-	  else if ([format isEqual: @"RTFD"])
-	    found = NSClassFromString(@"RTFDProducer");
+	  found = converter_bundles(format, producer);
+	  if (found != Nil)
+	    NSDebugLog(@"Found converter %@ for format %@", found, format);
 	  if (found != Nil)
 	    [p_classes setObject: found forKey: format];
 	}
@@ -135,10 +192,9 @@ static Class converter_class(NSString *format, BOOL producer)
       found = [c_classes objectForKey: format];
       if (found == Nil)
         {
-	  if ([format isEqual: @"RTF"])
-	    found = NSClassFromString(@"RTFConsumer");
-	  else if ([format isEqual: @"RTFD"])
-	    found = NSClassFromString(@"RTFDConsumer");
+	  found = converter_bundles(format, producer);
+	  if (found != Nil)
+	    NSDebugLog(@"Found converter %@ for format %@", found, format);
 	  if (found != Nil)
 	    [c_classes setObject: found forKey: format];
 	}