Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ignoring whitespaces in svg tags that do not accept pcdata. #331

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Ignoring whitespaces in svg tags that do not accept pcdata. #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
244b428
Adding [@@reflect.filter_whitespace] to all construct that do not acc…
Mbodin Dec 15, 2023
0a98a80
Adding a test with g with some space.
Mbodin Dec 15, 2023
0355d69
I now understand why the definition of altglyphdef_content was in svg…
Mbodin Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 61 additions & 0 deletions lib/svg_sigs.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,47 +697,62 @@ module type T = sig
val txt : string wrap -> [> | txt] elt

val svg : ([< | svg_attr], [< | svg_content], [> | svg]) star
[@@reflect.filter_whitespace]

val g : ([< | g_attr], [< | g_content], [> | g]) star
[@@reflect.filter_whitespace]

val defs : ([< | defs_attr], [< | defs_content], [> | defs]) star
[@@reflect.filter_whitespace]

val desc : ([< | desc_attr], [< | desc_content], [> | desc]) unary

val title : ([< | title_attr], [< | title_content], [> | title]) unary

val symbol : ([< | symbol_attr], [< | symbol_content], [> | symbol]) star
[@@reflect.filter_whitespace]

val use : ([< | use_attr], [< | use_content], [> | use]) star
[@@reflect.filter_whitespace]

val image : ([< | image_attr], [< | image_content], [> | image]) star
[@@reflect.filter_whitespace]

val switch : ([< | switch_attr], [< | switch_content], [> | switch]) star
[@@reflect.filter_whitespace]

val style : ([< | style_attr], [< | style_content], [> | style]) unary

val path : ([< | path_attr], [< | path_content], [> | path]) star
[@@reflect.filter_whitespace]

val rect : ([< | rect_attr], [< | rect_content], [> | rect]) star
[@@reflect.filter_whitespace]

val circle : ([< | circle_attr], [< | circle_content], [> | circle]) star
[@@reflect.filter_whitespace]

val ellipse :
([< | ellipse_attr], [< | ellipse_content], [> | ellipse]) star
[@@reflect.filter_whitespace]

val line : ([< | line_attr], [< | line_content], [> | line]) star
[@@reflect.filter_whitespace]

val polyline :
([< | polyline_attr], [< | polyline_content], [> | polyline]) star
[@@reflect.filter_whitespace]

val polygon :
([< | polygon_attr], [< | polygon_content], [> | polygon]) star
[@@reflect.filter_whitespace]

val text : ([< | text_attr], [< | text_content], [> | text]) star

val tspan : ([< | tspan_attr], [< | tspan_content], [> | tspan]) star

val tref : ([< | tref_attr], [< | tref_content], [> | tref]) star
[@@reflect.filter_whitespace]
[@@ocaml.deprecated "Removed in SVG2"]
(** @deprecated Removed in SVG2 *)

Expand All @@ -756,12 +771,14 @@ module type T = sig
val altGlyphDef :
([< | altglyphdef_attr], [< | altglyphdef_content], [> | altglyphdef])
unary
[@@reflect.filter_whitespace]
[@@ocaml.deprecated "Removed in SVG2"]
(** @deprecated Removed in SVG2 *)

val altGlyphItem :
([< | altglyphitem_attr], [< | altglyphitem_content], [> | altglyphitem
]) star
[@@reflect.filter_whitespace]
[@@ocaml.deprecated "Removed in SVG2"]
(** @deprecated Removed in SVG2 *)

Expand All @@ -770,152 +787,194 @@ module type T = sig
(** @deprecated Removed in SVG2 *)

val marker : ([< | marker_attr], [< | marker_content], [> | marker]) star
[@@reflect.filter_whitespace]

val color_profile :
([< | colorprofile_attr], [< | colorprofile_content], [> | colorprofile
]) star
[@@reflect.filter_whitespace]
[@@ocaml.deprecated "Removed in SVG2"]
(** @deprecated Removed in SVG2 *)

val linearGradient :
([< | lineargradient_attr], [< | lineargradient_content],
[> | lineargradient]) star
[@@reflect.filter_whitespace]

val radialGradient :
([< | radialgradient_attr], [< | radialgradient_content],
[> | radialgradient]) star
[@@reflect.filter_whitespace]

val stop :
([< | stop_attr], [< | stop_content], [> | stop ]) star
[@@reflect.filter_whitespace]

val pattern :
([< | pattern_attr], [< | pattern_content], [> | pattern]) star
[@@reflect.filter_whitespace]

val clipPath :
([< | clippath_attr], [< | clippath_content], [> | clippath]) star
[@@reflect.filter_whitespace]

val filter : ([< | filter_attr], [< | filter_content], [> | filter]) star
[@@reflect.filter_whitespace]

val feDistantLight :
([< | fedistantlight_attr], [< | fedistantlight_content],
[> | fedistantlight]) star
[@@reflect.filter_whitespace]

val fePointLight :
([< | fepointlight_attr], [< | fepointlight_content], [> | fepointlight
]) star
[@@reflect.filter_whitespace]

val feSpotLight :
([< | fespotlight_attr], [< | fespotlight_content], [> | fespotlight])
star
[@@reflect.filter_whitespace]

val feBlend :
([< | feblend_attr], [< | feblend_content], [> | feblend]) star
[@@reflect.filter_whitespace]

val feColorMatrix :
([< | fecolormatrix_attr], [< | fecolormatrix_content],
[> | fecolormatrix]) star
[@@reflect.filter_whitespace]

val feComponentTransfer :
([< | fecomponenttransfer_attr], [< | fecomponenttransfer_content],
[> | fecomponenttransfer]) star
[@@reflect.filter_whitespace]

val feFuncA :
([< | fefunca_attr], [< | fefunca_content], [> | fefunca]) star
[@@reflect.filter_whitespace]

val feFuncG :
([< | fefuncg_attr], [< | fefuncg_content], [> | fefuncg]) star
[@@reflect.filter_whitespace]

val feFuncB :
([< | fefuncb_attr], [< | fefuncb_content], [> | fefuncb]) star
[@@reflect.filter_whitespace]

val feFuncR :
([< | fefuncr_attr], [< | fefuncr_content], [> | fefuncr]) star
[@@reflect.filter_whitespace]

val feComposite :
([< | fecomposite_attr], [< | fecomposite_content], [> | fecomposite])
star
[@@reflect.filter_whitespace]

val feConvolveMatrix :
([< | feconvolvematrix_attr], [< | feconvolvematrix_content],
[> | feconvolvematrix]) star
[@@reflect.filter_whitespace]

val feDiffuseLighting :
([< | fediffuselighting_attr], [< | fediffuselighting_content],
[> | fediffuselighting]) star
[@@reflect.filter_whitespace]

val feDisplacementMap :
([< | fedisplacementmap_attr], [< | fedisplacementmap_content],
[> | fedisplacementmap]) star
[@@reflect.filter_whitespace]

val feFlood :
([< | feflood_attr], [< | feflood_content], [> | feflood]) star
[@@reflect.filter_whitespace]

val feGaussianBlur :
([< | fegaussianblur_attr], [< | fegaussianblur_content],
[> | fegaussianblur]) star
[@@reflect.filter_whitespace]

val feImage :
([< | feimage_attr], [< | feimage_content], [> | feimage]) star
[@@reflect.filter_whitespace]

val feMerge :
([< | femerge_attr], [< | femerge_content], [> | femerge]) star

val feMorphology :
([< | femorphology_attr], [< | femorphology_content], [> | femorphology
]) star
[@@reflect.filter_whitespace]

val feOffset :
([< | feoffset_attr], [< | feoffset_content], [> | feoffset]) star
[@@reflect.filter_whitespace]

val feSpecularLighting :
([< | fespecularlighting_attr], [< | fespecularlighting_content],
[> | fespecularlighting]) star
[@@reflect.filter_whitespace]

val feTile : ([< | fetile_attr], [< | fetile_content], [> | fetile]) star
[@@reflect.filter_whitespace]

val feTurbulence :
([< | feturbulence_attr], [< | feturbulence_content], [> | feturbulence
]) star
[@@reflect.filter_whitespace]

val cursor : ([< | cursor_attr], [< | cursor_content], [> | cursor]) star
[@@reflect.filter_whitespace]

val a : ([< | a_attr], [< | a_content], [> | a]) star
[@@reflect.filter_whitespace]

val view : ([< | view_attr], [< | view_content], [> | view]) star
[@@reflect.filter_whitespace]

val script :
([< | script_attr], [< | script_content], [> | script]) unary

val animate :
([< | animate_attr], [< | animate_content], [> | animate]) star
[@@reflect.filter_whitespace]

val set : ([< | set_attr], [< | set_content], [> | set]) star
[@@reflect.filter_whitespace]

val animateMotion :
([< | animatemotion_attr], [< | animatemotion_content],
[> | animatemotion]) star
[@@reflect.filter_whitespace]

val mpath : ([< | mpath_attr], [< | mpath_content], [> | mpath]) star
[@@reflect.filter_whitespace]

val animateColor :
([< | animatecolor_attr], [< | animatecolor_content], [> | animatecolor
]) star
[@@reflect.filter_whitespace]

val animateTransform :
([< | animatetransform_attr], [< | animatetransform_content],
[> | animatetransform]) star
[@@reflect.filter_whitespace]

val font : ([< | font_attr], [< | font_content], [> | font]) star
[@@reflect.filter_whitespace]
[@@ocaml.deprecated "Removed in SVG2"]
(** @deprecated Removed in SVG2 *)

val glyph : ([< | glyph_attr], [< | glyph_content], [> | glyph]) star
[@@reflect.filter_whitespace]
[@@ocaml.deprecated "Removed in SVG2"]
(** @deprecated Removed in SVG2 *)

val missing_glyph :
([< | missingglyph_attr], [< | missingglyph_content], [> | missingglyph
]) star
[@@reflect.filter_whitespace]
[@@ocaml.deprecated "Removed in SVG2"]
(** @deprecated Removed in SVG2 *)

Expand All @@ -934,12 +993,14 @@ module type T = sig
val font_face_src :
([< | font_face_src_attr], [< | font_face_src_content], [> | font_face_src])
star
[@@reflect.filter_whitespace]
[@@ocaml.deprecated "Removed in SVG2"]
(** @deprecated Removed in SVG2 *)

val font_face_uri :
([< | font_face_uri_attr], [< | font_face_uri_content], [> | font_face_uri])
star
[@@reflect.filter_whitespace]
[@@ocaml.deprecated "Removed in SVG2"]
(** @deprecated Removed in SVG2 *)

Expand Down
2 changes: 1 addition & 1 deletion lib/svg_types.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -874,9 +874,9 @@ type altglyph_attr =
| `Xlink_href
]

(* unary *)
type altglyphdef = [ | `AltGlyphDef ]

(* unary *)
type altglyphdef_attr = [ | core_attr ]

type altglyphitem = [ | `AltGlyphItem ]
Expand Down
4 changes: 4 additions & 0 deletions test/test_jsx.re
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,10 @@ let svg = (
[<stop offset="50.1%" />],
[stop(~a=[a_offset(`Percentage(50.1))], [])],
),
( "g with space",
[<g> </g>],
[g(~a=[], [])],
),
( "text x, y",
[<text x="1 2" y="3 4" />],
[
Expand Down
4 changes: 4 additions & 0 deletions test/test_ppx.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,10 @@ let svg = "svg", SvgTests.make Svg.[
[[%svg "<stop offset='50.1%'/>"]],
[stop ~a:[a_offset (`Percentage 50.1)] []] ;

"g with space",
[[%svg "<g> </g>"]],
[g ~a:[] []] ;

"text x, y",
[[%svg "<text x='1 2' y='3 4'/>"]],
[text ~a:[a_x_list [1., None; 2., None]; a_y_list [3., None; 4., None]] []] ;
Expand Down