DAOTHER-8905: Resolve interferance of MS Windows carriage return code…

… and NMRVIEW header
wwPDB · Jan 31, 2025 · 1fb1b37 · 1fb1b37
1 parent ef7b01f
commit 1fb1b37
Show file tree

Hide file tree

Showing 4 changed files with 703 additions and 644 deletions.
diff --git a/wwpdb/utils/nmr/pk/NmrViewPKLexer.py b/wwpdb/utils/nmr/pk/NmrViewPKLexer.py
@@ -10,7 +10,7 @@
 
 def serializedATN():
     return [
-        4,0,37,506,6,-1,6,-1,6,-1,2,0,7,0,2,1,7,1,2,2,7,2,2,3,7,3,2,4,7,
+        4,0,37,503,6,-1,6,-1,6,-1,2,0,7,0,2,1,7,1,2,2,7,2,2,3,7,3,2,4,7,
         4,2,5,7,5,2,6,7,6,2,7,7,7,2,8,7,8,2,9,7,9,2,10,7,10,2,11,7,11,2,
         12,7,12,2,13,7,13,2,14,7,14,2,15,7,15,2,16,7,16,2,17,7,17,2,18,7,
         18,2,19,7,19,2,20,7,20,2,21,7,21,2,22,7,22,2,23,7,23,2,24,7,24,2,
@@ -48,93 +48,93 @@ def serializedATN():
         8,37,10,37,12,37,421,9,37,1,37,1,37,1,37,1,37,1,37,1,37,1,37,5,37,
         430,8,37,10,37,12,37,433,9,37,5,37,435,8,37,10,37,12,37,438,9,37,
         1,37,4,37,441,8,37,11,37,12,37,442,1,37,1,37,1,38,1,38,1,39,1,39,
-        1,40,4,40,452,8,40,11,40,12,40,453,1,40,1,40,1,41,3,41,459,8,41,
-        1,41,1,41,1,42,1,42,5,42,465,8,42,10,42,12,42,468,9,42,1,42,1,42,
-        1,42,5,42,473,8,42,10,42,12,42,476,9,42,3,42,478,8,42,1,42,5,42,
-        481,8,42,10,42,12,42,484,9,42,1,42,1,42,1,43,4,43,489,8,43,11,43,
-        12,43,490,1,44,4,44,494,8,44,11,44,12,44,495,1,44,1,44,1,45,4,45,
-        501,8,45,11,45,12,45,502,1,45,1,45,1,474,0,46,3,1,5,2,7,3,9,4,11,
-        0,13,0,15,0,17,5,19,6,21,7,23,8,25,0,27,0,29,0,31,0,33,0,35,9,37,
-        10,39,0,41,11,43,12,45,13,47,14,49,15,51,16,53,17,55,18,57,19,59,
-        20,61,21,63,22,65,23,67,24,69,25,71,26,73,27,75,28,77,29,79,30,81,
-        31,83,32,85,33,87,34,89,35,91,36,93,37,3,0,1,2,11,2,0,43,43,45,45,
-        2,0,69,69,101,101,1,0,48,57,2,0,10,10,13,13,2,0,65,90,97,122,4,0,
-        42,43,45,46,63,63,95,95,5,0,34,35,37,37,39,39,44,44,124,124,2,0,
-        9,9,32,32,8,0,33,33,35,35,38,38,42,42,47,47,59,59,61,61,92,92,1,
-        0,49,57,5,0,9,10,13,13,32,32,123,123,125,125,552,0,3,1,0,0,0,0,5,
-        1,0,0,0,0,7,1,0,0,0,0,9,1,0,0,0,0,17,1,0,0,0,0,19,1,0,0,0,0,21,1,
-        0,0,0,0,23,1,0,0,0,0,35,1,0,0,0,0,37,1,0,0,0,0,41,1,0,0,0,0,43,1,
-        0,0,0,0,45,1,0,0,0,1,47,1,0,0,0,1,49,1,0,0,0,1,51,1,0,0,0,1,53,1,
-        0,0,0,1,55,1,0,0,0,1,57,1,0,0,0,1,59,1,0,0,0,1,61,1,0,0,0,1,63,1,
-        0,0,0,1,65,1,0,0,0,1,67,1,0,0,0,1,69,1,0,0,0,1,71,1,0,0,0,1,73,1,
-        0,0,0,1,75,1,0,0,0,1,77,1,0,0,0,1,79,1,0,0,0,1,81,1,0,0,0,1,83,1,
-        0,0,0,1,85,1,0,0,0,1,87,1,0,0,0,2,89,1,0,0,0,2,91,1,0,0,0,2,93,1,
-        0,0,0,3,95,1,0,0,0,5,104,1,0,0,0,7,109,1,0,0,0,9,116,1,0,0,0,11,
-        135,1,0,0,0,13,137,1,0,0,0,15,140,1,0,0,0,17,145,1,0,0,0,19,170,
-        1,0,0,0,21,195,1,0,0,0,23,219,1,0,0,0,25,221,1,0,0,0,27,225,1,0,
-        0,0,29,229,1,0,0,0,31,233,1,0,0,0,33,235,1,0,0,0,35,243,1,0,0,0,
-        37,250,1,0,0,0,39,254,1,0,0,0,41,257,1,0,0,0,43,288,1,0,0,0,45,325,
-        1,0,0,0,47,337,1,0,0,0,49,345,1,0,0,0,51,348,1,0,0,0,53,351,1,0,
-        0,0,55,361,1,0,0,0,57,365,1,0,0,0,59,369,1,0,0,0,61,373,1,0,0,0,
-        63,377,1,0,0,0,65,381,1,0,0,0,67,385,1,0,0,0,69,389,1,0,0,0,71,393,
-        1,0,0,0,73,397,1,0,0,0,75,402,1,0,0,0,77,410,1,0,0,0,79,446,1,0,
-        0,0,81,448,1,0,0,0,83,451,1,0,0,0,85,458,1,0,0,0,87,462,1,0,0,0,
-        89,488,1,0,0,0,91,493,1,0,0,0,93,500,1,0,0,0,95,96,5,108,0,0,96,
-        97,5,97,0,0,97,98,5,98,0,0,98,99,5,101,0,0,99,100,5,108,0,0,100,
-        101,1,0,0,0,101,102,6,0,0,0,102,4,1,0,0,0,103,105,7,0,0,0,104,103,
-        1,0,0,0,104,105,1,0,0,0,105,106,1,0,0,0,106,107,3,15,6,0,107,6,1,
-        0,0,0,108,110,7,0,0,0,109,108,1,0,0,0,109,110,1,0,0,0,110,113,1,
-        0,0,0,111,114,3,15,6,0,112,114,3,11,4,0,113,111,1,0,0,0,113,112,
-        1,0,0,0,114,8,1,0,0,0,115,117,7,0,0,0,116,115,1,0,0,0,116,117,1,
-        0,0,0,117,120,1,0,0,0,118,121,3,15,6,0,119,121,3,11,4,0,120,118,
-        1,0,0,0,120,119,1,0,0,0,121,127,1,0,0,0,122,124,7,1,0,0,123,125,
-        7,0,0,0,124,123,1,0,0,0,124,125,1,0,0,0,125,126,1,0,0,0,126,128,
-        3,15,6,0,127,122,1,0,0,0,127,128,1,0,0,0,128,10,1,0,0,0,129,130,
-        3,15,6,0,130,131,5,46,0,0,131,132,3,15,6,0,132,136,1,0,0,0,133,134,
-        5,46,0,0,134,136,3,15,6,0,135,129,1,0,0,0,135,133,1,0,0,0,136,12,
-        1,0,0,0,137,138,7,2,0,0,138,14,1,0,0,0,139,141,3,13,5,0,140,139,
-        1,0,0,0,141,142,1,0,0,0,142,140,1,0,0,0,142,143,1,0,0,0,143,16,1,
-        0,0,0,144,146,5,35,0,0,145,144,1,0,0,0,146,147,1,0,0,0,147,145,1,
-        0,0,0,147,148,1,0,0,0,148,152,1,0,0,0,149,151,8,3,0,0,150,149,1,
-        0,0,0,151,154,1,0,0,0,152,150,1,0,0,0,152,153,1,0,0,0,153,158,1,
-        0,0,0,154,152,1,0,0,0,155,157,5,35,0,0,156,155,1,0,0,0,157,160,1,
-        0,0,0,158,156,1,0,0,0,158,159,1,0,0,0,159,164,1,0,0,0,160,158,1,
-        0,0,0,161,163,8,3,0,0,162,161,1,0,0,0,163,166,1,0,0,0,164,162,1,
-        0,0,0,164,165,1,0,0,0,165,167,1,0,0,0,166,164,1,0,0,0,167,168,6,
-        7,1,0,168,18,1,0,0,0,169,171,5,33,0,0,170,169,1,0,0,0,171,172,1,
-        0,0,0,172,170,1,0,0,0,172,173,1,0,0,0,173,177,1,0,0,0,174,176,8,
-        3,0,0,175,174,1,0,0,0,176,179,1,0,0,0,177,175,1,0,0,0,177,178,1,
-        0,0,0,178,183,1,0,0,0,179,177,1,0,0,0,180,182,5,33,0,0,181,180,1,
-        0,0,0,182,185,1,0,0,0,183,181,1,0,0,0,183,184,1,0,0,0,184,189,1,
-        0,0,0,185,183,1,0,0,0,186,188,8,3,0,0,187,186,1,0,0,0,188,191,1,
-        0,0,0,189,187,1,0,0,0,189,190,1,0,0,0,190,192,1,0,0,0,191,189,1,
-        0,0,0,192,193,6,8,1,0,193,20,1,0,0,0,194,196,5,59,0,0,195,194,1,
-        0,0,0,196,197,1,0,0,0,197,195,1,0,0,0,197,198,1,0,0,0,198,202,1,
-        0,0,0,199,201,8,3,0,0,200,199,1,0,0,0,201,204,1,0,0,0,202,200,1,
-        0,0,0,202,203,1,0,0,0,203,208,1,0,0,0,204,202,1,0,0,0,205,207,5,
-        59,0,0,206,205,1,0,0,0,207,210,1,0,0,0,208,206,1,0,0,0,208,209,1,
-        0,0,0,209,214,1,0,0,0,210,208,1,0,0,0,211,213,8,3,0,0,212,211,1,
-        0,0,0,213,216,1,0,0,0,214,212,1,0,0,0,214,215,1,0,0,0,215,217,1,
-        0,0,0,216,214,1,0,0,0,217,218,6,9,1,0,218,22,1,0,0,0,219,220,3,33,
-        15,0,220,24,1,0,0,0,221,222,7,4,0,0,222,26,1,0,0,0,223,226,3,25,
-        11,0,224,226,3,13,5,0,225,223,1,0,0,0,225,224,1,0,0,0,226,28,1,0,
-        0,0,227,230,3,27,12,0,228,230,7,5,0,0,229,227,1,0,0,0,229,228,1,
-        0,0,0,230,30,1,0,0,0,231,234,3,29,13,0,232,234,7,6,0,0,233,231,1,
-        0,0,0,233,232,1,0,0,0,234,32,1,0,0,0,235,239,3,29,13,0,236,238,3,
-        31,14,0,237,236,1,0,0,0,238,241,1,0,0,0,239,237,1,0,0,0,239,240,
-        1,0,0,0,240,34,1,0,0,0,241,239,1,0,0,0,242,244,7,7,0,0,243,242,1,
-        0,0,0,244,245,1,0,0,0,245,243,1,0,0,0,245,246,1,0,0,0,246,247,1,
-        0,0,0,247,248,6,16,2,0,248,36,1,0,0,0,249,251,7,3,0,0,250,249,1,
-        0,0,0,251,252,1,0,0,0,252,250,1,0,0,0,252,253,1,0,0,0,253,38,1,0,
-        0,0,254,255,7,8,0,0,255,40,1,0,0,0,256,258,5,123,0,0,257,256,1,0,
-        0,0,258,259,1,0,0,0,259,257,1,0,0,0,259,260,1,0,0,0,260,261,1,0,
-        0,0,261,262,6,19,3,0,262,42,1,0,0,0,263,289,3,39,18,0,264,266,3,
-        39,18,0,265,267,5,47,0,0,266,265,1,0,0,0,267,268,1,0,0,0,268,266,
-        1,0,0,0,268,269,1,0,0,0,269,289,1,0,0,0,270,272,3,39,18,0,271,273,
-        5,42,0,0,272,271,1,0,0,0,273,274,1,0,0,0,274,272,1,0,0,0,274,275,
-        1,0,0,0,275,289,1,0,0,0,276,278,3,39,18,0,277,279,5,61,0,0,278,277,
-        1,0,0,0,279,280,1,0,0,0,280,278,1,0,0,0,280,281,1,0,0,0,281,289,
-        1,0,0,0,282,283,5,82,0,0,283,284,5,69,0,0,284,285,5,77,0,0,285,286,
+        1,40,4,40,452,8,40,11,40,12,40,453,1,40,1,40,1,41,1,41,1,42,1,42,
+        5,42,462,8,42,10,42,12,42,465,9,42,1,42,1,42,1,42,5,42,470,8,42,
+        10,42,12,42,473,9,42,3,42,475,8,42,1,42,5,42,478,8,42,10,42,12,42,
+        481,9,42,1,42,1,42,1,43,4,43,486,8,43,11,43,12,43,487,1,44,4,44,
+        491,8,44,11,44,12,44,492,1,44,1,44,1,45,4,45,498,8,45,11,45,12,45,
+        499,1,45,1,45,1,471,0,46,3,1,5,2,7,3,9,4,11,0,13,0,15,0,17,5,19,
+        6,21,7,23,8,25,0,27,0,29,0,31,0,33,0,35,9,37,10,39,0,41,11,43,12,
+        45,13,47,14,49,15,51,16,53,17,55,18,57,19,59,20,61,21,63,22,65,23,
+        67,24,69,25,71,26,73,27,75,28,77,29,79,30,81,31,83,32,85,33,87,34,
+        89,35,91,36,93,37,3,0,1,2,12,2,0,43,43,45,45,2,0,69,69,101,101,1,
+        0,48,57,2,0,10,10,13,13,2,0,65,90,97,122,4,0,42,43,45,46,63,63,95,
+        95,5,0,34,35,37,37,39,39,44,44,124,124,2,0,9,9,32,32,8,0,33,33,35,
+        35,38,38,42,42,47,47,59,59,61,61,92,92,1,0,49,57,3,0,9,9,13,13,32,
+        32,5,0,9,10,13,13,32,32,123,123,125,125,548,0,3,1,0,0,0,0,5,1,0,
+        0,0,0,7,1,0,0,0,0,9,1,0,0,0,0,17,1,0,0,0,0,19,1,0,0,0,0,21,1,0,0,
+        0,0,23,1,0,0,0,0,35,1,0,0,0,0,37,1,0,0,0,0,41,1,0,0,0,0,43,1,0,0,
+        0,0,45,1,0,0,0,1,47,1,0,0,0,1,49,1,0,0,0,1,51,1,0,0,0,1,53,1,0,0,
+        0,1,55,1,0,0,0,1,57,1,0,0,0,1,59,1,0,0,0,1,61,1,0,0,0,1,63,1,0,0,
+        0,1,65,1,0,0,0,1,67,1,0,0,0,1,69,1,0,0,0,1,71,1,0,0,0,1,73,1,0,0,
+        0,1,75,1,0,0,0,1,77,1,0,0,0,1,79,1,0,0,0,1,81,1,0,0,0,1,83,1,0,0,
+        0,1,85,1,0,0,0,1,87,1,0,0,0,2,89,1,0,0,0,2,91,1,0,0,0,2,93,1,0,0,
+        0,3,95,1,0,0,0,5,104,1,0,0,0,7,109,1,0,0,0,9,116,1,0,0,0,11,135,
+        1,0,0,0,13,137,1,0,0,0,15,140,1,0,0,0,17,145,1,0,0,0,19,170,1,0,
+        0,0,21,195,1,0,0,0,23,219,1,0,0,0,25,221,1,0,0,0,27,225,1,0,0,0,
+        29,229,1,0,0,0,31,233,1,0,0,0,33,235,1,0,0,0,35,243,1,0,0,0,37,250,
+        1,0,0,0,39,254,1,0,0,0,41,257,1,0,0,0,43,288,1,0,0,0,45,325,1,0,
+        0,0,47,337,1,0,0,0,49,345,1,0,0,0,51,348,1,0,0,0,53,351,1,0,0,0,
+        55,361,1,0,0,0,57,365,1,0,0,0,59,369,1,0,0,0,61,373,1,0,0,0,63,377,
+        1,0,0,0,65,381,1,0,0,0,67,385,1,0,0,0,69,389,1,0,0,0,71,393,1,0,
+        0,0,73,397,1,0,0,0,75,402,1,0,0,0,77,410,1,0,0,0,79,446,1,0,0,0,
+        81,448,1,0,0,0,83,451,1,0,0,0,85,457,1,0,0,0,87,459,1,0,0,0,89,485,
+        1,0,0,0,91,490,1,0,0,0,93,497,1,0,0,0,95,96,5,108,0,0,96,97,5,97,
+        0,0,97,98,5,98,0,0,98,99,5,101,0,0,99,100,5,108,0,0,100,101,1,0,
+        0,0,101,102,6,0,0,0,102,4,1,0,0,0,103,105,7,0,0,0,104,103,1,0,0,
+        0,104,105,1,0,0,0,105,106,1,0,0,0,106,107,3,15,6,0,107,6,1,0,0,0,
+        108,110,7,0,0,0,109,108,1,0,0,0,109,110,1,0,0,0,110,113,1,0,0,0,
+        111,114,3,15,6,0,112,114,3,11,4,0,113,111,1,0,0,0,113,112,1,0,0,
+        0,114,8,1,0,0,0,115,117,7,0,0,0,116,115,1,0,0,0,116,117,1,0,0,0,
+        117,120,1,0,0,0,118,121,3,15,6,0,119,121,3,11,4,0,120,118,1,0,0,
+        0,120,119,1,0,0,0,121,127,1,0,0,0,122,124,7,1,0,0,123,125,7,0,0,
+        0,124,123,1,0,0,0,124,125,1,0,0,0,125,126,1,0,0,0,126,128,3,15,6,
+        0,127,122,1,0,0,0,127,128,1,0,0,0,128,10,1,0,0,0,129,130,3,15,6,
+        0,130,131,5,46,0,0,131,132,3,15,6,0,132,136,1,0,0,0,133,134,5,46,
+        0,0,134,136,3,15,6,0,135,129,1,0,0,0,135,133,1,0,0,0,136,12,1,0,
+        0,0,137,138,7,2,0,0,138,14,1,0,0,0,139,141,3,13,5,0,140,139,1,0,
+        0,0,141,142,1,0,0,0,142,140,1,0,0,0,142,143,1,0,0,0,143,16,1,0,0,
+        0,144,146,5,35,0,0,145,144,1,0,0,0,146,147,1,0,0,0,147,145,1,0,0,
+        0,147,148,1,0,0,0,148,152,1,0,0,0,149,151,8,3,0,0,150,149,1,0,0,
+        0,151,154,1,0,0,0,152,150,1,0,0,0,152,153,1,0,0,0,153,158,1,0,0,
+        0,154,152,1,0,0,0,155,157,5,35,0,0,156,155,1,0,0,0,157,160,1,0,0,
+        0,158,156,1,0,0,0,158,159,1,0,0,0,159,164,1,0,0,0,160,158,1,0,0,
+        0,161,163,8,3,0,0,162,161,1,0,0,0,163,166,1,0,0,0,164,162,1,0,0,
+        0,164,165,1,0,0,0,165,167,1,0,0,0,166,164,1,0,0,0,167,168,6,7,1,
+        0,168,18,1,0,0,0,169,171,5,33,0,0,170,169,1,0,0,0,171,172,1,0,0,
+        0,172,170,1,0,0,0,172,173,1,0,0,0,173,177,1,0,0,0,174,176,8,3,0,
+        0,175,174,1,0,0,0,176,179,1,0,0,0,177,175,1,0,0,0,177,178,1,0,0,
+        0,178,183,1,0,0,0,179,177,1,0,0,0,180,182,5,33,0,0,181,180,1,0,0,
+        0,182,185,1,0,0,0,183,181,1,0,0,0,183,184,1,0,0,0,184,189,1,0,0,
+        0,185,183,1,0,0,0,186,188,8,3,0,0,187,186,1,0,0,0,188,191,1,0,0,
+        0,189,187,1,0,0,0,189,190,1,0,0,0,190,192,1,0,0,0,191,189,1,0,0,
+        0,192,193,6,8,1,0,193,20,1,0,0,0,194,196,5,59,0,0,195,194,1,0,0,
+        0,196,197,1,0,0,0,197,195,1,0,0,0,197,198,1,0,0,0,198,202,1,0,0,
+        0,199,201,8,3,0,0,200,199,1,0,0,0,201,204,1,0,0,0,202,200,1,0,0,
+        0,202,203,1,0,0,0,203,208,1,0,0,0,204,202,1,0,0,0,205,207,5,59,0,
+        0,206,205,1,0,0,0,207,210,1,0,0,0,208,206,1,0,0,0,208,209,1,0,0,
+        0,209,214,1,0,0,0,210,208,1,0,0,0,211,213,8,3,0,0,212,211,1,0,0,
+        0,213,216,1,0,0,0,214,212,1,0,0,0,214,215,1,0,0,0,215,217,1,0,0,
+        0,216,214,1,0,0,0,217,218,6,9,1,0,218,22,1,0,0,0,219,220,3,33,15,
+        0,220,24,1,0,0,0,221,222,7,4,0,0,222,26,1,0,0,0,223,226,3,25,11,
+        0,224,226,3,13,5,0,225,223,1,0,0,0,225,224,1,0,0,0,226,28,1,0,0,
+        0,227,230,3,27,12,0,228,230,7,5,0,0,229,227,1,0,0,0,229,228,1,0,
+        0,0,230,30,1,0,0,0,231,234,3,29,13,0,232,234,7,6,0,0,233,231,1,0,
+        0,0,233,232,1,0,0,0,234,32,1,0,0,0,235,239,3,29,13,0,236,238,3,31,
+        14,0,237,236,1,0,0,0,238,241,1,0,0,0,239,237,1,0,0,0,239,240,1,0,
+        0,0,240,34,1,0,0,0,241,239,1,0,0,0,242,244,7,7,0,0,243,242,1,0,0,
+        0,244,245,1,0,0,0,245,243,1,0,0,0,245,246,1,0,0,0,246,247,1,0,0,
+        0,247,248,6,16,2,0,248,36,1,0,0,0,249,251,7,3,0,0,250,249,1,0,0,
+        0,251,252,1,0,0,0,252,250,1,0,0,0,252,253,1,0,0,0,253,38,1,0,0,0,
+        254,255,7,8,0,0,255,40,1,0,0,0,256,258,5,123,0,0,257,256,1,0,0,0,
+        258,259,1,0,0,0,259,257,1,0,0,0,259,260,1,0,0,0,260,261,1,0,0,0,
+        261,262,6,19,3,0,262,42,1,0,0,0,263,289,3,39,18,0,264,266,3,39,18,
+        0,265,267,5,47,0,0,266,265,1,0,0,0,267,268,1,0,0,0,268,266,1,0,0,
+        0,268,269,1,0,0,0,269,289,1,0,0,0,270,272,3,39,18,0,271,273,5,42,
+        0,0,272,271,1,0,0,0,273,274,1,0,0,0,274,272,1,0,0,0,274,275,1,0,
+        0,0,275,289,1,0,0,0,276,278,3,39,18,0,277,279,5,61,0,0,278,277,1,
+        0,0,0,279,280,1,0,0,0,280,278,1,0,0,0,280,281,1,0,0,0,281,289,1,
+        0,0,0,282,283,5,82,0,0,283,284,5,69,0,0,284,285,5,77,0,0,285,286,
         5,65,0,0,286,287,5,82,0,0,287,289,5,75,0,0,288,263,1,0,0,0,288,264,
         1,0,0,0,288,270,1,0,0,0,288,276,1,0,0,0,288,282,1,0,0,0,289,293,
         1,0,0,0,290,292,5,32,0,0,291,290,1,0,0,0,292,295,1,0,0,0,293,291,
@@ -181,27 +181,26 @@ def serializedATN():
         440,1,0,0,0,438,436,1,0,0,0,439,441,7,3,0,0,440,439,1,0,0,0,441,
         442,1,0,0,0,442,440,1,0,0,0,442,443,1,0,0,0,443,444,1,0,0,0,444,
         445,6,37,4,0,445,78,1,0,0,0,446,447,3,33,15,0,447,80,1,0,0,0,448,
-        449,3,7,2,0,449,82,1,0,0,0,450,452,7,7,0,0,451,450,1,0,0,0,452,453,
-        1,0,0,0,453,451,1,0,0,0,453,454,1,0,0,0,454,455,1,0,0,0,455,456,
-        6,40,2,0,456,84,1,0,0,0,457,459,5,13,0,0,458,457,1,0,0,0,458,459,
-        1,0,0,0,459,460,1,0,0,0,460,461,5,10,0,0,461,86,1,0,0,0,462,466,
-        5,123,0,0,463,465,5,32,0,0,464,463,1,0,0,0,465,468,1,0,0,0,466,464,
-        1,0,0,0,466,467,1,0,0,0,467,477,1,0,0,0,468,466,1,0,0,0,469,478,
-        3,7,2,0,470,473,3,33,15,0,471,473,5,32,0,0,472,470,1,0,0,0,472,471,
-        1,0,0,0,473,476,1,0,0,0,474,475,1,0,0,0,474,472,1,0,0,0,475,478,
-        1,0,0,0,476,474,1,0,0,0,477,469,1,0,0,0,477,474,1,0,0,0,478,482,
-        1,0,0,0,479,481,5,32,0,0,480,479,1,0,0,0,481,484,1,0,0,0,482,480,
-        1,0,0,0,482,483,1,0,0,0,483,485,1,0,0,0,484,482,1,0,0,0,485,486,
-        5,125,0,0,486,88,1,0,0,0,487,489,8,10,0,0,488,487,1,0,0,0,489,490,
-        1,0,0,0,490,488,1,0,0,0,490,491,1,0,0,0,491,90,1,0,0,0,492,494,7,
-        7,0,0,493,492,1,0,0,0,494,495,1,0,0,0,495,493,1,0,0,0,495,496,1,
-        0,0,0,496,497,1,0,0,0,497,498,6,44,2,0,498,92,1,0,0,0,499,501,5,
-        125,0,0,500,499,1,0,0,0,501,502,1,0,0,0,502,500,1,0,0,0,502,503,
-        1,0,0,0,503,504,1,0,0,0,504,505,6,45,4,0,505,94,1,0,0,0,55,0,1,2,
+        449,3,7,2,0,449,82,1,0,0,0,450,452,7,10,0,0,451,450,1,0,0,0,452,
+        453,1,0,0,0,453,451,1,0,0,0,453,454,1,0,0,0,454,455,1,0,0,0,455,
+        456,6,40,2,0,456,84,1,0,0,0,457,458,5,10,0,0,458,86,1,0,0,0,459,
+        463,5,123,0,0,460,462,5,32,0,0,461,460,1,0,0,0,462,465,1,0,0,0,463,
+        461,1,0,0,0,463,464,1,0,0,0,464,474,1,0,0,0,465,463,1,0,0,0,466,
+        475,3,7,2,0,467,470,3,33,15,0,468,470,5,32,0,0,469,467,1,0,0,0,469,
+        468,1,0,0,0,470,473,1,0,0,0,471,472,1,0,0,0,471,469,1,0,0,0,472,
+        475,1,0,0,0,473,471,1,0,0,0,474,466,1,0,0,0,474,471,1,0,0,0,475,
+        479,1,0,0,0,476,478,5,32,0,0,477,476,1,0,0,0,478,481,1,0,0,0,479,
+        477,1,0,0,0,479,480,1,0,0,0,480,482,1,0,0,0,481,479,1,0,0,0,482,
+        483,5,125,0,0,483,88,1,0,0,0,484,486,8,11,0,0,485,484,1,0,0,0,486,
+        487,1,0,0,0,487,485,1,0,0,0,487,488,1,0,0,0,488,90,1,0,0,0,489,491,
+        7,7,0,0,490,489,1,0,0,0,491,492,1,0,0,0,492,490,1,0,0,0,492,493,
+        1,0,0,0,493,494,1,0,0,0,494,495,6,44,2,0,495,92,1,0,0,0,496,498,
+        5,125,0,0,497,496,1,0,0,0,498,499,1,0,0,0,499,497,1,0,0,0,499,500,
+        1,0,0,0,500,501,1,0,0,0,501,502,6,45,4,0,502,94,1,0,0,0,54,0,1,2,
         104,109,113,116,120,124,127,135,142,147,152,158,164,172,177,183,
         189,197,202,208,214,225,229,233,239,245,252,259,268,274,280,288,
-        293,305,311,317,325,330,419,431,436,442,453,458,466,472,474,477,
-        482,490,495,502,5,5,1,0,0,1,0,6,0,0,5,2,0,4,0,0
+        293,305,311,317,325,330,419,431,436,442,453,463,469,471,474,479,
+        487,492,499,5,5,1,0,0,1,0,6,0,0,5,2,0,4,0,0
     ]
 
 class NmrViewPKLexer(Lexer):
@@ -245,7 +244,7 @@ class NmrViewPKLexer(Lexer):
     Simple_name_LA = 30
     Float_LA = 31
     SPACE_LA = 32
-    RETURN_LA = 33
+    SINGLE_NL_LA = 33
     ENCLOSE_DATA_LA = 34
     Any_name = 35
     SPACE_CM = 36
@@ -257,15 +256,15 @@ class NmrViewPKLexer(Lexer):
 
     literalNames = [ "<INVALID>",
             "'label'", "'dataset'", "'sw'", "'sf'", "'condition'", "'vol'", 
-            "'int'", "'stat'", "'comment'" ]
+            "'int'", "'stat'", "'comment'", "'\\n'" ]
 
     symbolicNames = [ "<INVALID>",
             "Label", "Integer", "Float", "Real", "SHARP_COMMENT", "EXCLM_COMMENT", 
             "SMCLN_COMMENT", "Simple_name", "SPACE", "RETURN", "L_brace", 
             "SECTION_COMMENT", "LINE_COMMENT", "Dataset", "Sw", "Sf", "Condition", 
             "L_name", "P_name", "W_name", "B_name", "E_name", "J_name", 
             "U_name", "Vol", "Int", "Stat", "Comment", "Flag0", "Simple_name_LA", 
-            "Float_LA", "SPACE_LA", "RETURN_LA", "ENCLOSE_DATA_LA", "Any_name", 
+            "Float_LA", "SPACE_LA", "SINGLE_NL_LA", "ENCLOSE_DATA_LA", "Any_name", 
             "SPACE_CM", "R_brace" ]
 
     ruleNames = [ "Label", "Integer", "Float", "Real", "DEC_DOT_DEC", "DEC_DIGIT", 
@@ -276,7 +275,7 @@ class NmrViewPKLexer(Lexer):
                   "Sw", "Sf", "Condition", "L_name", "P_name", "W_name", 
                   "B_name", "E_name", "J_name", "U_name", "Vol", "Int", 
                   "Stat", "Comment", "Flag0", "Simple_name_LA", "Float_LA", 
-                  "SPACE_LA", "RETURN_LA", "ENCLOSE_DATA_LA", "Any_name", 
+                  "SPACE_LA", "SINGLE_NL_LA", "ENCLOSE_DATA_LA", "Any_name", 
                   "SPACE_CM", "R_brace" ]
 
     grammarFileName = "NmrViewPKLexer.g4"