diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,3 +7,8 @@ ## 0.1.1.0 -- 2022-02-19 * First version revised A. Fixed issues with the module Melodics.Ukrainian.Common shared by the two similar packages. + +## 0.2.0.0 -- 2023-02-02 + +* Second version. Switched to NoImplicitPrelude extension. Change the name of the module. Updated the dependencies boundaries. + diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2020-2022 Oleksandr Zhabenko +Copyright (c) 2020-2023 Oleksandr Zhabenko Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/Melodics/Ukrainian/Common2.hs b/Melodics/Ukrainian/Common2.hs deleted file mode 100644 --- a/Melodics/Ukrainian/Common2.hs +++ /dev/null @@ -1,43 +0,0 @@ -{-# OPTIONS_HADDOCK show-extensions #-} -{-# LANGUAGE BangPatterns #-} - --- | --- Module : Melodics.Ukrainian.Common2 --- Copyright : (c) OleksandrZhabenko 2021-2022 --- License : MIT --- Maintainer : olexandr543@yahoo.com --- --- Functions provide functionality of a musical instrument synthesizer or for Ukrainian speech synthesis --- especially for poets, translators and writers. Is rewritten from the module Melodics.ByteString.Ukrainian.Arr --- for optimization purposes. Contains the common for two modules definitions. --- Phonetic material is taken from the : --- --- Solomija Buk, Ján Mačutek, Andrij Rovenchak. Some properties of --- the Ukrainian writing system. [Electronic resource] https://arxiv.org/ftp/arxiv/papers/0802/0802.4198.pdf - -module Melodics.Ukrainian.Common2 where - -import CaseBi.Arr -import GHC.Arr (Array(..)) - -{- --- Inspired by: https://mail.haskell.org/pipermail/beginners/2011-October/008649.html --} - -data Triple = Z | O | T - deriving (Eq,Ord,Show) - -isUkrainianL :: Char -> Bool -isUkrainianL y | (y >= '\1070' && y <= '\1097') = True - | otherwise = getBFstLSorted' False (map (\x -> (x, True)) "'-\700\1028\1030\1031\1068\1100\1102\1103\1108\1110\1111\1168\1169\8217") y - -isUkrainianLTup :: Array Int (Char, Bool) -> Char -> Bool -isUkrainianLTup !tup15 y - | (y >= '\1070' && y <= '\1097') = True - | otherwise = getBFst' (False, tup15) y - -isConsNotJ :: Char -> Bool -isConsNotJ = getBFstLSorted' False (zip "\1073\1074\1075\1076\1078\1079\1082\1083\1084\1085\1087\1088\1089\1090\1092\1093\1094\1095\1096\1097\1169" (repeat True)) - -isConsNotJTup :: Array Int (Char,Bool) -> Char -> Bool -isConsNotJTup !tup16 = getBFst' (False, tup16) diff --git a/Phladiprelio/Ukrainian/Common2.hs b/Phladiprelio/Ukrainian/Common2.hs new file mode 100644 --- /dev/null +++ b/Phladiprelio/Ukrainian/Common2.hs @@ -0,0 +1,46 @@ +{-# OPTIONS_HADDOCK show-extensions #-} +{-# LANGUAGE BangPatterns, NoImplicitPrelude #-} + +-- | +-- Module : Phladiprelio.Ukrainian.Common2 +-- Copyright : (c) Oleksandr Zhabenko 2021-2023 +-- License : MIT +-- Maintainer : oleksandr.zhabenko@yahoo.com +-- +-- Functions provide functionality of a musical instrument synthesizer or for Ukrainian speech synthesis +-- especially for poets, translators and writers. Is rewritten from the module Melodics.ByteString.Ukrainian.Arr +-- for optimization purposes. Contains the common for two modules definitions. +-- Phonetic material is taken from the : +-- +-- Solomija Buk, Ján Mačutek, Andrij Rovenchak. Some properties of +-- the Ukrainian writing system. [Electronic resource] https://arxiv.org/ftp/arxiv/papers/0802/0802.4198.pdf + +module Phladiprelio.Ukrainian.Common2 where + +import GHC.Base +import GHC.List (zip, repeat) +import CaseBi.Arr +import GHC.Arr (Array(..)) +import Text.Show (Show(..)) + +{- +-- Inspired by: https://mail.haskell.org/pipermail/beginners/2011-October/008649.html +-} + +data Triple = Z | O | T + deriving (Eq,Ord,Show) + +isUkrainianL :: Char -> Bool +isUkrainianL y | (y >= '\1070' && y <= '\1097') = True + | otherwise = getBFstLSorted' False (map (\x -> (x, True)) "'-\700\1028\1030\1031\1068\1100\1102\1103\1108\1110\1111\1168\1169\8217") y + +isUkrainianLTup :: Array Int (Char, Bool) -> Char -> Bool +isUkrainianLTup !tup15 y + | (y >= '\1070' && y <= '\1097') = True + | otherwise = getBFst' (False, tup15) y + +isConsNotJ :: Char -> Bool +isConsNotJ = getBFstLSorted' False (zip "\1073\1074\1075\1076\1078\1079\1082\1083\1084\1085\1087\1088\1089\1090\1092\1093\1094\1095\1096\1097\1169" (repeat True)) + +isConsNotJTup :: Array Int (Char,Bool) -> Char -> Bool +isConsNotJTup !tup16 = getBFst' (False, tup16) diff --git a/ukrainian-phonetics-common.cabal b/ukrainian-phonetics-common.cabal --- a/ukrainian-phonetics-common.cabal +++ b/ukrainian-phonetics-common.cabal @@ -2,14 +2,14 @@ -- further documentation, see http://haskell.org/cabal/users-guide/ name: ukrainian-phonetics-common -version: 0.1.1.0 +version: 0.2.0.0 synopsis: A library to work with the basic Ukrainian phonetics and syllable segmentation. description: The functionality that is shared by the two dependent packages - ukrainian-phonetics-basic-array and ukranian-phonetics-basic-array-bytestring. homepage: https://hackage.haskell.org/package/ukrainian-phonetics-common license: MIT license-file: LICENSE author: OleksandrZhabenko -maintainer: olexandr543@yahoo.com +maintainer: oleksandr.zhabenko@yahoo.com copyright: Oleksandr Zhabenko category: Language build-type: Simple @@ -17,9 +17,9 @@ cabal-version: >=1.10 library - exposed-modules: Melodics.Ukrainian.Common2 + exposed-modules: Phladiprelio.Ukrainian.Common2 -- other-modules: - other-extensions: BangPatterns - build-depends: base >=4.8 && <5, mmsyn2-array >=0.3 && <1 + other-extensions: BangPatterns, NoImplicitPrelude + build-depends: base >=4.13 && <5, mmsyn2-array ==0.3.1.1 -- hs-source-dirs: default-language: Haskell2010