Merge new upstream release

14 files changed, 8 insertions, 2 deletions

diff --git a/plot/Imakefile b/plot/Imakefile
index 316b296..316b296 100644..100755
--- a/plot/Imakefile
+++ b/plot/Imakefile
diff --git a/plot/Jamfile b/plot/Jamfile
index 5468cd6..5468cd6 100644..100755
--- a/plot/Jamfile
+++ b/plot/Jamfile
diff --git a/plot/License.txt b/plot/License.txt
index a871fcf..a871fcf 100644..100755
--- a/plot/License.txt
+++ b/plot/License.txt
diff --git a/plot/Readme.txt b/plot/Readme.txt
index 6d15a37..6d15a37 100644..100755
--- a/plot/Readme.txt
+++ b/plot/Readme.txt
diff --git a/plot/X3DOM_LICENSE.txt b/plot/X3DOM_LICENSE.txt
index d9c2faf..d9c2faf 100644..100755
--- a/plot/X3DOM_LICENSE.txt
+++ b/plot/X3DOM_LICENSE.txt
diff --git a/plot/afiles b/plot/afiles
index 9e3f888..9e3f888 100644..100755
--- a/plot/afiles
+++ b/plot/afiles
diff --git a/plot/plot.c b/plot/plot.c
index bc993a8..948cb64 100644..100755
--- a/plot/plot.c
+++ b/plot/plot.c
@@ -968,6 +968,8 @@ static LRESULT CALLBACK MainWndProc(
 		case WM_CHAR:
 			debugf(("It's a char message, wParam = 0x%x\n",wParam));
 			switch(wParam) {
+				case '\r':	
+				case '\n':	
 				case ' ':	/* Space */
 					debugf(("It's a SPACE, so signal it\n"));
 					plot_signal = 1;
diff --git a/plot/plot.h b/plot/plot.h
index 89bf16b..89bf16b 100644..100755
--- a/plot/plot.h
+++ b/plot/plot.h
diff --git a/plot/vrml.c b/plot/vrml.c
index b077cdb..5b3f9a1 100644..100755
--- a/plot/vrml.c
+++ b/plot/vrml.c
@@ -1314,8 +1314,10 @@ static void check_format() {
 
 /* Return the global format file extension */
 static char *ret_ext(vrml_fmt fmt) {
-	if (fmt == fmt_uninit)
+	if (fmt == fmt_uninit) {
 		check_format();
+		fmt = g_fmt;
+	}
 
 	if (fmt == fmt_x3dom)	
 		return ".x3d.html";
@@ -1327,8 +1329,10 @@ static char *ret_ext(vrml_fmt fmt) {
 
 /* Return the global format type name */
 static char *ret_format(vrml_fmt fmt) {
-	if (fmt == fmt_uninit)
+	if (fmt == fmt_uninit) {
 		check_format();
+		fmt = g_fmt;
+	}
 
 	if (fmt == fmt_x3dom)	
 		return "X3DOM";
diff --git a/plot/vrml.h b/plot/vrml.h
index ff44a6c..ff44a6c 100644..100755
--- a/plot/vrml.h
+++ b/plot/vrml.h
diff --git a/plot/x3dom.css b/plot/x3dom.css
index c92109d..c92109d 100644..100755
--- a/plot/x3dom.css
+++ b/plot/x3dom.css
diff --git a/plot/x3dom.css.h b/plot/x3dom.css.h
index d10fb9b..d10fb9b 100644..100755
--- a/plot/x3dom.css.h
+++ b/plot/x3dom.css.h
diff --git a/plot/x3dom.js b/plot/x3dom.js
index 5744b3c..5744b3c 100644..100755
--- a/plot/x3dom.js
+++ b/plot/x3dom.js
diff --git a/plot/x3dom.js.h b/plot/x3dom.js.h
index 11ea311..11ea311 100644..100755
--- a/plot/x3dom.js.h
+++ b/plot/x3dom.js.h