--- linuxsampler/trunk/src/scriptvm/editor/nksp.l	2019/08/27 21:36:53	3573
+++ linuxsampler/trunk/src/scriptvm/editor/nksp.l	2019/09/02 09:21:43	3591
@@ -71,8 +71,8 @@
 
 DIGIT    [0-9]
 ID       [a-zA-Z][a-zA-Z0-9_]*
-METRIC   (k|h|da|d|c|m|u)
-UNIT     (s|Hz|B)
+METRIC   (k|h|(da)|d|c|m|u)
+UNIT     (s|(Hz)|B)
 END_ID   on|while|if|select|function|synchronized
 
 %%
@@ -100,13 +100,13 @@
 }
 
 <METRIC>{METRIC}{1,2} {
-    yyextra->token = MetrixPrefixToken(yytext);
+    yyextra->token = MetricPrefixToken(yytext);
     yy_pop_state(yyscanner);
     return yyextra->token.baseType;
 }
 
 <METRIC>{METRIC}{1,2}/{UNIT} {
-    yyextra->token = MetrixPrefixToken(yytext);
+    yyextra->token = MetricPrefixToken(yytext);
     yy_pop_state(yyscanner);
     yy_push_state(UNIT, yyscanner);
     return yyextra->token.baseType;