From c805f6a264f1f52b2de810612327f9c31e635f27 Mon Sep 17 00:00:00 2001 From: Martin Bodin Date: Mon, 27 Nov 2023 16:03:37 +0100 Subject: [PATCH 1/4] =?UTF-8?q?Typo=20whitout=20=E2=86=92=20without.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/svg_f.ml | 6 +++--- lib/svg_types.mli | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/svg_f.ml b/lib/svg_f.ml index 3a6a13ff5..d9c20635c 100644 --- a/lib/svg_f.ml +++ b/lib/svg_f.ml @@ -90,7 +90,7 @@ let string_of_color s = s let string_of_icccolor s = s -let string_of_paint_whitout_icc = function +let string_of_paint_without_icc = function | `None -> "none" | `CurrentColor -> "currentColor" | `Color (c, icc) -> opt_concat (string_of_color c) string_of_icccolor icc @@ -98,8 +98,8 @@ let string_of_paint_whitout_icc = function let string_of_paint = function | `Icc (iri, None) -> string_of_iri iri | `Icc (iri, Some b) -> - (string_of_iri iri) ^" "^ (string_of_paint_whitout_icc b) - | #paint_whitout_icc as c -> string_of_paint_whitout_icc c + (string_of_iri iri) ^" "^ (string_of_paint_without_icc b) + | #paint_without_icc as c -> string_of_paint_without_icc c let string_of_fill_rule = function | `Nonzero -> "nonzero" diff --git a/lib/svg_types.mli b/lib/svg_types.mli index a786da522..8988693d2 100644 --- a/lib/svg_types.mli +++ b/lib/svg_types.mli @@ -277,16 +277,18 @@ type percentage = float type strings = string list type color = string + +(* ICC color specification *) type icccolor = string -type paint_whitout_icc = +type paint_without_icc = [ `None | `CurrentColor | `Color of (color * icccolor option) ] type paint = - [ paint_whitout_icc - | `Icc of (iri * paint_whitout_icc option) ] + [ paint_without_icc + | `Icc of (iri * paint_without_icc option) ] type fill_rule = [ `Nonzero From c16d8e240df3c42df77e688397e9c0c8ffa3ad3c Mon Sep 17 00:00:00 2001 From: Martin Bodin Date: Mon, 27 Nov 2023 17:08:48 +0100 Subject: [PATCH 2/4] Adding entry in changelog. --- CHANGES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index bb71b71c5..a90d62d2c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -24,6 +24,9 @@ * Add svg `fill-rule` attribute (#294 by Eric @dedbox Griffis) +* Fix typo `whitout` in type definition + (#324 by Martin @MBodin Bodin) + # 4.5.0 * Move all the PPXs to ppxlib From c34519ef04ae12276e9b30c41dbbcdb93c613ec9 Mon Sep 17 00:00:00 2001 From: Martin Bodin Date: Tue, 28 Nov 2023 09:15:58 +0100 Subject: [PATCH 3/4] Updating the changelog. --- CHANGES.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index a90d62d2c..54bbdfb44 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,8 @@ +# NEXT + +* Fix typo `whitout` in type definition + (#324 by Martin @MBodin Bodin) + # 4.6.0 * Update for OCaml 5.0 and drop support for OCaml 4.2.0 @@ -24,9 +29,6 @@ * Add svg `fill-rule` attribute (#294 by Eric @dedbox Griffis) -* Fix typo `whitout` in type definition - (#324 by Martin @MBodin Bodin) - # 4.5.0 * Move all the PPXs to ppxlib From d5b80bb9c33d48ed871cb4b9c01ab9e021678f58 Mon Sep 17 00:00:00 2001 From: Martin Bodin Date: Wed, 29 Nov 2023 14:03:06 +0100 Subject: [PATCH 4/4] Adding a missing word that helped me understand these ICC annotations. --- lib/svg_types.mli | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/svg_types.mli b/lib/svg_types.mli index 8988693d2..a20df4ac4 100644 --- a/lib/svg_types.mli +++ b/lib/svg_types.mli @@ -278,7 +278,7 @@ type strings = string list type color = string -(* ICC color specification *) +(* ICC color profile specification *) type icccolor = string type paint_without_icc =