[TiLP-devel] [TiLP-commit] rev 273 - in libtifiles/trunk: . docs src tests

[<sv...@te...>]

Author: roms
Date: Thu May  1 16:52:15 2003
New Revision: 273

Modified:
   libtifiles/trunk/ChangeLog
   libtifiles/trunk/aclocal.m4
   libtifiles/trunk/configure.in
   libtifiles/trunk/docs/Makefile
   libtifiles/trunk/src/Makefile.in
   libtifiles/trunk/src/trans.c
   libtifiles/trunk/tests/Makefile.in
Log:
Added 'mu' char to TI89..V200

Modified: libtifiles/trunk/ChangeLog
==============================================================================
--- libtifiles/trunk/ChangeLog	(original)
+++ libtifiles/trunk/ChangeLog	Thu May  1 16:52:15 2003
@@ -3,6 +3,10 @@
 To do: 
   - pre-init structs (ti9x_create_regular_content) rather than bzeros them.
 
+- 01/05/2003, version 0.5.6:
+	Added 'mu' char to TI89..V200. Unicode translation was missing for
+	TI92(+)/V200.
+	
 - 19/04/2003, version 0.5.5:
 	Added various varname translations (ASCII, ISO8859-1 and UTF-8).
 	Some fields have been extended (trans[9] -> trans[17]) to store

Modified: libtifiles/trunk/aclocal.m4
==============================================================================
--- libtifiles/trunk/aclocal.m4	(original)
+++ libtifiles/trunk/aclocal.m4	Thu May  1 16:52:15 2003
@@ -1,4 +1,4 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p4
+dnl aclocal.m4t generated automatically by aclocal 1.4-p4
 
 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation

Modified: libtifiles/trunk/configure.in
==============================================================================
--- libtifiles/trunk/configure.in	(original)
+++ libtifiles/trunk/configure.in	Thu May  1 16:52:15 2003
@@ -9,7 +9,7 @@
 # set library version number
 MAJOR_VERSION=0
 MINOR_VERSION=5
-MICRO_VERSION=5
+MICRO_VERSION=6
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
 
 AC_SUBST(MAJOR_VERSION)

Modified: libtifiles/trunk/docs/Makefile
==============================================================================
--- libtifiles/trunk/docs/Makefile	(original)
+++ libtifiles/trunk/docs/Makefile	Thu May  1 16:52:15 2003
@@ -124,9 +124,9 @@
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps docs/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -139,11 +139,6 @@
 subdir = docs
 
 distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \

Modified: libtifiles/trunk/src/Makefile.in
==============================================================================
--- libtifiles/trunk/src/Makefile.in	(original)
+++ libtifiles/trunk/src/Makefile.in	Thu May  1 16:52:15 2003
@@ -304,69 +304,6 @@
 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 	  fi; \
 	done
-error.lo error.o : error.c intl.h ../config.h export.h file_err.h
-files8x.lo files8x.o : files8x.c file_int.h stdints.h ../config.h \
-	export.h file_def.h typesxx.h types73.h types82.h types83.h \
-	types83p.h types85.h types86.h types89.h types92.h types92p.h \
-	typesv2.h filesxx.h files8x.h files9x.h file_err.h misc.h \
-	intelhex.h macros.h trans.h
-files9x.lo files9x.o : files9x.c file_int.h stdints.h ../config.h \
-	export.h file_def.h typesxx.h types73.h types82.h types83.h \
-	types83p.h types85.h types86.h types89.h types92.h types92p.h \
-	typesv2.h filesxx.h files8x.h files9x.h file_err.h misc.h \
-	macros.h trans.h
-filesxx.lo filesxx.o : filesxx.c file_int.h stdints.h ../config.h \
-	export.h file_def.h typesxx.h types73.h types82.h types83.h \
-	types83p.h types85.h types86.h types89.h types92.h types92p.h \
-	typesv2.h filesxx.h files8x.h files9x.h file_err.h
-grp_ops.lo grp_ops.o : grp_ops.c file_int.h stdints.h ../config.h \
-	export.h file_def.h typesxx.h types73.h types82.h types83.h \
-	types83p.h types85.h types86.h types89.h types92.h types92p.h \
-	typesv2.h filesxx.h files8x.h files9x.h file_err.h macros.h
-intelhex.lo intelhex.o : intelhex.c stdints.h ../config.h macros.h \
-	intelhex.h
-intrface.lo intrface.o : intrface.c intl.h ../config.h export.h \
-	file_ver.h file_int.h stdints.h file_def.h typesxx.h types73.h \
-	types82.h types83.h types83p.h types85.h types86.h types89.h \
-	types92.h types92p.h typesv2.h filesxx.h files8x.h files9x.h \
-	trans.h grp_ops.h
-misc.lo misc.o : misc.c stdints.h ../config.h export.h file_int.h \
-	file_def.h typesxx.h types73.h types82.h types83.h types83p.h \
-	types85.h types86.h types89.h types92.h types92p.h typesv2.h \
-	filesxx.h files8x.h files9x.h
-trans.lo trans.o : trans.c stdints.h ../config.h typesxx.h types73.h \
-	types82.h types83.h types83p.h types85.h types86.h types89.h \
-	types92.h types92p.h typesv2.h file_int.h export.h file_def.h \
-	filesxx.h files8x.h files9x.h
-type2str.lo type2str.o : type2str.c intl.h ../config.h file_def.h \
-	typesxx.h types73.h stdints.h types82.h types83.h types83p.h \
-	types85.h types86.h types89.h types92.h types92p.h typesv2.h \
-	filesxx.h files8x.h export.h files9x.h
-types73.lo types73.o : types73.c intl.h ../config.h export.h types73.h \
-	stdints.h
-types82.lo types82.o : types82.c intl.h ../config.h export.h types82.h \
-	stdints.h
-types83.lo types83.o : types83.c intl.h ../config.h export.h types83.h \
-	stdints.h
-types83p.lo types83p.o : types83p.c intl.h ../config.h export.h \
-	types83p.h stdints.h
-types85.lo types85.o : types85.c intl.h ../config.h export.h types85.h \
-	stdints.h
-types86.lo types86.o : types86.c intl.h ../config.h export.h types86.h \
-	stdints.h
-types89.lo types89.o : types89.c intl.h ../config.h export.h types89.h \
-	stdints.h
-types92.lo types92.o : types92.c intl.h ../config.h export.h types92.h \
-	stdints.h
-types92p.lo types92p.o : types92p.c intl.h ../config.h export.h \
-	types92p.h stdints.h
-typesv2.lo typesv2.o : typesv2.c intl.h ../config.h export.h typesv2.h \
-	stdints.h
-typesxx.lo typesxx.o : typesxx.c intl.h ../config.h file_int.h stdints.h \
-	export.h file_def.h typesxx.h types73.h types82.h types83.h \
-	types83p.h types85.h types86.h types89.h types92.h types92p.h \
-	typesv2.h filesxx.h files8x.h files9x.h file_err.h misc.h
-
 info-am:
 info: info-am
 dvi-am:

Modified: libtifiles/trunk/src/trans.c
==============================================================================
--- libtifiles/trunk/src/trans.c	(original)
+++ libtifiles/trunk/src/trans.c	Thu May  1 16:52:15 2003
@@ -94,7 +94,10 @@
     if((uint8_t)*src < 0x80) // ASCII part
       wchar = *src;
     else if((uint8_t)*src >= 0xA0) // ISO8859-1 part
-      wchar = *src & 0xff;
+      switch((uint8_t)*src) {
+      case 0xb5: wchar = 0x03bc; break; // mu
+      default:   wchar = *src & 0xff; break;
+      }
     else 
       { // greek characters
 	switch((uint8_t)*src) {
@@ -422,21 +425,36 @@
 char *ti92_translate_varname(const char *varname, char *translate,
 			     uint8_t vartype)
 {
-  strcpy(translate, varname);
+  switch(encoding) {
+  case ENCODING_ASCII: return tifiles_convert_to_ascii(translate, varname);
+  case ENCODING_LATIN1: return tifiles_convert_to_latin1(translate, varname);
+  case ENCODING_UNICODE: return tifiles_convert_to_unicode(translate, varname);
+  }
+
   return translate;
 }
 
 char *ti92p_translate_varname(const char *varname, char *translate,
 			      uint8_t vartype)
 {
-  strcpy(translate, varname);
+  switch(encoding) {
+  case ENCODING_ASCII: return tifiles_convert_to_ascii(translate, varname);
+  case ENCODING_LATIN1: return tifiles_convert_to_latin1(translate, varname);
+  case ENCODING_UNICODE: return tifiles_convert_to_unicode(translate, varname);
+  }
+
   return translate;
 }
 
 char *v200_translate_varname(const char *varname, char *translate,
 			     uint8_t vartype)
 {
-  strcpy(translate, varname);
+  switch(encoding) {
+  case ENCODING_ASCII: return tifiles_convert_to_ascii(translate, varname);
+  case ENCODING_LATIN1: return tifiles_convert_to_latin1(translate, varname);
+  case ENCODING_UNICODE: return tifiles_convert_to_unicode(translate, varname);
+  }
+
   return translate;
 }
 

Modified: libtifiles/trunk/tests/Makefile.in
==============================================================================
--- libtifiles/trunk/tests/Makefile.in	(original)
+++ libtifiles/trunk/tests/Makefile.in	Thu May  1 16:52:15 2003
@@ -255,14 +255,6 @@
 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 	  fi; \
 	done
-test_tifiles.o: test_tifiles.c ../config.h ../src/file_int.h \
-	../src/stdints.h ../src/export.h ../src/file_def.h \
-	../src/typesxx.h ../src/types73.h ../src/types82.h \
-	../src/types83.h ../src/types83p.h ../src/types85.h \
-	../src/types86.h ../src/types89.h ../src/types92.h \
-	../src/types92p.h ../src/typesv2.h ../src/filesxx.h \
-	../src/files8x.h ../src/files9x.h
-
 info-am:
 info: info-am
 dvi-am: