Merge branch 'master' into work

version 1.5 was first created in git.

.gitignore

@@ -1,12 +1,13 @@
-*.*%
-*.cdslck
-.inca.db.*
-inca.*.pak
-*.swp
-*.log
+netgen
+netgenexec
+defs.mak
+Depend
+config.cache
+config.log
+config.status
+*.o
 *.so
 *~
-*/av_extracted*/
-.nfs*
-*.cd-
-*/mommdl/
+*.log
+UPDATE_ME
+VERSION

VERSION

@@ -1 +1 @@
-1.5.74
+1.5.76

tcltk/netgen.tcl.in

@@ -84,9 +84,9 @@ proc netgen::convert_to_json {filename lvs_final} {
                nets {
 	          puts $fjson "   \"${key}\": \["
 		  set cktval [lindex $value 0]
-		  puts $fjson "    \"$cktval\","
+		  puts $fjson "    $cktval,"
 		  set cktval [lindex $value 1]
-		  puts $fjson "    \"$cktval\""
+		  puts $fjson "    $cktval"
 		  if {$kidx == $nkeys} {
 		     puts $fjson "   \]"
 		  } else {
@@ -322,9 +322,9 @@ proc netgen::convert_to_json {filename lvs_final} {
 		        puts $fjson "             \[\"${propname}\", \"${propval}\"\],"
 		     }
 		     set property [lindex $instance end]
-		     set prop0 [lindex $property 0]
-		     set propname [lindex $prop0 0]
-		     set propval [lindex $prop0 1]
+		     set prop1 [lindex $property 1]
+		     set propname [lindex $prop1 0]
+		     set propval [lindex $prop1 1]
 		     puts $fjson "             \[\"${propname}\", \"${propval}\"\]"
 	             puts $fjson "           \]"
 	             puts $fjson "         \]"