Add the new features to the specification

Tune up some of the grammar
adobe-type-tools · Jun 5, 2024 · df384ca · df384ca
1 parent 7b07c6b
commit df384ca
Show file tree

Hide file tree

Showing 8 changed files with 1,058 additions and 913 deletions.
diff --git a/c/addfeatures/hotconv/FeatLexer.cpp b/c/addfeatures/hotconv/FeatLexer.cpp
diff --git a/c/addfeatures/hotconv/FeatLexer.g4 b/c/addfeatures/hotconv/FeatLexer.g4
@@ -35,10 +35,10 @@ ANON_v                      : 'anonymous' -> pushMode(Anon) ;
 mode Anon;
 
 A_WHITESPACE                : [ \t\r\n]+ -> skip ;
-A_LABEL                     : (NAMELABEL | EXTNAME | STRVAL | AXISUNIT | MARK) { anon_tag = getText(); } ;
+A_LABEL                     : (NAMELABEL | EXTNAME | STRVAL | MARK) { anon_tag = getText(); } ;
 A_LBRACE                    : '{' -> mode(AnonContent) ;
 
 mode AnonContent;
 
-A_CLOSE                     : '\r'? '\n}' [ \t]* (NAMELABEL | EXTNAME | STRVAL | AXISUNIT | MARK) [ \t]* ';' { verify_anon(getText()) }? -> popMode ;
+A_CLOSE                     : '\r'? '\n}' [ \t]* (NAMELABEL | EXTNAME | STRVAL | MARK) [ \t]* ';' { verify_anon(getText()) }? -> popMode ;
 A_LINE                      : '\r'? '\n' ~[\r\n]* ;
diff --git a/c/addfeatures/hotconv/FeatLexer.interp b/c/addfeatures/hotconv/FeatLexer.interp
diff --git a/c/addfeatures/hotconv/FeatParser.cpp b/c/addfeatures/hotconv/FeatParser.cpp
diff --git a/c/addfeatures/hotconv/FeatParser.g4 b/c/addfeatures/hotconv/FeatParser.g4
@@ -561,7 +561,7 @@ label:
 ;
 
 tag:
-    NAMELABEL | EXTNAME | STRVAL | AXISUNIT | MARK     // MARK included for "feature mark"
+    NAMELABEL | EXTNAME | STRVAL | MARK     // MARK included for "feature mark"
 ;
 
 fixedNum:

diff --git a/c/addfeatures/hotconv/FeatParser.h b/c/addfeatures/hotconv/FeatParser.h
@@ -1996,7 +1996,6 @@ class  FeatParser : public antlr4::Parser {
     antlr4::tree::TerminalNode *NAMELABEL();
     antlr4::tree::TerminalNode *EXTNAME();
     antlr4::tree::TerminalNode *STRVAL();
-    antlr4::tree::TerminalNode *AXISUNIT();
     antlr4::tree::TerminalNode *MARK();
 
 

diff --git a/c/addfeatures/hotconv/FeatParser.interp b/c/addfeatures/hotconv/FeatParser.interp