@@ -74,11 +74,11 @@ let list
74
74
|> Common. list loc
75
75
|> fun e -> Some e
76
76
77
- let spaces = list (Re_str. regexp " [ \t\r \f ]+" ) " space"
78
- let commas = list (Re_str. regexp " [ \t\r \f ]*,[ \t\r \f ]*" ) " comma"
79
- let semicolons = list (Re_str. regexp " [ \t\r \f ]*;[ \t\r \f ]*" ) " semicolon"
77
+ let spaces = list (Re_str. regexp " [ \t\r\n ]+" ) " space"
78
+ let commas = list (Re_str. regexp " [ \t\r\n ]*,[ \t\r\n ]*" ) " comma"
79
+ let semicolons = list (Re_str. regexp " [ \t\r\n ]*;[ \t\r\n ]*" ) " semicolon"
80
80
81
- let spaces_or_commas_regexp = Re_str. regexp " \\ ([ \t\r \f ]*,[ \t\r \f ]*\\ )\\ |[ \t\r \f ]+"
81
+ let spaces_or_commas_regexp = Re_str. regexp " \\ ([ \t\r\n ]*,[ \t\r\n ]*\\ )\\ |[ \t\r\n ]+"
82
82
let spaces_or_commas_ = exp_list spaces_or_commas_regexp " space- or comma"
83
83
let spaces_or_commas = list spaces_or_commas_regexp " space- or comma"
84
84
@@ -348,7 +348,7 @@ let offset =
348
348
end [@ metaloc loc]
349
349
350
350
let transform_item =
351
- let regexp = Re_str. regexp " \\ ([a-zA-Z]+\\ )[ \t\r \f ]*(\\ ([^)]*\\ ))" in
351
+ let regexp = Re_str. regexp " \\ ([a-zA-Z]+\\ )[ \t\r\n ]*(\\ ([^)]*\\ ))" in
352
352
353
353
fun ?separated_by :_ ?default :_ loc name s ->
354
354
if not @@ does_match regexp s then
@@ -409,8 +409,8 @@ let transform_item =
409
409
Some e
410
410
411
411
let rec transform =
412
- let regexp_wsp = Re_str. regexp " [ \t\r \f ]*" in
413
- let regexp = Re_str. regexp " [ \t\r \f ]*\\ ([a-zA-Z]+[ \t\r \f ]*([^)]*)\\ )\\ (.*\\ )" in
412
+ let regexp_wsp = Re_str. regexp " [ \t\r\n ]*" in
413
+ let regexp = Re_str. regexp " [ \t\r\n ]*\\ ([a-zA-Z]+[ \t\r\n ]*([^)]*)\\ )\\ (.*\\ )" in
414
414
415
415
fun ?separated_by :_ ?default :_ loc name s ->
416
416
if does_match regexp_wsp s then
@@ -419,9 +419,9 @@ let rec transform =
419
419
begin
420
420
let item = Re_str. matched_group 1 s in
421
421
let rest = Re_str. matched_group 2 s in
422
- Option. bind (transform_item ~separated_by ~default loc name item) (fun item ->
423
- Option. bind (transform ~separated_by ~default loc name rest) (fun l ->
424
- Some ( item :: l) ))
422
+ Option. bind (transform_item loc name item) (fun item ->
423
+ Option. bind (transform loc name rest) (fun l ->
424
+ Some [ % expr [ % e item] :: [ % e l]] ))
425
425
end
426
426
else
427
427
Common. error loc " Value of %s is not a list of SVG transform" name
0 commit comments