summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bin/transcriptor.ml19
-rw-r--r--src/lib/parser.mly1
-rw-r--r--src/lib/repr/default.ml1
-rw-r--r--src/lib/repr/default.mli2
-rw-r--r--src/lib/repr/tengwar.ml270
-rw-r--r--src/lib/repr/tengwar.mli1
-rw-r--r--src/lib/sounds/sig.ml2
-rw-r--r--src/lib/sounds/sounds.ml12
-rw-r--r--src/lib/sounds/sounds.mli1
-rw-r--r--src/test/test.ml5
10 files changed, 229 insertions, 85 deletions
diff --git a/src/bin/transcriptor.ml b/src/bin/transcriptor.ml
index f86852f..77a7b6f 100644
--- a/src/bin/transcriptor.ml
+++ b/src/bin/transcriptor.ml
@@ -5,12 +5,21 @@ let process (optional_line : string option) =
| None -> ()
| Some line ->
- let res = Result.map
+ let result =(T.Reader.process line) in
+
+ let res1 = Result.map
(fun t-> Sounds.repr (module Repr.Default) t)
- (T.Reader.process line) in
- match res with
- | Ok response -> print_endline response
- | Error err -> print_endline err
+ result in
+ let () = match res1 with
+ | Ok response -> print_endline response
+ | Error err -> print_endline err in
+ let res2 = Result.map
+ (fun t-> Sounds.repr (module Repr.Tengwar) t)
+ result in
+ let () = match res2 with
+ | Ok response -> print_endline response
+ | Error err -> print_endline err in
+ ()
let rec repeat channel =
(* Attempt to read one line. *)
diff --git a/src/lib/parser.mly b/src/lib/parser.mly
index 6c1722a..fbd22f6 100644
--- a/src/lib/parser.mly
+++ b/src/lib/parser.mly
@@ -87,6 +87,7 @@ voyels_semi:
| voyels { $1 }
| I voyels { Sounds.diphtongue Sounds.semi_voyel_y $2 }
| Y voyels { Sounds.diphtongue Sounds.semi_voyel_y $2 }
+ | U voyels { Sounds.diphtongue Sounds.semi_voyel_u $2 }
ending_consonant:
| Nothing { Some (Sounds.none) }
diff --git a/src/lib/repr/default.ml b/src/lib/repr/default.ml
index 2688411..22a023f 100644
--- a/src/lib/repr/default.ml
+++ b/src/lib/repr/default.ml
@@ -51,6 +51,7 @@ and r = "R"
and semi_voyel_w = "w"
and semi_voyel_y = "j"
+and semi_voyel_u = "8"
let muted
: t -> t
diff --git a/src/lib/repr/default.mli b/src/lib/repr/default.mli
index 27a84bb..26c7d73 100644
--- a/src/lib/repr/default.mli
+++ b/src/lib/repr/default.mli
@@ -1 +1 @@
-include Sounds.Sig.REPR with type t = String.t
+include Sounds.Sig.REPR
diff --git a/src/lib/repr/tengwar.ml b/src/lib/repr/tengwar.ml
index 4d9ad5e..4fc224b 100644
--- a/src/lib/repr/tengwar.ml
+++ b/src/lib/repr/tengwar.ml
@@ -13,10 +13,12 @@ type category =
type voyel =
{ opened : bool
+ ; position : [`Above | `Below ]
; app : (position -> string) }
type consonant =
{ position : position
+ ; muted: string option
; repr : string
; primary : bool
; category : category }
@@ -28,29 +30,19 @@ and t =
| Consonant of consonant
| Voyel of voyel
| Nasal of nasal
+ | Repr of string
+ | Nothing
-let none = ""
+let none = Nothing
-let a =
- { opened = true
- ; app = function
- | Pos1 -> "#"
- | Pos2 -> "E"
- | Pos3 -> "D"
- | Pos4 -> "C" }
-
-and a_nasal = Nasal
- (fun f -> match f with
- | Consonant c -> begin match c.primary, c.position, c.category with
- | true, Pos1, _ -> "{#"
- | true, _, _ -> "[E"
- | false, _, I -> "5#"
- | false, _, II -> "t#"
- | false, _, III -> "g#"
- end
- | _ -> "`pC"
-
- )
+let a = Voyel
+ { opened = true
+ ; position = `Above
+ ; app = function
+ | Pos1 -> "#"
+ | Pos2 -> "E"
+ | Pos3 -> "D"
+ | Pos4 -> "C" }
let app_e = function
| Pos1 -> "$"
@@ -64,20 +56,68 @@ and app_eu = function
| Pos3 -> "Þ"
| Pos4 -> "ß"
-let e_opened = { opened = true ; app = app_e }
-and e_closed = { opened = false ; app = app_e }
-and schwa = "°"
+let e_opened = Voyel { opened = true ; position = `Above ; app = app_e }
+and e_closed = Voyel { opened = false; position = `Above ; app = app_e }
+and schwa = Voyel
+ { opened = true
+ ; position = `Below
+ ; app = function
+ | Pos1 -> "È"
+ | Pos2 -> "É"
+ | Pos3 -> "Ê"
+ | Pos4 -> "Ë" }
+
+and eu_opened = Voyel { opened = true ; position = `Above ; app = app_eu }
+and eu_closed = Voyel { opened = false ; position = `Above ; app = app_eu }
+
+and o = Voyel
+ { opened = true
+ ; position = `Above
+ ; app = function
+ | Pos1 -> "^"
+ | Pos2 -> "Y"
+ | Pos3 -> "H"
+ | Pos4 -> "N" }
+
+and i = Voyel
+ { opened = true
+ ; position = `Above
+ ; app = function
+ | Pos1 -> "%"
+ | Pos2 -> "T"
+ | Pos3 -> "G"
+ | Pos4 -> "B" }
+
+and y = Voyel
+ { opened = true
+ ; position = `Above
+ ; app = function
+ | Pos1 -> "Ø"
+ | Pos2 -> "Ù"
+ | Pos3 -> "Ú"
+ | Pos4 -> "Û" }
+
+and u = Voyel
+ { opened = true
+ ; position = `Above
+ ; app = function
+ | Pos1 -> "&"
+ | Pos2 -> "U"
+ | Pos3 -> "J"
+ | Pos4 -> "M" }
-and eu_opened = { opened = true ; app = app_eu }
-and eu_closed = { opened = false ; app = app_eu }
+and a_nasal = Nasal
+ (fun f -> match f with
+ | Consonant c -> begin match c.primary, c.position, c.category with
+ | true, Pos1, _ -> "{#"
+ | true, _, _ -> "[E"
+ | false, _, I -> "5#"
+ | false, _, II -> "t#"
+ | false, _, III -> "g#"
+ end
+ | _ -> "5#"
-and o =
- { opened = true
- ; app = function
- | Pos1 -> "^"
- | Pos2 -> "Y"
- | Pos3 -> "H"
- | Pos4 -> "N" }
+ )
and o_nasal = Nasal
(fun f -> match f with
@@ -88,17 +128,9 @@ and o_nasal = Nasal
| false, _, II -> "t^"
| false, _, III -> "g^"
end
- | _ -> "`pN"
+ | _ -> "5^"
)
-and i =
- { opened = true
- ; app = function
- | Pos1 -> "%"
- | Pos2 -> "T"
- | Pos3 -> "G"
- | Pos4 -> "B" }
-
and i_nasal = Nasal
(fun f -> match f with
| Consonant c -> begin match c.primary, c.position, c.category with
@@ -108,16 +140,7 @@ and i_nasal = Nasal
| false, _, II -> "t$"
| false, _, III -> "g$"
end
- | _ -> "`pV"
- )
-
-and y =
- { opened = true
- ; app = function
- | Pos1 -> "Ø"
- | Pos2 -> "Ù"
- | Pos3 -> "Ú"
- | Pos4 -> "Û" }
+ | _ -> "5$")
and y_nasal = Nasal
(fun f -> match f with
@@ -128,144 +151,245 @@ and y_nasal = Nasal
| false, _, II -> "tØ"
| false, _, III -> "gØ"
end
- | _ -> "`pÛ"
-
- )
-
-and u =
- { opened = true
- ; app = function
- | Pos1 -> "&"
- | Pos2 -> "U"
- | Pos3 -> "J"
- | Pos4 -> "M" }
+ | _ -> "5Ø")
and p = Consonant
{ position = Pos2
+ ; muted = Some "y"
; category = II
; primary = true
; repr = "q" }
+
and b = Consonant
{ position = Pos1
+ ; muted = Some "y"
; category = II
; primary = true
; repr = "w" }
and t = Consonant
{ position = Pos2
+ ; muted = Some "6"
; category = I
; primary = true
; repr = "1" }
+
and d = Consonant
{ position = Pos1
+ ; muted = Some "6"
; category = I
; primary = true
; repr = "2" }
and k = Consonant
{ position = Pos3
+ ; muted = Some "h"
; category = III
; primary = true
; repr = "a" }
+
and g = Consonant
{ position = Pos1
+ ; muted = Some "h"
; category = III
; primary = true
; repr = "s" }
and f = Consonant
{ position = Pos3
+ ; muted = None
; category = II
; primary = true
; repr = "e" }
and v = Consonant
{ position = Pos1
+ ; muted = None
; category = II
; primary = true
; repr = "r" }
and ch = Consonant
{ position = Pos1
+ ; muted = None
; category = III
; primary = true
; repr = "d" }
+
and j = Consonant
{ position = Pos1
+ ; muted = None
; category = III
; primary = true
; repr = "f" }
and s = Consonant
- { position = Pos3
+ { position = Pos4
+ ; muted = Some "i"
; category = I
; primary = true
; repr = "3" }
and z = Consonant
{ position = Pos1
+ ; muted = None
; category = I
; primary = true
; repr = "4" }
and m = Consonant
{ position = Pos1
+ ; muted = None
; category = II
; primary = true
; repr = "t" }
and n = Consonant
{ position = Pos1
+ ; muted = None
; category = I
; primary = true
; repr = "5" }
and gn = Consonant
{ position = Pos1
+ ; muted = None
; category = III
; primary = false
; repr = "b" }
and l = Consonant
{ position = Pos1
+ ; muted = None
; category = II
; primary = false
; repr = "j" }
and r = Consonant
{ position = Pos2
+ ; muted = None
; category = I
; primary = false
; repr = "7" }
and semi_voyel_w = Consonant
{ position = Pos3
+ ; muted = None
; category = II
; primary = false
; repr = "." }
and semi_voyel_y = Consonant
{ position = Pos1
+ ; muted = None
; category = II
; primary = false
; repr = "l" }
+
+and semi_voyel_u = Consonant
+ { position = Pos2
+ ; muted = None
+ ; category = II
+ ; primary = false
+ ; repr = "]" }
+
+let diphtongue
+ : t -> t -> t
+ = fun t1 t2 -> match t1, t2 with
(*
+ | Consonant _, Voyel _ when t1 = semi_voyel_y && t2 = schwa ->
+ Consonant
+ { position = Pos1
+ ; muted = None
+ ; category = II
+ ; primary = false
+ ; repr = "m"}
+ *)
+ | Consonant c, Voyel v ->
+ Repr(c.repr ^ (v.app c.position))
+ | Consonant c, Nasal n ->
+ Repr(c.repr ^ (n none))
+ | _ ->
+ print_endline "Ignoring diphtongue";
+ none
let muted
: t -> t
= fun t ->
- Printf.sprintf "(%s)" t
-
-let diphtongue
- : t -> t -> t
- = fun t1 t2 ->
- Printf.sprintf "[%s%s]" t1 t2
+ match t with
+ | Consonant c ->
+ begin match c.muted with
+ | None -> t
+ | Some s -> Consonant {c with repr = s}
+ end
+ | _ -> t
+
+
+and portant =
+ { position = Pos4
+ ; muted = None
+ ; category = III
+ ; primary = false
+ ; repr = "`" }
let fold
: t list -> string
= fun elems ->
let buff = Buffer.create 16 in
- List.iter elems
- ~f:(fun f -> Buffer.add_string buff f);
+
+ let rec _fold
+ = fun init -> function
+ | [] ->
+ begin match init with
+ | None
+ | Some Nothing
+ -> ()
+ | Some Voyel ( {position = `Above; _ } as v) ->
+ Buffer.add_string buff ("`" ^ (v.app portant.position))
+ | Some Voyel ( {position = `Below; _ } as v) ->
+ Buffer.add_string buff (v.app Pos1)
+ | Some Nasal n ->
+ Buffer.add_string buff ("`" ^ (n (Consonant portant)))
+ | Some Repr r ->
+ Buffer.add_string buff r
+ | Some Consonant c ->
+ Buffer.add_string buff (c.repr)
+ end
+ | hd::tl ->
+ match init, hd with
+ | Some Nothing, _ -> _fold (Some hd) tl
+ | _, Nothing -> _fold init tl
+ | Some Voyel ({position = `Above; _} as v), Consonant c ->
+ Buffer.add_string buff (c.repr ^ (v.app c.position));
+ _fold None tl
+ | Some Voyel ({position = `Below; _} as v), Consonant c ->
+ Buffer.add_string buff ((v.app Pos1)^ c.repr);
+ _fold None tl
+ | Some Nasal n, Consonant c ->
+ Buffer.add_string buff (c.repr ^ (n hd));
+ _fold None tl
+ | Some Voyel v, _ ->
+ Buffer.add_string buff ("`" ^ (v.app portant.position));
+ _fold (Some hd) tl
+ | Some Nasal n, _ ->
+ Buffer.add_string buff ("`" ^ (n (Consonant portant)));
+ _fold (Some hd) tl
+ | Some Repr r, _ ->
+ Buffer.add_string buff r;
+ _fold (Some hd) tl
+ | Some Consonant c, _ ->
+ Buffer.add_string buff c.repr;
+ _fold (Some hd) tl
+
+ | None, Consonant c ->
+ Buffer.add_string buff c.repr;
+ _fold None tl
+ | None, Repr r ->
+ Buffer.add_string buff r;
+ _fold None tl
+ | None, Voyel _
+ | None, Nasal _ -> _fold (Some hd) tl
+
+ in
+ _fold None elems;
Buffer.contents buff
- *)
diff --git a/src/lib/repr/tengwar.mli b/src/lib/repr/tengwar.mli
new file mode 100644
index 0000000..8204341
--- /dev/null
+++ b/src/lib/repr/tengwar.mli
@@ -0,0 +1 @@
+include Sounds.Sig.REPR
diff --git a/src/lib/sounds/sig.ml b/src/lib/sounds/sig.ml
index 016c757..3c3c731 100644
--- a/src/lib/sounds/sig.ml
+++ b/src/lib/sounds/sig.ml
@@ -42,8 +42,8 @@ module type REPR = sig
val r : t
val semi_voyel_w : t
-
val semi_voyel_y : t
+ val semi_voyel_u : t
val muted : t -> t
diff --git a/src/lib/sounds/sounds.ml b/src/lib/sounds/sounds.ml
index 2e8e95b..47fea2b 100644
--- a/src/lib/sounds/sounds.ml
+++ b/src/lib/sounds/sounds.ml
@@ -21,6 +21,7 @@ type code =
| Voyel_EU_Opened
| SemiVoyel_W
| SemiVoyel_Y
+ | SemiVoyel_U
| Consonant_P
| Consonant_B
| Consonant_T
@@ -203,6 +204,11 @@ let semi_voyel_y =
kind = SemiVoyel
; code = SemiVoyel_Y}
+let semi_voyel_u =
+ { none with
+ kind = SemiVoyel
+ ; code = SemiVoyel_U}
+
let rec nasal t =
match t.kind, t.code with
@@ -212,10 +218,7 @@ let rec nasal t =
(* The only case we could have the nasalisation of such diphtongue, is
the case I E, N -> wich is transformed into I, I N. *)
Some ( diphtongue s1 { i with nasal = true } )
- | (SemiVoyel_Y, _)
- | (SemiVoyel_W, _) ->
- Option.map (fun s -> diphtongue s1 s) (nasal s2)
- | _ -> None
+ | _ -> Option.map (fun s -> diphtongue s1 s) (nasal s2)
end
| Voyel, _ -> Some { t with nasal = true }
| _ -> None
@@ -263,6 +266,7 @@ let repr
| SemiVoyel_W , _ -> Repr.semi_voyel_w
| SemiVoyel_Y , _ -> Repr.semi_voyel_y
+ | SemiVoyel_U , _ -> Repr.semi_voyel_u
| Consonant_P , _ -> Repr.p
| Consonant_B , _ -> Repr.b
diff --git a/src/lib/sounds/sounds.mli b/src/lib/sounds/sounds.mli
index 4f0bbc1..7dea8c0 100644
--- a/src/lib/sounds/sounds.mli
+++ b/src/lib/sounds/sounds.mli
@@ -68,6 +68,7 @@ val l: t
val semi_voyel_w: t
val semi_voyel_y: t
+val semi_voyel_u: t
val is_voyel : t -> bool
val is_nasal : t -> bool
diff --git a/src/test/test.ml b/src/test/test.ml
index f6f1f2c..0c320bd 100644
--- a/src/test/test.ml
+++ b/src/test/test.ml
@@ -77,7 +77,7 @@ let tests =
; "crions", "kRi§(s)"
; "co|incidant", "ko5sid@(t)"
; "croire", "kR[wa]R°"
- ; "cuillère", "kyi[jE]R°"
+ ; "cuillère", "k[8i][jE]R°"
; "demeure", "d°m9R°"
; "diag|nostic", "d[ja]gnostik"
; "ébrouas", "ebRua(s)"
@@ -91,9 +91,11 @@ let tests =
; "liant", "L[j@](t)"
; "lion", "L[j§]"
; "loin", "L[w5]"
+ ; "lui", "L[8i]"
; "groin", "gR[w5]"
; "hélicoptère", "eLikoptER°"
; "hirondelle", "iR§dEL°"
+ ; "jama|iquain", "Zamaik5"
; "joues", "Zu(s)"
; "libellule", "LibELyL°"
; "main", "m5"
@@ -113,6 +115,7 @@ let tests =
; "platte", "pLat°"
; "proie", "pR[wa]"
; "quille", "ki[j°]"
+ ; "rébellion", "RebEL[j§]"
; "reine", "REn°"
; "rien", "R[j5]"
; "soin", "s[w5]"
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-14 17:40:51 +0000