ignore first and last variable by index, not value

20 files changed, 114 insertions, 144 deletions

diff --git a/js/Misc/CBLOCK.js b/js/Misc/CBLOCK.js
index 9bd6992a..c2f8ee2a 100644
--- a/js/Misc/CBLOCK.js
+++ b/js/Misc/CBLOCK.js
@@ -72,11 +72,10 @@ function CBLOCK() {
             this.auto0 = arguments[0]["auto0"];
             this.depu = parseBoolean(arguments[0]["depu"]);
             this.dept = parseBoolean(arguments[0]["dept"]);
-            this.lab = arguments[0]["lab"];
             if (!ok) {
                 break;
             }
-            label[1-1] = this.lab;
+            label[1-1] = lab;
             var funam = stripblanks(this.function_name);
             this.xx = this.xx.slice();
             this.z = this.z.slice();
diff --git a/js/Misc/CBLOCK.pickle b/js/Misc/CBLOCK.pickle
index 7fb5b3f6..1b044560 100644
--- a/js/Misc/CBLOCK.pickle
+++ b/js/Misc/CBLOCK.pickle
@@ -24,22 +24,20 @@ aS'xx'
 p11
 aS'rpar'
 p12
-aS'lab'
-p13
 aS'ipar'
-p14
+p13
 aS'graphics'
-p15
+p14
 aS'x'
-p16
+p15
 aS'model'
-p17
+p16
 aS'z'
-p18
+p17
 aS'function_name'
-p19
-atp20
-Rp21
+p18
+atp19
+Rp20
 .(dp0
 S'ci'
 p1
diff --git a/js/Misc/CBLOCK4.js b/js/Misc/CBLOCK4.js
index 19dc8fa3..0809b51a 100644
--- a/js/Misc/CBLOCK4.js
+++ b/js/Misc/CBLOCK4.js
@@ -66,11 +66,10 @@ function CBLOCK4() {
             this.auto0 = arguments[0]["auto0"];
             this.depu = parseBoolean(arguments[0]["depu"]);
             this.dept = parseBoolean(arguments[0]["dept"]);
-            this.lab = arguments[0]["lab"];
             if (!ok) {
                 break;
             }
-            label[1-1] = this.lab;
+            label[1-1] = lab;
             var funam = stripblanks(this.function_name);
             this.xx = this.xx.slice();
             this.z = this.z.slice();
diff --git a/js/Misc/CBLOCK4.pickle b/js/Misc/CBLOCK4.pickle
index e96df717..c64be475 100644
--- a/js/Misc/CBLOCK4.pickle
+++ b/js/Misc/CBLOCK4.pickle
@@ -18,38 +18,36 @@ aS'function_name'
 p8
 aS'in1'
 p9
-aS'lab'
-p10
 aS'it'
-p11
+p10
 aS'graphics'
-p12
+p11
 aS'nmode'
-p13
+p12
 aS'z'
-p14
+p13
 aS'xx'
-p15
+p14
 aS'nzcr'
-p16
+p15
 aS'depu'
-p17
+p16
 aS'dept'
-p18
+p17
 aS'opar'
-p19
+p18
 aS'oz'
-p20
+p19
 aS'ipar'
-p21
+p20
 aS'x'
-p22
+p21
 aS'model'
-p23
+p22
 aS'ot'
-p24
-atp25
-Rp26
+p23
+atp24
+Rp25
 .(dp0
 S'model.odstate'
 p1
diff --git a/js/Misc/MBLOCK.js b/js/Misc/MBLOCK.js
index f0550d85..d47ae31f 100644
--- a/js/Misc/MBLOCK.js
+++ b/js/Misc/MBLOCK.js
@@ -58,7 +58,7 @@ function MBLOCK() {
             }
             var exprs = tlist(["MBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],exprs[1-1][1-1],exprs[1-1][2-1],exprs[1-1][3-1],exprs[1-1][4-1],exprs[1-1][5-1],paramv,sci2exp(this.pprop.slice()),exprs[1-1][7-1],exprs[2-1]);
         }
-        this.lab_1 = list(exprs.in,exprs.intype,exprs.out,exprs.outtype,exprs.param,exprs.pprop,exprs.nameF);
+        var lab_1 = list(exprs.in,exprs.intype,exprs.out,exprs.outtype,exprs.param,exprs.pprop,exprs.nameF);
         var lab_2 = exprs.paramv;
         while (true) {
             var ok = true;
@@ -69,7 +69,6 @@ function MBLOCK() {
             this.Tparam = arguments[0]["Tparam"];
             this.pprop = inverse(arguments[0]["pprop"]);
             this.Tfunam = arguments[0]["Tfunam"];
-            this.lab_1 = arguments[0]["lab_1"];
             if (!ok) {
                 break;
             }
@@ -265,11 +264,11 @@ function MBLOCK() {
                     this.model.rpar = new ScilabDouble([this.model.rpar],[paramv[i-1].slice()]);
                 }
                 this.model.sim[1-1] = new ScilabDouble([this.funam]);
-                exprs.in = this.lab_1[1-1];
-                exprs.intype = this.lab_1[2-1];
-                exprs.out = this.lab_1[3-1];
-                exprs.outtype = this.lab_1[4-1];
-                exprs.param = this.lab_1[5-1];
+                exprs.in = lab_1[1-1];
+                exprs.intype = lab_1[2-1];
+                exprs.out = lab_1[3-1];
+                exprs.outtype = lab_1[4-1];
+                exprs.param = lab_1[5-1];
                 exprs.paramv = list();
                 if (Tparam_sz!=0) {
                     if (this.type[lab_2-1]==15) {
@@ -282,8 +281,8 @@ function MBLOCK() {
                         }
                     }
                 }
-                exprs.pprop = this.lab_1[6-1];
-                exprs.nameF = this.lab_1[7-1];
+                exprs.pprop = lab_1[6-1];
+                exprs.nameF = lab_1[7-1];
                 exprs.funtxt = tt;
                 this.x.model = this.model;
                 this.graphics.gr_i[1-1][1-1] = new ScilabString(["txt=[\'Modelica\';\' "+nameF+" \'];"]);
diff --git a/js/Misc/MBLOCK.pickle b/js/Misc/MBLOCK.pickle
index 8c1cc41c..6f7bc938 100644
--- a/js/Misc/MBLOCK.pickle
+++ b/js/Misc/MBLOCK.pickle
@@ -4,40 +4,38 @@ p0
 ((lp1
 S'Touttype'
 p2
-aS'lab_1'
-p3
 aS'Tparam'
-p4
+p3
 aS'intype'
-p5
+p4
 aS'in1'
-p6
+p5
 aS'Tin'
-p7
+p6
 aS'outtype'
-p8
+p7
 aS'Tout'
-p9
+p8
 aS'pprop'
-p10
+p9
 aS'graphics'
-p11
+p10
 aS'funam'
-p12
+p11
 aS'x'
-p13
+p12
 aS'model'
-p14
+p13
 aS'out'
-p15
+p14
 aS'type'
-p16
+p15
 aS'Tintype'
-p17
+p16
 aS'Tfunam'
-p18
-atp19
-Rp20
+p17
+atp18
+Rp19
 .(dp0
 S'rhs_txt'
 p1
diff --git a/js/Misc/c_block.js b/js/Misc/c_block.js
index 97ce52d1..18d41122 100644
--- a/js/Misc/c_block.js
+++ b/js/Misc/c_block.js
@@ -49,14 +49,13 @@ function c_block() {
             this.o = parseFloat(arguments[0]["o"]);
             this.rpar = inverse(arguments[0]["rpar"]);
             this.funam = arguments[0]["funam"];
-            this.lab = arguments[0]["lab"];
             if (!ok) {
                 break;
             }
             if (this.funam==" ") {
                 break;
             }
-            label[1-1] = this.lab;
+            label[1-1] = lab;
             this.rpar = this.rpar.slice();
             this.i = int(this.i.slice());
             var ni = size(this.i,1);
diff --git a/js/Misc/c_block.pickle b/js/Misc/c_block.pickle
index 6d9ad356..a1000e9e 100644
--- a/js/Misc/c_block.pickle
+++ b/js/Misc/c_block.pickle
@@ -8,18 +8,16 @@ aS'o'
 p3
 aS'rpar'
 p4
-aS'lab'
-p5
 aS'graphics'
-p6
+p5
 aS'funam'
-p7
+p6
 aS'x'
-p8
+p7
 aS'model'
-p9
-atp10
-Rp11
+p8
+atp9
+Rp10
 .(dp0
 S'label[1-1]'
 p1
diff --git a/js/Misc/fortran_block.js b/js/Misc/fortran_block.js
index 38be4adc..4b6be5db 100644
--- a/js/Misc/fortran_block.js
+++ b/js/Misc/fortran_block.js
@@ -40,14 +40,13 @@ function fortran_block() {
             this.o = parseFloat(arguments[0]["o"]);
             this.rpar = inverse(arguments[0]["rpar"]);
             this.funam = arguments[0]["funam"];
-            this.lab = arguments[0]["lab"];
             if (!ok) {
                 break;
             }
             if (this.funam==" ") {
                 break;
             }
-            label[1-1] = this.lab;
+            label[1-1] = lab;
             this.rpar = this.rpar.slice();
             this.i = int(this.i.slice());
             var ni = size(this.i,1);
diff --git a/js/Misc/fortran_block.pickle b/js/Misc/fortran_block.pickle
index 291369ef..c60970bb 100644
--- a/js/Misc/fortran_block.pickle
+++ b/js/Misc/fortran_block.pickle
@@ -8,18 +8,16 @@ aS'o'
 p3
 aS'rpar'
 p4
-aS'lab'
-p5
 aS'graphics'
-p6
+p5
 aS'funam'
-p7
+p6
 aS'x'
-p8
+p7
 aS'model'
-p9
-atp10
-Rp11
+p8
+atp9
+Rp10
 .(dp0
 S'label[1-1]'
 p1
diff --git a/js/Misc/generic_block.js b/js/Misc/generic_block.js
index 01ccc1b0..84c6ae5e 100644
--- a/js/Misc/generic_block.js
+++ b/js/Misc/generic_block.js
@@ -62,11 +62,10 @@ function generic_block() {
             this.auto0 = arguments[0]["auto0"];
             this.depu = parseBoolean(arguments[0]["depu"]);
             this.dept = parseBoolean(arguments[0]["dept"]);
-            this.lab = arguments[0]["lab"];
             if (!ok) {
                 break;
             }
-            var label = this.lab;
+            var label = lab;
             this.function_name = stripblanks(this.function_name);
             this.xx = this.xx.slice();
             this.z = this.z.slice();
diff --git a/js/Misc/generic_block.pickle b/js/Misc/generic_block.pickle
index c26a1290..a4b8edaa 100644
--- a/js/Misc/generic_block.pickle
+++ b/js/Misc/generic_block.pickle
@@ -22,22 +22,20 @@ aS'xx'
 p10
 aS'funtyp'
 p11
-aS'lab'
-p12
 aS'ipar'
-p13
+p12
 aS'graphics'
-p14
+p13
 aS'x'
-p15
+p14
 aS'model'
-p16
+p15
 aS'z'
-p17
+p16
 aS'function_name'
-p18
-atp19
-Rp20
+p17
+atp18
+Rp19
 .(dp0
 S'ci'
 p1
diff --git a/js/Misc/generic_block2.js b/js/Misc/generic_block2.js
index 463f15cf..1f79af44 100644
--- a/js/Misc/generic_block2.js
+++ b/js/Misc/generic_block2.js
@@ -66,11 +66,10 @@ function generic_block2() {
             this.auto0 = arguments[0]["auto0"];
             this.depu = parseBoolean(arguments[0]["depu"]);
             this.dept = parseBoolean(arguments[0]["dept"]);
-            this.lab = arguments[0]["lab"];
             if (!ok) {
                 break;
             }
-            var label = this.lab;
+            var label = lab;
             this.function_name = stripblanks(this.function_name);
             this.xx = this.xx.slice();
             this.z = this.z.slice();
diff --git a/js/Misc/generic_block2.pickle b/js/Misc/generic_block2.pickle
index 8023e025..ad3ee78a 100644
--- a/js/Misc/generic_block2.pickle
+++ b/js/Misc/generic_block2.pickle
@@ -24,24 +24,22 @@ aS'nzcr'
 p11
 aS'funtyp'
 p12
-aS'lab'
-p13
 aS'ipar'
-p14
+p13
 aS'graphics'
-p15
+p14
 aS'x'
-p16
+p15
 aS'model'
-p17
+p16
 aS'z'
-p18
+p17
 aS'nmode'
-p19
+p18
 aS'function_name'
-p20
-atp21
-Rp22
+p19
+atp20
+Rp21
 .(dp0
 S'ci'
 p1
diff --git a/js/Misc/generic_block3.js b/js/Misc/generic_block3.js
index 55cdf65f..be27368c 100644
--- a/js/Misc/generic_block3.js
+++ b/js/Misc/generic_block3.js
@@ -70,11 +70,10 @@ function generic_block3() {
             this.auto0 = arguments[0]["auto0"];
             this.depu = parseBoolean(arguments[0]["depu"]);
             this.dept = parseBoolean(arguments[0]["dept"]);
-            this.lab = arguments[0]["lab"];
             if (!ok) {
                 break;
             }
-            var label = this.lab;
+            var label = lab;
             this.function_name = stripblanks(this.function_name);
             this.xx = this.xx.slice();
             this.z = this.z.slice();
diff --git a/js/Misc/generic_block3.pickle b/js/Misc/generic_block3.pickle
index 9a802844..994993fa 100644
--- a/js/Misc/generic_block3.pickle
+++ b/js/Misc/generic_block3.pickle
@@ -22,36 +22,34 @@ aS'function_name'
 p10
 aS'in1'
 p11
-aS'lab'
-p12
 aS'graphics'
-p13
+p12
 aS'nmode'
-p14
+p13
 aS'z'
-p15
+p14
 aS'xx'
-p16
+p15
 aS'nzcr'
-p17
+p16
 aS'depu'
-p18
+p17
 aS'dept'
-p19
+p18
 aS'opar'
-p20
+p19
 aS'oz'
-p21
+p20
 aS'ipar'
-p22
+p21
 aS'x'
-p23
+p22
 aS'model'
-p24
+p23
 aS'ot'
-p25
-atp26
-Rp27
+p24
+atp25
+Rp26
 .(dp0
 S'model.odstate'
 p1
diff --git a/js/Misc/scifunc_block.js b/js/Misc/scifunc_block.js
index 9da74f19..9f843979 100644
--- a/js/Misc/scifunc_block.js
+++ b/js/Misc/scifunc_block.js
@@ -63,11 +63,10 @@ function scifunc_block() {
             this.rpar = inverse(arguments[0]["rpar"]);
             this.auto0 = arguments[0]["auto0"];
             this.deptime = arguments[0]["deptime"];
-            this.lab = arguments[0]["lab"];
             if (!ok) {
                 break;
             }
-            exprs[1-1] = this.lab;
+            exprs[1-1] = lab;
             this.xx = this.xx.slice();
             this.z = this.z.slice();
             this.rpar = this.rpar.slice();
diff --git a/js/Misc/scifunc_block.pickle b/js/Misc/scifunc_block.pickle
index 4a6e19c2..95ffe5db 100644
--- a/js/Misc/scifunc_block.pickle
+++ b/js/Misc/scifunc_block.pickle
@@ -18,18 +18,16 @@ aS'rpar'
 p8
 aS'xx'
 p9
-aS'lab'
-p10
 aS'graphics'
-p11
+p10
 aS'x'
-p12
+p11
 aS'model'
-p13
+p12
 aS'z'
-p14
-atp15
-Rp16
+p13
+atp14
+Rp15
 .(dp0
 S'exprs[1-1]'
 p1
diff --git a/js/Misc/scifunc_block_m.js b/js/Misc/scifunc_block_m.js
index e4954df0..2df3f544 100644
--- a/js/Misc/scifunc_block_m.js
+++ b/js/Misc/scifunc_block_m.js
@@ -65,11 +65,10 @@ function scifunc_block_m() {
             this.rpar = inverse(arguments[0]["rpar"]);
             this.auto0 = arguments[0]["auto0"];
             this.deptime = arguments[0]["deptime"];
-            this.lab = arguments[0]["lab"];
             if (!ok) {
                 break;
             }
-            exprs[1-1] = this.lab;
+            exprs[1-1] = lab;
             this.xx = this.xx.slice();
             this.z = this.z.slice();
             this.rpar = this.rpar.slice();
diff --git a/js/Misc/scifunc_block_m.pickle b/js/Misc/scifunc_block_m.pickle
index 87763930..48775162 100644
--- a/js/Misc/scifunc_block_m.pickle
+++ b/js/Misc/scifunc_block_m.pickle
@@ -18,18 +18,16 @@ aS'rpar'
 p8
 aS'xx'
 p9
-aS'lab'
-p10
 aS'graphics'
-p11
+p10
 aS'x'
-p12
+p11
 aS'model'
-p13
+p12
 aS'z'
-p14
-atp15
-Rp16
+p13
+atp14
+Rp15
 .(dp0
 S'exprs[1-1]'
 p1