phonetic-languages-simplified-generalized-examples-array 0.7.0.0 → 0.8.0.0
raw patch · 5 files changed
+60/−32 lines, 5 filesdep ~phonetic-languages-simplified-generalized-properties-arrayPVP ok
version bump matches the API change (PVP)
Dependency ranges changed: phonetic-languages-simplified-generalized-properties-array
API changes (from Hackage documentation)
Files
- ChangeLog.md +11/−5
- Phonetic/Languages/General/Simple.hs +17/−14
- Phonetic/Languages/Simplified/Array/General/FuncRep2RelatedG2.hs +25/−8
- README.md +4/−2
- phonetic-languages-simplified-generalized-examples-array.cabal +3/−3
ChangeLog.md view
@@ -15,7 +15,7 @@ ## 0.2.0.0 -- 2021-05-24 * Second version. Added new modules: Phonetic.Languages.General.Simple.Parsing, Phonetic.Languages.General.Lines.Parsing,-Phonetic.Languages.General.GetInfo.Parsing. Added README.md file with some remarks to the new modules. +Phonetic.Languages.General.GetInfo.Parsing. Added README.md file with some remarks to the new modules. ## 0.2.0.1 -- 2021-05-26 @@ -32,7 +32,7 @@ ## 0.4.0.0 -- 2021-07-06 -* Fourth version. Added a new module EspeakNG_IPA to use the espeak and IPA functionality. +* Fourth version. Added a new module EspeakNG_IPA to use the espeak and IPA functionality. For this, added mmsyn3 and process as new dependencies. ## 0.4.1.0 -- 2021-07-06@@ -41,7 +41,7 @@ ## 0.4.1.1 -- 2021-07-06 ː-* Fourth version revised B. Fixed spelling and stylistic issues in the documentation. +* Fourth version revised B. Fixed spelling and stylistic issues in the documentation. ## 0.4.2.0 -- 2021-07-08 @@ -78,10 +78,16 @@ ## 0.6.2.0 -- 2021-07-31 -* Sixth version revised B. Changed the dependency boundaries so that the issues are fixed with '0' and not '0' functions. -Some code improvements (reduced duplication). +* Sixth version revised B. Changed the dependency boundaries so that the issues are fixed with '0' and not '0' functions.+Some code improvements (reduced duplication). ## 0.7.0.0 -- 2021-08-09 * Seventh version. Added information to the documentation in the pdf format. Changed the dependency boundaries so that it now uses more linearized rhythmicity properties for polyrhythmic properties.++## 0.8.0.0 -- 2021-08-14++* Eigth version. Changed the dependency boundaries and added new weighted properties and fixed some issues with+the previous ones so that they use more complete information. Added the handler for the case of the empty line for+the Simple submodule and related functionality. Some documentation improvements.
Phonetic/Languages/General/Simple.hs view
@@ -52,7 +52,7 @@ generalProc2G :: GWritingSystemPRPLX -- ^ Data used to obtain the phonetic language representation of the text. -> [(Char,Char)] -- ^ The pairs of the 'Char' that corresponds to the similar phonetic languages consonant phenomenon- -- (e. g. allophones). Must be sorted in the ascending order to be used correctly. + -- (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@@ -94,7 +94,7 @@ generalProc2 :: GWritingSystemPRPLX -- ^ Data used to obtain the phonetic language representation of the text. -> [(Char,Char)] -- ^ The pairs of the 'Char' that corresponds to the similar phonetic languages consonant phenomenon- -- (e. g. allophones). Must be sorted in the ascending order to be used correctly. + -- (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@@ -169,13 +169,14 @@ else let !perms = decodeLConstraints argCs . genPermutationsL $ l in generalProcMMs wrs ks arr gs js vs h qs interactive coeffs coeffsWX argsZipped perms subs --- | Function provides message information. +-- | Function provides message information. messageInfo :: Int -> String-messageInfo n +messageInfo n | n == 1 = "You stopped the program, please, if needed, run it again with better arguments. " | n == 2 = "Please, specify the variant which you would like to become the resulting string by its number. " | n == 3 = "Please, check whether the line below corresponds and is consistent with the constraints you have specified between the +a and -a options. Check also whether you have specified the \"+b\" or \"+bl\" option(s). If it is inconsistent then enter further \"n\", press Enter and then run the program again with better arguments. " `mappend` newLineEnding `mappend` "If the line is consistent with your input between +a and -a then just press Enter to proceed further. " `mappend` newLineEnding | n == 4 = "No data has been specified to control the computation process. "+ | n == 5 = "(/ You have specified properties / property and the range(s) so that for the words and their concatenations there are no variants available. Try to change the call parameters /)" | otherwise = "You have specified just one variant of the properties. " -- |@@ -184,14 +185,16 @@ | null xss = putStrLn "" >> return "" | otherwise = do let !datas = map (\(idx,str) -> show idx `mappend` ('\t' : str)) . trans232 . map f $ xss- mapM_ putStrLn datas- putStrLn ""- putStrLn . messageInfo $ 2- number <- getLine- let !lineRes = concat . filter ((number `mappend` "\t")`L.isPrefixOf`) $ datas- !ts = drop 1 . dropWhile (/= '\t') $ lineRes- putStrLn ts >> return ts- + if null datas then (putStrLn . messageInfo $ 5) >> return ""+ else do+ mapM_ putStrLn datas+ putStrLn ""+ putStrLn . messageInfo $ 2+ number <- getLine+ let !lineRes = concat . filter ((number `mappend` "\t")`L.isPrefixOf`) $ datas+ !ts = drop 1 . dropWhile (/= '\t') $ lineRes+ putStrLn ts >> return ts+ printWarning :: String -> IO String printWarning xs = do putStrLn . messageInfo $ 3@@ -201,7 +204,7 @@ generalProcMs :: GWritingSystemPRPLX -- ^ Data used to obtain the phonetic language representation of the text. -> [(Char,Char)] -- ^ The pairs of the 'Char' that corresponds to the similar phonetic languages consonant phenomenon- -- (e. g. allophones). Must be sorted in the ascending order to be used correctly. + -- (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@@ -246,7 +249,7 @@ generalProcMMs :: GWritingSystemPRPLX -- ^ Data used to obtain the phonetic language representation of the text. -> [(Char,Char)] -- ^ The pairs of the 'Char' that corresponds to the similar phonetic languages consonant phenomenon- -- (e. g. allophones). Must be sorted in the ascending order to be used correctly. + -- (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
Phonetic/Languages/Simplified/Array/General/FuncRep2RelatedG2.hs view
@@ -24,7 +24,7 @@ chooseMax :: (Ord c) => GWritingSystemPRPLX -- ^ Data used to obtain the phonetic language representation of the text. -> [(Char,Char)] -- ^ The pairs of the 'Char' that corresponds to the similar phonetic languages consonant phenomenon- -- (e. g. allophones). Must be sorted in the ascending order to be used correctly. + -- (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.@@ -41,7 +41,7 @@ -- \"0y\", \"0z\", \"y\", \"y0\", \"y2\", \"y3\", \"y4\", \"yy\", \"yy2\", \"yy3\", \"z\", \"z2\", \"z3\", \"z4\", -- \"zz\", \"zz2\", \"zz3\", \"zz4\" or some other one (that is the default one). Since the 0.5.0.0 version -- you can use also \"w\" and \"x\"-based lines of properties. Specifies the applied properties- -- to get the result. The \"z\"-line uses \'F\' functions. + -- to get the result. The \"z\"-line uses \'F\' functions. -> FuncRep2 String Double c chooseMax = chooseMaxG 1.3 {-# INLINE chooseMax #-}@@ -51,7 +51,7 @@ :: (Ord c) => Double -- ^ Must be greater than 1.0 though it is not checked. -> GWritingSystemPRPLX -- ^ Data used to obtain the phonetic language representation of the text. -> [(Char,Char)] -- ^ The pairs of the 'Char' that corresponds to the similar phonetic languages consonant phenomenon- -- (e. g. allophones). Must be sorted in the ascending order to be used correctly. + -- (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.@@ -73,11 +73,28 @@ -- with the 'Int' arguments from the first argument tuple. This allows to rearrange the given text and then -- to rewrite it. -- Besides there are new lines of the arguments for the 'String' argument that can begin with \"c\", \"s\", \"t\",- -- \"u\", \"v\" letters. For more information, please, refer to the 'Phonetic.Languages.Array.Ukrainian.PropertiesSyllablesG2.rhythmicity'.+ -- \"u\", \"v\", or some other letters. For more information, please, refer to the 'Phonetic.Languages.Array.Ukrainian.PropertiesSyllablesG2.rhythmicity'. -> FuncRep2 String Double c chooseMaxG k wrs ks arr gs us vs g h coeffs xs choice- | take 1 choice == "c" = procRhythmicity23F k g h choice coeffs wrs ks arr gs us vs- | getBFstL' False (zip ["02y","02z","03y","03z","04y","04z","0y","0z","s01","s02","s03","s04",+ | take 1 choice `elem` ["c","C","N"] = procRhythmicity23F k g h choice coeffs wrs ks arr gs us vs+ | getBFstL' False (zip ["S01","S02","S03","S04","S11",+ "S12","S12","S13","S14","S21","S22","S23","S24","S31","S32","S33","S34","S41","S42","S43","S44",+ "S51","S52","S53","S54","S61","S62","S63","S64","S71","S72","S74","T01","T02","T03","T04","T11",+ "T12","T13","T14","T21","T22","T23","T24","T31","T32","T33","T34","T41","T42","T43","T44","T51",+ "T52","T53","T54","T61","T62","T63","T64","T71","T72","T73","T74","U01","U02","U03","U04","U11",+ "U12","U13","U14","U21","U21","U22","U23","U24","U31","U32","U33","U34","U41","U42","U43","U44",+ "U51","U52","U53","U54","U61","U62","U63","U64","U71","U72","U73","U74","V01","V02","V03","V04",+ "V11","V12","V13","V14","V21","V22","V23","V24","V31","V32","V33","V34","V41","V42","V43","V44",+ "V51","V52","V53","V54","V61","V62","V63","V64","V71","V72","V74","W01","W02","W03","W04","W11",+ "W12","W13","W14","W21","W22","W23","W24","W31","W32","W33","W34","W41","W42","W43","W44","W51",+ "W52","W53","W54","W61","W62","W63","W64","W71","W72","W73","W74","X01","X02","X03","X04","X11",+ "X12","X13","X14","X21","X22","X23","X24","X31","X32","X33","X34","X41","X42","X43","X44","X51",+ "X52","X53","X54","X61","X62","X63","X64","X71","X72","X73","X74","Y01","Y02","Y03","Y04",+ "Y11","Y12","Y13","Y14","Y21","Y22","Y23","Y24","Y31","Y32","Y33","Y34","Y41","Y42","Y43","Y44",+ "Y51","Y52","Y53","Y54","Y61","Y62","Y63","Y64","Y71","Y72","Y74","Z01","Z02","Z03","Z04","Z11",+ "Z12","Z13","Z14","Z21","Z22","Z23","Z24","Z31","Z32","Z33","Z34","Z41","Z42","Z43","Z44","Z51",+ "Z52","Z53","Z54","Z61","Z62","Z63","Z64","Z71","Z72","Z73","Z74",+ "02y","02z","03y","03z","04y","04z","0y","0z","s01","s02","s03","s04", "s11","s12","s13","s14","s21","s22","s23","s24","s31","s32","s33","s34","s41","s42","s43","s44", "s51","s52","s53","s54","s61","s62","s63","s64","s71","s72","s74","t01","t02","t03","t04","t11", "t12","t13","t14","t21","t22","t23","t24","t31","t32","t33","t34","t41","t42","t43","t44","t51",@@ -106,7 +123,7 @@ ("zz2",procB2InvFF wrs ks arr gs us vs k g (xs !! 1) coeffs), ("zz3",procB2InvFF wrs ks arr gs us vs k g (xs !! 2) coeffs), ("zz4", procB2InvFF wrs ks arr gs us vs k g (xs !! 3) coeffs)] choice- + -- | Allows to choose precision in the Numeric.showFDouble function being given a choice parameter. precChoice :: String -- ^ Is intended to be one of the following strings: \"02y\", \"02z\", \"03y\", \"03z\", \"04y\", \"04z\",@@ -118,7 +135,7 @@ -- with the 'Int' arguments from the first argument tuple. This allows to rearrange the given text and then -- to rewrite it. -- Besides there are new lines of the arguments for the 'String' argument that can begin with \"c\", \"s\", \"t\",- -- \"u\", \"v\" letters. For more information, please, refer to the 'Phonetic.Languages.Array.Ukrainian.PropertiesSyllablesG2.rhythmicity'.+ -- \"u\", \"v\", or some other letters. For more information, please, refer to the 'Phonetic.Languages.Array.Ukrainian.PropertiesSyllablesG2.rhythmicity'. -> Maybe Int precChoice = getBFstL' (Just 4) [("02y",Just 0),("02z",Just 0),("03y",Just 0),("03z",Just 0),("04y",Just 0), ("04z",Just 0),("0y",Just 0),("0z",Just 0),("y",Just 0),("y0",Just 0),("y2",Just 0),("y3",Just 0), ("y4",Just 0),
README.md view
@@ -1,5 +1,5 @@ The version 0.2.0.0 is prepared to the Day of the Saints Cyril and Methodius, the 'Apostles to the Slavs',-and to the Day of Slavic writing systems and culture. +and to the Day of Slavic writing systems and culture. The functions in the modules Phonetic.Languages.General.Simple.Parsing, Phonetic.Languages.General.Lines.Parsing, Phonetic.Languages.General.GetInfo.Parsing highly depend on the data types in the phonetic-languages-phonetics-basics@@ -76,7 +76,7 @@ Since the 0.5.0.0 version you can use also "w" and "x" series (lines) of properties. They use more complex approach and are intended for 4 elements in the rhythmic groups. For more information, please, refer to the section 'WX argument' in the English instruction:-https://web.archive.org/web/20210809162431/https://oleksandrzhabenko.github.io/uk/Eng-Ukrainian_as_a_Phonetic_Language_Instructions-0.7.0.0.pdf+https://web.archive.org/web/20210814202129/https://oleksandrzhabenko.github.io/uk/Eng-Ukrainian_as_a_Phonetic_Language_Instructions-0.8.0.0.pdf There are also some additional information there about the changes in the 0.6.0.0 version. @@ -91,3 +91,5 @@ Since the 0.7.0.0 version the "c", "s", "t", "u" and "v" series can have negative (by sign) result of the properties. This does not influence the general behavior of the functions.++Since the 0.8.0.0 version there are also new "weighted" properties lines used.
phonetic-languages-simplified-generalized-examples-array.cabal view
@@ -3,9 +3,9 @@ -- http://haskell.org/cabal/users-guide/ name: phonetic-languages-simplified-generalized-examples-array-version: 0.7.0.0+version: 0.8.0.0 synopsis: Helps to create texts with the given phonetic properties (e. g. poetic).-description: Is rewritten from the modules of the @phonetic-languages-simplified-examples-array@ package. Can be used not only for Ukrainian, but also for other languages. +description: Is rewritten from the modules of the @phonetic-languages-simplified-examples-array@ package. Can be used not only for Ukrainian, but also for other languages. homepage: https://hackage.haskell.org/package/phonetic-languages-simplified-generalized-examples-array license: MIT license-file: LICENSE@@ -21,6 +21,6 @@ exposed-modules: Phonetic.Languages.General.Lines, Phonetic.Languages.General.Parsing, Phonetic.Languages.General.Simple, Phonetic.Languages.General.GetTextualInfo, Phonetic.Languages.Simplified.Array.General.FuncRep2RelatedG2, Phonetic.Languages.General.Simple.Parsing, Phonetic.Languages.General.Lines.Parsing, Phonetic.Languages.General.GetInfo.Parsing, EspeakNG_IPA -- other-modules: other-extensions: BangPatterns, FlexibleContexts- build-depends: base >=4.8 && <4.15, phonetic-languages-simplified-generalized-examples-common >=0.2 && <1, subG >=0.4.2 && <1, phonetic-languages-simplified-generalized-properties-array >=0.5 && <1, phonetic-languages-simplified-base >=0.2 && <1, phonetic-languages-permutations-array >=0.1 && <1, phonetic-languages-filters-array >=0.1 && <1, phonetic-languages-phonetics-basics >=0.8.1 && <1, phonetic-languages-constraints-array >=0.1 && <1, parallel >=3.2.0.6 && <4, phonetic-languages-plus >=0.2 && <1, mmsyn2-array >=0.1.3 && <1, heaps >=0.3.6.1 && <1, mmsyn3 >=0.1.5 && <1, process >= 1.6.2 && <2+ build-depends: base >=4.8 && <4.15, phonetic-languages-simplified-generalized-examples-common >=0.2 && <1, subG >=0.4.2 && <1, phonetic-languages-simplified-generalized-properties-array >=0.6 && <1, phonetic-languages-simplified-base >=0.2 && <1, phonetic-languages-permutations-array >=0.1 && <1, phonetic-languages-filters-array >=0.1 && <1, phonetic-languages-phonetics-basics >=0.8.1 && <1, phonetic-languages-constraints-array >=0.1 && <1, parallel >=3.2.0.6 && <4, phonetic-languages-plus >=0.2 && <1, mmsyn2-array >=0.1.3 && <1, heaps >=0.3.6.1 && <1, mmsyn3 >=0.1.5 && <1, process >= 1.6.2 && <2 -- hs-source-dirs: default-language: Haskell2010