diff --git a/ChangeLog.md b/ChangeLog.md --- a/ChangeLog.md +++ b/ChangeLog.md @@ -106,3 +106,6 @@ new model of computations with the possibly two modes instead of just one -- PhoPaaW and SaaW. Some code improvements. +## 0.12.0.0 -- 2022-09-13 + +* Twelfth version. Moved the common functionality for coeffs to the phonetic-languages-basis package. Added new functionality to use diverse2GGL function. diff --git a/Phonetic/Languages/Array/General/PropertiesFuncRepG2.hs b/Phonetic/Languages/Array/General/PropertiesFuncRepG2.hs --- a/Phonetic/Languages/Array/General/PropertiesFuncRepG2.hs +++ b/Phonetic/Languages/Array/General/PropertiesFuncRepG2.hs @@ -51,6 +51,7 @@ import Data.Maybe (fromMaybe,mapMaybe) import Data.Monoid (mappend) import Phonetic.Languages.EmphasisG +import Phonetic.Languages.Coeffs #ifdef __GLASGOW_HASKELL__ #if __GLASGOW_HASKELL__==708 @@ -64,10 +65,11 @@ -> String -- ^ Actually is the \' \':us ++ vs in the following functions where in the definition is us and vs 'String's. See the -- source code of the module. -> (Int16 -> c) + -> String -- ^ Specifies the list of 'Char' that the function is sensitive to. -> FuncRep2 ReadyForConstructionPL Int16 c -procDiverse2I wrs zs g = +procDiverse2I wrs zs g sels = D (\x -> case x of - StrG xs -> diverse2GL zs . concatMap string1 . stringToXG wrs $ xs + StrG xs -> diverse2GGL sels zs . concatMap string1 . stringToXG wrs $ xs FSLG tsss -> 1) g {-# INLINE procDiverse2I #-} @@ -76,10 +78,11 @@ -> String -- ^ Actually is the \' \':us ++ vs in the following functions where in the definition is us and vs 'String's. See the -- source code of the module. -> (Double -> c) + -> String -- ^ Specifies the list of 'Char' that the function is sensitive to. -> FuncRep2 ReadyForConstructionPL Double c -procDiverse2F wrs zs g = +procDiverse2F wrs zs g sels = D (\x ->case x of - StrG xs -> int2Double . fromEnum . diverse2GL zs . concatMap string1 . stringToXG wrs $ xs + StrG xs -> int2Double . fromEnum . diverse2GGL sels zs . concatMap string1 . stringToXG wrs $ xs FSLG _ -> 1.0) g {-# INLINE procDiverse2F #-} @@ -102,17 +105,18 @@ -> [(Char,Char)] -> CharPhoneticClassification -> SegmentRulesG - -> String -- ^ Corresponds to the \'0\' symbol delimiter in the @ukrainian-phonetics-basic-array@ package. - -> String -- ^ Corresponds to the \'1\' and \'-\' symbol delimiters in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 100 delimiter in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 101 delimiter in the @ukrainian-phonetics-basic-array@ package. -> ([Double] -> Double) -> (Double -> c) -> MappingFunctionPL -> Coeffs2 + -> String -- ^ Specifies the list of 'Char' that the function is sensitive to. -> FuncRep2 ReadyForConstructionPL Double c -procB2FG wrs ks arr gs us vs h1 h g coeffs = +procB2FG wrs ks arr gs us vs h1 h g coeffs sels = D (\t -> case t of StrG xs -> let ys = concatMap string1 . stringToXG wrs $ xs in - ((int2Double . fromEnum . diverse2GL zs $ ys)*(h1 . mconcat . (fromMaybe (const [[-5.0]]) (fromPhoPaaW g)) . map (divSylls . reSyllableCntnts ks gs . + ((int2Double . fromEnum . diverse2GGL sels zs $ ys)*(h1 . mconcat . (fromMaybe (const [[-5.0]]) (fromPhoPaaW g)) . map (divSylls . reSyllableCntnts ks gs . groupSnds . str2PRSs arr) . words1 . mapMaybe (f us vs) $ ys)) FSLG tsss -> h1 . mconcat . (fromMaybe (const [[-6.0]]) (fromSaaW g)) $ tsss) h where zs = ' ':us `mappend` vs @@ -123,11 +127,12 @@ -> [(Char,Char)] -> CharPhoneticClassification -> SegmentRulesG - -> String -- ^ Corresponds to the \'0\' symbol delimiter in the @ukrainian-phonetics-basic-array@ package. - -> String -- ^ Corresponds to the \'1\' and \'-\' symbol delimiters in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 100 delimiter in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 101 delimiter in the @ukrainian-phonetics-basic-array@ package. -> (Double -> c) -> MappingFunctionPL -> Coeffs2 + -> String -- ^ Specifies the list of 'Char' that the function is sensitive to. -> FuncRep2 ReadyForConstructionPL Double c procB2F wrs ks arr gs us vs h g coeffs = procB2FG wrs ks arr gs us vs (eval23Coeffs coeffs) h g coeffs {-# INLINE procB2F #-} @@ -137,12 +142,13 @@ -> [(Char,Char)] -> CharPhoneticClassification -> SegmentRulesG - -> String -- ^ Corresponds to the \'0\' symbol delimiter in the @ukrainian-phonetics-basic-array@ package. - -> String -- ^ Corresponds to the \'1\' and \'-\' symbol delimiters in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 100 delimiter in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 101 delimiter in the @ukrainian-phonetics-basic-array@ package. -> Double -> (Double -> c) -> MappingFunctionPL -> Coeffs2 + -> String -- ^ Specifies the list of 'Char' that the function is sensitive to. -> FuncRep2 ReadyForConstructionPL Double c procB2FF wrs ks arr gs us vs k h g coeffs = procB2FG wrs ks arr gs us vs (eval23CoeffsF k coeffs) h g coeffs {-# INLINE procB2FF #-} @@ -152,18 +158,19 @@ -> [(Char,Char)] -> CharPhoneticClassification -> SegmentRulesG - -> String -- ^ Corresponds to the \'0\' symbol delimiter in the @ukrainian-phonetics-basic-array@ package. - -> String -- ^ Corresponds to the \'1\' and \'-\' symbol delimiters in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 100 delimiter in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 101 delimiter in the @ukrainian-phonetics-basic-array@ package. -> ([Double] -> Double) -> (Double -> c) -> MappingFunctionPL -> Coeffs2 + -> String -- ^ Specifies the list of 'Char' that the function is sensitive to. -> FuncRep2 ReadyForConstructionPL Double c -procB2InvFG wrs ks arr gs us vs h1 h g coeffs = +procB2InvFG wrs ks arr gs us vs h1 h g coeffs sels = D (\t -> case t of StrG xs -> let !ys = concatMap string1 . stringToXG wrs $ xs - !z = diverse2GL zs ys in if z == 0 then (h1 . mconcat . (fromMaybe (const [[-5.0]]) (fromPhoPaaW g)) . map (divSylls . reSyllableCntnts ks gs . groupSnds . + !z = diverse2GGL sels zs ys in if z == 0 then (h1 . mconcat . (fromMaybe (const [[-5.0]]) (fromPhoPaaW g)) . map (divSylls . reSyllableCntnts ks gs . groupSnds . str2PRSs arr) . words1 . mapMaybe (f us vs) $ ys) ** 2.0 else ((h1 . mconcat . (fromMaybe (const [[-5.0]]) (fromPhoPaaW g)) . map (divSylls . reSyllableCntnts ks gs . groupSnds . str2PRSs arr) . words1 . mapMaybe (f us vs) $ ys) / (int2Double . fromEnum $ z)) @@ -176,13 +183,14 @@ -> [(Char,Char)] -> CharPhoneticClassification -> SegmentRulesG - -> String -- ^ Corresponds to the \'0\' symbol delimiter in the @ukrainian-phonetics-basic-array@ package. - -> String -- ^ Corresponds to the \'1\' and \'-\' symbol delimiters in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 100 delimiter in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 101 delimiter in the @ukrainian-phonetics-basic-array@ package. -> (Double -> c) -> MappingFunctionPL -> Coeffs2 + -> String -- ^ Specifies the list of 'Char' that the function is sensitive to. -> FuncRep2 ReadyForConstructionPL Double c -procB2InvF wrs ks arr gs us vs h g coeffs = procB2InvFG wrs ks arr gs us vs (eval23Coeffs coeffs) h g coeffs +procB2InvF wrs ks arr gs us vs h g coeffs= procB2InvFG wrs ks arr gs us vs (eval23Coeffs coeffs) h g coeffs {-# INLINE procB2InvF #-} procB2InvFF @@ -190,12 +198,13 @@ -> [(Char,Char)] -> CharPhoneticClassification -> SegmentRulesG - -> String -- ^ Corresponds to the \'0\' symbol delimiter in the @ukrainian-phonetics-basic-array@ package. - -> String -- ^ Corresponds to the \'1\' and \'-\' symbol delimiters in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 100 delimiter in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 101 delimiter in the @ukrainian-phonetics-basic-array@ package. -> Double -> (Double -> c) -> MappingFunctionPL -> Coeffs2 + -> String -- ^ Specifies the list of 'Char' that the function is sensitive to. -> FuncRep2 ReadyForConstructionPL Double c procB2InvFF wrs ks arr gs us vs k h g coeffs = procB2InvFG wrs ks arr gs us vs (eval23CoeffsF k coeffs) h g coeffs {-# INLINE procB2InvFF #-} @@ -221,8 +230,8 @@ -> [(Char,Char)] -> CharPhoneticClassification -> SegmentRulesG - -> String -- ^ Corresponds to the \'0\' symbol delimiter in the @ukrainian-phonetics-basic-array@ package. - -> String -- ^ Corresponds to the \'1\' and \'-\' symbol delimiters in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 100 delimiter in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 101 delimiter in the @ukrainian-phonetics-basic-array@ package. -> String -- ^ The starting 'String' which defines the line to be constructed -> FuncRep2 ReadyForConstructionPL Double c procRhythmicity23F k g h choice coeffs wrs ks arr hs us vs bbs = D (rhythmicity k choice h coeffs bbs wrs ks arr hs us vs) g diff --git a/Phonetic/Languages/Array/General/PropertiesSyllablesG2.hs b/Phonetic/Languages/Array/General/PropertiesSyllablesG2.hs --- a/Phonetic/Languages/Array/General/PropertiesSyllablesG2.hs +++ b/Phonetic/Languages/Array/General/PropertiesSyllablesG2.hs @@ -19,16 +19,8 @@ {-# LANGUAGE CPP, BangPatterns, MultiWayIf #-} module Phonetic.Languages.Array.General.PropertiesSyllablesG2 ( - -- * Newtype to work with - CoeffTwo(..) - , Coeffs2 - , isEmpty - , isPair - , fstCF - , sndCF - , readCF -- * Mapping function data type - , MappingFunctionPL(..) + MappingFunctionPL(..) , isPhoPaaW , isSaaW , fromPhoPaaW @@ -62,6 +54,7 @@ import Text.Read (readMaybe) import Phonetic.Languages.EmphasisG import GHC.Int (Int8) +import Phonetic.Languages.Coeffs #ifdef __GLASGOW_HASKELL__ #if __GLASGOW_HASKELL__==708 @@ -70,35 +63,6 @@ #endif #endif -data CoeffTwo a = CF0 | CF2 (Maybe a) (Maybe a) deriving (Eq) - -isEmpty :: CoeffTwo a -> Bool -isEmpty CF0 = True -isEmpty _ = False - -isPair :: CoeffTwo a -> Bool -isPair CF0 = False -isPair _ = True - -fstCF :: CoeffTwo a -> Maybe a -fstCF (CF2 x _) = x -fstCF _ = Nothing - -sndCF :: CoeffTwo a -> Maybe a -sndCF (CF2 _ y) = y -sndCF _ = Nothing - -readCF :: String -> Coeffs2 -readCF xs - | any (== '_') xs = let (!ys,!zs) = (\(ks,ts) -> (readMaybe ks::Maybe Double,readMaybe (drop 1 ts)::Maybe Double)) . break (== '_') $ xs in - if (isNothing ys && isNothing zs) then CF0 else CF2 ys zs - | otherwise = CF0 - --- | A data type that is used to represent the coefficients of the rhythmicity functions as a one argument value. -type Coeffs2 = CoeffTwo Double - --------------------------------------------------------------------------------------------- - eval23 = evalRhythmicity23 . mconcat {-# INLINE eval23 #-} @@ -141,8 +105,8 @@ -- (e. g. allophones). Must be sorted in the ascending order to be used correctly. -> CharPhoneticClassification -- ^ The 'Array' 'Int' 'PRS' must be sorted in the ascending order to be used in the module correctly. -> SegmentRulesG - -> String -- ^ Corresponds to the \'0\' symbol delimiter in the @ukrainian-phonetics-basic-array@ package. - -> String -- ^ Corresponds to the \'1\' and \'-\' symbol delimiters in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 100 delimiter in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 101 delimiter in the @ukrainian-phonetics-basic-array@ package. -> ReadyForConstructionPL -> Double rhythmicityG f g bbs wrs ks arr hs us vs xs@(FSLG tsss) @@ -166,8 +130,8 @@ -- (e. g. allophones). Must be sorted in the ascending order to be used correctly. -> CharPhoneticClassification -- ^ The 'Array' 'Int' 'PRS' must be sorted in the ascending order to be used in the module correctly. -> SegmentRulesG - -> String -- ^ Corresponds to the \'0\' symbol delimiter in the @ukrainian-phonetics-basic-array@ package. - -> String -- ^ Corresponds to the \'1\' and \'-\' symbol delimiters in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 100 delimiter in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 101 delimiter in the @ukrainian-phonetics-basic-array@ package. -> ReadyForConstructionPL -> Double rhythmicity0i f = rhythmicityG f eval23 @@ -186,8 +150,8 @@ -- (e. g. allophones). Must be sorted in the ascending order to be used correctly. -> CharPhoneticClassification -- ^ The 'Array' 'Int' 'PRS' must be sorted in the ascending order to be used in the module correctly. -> SegmentRulesG - -> String -- ^ Corresponds to the \'0\' symbol delimiter in the @ukrainian-phonetics-basic-array@ package. - -> String -- ^ Corresponds to the \'1\' and \'-\' symbol delimiters in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 100 delimiter in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 101 delimiter in the @ukrainian-phonetics-basic-array@ package. -> ReadyForConstructionPL -> Double rhythmicityKi f k2 k3 = rhythmicityG f (eval23K k2 k3) @@ -205,8 +169,8 @@ -- (e. g. allophones). Must be sorted in the ascending order to be used correctly. -> CharPhoneticClassification -- ^ The 'Array' 'Int' 'PRS' must be sorted in the ascending order to be used in the module correctly. -> SegmentRulesG - -> String -- ^ Corresponds to the \'0\' symbol delimiter in the @ukrainian-phonetics-basic-array@ package. - -> String -- ^ Corresponds to the \'1\' and \'-\' symbol delimiters in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 100 delimiter in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 101 delimiter in the @ukrainian-phonetics-basic-array@ package. -> ReadyForConstructionPL -> Double rhythmicity0Fi f k = rhythmicityG f (eval23F k) @@ -226,8 +190,8 @@ -- (e. g. allophones). Must be sorted in the ascending order to be used correctly. -> CharPhoneticClassification -- ^ The 'Array' 'Int' 'PRS' must be sorted in the ascending order to be used in the module correctly. -> SegmentRulesG - -> String -- ^ Corresponds to the \'0\' symbol delimiter in the @ukrainian-phonetics-basic-array@ package. - -> String -- ^ Corresponds to the \'1\' and \'-\' symbol delimiters in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 100 delimiter in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 101 delimiter in the @ukrainian-phonetics-basic-array@ package. -> ReadyForConstructionPL -> Double rhythmicityKFi f k k2 k3 = rhythmicityG f (eval23KF k k2 k3) diff --git a/Phonetic/Languages/EmphasisG.hs b/Phonetic/Languages/EmphasisG.hs --- a/Phonetic/Languages/EmphasisG.hs +++ b/Phonetic/Languages/EmphasisG.hs @@ -44,8 +44,8 @@ -- (e. g. allophones). Must be sorted in the ascending order to be used correctly. -> CharPhoneticClassification -- ^ The 'Array' 'Int' 'PRS' must be sorted in the ascending order to be used in the module correctly. -> SegmentRulesG - -> String -- ^ Corresponds to the \'0\' symbol delimiter in the @ukrainian-phonetics-basic-array@ package. - -> String -- ^ Corresponds to the \'1\' and \'-\' symbol delimiters in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 100 delimiter in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 101 delimiter in the @ukrainian-phonetics-basic-array@ package. -> String -> IO ([[FlowSoundG]],[SyllWeightsG],[[[Int8]]]) weightStringIO wrs ks arr hs us vs xs = weightSyllablesIO fss >>= \zs -> pure (tsss, zs, helper1F . scanl' (+) (-128::Int8) . map (fromIntegral . length) $ tsss) @@ -58,8 +58,8 @@ -- (e. g. allophones). Must be sorted in the ascending order to be used correctly. -> CharPhoneticClassification -- ^ The 'Array' 'Int' 'PRS' must be sorted in the ascending order to be used in the module correctly. -> SegmentRulesG - -> String -- ^ Corresponds to the \'0\' symbol delimiter in the @ukrainian-phonetics-basic-array@ package. - -> String -- ^ Corresponds to the \'1\' and \'-\' symbol delimiters in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 100 delimiter in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 101 delimiter in the @ukrainian-phonetics-basic-array@ package. -> Int -> String -> IO ([[FlowSoundG]],[[SyllWeightsG]],[[[Int8]]]) @@ -126,8 +126,8 @@ -- (e. g. allophones). Must be sorted in the ascending order to be used correctly. -> CharPhoneticClassification -- ^ The 'Array' 'Int' 'PRS' must be sorted in the ascending order to be used in the module correctly. -> SegmentRulesG - -> String -- ^ Corresponds to the \'0\' symbol delimiter in the @ukrainian-phonetics-basic-array@ package. - -> String -- ^ Corresponds to the \'1\' and \'-\' symbol delimiters in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 100 delimiter in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 101 delimiter in the @ukrainian-phonetics-basic-array@ package. -> String -> [[FlowSoundG]] convF1 wrs ks arr hs us vs xs @@ -140,8 +140,8 @@ -- (e. g. allophones). Must be sorted in the ascending order to be used correctly. -> CharPhoneticClassification -- ^ The 'Array' 'Int' 'PRS' must be sorted in the ascending order to be used in the module correctly. -> SegmentRulesG - -> String -- ^ Corresponds to the \'0\' symbol delimiter in the @ukrainian-phonetics-basic-array@ package. - -> String -- ^ Corresponds to the \'1\' and \'-\' symbol delimiters in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 100 delimiter in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 101 delimiter in the @ukrainian-phonetics-basic-array@ package. -> String -> [([String],[[Int8]],[FlowSoundG])] convF3 wrs ks arr hs us vs xs @@ -156,8 +156,8 @@ -- (e. g. allophones). Must be sorted in the ascending order to be used correctly. -> CharPhoneticClassification -- ^ The 'Array' 'Int' 'PRS' must be sorted in the ascending order to be used in the module correctly. -> SegmentRulesG - -> String -- ^ Corresponds to the \'0\' symbol delimiter in the @ukrainian-phonetics-basic-array@ package. - -> String -- ^ Corresponds to the \'1\' and \'-\' symbol delimiters in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 100 delimiter in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 101 delimiter in the @ukrainian-phonetics-basic-array@ package. -> String -> [(String,[[Int8]])] convF3W wrs ks arr hs us vs xs @@ -170,8 +170,8 @@ -- (e. g. allophones). Must be sorted in the ascending order to be used correctly. -> CharPhoneticClassification -- ^ The 'Array' 'Int' 'PRS' must be sorted in the ascending order to be used in the module correctly. -> SegmentRulesG - -> String -- ^ Corresponds to the \'0\' symbol delimiter in the @ukrainian-phonetics-basic-array@ package. - -> String -- ^ Corresponds to the \'1\' and \'-\' symbol delimiters in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 100 delimiter in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 101 delimiter in the @ukrainian-phonetics-basic-array@ package. -> String -> String -> [[[Int8]]] @@ -184,8 +184,8 @@ -- (e. g. allophones). Must be sorted in the ascending order to be used correctly. -> CharPhoneticClassification -- ^ The 'Array' 'Int' 'PRS' must be sorted in the ascending order to be used in the module correctly. -> SegmentRulesG - -> String -- ^ Corresponds to the \'0\' symbol delimiter in the @ukrainian-phonetics-basic-array@ package. - -> String -- ^ Corresponds to the \'1\' and \'-\' symbol delimiters in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 100 delimiter in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 101 delimiter in the @ukrainian-phonetics-basic-array@ package. -> String -> ReadyForConstructionPL -> String @@ -201,8 +201,8 @@ -- (e. g. allophones). Must be sorted in the ascending order to be used correctly. -> CharPhoneticClassification -- ^ The 'Array' 'Int' 'PRS' must be sorted in the ascending order to be used in the module correctly. -> SegmentRulesG - -> String -- ^ Corresponds to the \'0\' symbol delimiter in the @ukrainian-phonetics-basic-array@ package. - -> String -- ^ Corresponds to the \'1\' and \'-\' symbol delimiters in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 100 delimiter in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 101 delimiter in the @ukrainian-phonetics-basic-array@ package. -> Bool -> String -> IO ([[FlowSoundG]],[[[[Int8]]] -> [[Double]]],ReadyForConstructionPL) @@ -219,8 +219,8 @@ -- (e. g. allophones). Must be sorted in the ascending order to be used correctly. -> CharPhoneticClassification -- ^ The 'Array' 'Int' 'PRS' must be sorted in the ascending order to be used in the module correctly. -> SegmentRulesG - -> String -- ^ Corresponds to the \'0\' symbol delimiter in the @ukrainian-phonetics-basic-array@ package. - -> String -- ^ Corresponds to the \'1\' and \'-\' symbol delimiters in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 100 delimiter in the @ukrainian-phonetics-basic-array@ package. + -> String -- ^ Corresponds to the 101 delimiter in the @ukrainian-phonetics-basic-array@ package. -> Int -> Bool -> String diff --git a/phonetic-languages-simplified-generalized-properties-array.cabal b/phonetic-languages-simplified-generalized-properties-array.cabal --- a/phonetic-languages-simplified-generalized-properties-array.cabal +++ b/phonetic-languages-simplified-generalized-properties-array.cabal @@ -3,7 +3,7 @@ -- http://haskell.org/cabal/users-guide/ name: phonetic-languages-simplified-generalized-properties-array -version: 0.11.0.0 +version: 0.12.0.0 synopsis: Some 'properties' of the phonetic languages approach text. description: Generalizes the functionality of the https://hackage.haskell.org/package/phonetic-languages-simplified-properties-array homepage: https://hackage.haskell.org/package/phonetic-languages-simplified-generalized-properties-array @@ -21,6 +21,6 @@ exposed-modules: Phonetic.Languages.Array.General.PropertiesFuncRepG2, Phonetic.Languages.Array.General.PropertiesSyllablesG2, Phonetic.Languages.EmphasisG -- other-modules: other-extensions: CPP, BangPatterns, MultiWayIf - build-depends: base >=4.8 && <5, phonetic-languages-basis ==0.1.1.0, phonetic-languages-rhythmicity ==0.9.2.0, phonetic-languages-phonetics-basics ==0.9.0.0, lists-flines ==0.1.2.0, mmsyn2-array ==0.3.0.0 + build-depends: base >=4.8 && <5, phonetic-languages-basis ==0.2.0.0, phonetic-languages-rhythmicity ==0.9.2.0, phonetic-languages-phonetics-basics ==0.9.1.0, lists-flines ==0.1.2.0, mmsyn2-array ==0.3.0.0 -- hs-source-dirs: default-language: Haskell2010