+ pdstring: added abstractions any2string.pd, string2any.pd for single-object-external builds

+ locale: added uselocale.pd (not installed by default)

svn path=/trunk/externals/moocow/pdstring/; revision=10762

6 files changed, 69 insertions, 18 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 9b70299..275a330 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -51,19 +51,22 @@ EXTRA_PROGRAMS = \
 ## --- patches
 pdexterns_DATA = \
 	any2wchars.pd \
-	wchars2any.pd
+	wchars2any.pd \
+	any2string.pd \
+	string2any.pd
 
 ## --- documentation
 pddoc_DATA = \
 	pdstring-help.pd \
+	any2string-help.pd \
+	string2any-help.pd \
 	any2bytes-help.pd \
 	bytes2any-help.pd \
 	bytes2wchars-help.pd \
 	wchars2bytes-help.pd \
 	any2wchars-help.pd \
-	wchars2any-help.pd
-
-	printbytes-help.pd 
+	wchars2any-help.pd \
+	printbytes-help.pd \
 	printwchars-help.pd
 
 
@@ -93,16 +96,16 @@ if WANT_OBJECT_EXTERNALS
 all-local:
 	rm -f any2string.$(PDEXT)
 	rm -f string2any.$(PDEXT)
-	$(LN_S) any2bytes.$(PDEXT) any2string.$(PDEXT)
-	$(LN_S) bytes2any.$(PDEXT) string2any.$(PDEXT)
+#	$(LN_S) any2bytes.$(PDEXT) any2string.$(PDEXT)
+#	$(LN_S) bytes2any.$(PDEXT) string2any.$(PDEXT)
 endif
 
 install-data-hook:
 	rm -f $(pdexternsdir)/any2string.$(PDEXT)
 	rm -f $(pdexternsdir)/string2any.$(PDEXT)
 if WANT_OBJECT_EXTERNALS
-	$(LN_S) any2bytes.$(PDEXT) $(pdexternsdir)/any2string.$(PDEXT)
-	$(LN_S) bytes2any.$(PDEXT) $(pdexternsdir)/string2any.$(PDEXT)
+#	$(LN_S) any2bytes.$(PDEXT) $(pdexternsdir)/any2string.$(PDEXT)
+#	$(LN_S) bytes2any.$(PDEXT) $(pdexternsdir)/string2any.$(PDEXT)
 endif
 
 uninstall-local:
diff --git a/src/Makefile.in b/src/Makefile.in
index 48056b8..25fb64b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -64,6 +64,7 @@ EXTRA_PROGRAMS = pdstring$(EXEEXT) any2bytes$(EXEEXT) \
 subdir = src
 SUBDIRS =
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/any2bytes-help.pd $(srcdir)/bytes2any-help.pd \
 	$(srcdir)/config.h.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -71,7 +72,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = any2string-help.pd string2any-help.pd
 @WANT_OBJECT_EXTERNALS_TRUE@am__EXEEXT_1 = any2bytes$(EXEEXT) \
 @WANT_OBJECT_EXTERNALS_TRUE@	bytes2any$(EXEEXT) \
 @WANT_OBJECT_EXTERNALS_TRUE@	bytes2wchars$(EXEEXT) \
@@ -244,16 +245,22 @@ target_alias = @target_alias@
 SUFFIXES = .@PDEXT@
 pdexterns_DATA = \
 	any2wchars.pd \
-	wchars2any.pd
+	wchars2any.pd \
+	any2string.pd \
+	string2any.pd
 
 pddoc_DATA = \
 	pdstring-help.pd \
+	any2string-help.pd \
+	string2any-help.pd \
 	any2bytes-help.pd \
 	bytes2any-help.pd \
 	bytes2wchars-help.pd \
 	wchars2bytes-help.pd \
 	any2wchars-help.pd \
-	wchars2any-help.pd
+	wchars2any-help.pd \
+	printbytes-help.pd \
+	printwchars-help.pd
 
 
 #-----------------------------------------------------------------------
@@ -751,9 +758,6 @@ uninstall-info: uninstall-info-recursive
 	uninstall-pdexternsDATA uninstall-pdexternsPROGRAMS
 
 
-	printbytes-help.pd 
-	printwchars-help.pd
-
 #-----------------------------------------------------------------------
 # aliases via install hook
 #-----------------------------------------------------------------------
@@ -761,14 +765,14 @@ uninstall-info: uninstall-info-recursive
 @WANT_OBJECT_EXTERNALS_TRUE@all-local:
 @WANT_OBJECT_EXTERNALS_TRUE@	rm -f any2string.$(PDEXT)
 @WANT_OBJECT_EXTERNALS_TRUE@	rm -f string2any.$(PDEXT)
-@WANT_OBJECT_EXTERNALS_TRUE@	$(LN_S) any2bytes.$(PDEXT) any2string.$(PDEXT)
-@WANT_OBJECT_EXTERNALS_TRUE@	$(LN_S) bytes2any.$(PDEXT) string2any.$(PDEXT)
+#	$(LN_S) any2bytes.$(PDEXT) any2string.$(PDEXT)
+#	$(LN_S) bytes2any.$(PDEXT) string2any.$(PDEXT)
 
 install-data-hook:
 	rm -f $(pdexternsdir)/any2string.$(PDEXT)
 	rm -f $(pdexternsdir)/string2any.$(PDEXT)
-@WANT_OBJECT_EXTERNALS_TRUE@	$(LN_S) any2bytes.$(PDEXT) $(pdexternsdir)/any2string.$(PDEXT)
-@WANT_OBJECT_EXTERNALS_TRUE@	$(LN_S) bytes2any.$(PDEXT) $(pdexternsdir)/string2any.$(PDEXT)
+#	$(LN_S) any2bytes.$(PDEXT) $(pdexternsdir)/any2string.$(PDEXT)
+#	$(LN_S) bytes2any.$(PDEXT) $(pdexternsdir)/string2any.$(PDEXT)
 
 uninstall-local:
 	rm -f $(pdexternsdir)/any2string.$(PDEXT)
diff --git a/src/any2bytes.c b/src/any2bytes.c
index 4760c5f..df2376a 100644
--- a/src/any2bytes.c
+++ b/src/any2bytes.c
@@ -165,7 +165,9 @@ void any2bytes_setup_guts(void)
 			      0);
 
   //-- alias
+#ifndef PDSTRING_OBJECT_EXTERNALS
   class_addcreator((t_newmethod)any2bytes_new, gensym("any2string"), A_GIMME, 0);
+#endif
   
   //-- methods
   class_addanything(any2bytes_class, (t_method)any2bytes_anything);
@@ -187,6 +189,11 @@ void any2bytes_setup(void)
   any2bytes_setup_guts();
 }
 
+#if 0
+/*--
+  this (with symlink install) causes pd-extended 0.41.4 20090209 to puke.
+  bug report by hcs, Thu, 12 Feb 2009
+*/
 /*--------------------------------------------------------------------
  * setup (any2string alias)
  */
@@ -195,3 +202,4 @@ void any2string_setup(void) {
   post("any2string_setup(): Prefer [any2bytes] over [any2string].");
   any2bytes_setup();
 }
+#endif
diff --git a/src/any2string.pd b/src/any2string.pd
new file mode 100644
index 0000000..d227144
--- /dev/null
+++ b/src/any2string.pd
@@ -0,0 +1,13 @@
+#N canvas 0 0 450 300 10;
+#X obj 41 47 inlet;
+#X obj 141 47 inlet;
+#X obj 41 117 outlet;
+#X obj 41 83 any2bytes \$1 \$2;
+#X text 38 12 any2string.pd : wrapper for any2bytes;
+#X text 30 169 WARNING: this abstraction will never be used if [pdstring]
+was built as a multi-object library \, rather than single-object externals.
+;
+#X text 142 263 Bryan Jurish <moocow@ling.uni-potsdam.de>;
+#X connect 0 0 3 0;
+#X connect 1 0 3 1;
+#X connect 3 0 2 0;
diff --git a/src/bytes2any.c b/src/bytes2any.c
index a7dc5b2..2d7ccb4 100644
--- a/src/bytes2any.c
+++ b/src/bytes2any.c
@@ -210,7 +210,9 @@ void bytes2any_setup_guts(void)
 			       0);
 
   //-- alias
+#ifndef PDSTRING_OBJECT_EXTERNALS
   class_addcreator((t_newmethod)bytes2any_new, gensym("string2any"), A_GIMME, 0);
+#endif
   
   //-- methods
   class_addanything(bytes2any_class, (t_method)bytes2any_anything);
@@ -231,6 +233,11 @@ void bytes2any_setup(void)
   bytes2any_setup_guts();
 }
 
+#if 0
+/*--
+  this (with symlink install) causes pd-extended 0.41.4 20090209 to puke.
+  bug report by hcs, Thu, 12 Feb 2009
+*/
 /*--------------------------------------------------------------------
  * setup (string2any alias)
  */
@@ -239,3 +246,4 @@ void string2any_setup(void) {
   post("string2any_setup(): Prefer [bytes2any] over [string2any].");
   bytes2any_setup();
 }
+#endif
diff --git a/src/string2any.pd b/src/string2any.pd
new file mode 100644
index 0000000..ccdf97b
--- /dev/null
+++ b/src/string2any.pd
@@ -0,0 +1,15 @@
+#N canvas 332 122 450 300 10;
+#X obj 41 47 inlet;
+#X obj 141 47 inlet;
+#X obj 41 117 outlet;
+#X text 38 12 string2any.pd : wrapper for bytes2any;
+#X obj 41 83 bytes2any \$1 \$2;
+#X obj 141 117 outlet;
+#X text 30 169 WARNING: this abstraction will never be used if [pdstring]
+was built as a multi-object library \, rather than single-object externals.
+;
+#X text 142 263 Bryan Jurish <moocow@ling.uni-potsdam.de>;
+#X connect 0 0 4 0;
+#X connect 1 0 4 1;
+#X connect 4 0 2 0;
+#X connect 4 1 5 0;