改Open计数由Boolean转为int

src/main/java/com/brilliace/swifteditor/tag/TagLine.java

@@ -224,23 +224,23 @@ public class TagLine implements MessageArea {
     public String toAnalyzeReg() {
         StringBuilder sb = new StringBuilder();
         int cnt = 0;
-        boolean hasOpen = false;
+        int hasOpen = 0;
         for (TagCell cell : cellList) {
             for (int[] opt : options) {
                 if (cnt == opt[0]) {
                     sb.append('(');
-                    hasOpen = true;
+                    hasOpen++;
 //					break;
                 } else if (cnt == opt[1]) {
                     sb.append(")?");
-                    hasOpen = false;
+                    hasOpen--;
 //					break;
                 }
             }
             cnt++;
             sb.append(cell.toReg());
         }
-        if (hasOpen)
+        if (hasOpen>0)
             sb.append(")?");
         return sb.toString();
     }

src/main/resources/tags.properties

@@ -87,6 +87,7 @@
 21E=35x
 21F=16x
 21G=16x
+21H=4!c/16x
 21N=16x
 21P=16x
 21R=16x
@@ -121,12 +122,15 @@
 23C=7a
 23D=10a
 23E=4!c['/'30x]
+23F=4!a['/'35x]
 23G=4!c['/'4!c]
 23H=8!c
 23S=6!a
 23X=4!c'/'65x
 24B=':'4!c'/'[8c]'/'4!c
 24D=4!c['/'35x]
+24E=4!c['/'35x]
+24G=4!c['CRLF'6*35x]
 25=35x
 25A='/'34x
 25D=':'4!c'/'[8c]'/'4!c
@@ -139,6 +143,7 @@
 26F=9a
 26H=16x
 26T=3!c
+26K=4!c
 27=1!n'/'1!n
 28=5n['/'2n]
 28C=5n['/'5n]
@@ -192,7 +197,7 @@
 32R=['N']3!a<NUMBER>15
 32U=<CUR><AMOUNT>15
 33A=<DATE2><CUR><AMOUNT>15
-33B=3!a15d
+33B=<CUR><AMOUNT>15
 33C=<DATE2><CUR><AMOUNT>15
 33D=<DATE2><CUR><AMOUNT>15
 33E=<CUR><AMOUNT>15
@@ -217,6 +222,7 @@
 35C=3!c
 35D=<DATE2>
 35E=6*50x
+35G=12*65x
 35H=['N']3!a<NUMBER>15
 35L=4*35x
 35N=3!a<NUMBER>15
@@ -252,14 +258,19 @@
 39A=2n'/'2n
 39B=13x
 39C=4*35x
+39D=12*65z
+39E=12*65z
 39M=2!a
 40A=24x
 40B=24x'CRLF'24x
 40C=4!a['/'35x]
+40D=2!a
 40E=30x['/'35x]
 40F=30x
 41A=<SWIFTBIC>'CRLF'14x
 41D=4*35x'CRLF'14x
+41F=<SWIFTBIC>
+41G=4*35x
 42A=['/'<DC>]['/'34x]['CRLF']<SWIFTBIC>
 42C=3*35x
 42D=['/'<DC>]['/'34x]['CRLF']4*35x
@@ -273,14 +284,19 @@
 44D=6*65x
 44E=65x
 44F=65x
+44H=2!a['/'65x]
 45A=100*65z
 45B=100*65z
+45C=100*65z
 45D=150*65z
+45L=50*65z
 46A=100*65z
 46B=100*65z
 47A=100*65z
 47B=100*65z
 48=3n['/'35x]
+48B=4!c
+48D=4!c
 49=7!x
 49G=100*65z
 49H=100*65z
@@ -296,6 +312,7 @@
 50H='/'34x'CRLF'4*35x
 50K=['/'34x'CRLF']4*35x
 50L=35x
+51=4*35x
 51A=['/'<DC>]['/'34x]['CRLF']<SWIFTBIC>
 51C='/'34x
 51D=['/'<DC>]['/'34x]['CRLF']4*35x
@@ -307,6 +324,7 @@
 53B=['/'<DC>]['/'34x]['CRLF'][35x]
 53C='/'34x
 53D=['/'<DC>]['/'34x]['CRLF']4*35x
+53J=5*40x
 54A=['/'<DC>]['/'34x]['CRLF']<SWIFTBIC>
 54B=['/'<DC>]['/'34x]['CRLF'][35x]
 54D=['/'<DC>]['/'34x]['CRLF']4*35x
@@ -373,11 +391,13 @@
 77B=3*35x
 77C=150*65x
 77D=6*35x
-77E=73z['CRLF'9999*78z]
+77E=[80*78z]
 77F=1800y
 77H=6a['/'<DATE4>]['//'<YEAR>]
 77J=70*50z
+77L=150*65z
 77T=9000z
+77U=150*65z
 78=12*65x
 79=35*50x
 79Z=35*50z
@@ -470,7 +490,7 @@
 97B=':'4!c'/'[8c]'/'4!c'/'35x
 97C=':'4!c'//'4!c
 97E=':'4!c'//'34x
-98A=':'4!c'//'<DATE4>T50
+98A=':'4!c'//'<DATE4>
 98B=':'4!c'/'[8c]'/'4!c
 98C=':'4!c'//'<DATE4><TIME2>
 98D=<DATE4><TIME2>[','3n]['/'['N']<TIME3>]