Skip to content

Commit 244b428

Browse files
MbodinMbodin
committed
Adding [@@reflect.filter_whitespace] to all construct that do not accept pcdata (see ocsigen#330).
1 parent d291653 commit 244b428

File tree

2 files changed

+66
-5
lines changed

2 files changed

+66
-5
lines changed

‎lib/svg_sigs.mli

+61-4
Original file line numberDiff line numberDiff line change
@@ -697,47 +697,62 @@ module type T = sig
697697
val txt : string wrap -> [> | txt] elt
698698

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

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

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

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

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

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

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

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

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

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

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

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

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

725735
val ellipse :
726736
([< | ellipse_attr], [< | ellipse_content], [> | ellipse]) star
737+
[@@reflect.filter_whitespace]
727738

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

730742
val polyline :
731743
([< | polyline_attr], [< | polyline_content], [> | polyline]) star
744+
[@@reflect.filter_whitespace]
732745

733746
val polygon :
734747
([< | polygon_attr], [< | polygon_content], [> | polygon]) star
748+
[@@reflect.filter_whitespace]
735749

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

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

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

@@ -749,19 +764,17 @@ module type T = sig
749764
[@@ocaml.deprecated "Removed in SVG2"]
750765
(** @deprecated Removed in SVG2 *)
751766

752-
type altglyphdef_content =
753-
[ | `Ref of (glyphref elt) list | `Item of (altglyphitem elt) list
754-
]
755-
756767
val altGlyphDef :
757768
([< | altglyphdef_attr], [< | altglyphdef_content], [> | altglyphdef])
758769
unary
770+
[@@reflect.filter_whitespace]
759771
[@@ocaml.deprecated "Removed in SVG2"]
760772
(** @deprecated Removed in SVG2 *)
761773

762774
val altGlyphItem :
763775
([< | altglyphitem_attr], [< | altglyphitem_content], [> | altglyphitem
764776
]) star
777+
[@@reflect.filter_whitespace]
765778
[@@ocaml.deprecated "Removed in SVG2"]
766779
(** @deprecated Removed in SVG2 *)
767780

@@ -770,152 +783,194 @@ module type T = sig
770783
(** @deprecated Removed in SVG2 *)
771784

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

774788
val color_profile :
775789
([< | colorprofile_attr], [< | colorprofile_content], [> | colorprofile
776790
]) star
791+
[@@reflect.filter_whitespace]
777792
[@@ocaml.deprecated "Removed in SVG2"]
778793
(** @deprecated Removed in SVG2 *)
779794

780795
val linearGradient :
781796
([< | lineargradient_attr], [< | lineargradient_content],
782797
[> | lineargradient]) star
798+
[@@reflect.filter_whitespace]
783799

784800
val radialGradient :
785801
([< | radialgradient_attr], [< | radialgradient_content],
786802
[> | radialgradient]) star
803+
[@@reflect.filter_whitespace]
787804

788805
val stop :
789806
([< | stop_attr], [< | stop_content], [> | stop ]) star
807+
[@@reflect.filter_whitespace]
790808

791809
val pattern :
792810
([< | pattern_attr], [< | pattern_content], [> | pattern]) star
811+
[@@reflect.filter_whitespace]
793812

794813
val clipPath :
795814
([< | clippath_attr], [< | clippath_content], [> | clippath]) star
815+
[@@reflect.filter_whitespace]
796816

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

799820
val feDistantLight :
800821
([< | fedistantlight_attr], [< | fedistantlight_content],
801822
[> | fedistantlight]) star
823+
[@@reflect.filter_whitespace]
802824

803825
val fePointLight :
804826
([< | fepointlight_attr], [< | fepointlight_content], [> | fepointlight
805827
]) star
828+
[@@reflect.filter_whitespace]
806829

807830
val feSpotLight :
808831
([< | fespotlight_attr], [< | fespotlight_content], [> | fespotlight])
809832
star
833+
[@@reflect.filter_whitespace]
810834

811835
val feBlend :
812836
([< | feblend_attr], [< | feblend_content], [> | feblend]) star
837+
[@@reflect.filter_whitespace]
813838

814839
val feColorMatrix :
815840
([< | fecolormatrix_attr], [< | fecolormatrix_content],
816841
[> | fecolormatrix]) star
842+
[@@reflect.filter_whitespace]
817843

818844
val feComponentTransfer :
819845
([< | fecomponenttransfer_attr], [< | fecomponenttransfer_content],
820846
[> | fecomponenttransfer]) star
847+
[@@reflect.filter_whitespace]
821848

822849
val feFuncA :
823850
([< | fefunca_attr], [< | fefunca_content], [> | fefunca]) star
851+
[@@reflect.filter_whitespace]
824852

825853
val feFuncG :
826854
([< | fefuncg_attr], [< | fefuncg_content], [> | fefuncg]) star
855+
[@@reflect.filter_whitespace]
827856

828857
val feFuncB :
829858
([< | fefuncb_attr], [< | fefuncb_content], [> | fefuncb]) star
859+
[@@reflect.filter_whitespace]
830860

831861
val feFuncR :
832862
([< | fefuncr_attr], [< | fefuncr_content], [> | fefuncr]) star
863+
[@@reflect.filter_whitespace]
833864

834865
val feComposite :
835866
([< | fecomposite_attr], [< | fecomposite_content], [> | fecomposite])
836867
star
868+
[@@reflect.filter_whitespace]
837869

838870
val feConvolveMatrix :
839871
([< | feconvolvematrix_attr], [< | feconvolvematrix_content],
840872
[> | feconvolvematrix]) star
873+
[@@reflect.filter_whitespace]
841874

842875
val feDiffuseLighting :
843876
([< | fediffuselighting_attr], [< | fediffuselighting_content],
844877
[> | fediffuselighting]) star
878+
[@@reflect.filter_whitespace]
845879

846880
val feDisplacementMap :
847881
([< | fedisplacementmap_attr], [< | fedisplacementmap_content],
848882
[> | fedisplacementmap]) star
883+
[@@reflect.filter_whitespace]
849884

850885
val feFlood :
851886
([< | feflood_attr], [< | feflood_content], [> | feflood]) star
887+
[@@reflect.filter_whitespace]
852888

853889
val feGaussianBlur :
854890
([< | fegaussianblur_attr], [< | fegaussianblur_content],
855891
[> | fegaussianblur]) star
892+
[@@reflect.filter_whitespace]
856893

857894
val feImage :
858895
([< | feimage_attr], [< | feimage_content], [> | feimage]) star
896+
[@@reflect.filter_whitespace]
859897

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

863901
val feMorphology :
864902
([< | femorphology_attr], [< | femorphology_content], [> | femorphology
865903
]) star
904+
[@@reflect.filter_whitespace]
866905

867906
val feOffset :
868907
([< | feoffset_attr], [< | feoffset_content], [> | feoffset]) star
908+
[@@reflect.filter_whitespace]
869909

870910
val feSpecularLighting :
871911
([< | fespecularlighting_attr], [< | fespecularlighting_content],
872912
[> | fespecularlighting]) star
913+
[@@reflect.filter_whitespace]
873914

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

876918
val feTurbulence :
877919
([< | feturbulence_attr], [< | feturbulence_content], [> | feturbulence
878920
]) star
921+
[@@reflect.filter_whitespace]
879922

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

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

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

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

889935
val animate :
890936
([< | animate_attr], [< | animate_content], [> | animate]) star
937+
[@@reflect.filter_whitespace]
891938

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

894942
val animateMotion :
895943
([< | animatemotion_attr], [< | animatemotion_content],
896944
[> | animatemotion]) star
945+
[@@reflect.filter_whitespace]
897946

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

900950
val animateColor :
901951
([< | animatecolor_attr], [< | animatecolor_content], [> | animatecolor
902952
]) star
953+
[@@reflect.filter_whitespace]
903954

904955
val animateTransform :
905956
([< | animatetransform_attr], [< | animatetransform_content],
906957
[> | animatetransform]) star
958+
[@@reflect.filter_whitespace]
907959

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

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

916970
val missing_glyph :
917971
([< | missingglyph_attr], [< | missingglyph_content], [> | missingglyph
918972
]) star
973+
[@@reflect.filter_whitespace]
919974
[@@ocaml.deprecated "Removed in SVG2"]
920975
(** @deprecated Removed in SVG2 *)
921976

@@ -934,12 +989,14 @@ module type T = sig
934989
val font_face_src :
935990
([< | font_face_src_attr], [< | font_face_src_content], [> | font_face_src])
936991
star
992+
[@@reflect.filter_whitespace]
937993
[@@ocaml.deprecated "Removed in SVG2"]
938994
(** @deprecated Removed in SVG2 *)
939995

940996
val font_face_uri :
941997
([< | font_face_uri_attr], [< | font_face_uri_content], [> | font_face_uri])
942998
star
999+
[@@reflect.filter_whitespace]
9431000
[@@ocaml.deprecated "Removed in SVG2"]
9441001
(** @deprecated Removed in SVG2 *)
9451002

‎lib/svg_types.mli

+5-1
Original file line numberDiff line numberDiff line change
@@ -876,9 +876,13 @@ type altglyph_attr =
876876

877877
type altglyphdef = [ | `AltGlyphDef ]
878878

879-
(* unary *)
880879
type altglyphdef_attr = [ | core_attr ]
881880

881+
(* unary *)
882+
type altglyphdef_content =
883+
[ | `Ref of (glyphref elt) list | `Item of (altglyphitem elt) list
884+
]
885+
882886
type altglyphitem = [ | `AltGlyphItem ]
883887

884888

0 commit comments

Comments
 (0)