cvsimport

2015-06-09 13:02:15 +00:00
parent 7c4a8f3b51 ee400b08a8
commit 4454948f21
10 changed files with 261 additions and 259 deletions
--- a/parse.y
+++ b/parse.y
@@ -156,9 +156,20 @@ main		: FONTNAME STRING		{
 				free($3);
 				YYERROR;
 			}
-			conf_autogroup(conf, $2, $3);
+			conf_autogroup(conf, $2, NULL, $3);
 			free($3);
 		}
+		| AUTOGROUP NUMBER STRING ',' STRING {
+			if ($2 < 0 || $2 > 9) {
+				yyerror("invalid autogroup");
+				free($3);
+				free($5);
+				YYERROR;
+			}
+			conf_autogroup(conf, $2, $3, $5);
+			free($3);
+			free($5);
+		}
 		| IGNORE STRING {
 			conf_ignore(conf, $2);
 			free($2);