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

Typo whitout → without. #324

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

Typo whitout → without. #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c805f6a
Typo whitout → without.
Mbodin Nov 27, 2023
c16d8e2
Adding entry in changelog.
Mbodin Nov 27, 2023
c34519e
Updating the changelog.
Mbodin Nov 28, 2023
d5b80bb
Adding a missing word that helped me understand these ICC annotations.
Mbodin Nov 29, 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
5 changes: 5 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions lib/svg_f.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,16 @@ 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

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"
Expand Down
8 changes: 5 additions & 3 deletions lib/svg_types.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,16 +277,18 @@ type percentage = float
type strings = string list

type color = string

(* ICC color profile 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
Expand Down
Loading