diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -159,3 +159,8 @@ syntaxis) functions to define the syllable durations. Added also the possibility to use just pairwise permutations instead of the full universal set of them. Updated the dependency boundaries and the documentation appropriately. Fixed the issue with not properly documented (re-)installation process for the package(s). + +## 0.13.1.0 -- 2021-10-23 + +* The thirteenth version revised A. Imlemented pairwise permutations mode more deeply. Some documentation improvements. +Updated the dependencies boundaries. diff --git a/Phonetic/Languages/Simple.hs b/Phonetic/Languages/Simple.hs --- a/Phonetic/Languages/Simple.hs +++ b/Phonetic/Languages/Simple.hs @@ -83,8 +83,10 @@ if pairwisePermutations then do putStrLn . messageInfo 8 $ nativeUkrainian mStr <- getLine - let !m = fromMaybe 10 (readMaybe mStr::Maybe Int) - !wss = prepareTuneTextMN m 1 . unwords $ kss + let !m = fromMaybe 10 (readMaybe mStr::Maybe Int) `rem` 11 + !wss + | textProcessment1 `elem` [10,20,30,40,50,60,70,80,90] = kss + | otherwise = prepareTuneTextMN m 1 . unwords $ kss mapM_ (\tss -> generalProc2G syllableDurationsDs pairwisePermutations recursiveMode nativeUkrainian toFileMode1 interactiveP jstL0 (fullArgsConvertTextualSimple mightNotUkrWord tss args0) coeffs coeffsWX (fullArgsConvertTextualSimple mightNotUkrWord tss args) lstW) wss else do @@ -93,7 +95,7 @@ | otherwise = prepareTuneTextMN (if textProcessment1 `elem` [21,31,41,51,61] then m else 7) 1 . unwords $ kss mapM_ (\tss -> generalProc2G syllableDurationsDs pairwisePermutations recursiveMode nativeUkrainian toFileMode1 interactiveP jstL0 (fullArgsConvertTextualSimple mightNotUkrWord tss args0) coeffs coeffsWX (fullArgsConvertTextualSimple mightNotUkrWord tss args) lstW) wss) textProcessmentFss - m = quot textProcessment1 10 + m = if textProcessment1 == 10 || textProcessment1 == 11 then 10 else quot textProcessment1 10 {-| If 'False' then it might be the Ukrainian word in the phonetic languages approach. If 'True', it is not. Is an example of the predicate inside the 'fullArgsConvertTextual' function for the Ukrainian language. @@ -312,7 +314,6 @@ else do let strIntrpr = convStringInterpreter stringInterpreted ts !firstArgs = takeWhile (not . all isLetter) args - putStrLn strIntrpr wordsNN <- if pairwisePermutations then do putStrLn . messageInfo 8 $ nativeUkrainian diff --git a/README b/README --- a/README +++ b/README @@ -2,19 +2,19 @@ of the package phonetic-languages-simplified-examples-array in Ukrainian is here: -https://oleksandrzhabenko.github.io/uk/InstructionUkr.13.pdf +https://oleksandrzhabenko.github.io/uk/InstructionUkr.13.1.pdf or here: -https://web.archive.org/web/20211014194920/https://oleksandrzhabenko.github.io/uk/InstructionUkr.13.pdf +https://web.archive.org/web/20211023171852/https://oleksandrzhabenko.github.io/uk/InstructionUkr.13.1.pdf The instruction in English is here: -https://oleksandrzhabenko.github.io/uk/InstructionEng.13.pdf +https://oleksandrzhabenko.github.io/uk/InstructionEng.13.1.pdf or here: -https://web.archive.org/web/20211014195109/https://oleksandrzhabenko.github.io/uk/InstructionEng.13.pdf +http://web.archive.org/web/20211023172024/https://oleksandrzhabenko.github.io/uk/InstructionEng.13.1.pdf Since the version 0.2.0.0 there exists also comparative mode for the rewritePoemG3 executable. It allows to diff --git a/phonetic-languages-simplified-examples-array.cabal b/phonetic-languages-simplified-examples-array.cabal --- a/phonetic-languages-simplified-examples-array.cabal +++ b/phonetic-languages-simplified-examples-array.cabal @@ -2,7 +2,7 @@ -- further documentation, see http://haskell.org/cabal/users-guide/ name: phonetic-languages-simplified-examples-array -version: 0.13.0.0 +version: 0.13.1.0 synopsis: Helps to create Ukrainian texts with the given phonetic properties. description: Uses more functionality of the arrays and lists. The vector-related functionality is removed and this made the executables and libraries much more lightweight. Deal the Ukrainian as one of the phonetic languages. For the brief introduction in English, please, refer to: https://functional-art.org/2020/papers/Poetry-OleksandrZhabenko.pdf. Since the version 0.3.0.0 the package has the multiple variations mode for @lineVariantsG3@ executable that allows to use modifications in the text, e. g. synonyms, paraphrases etc. homepage: https://hackage.haskell.org/package/phonetic-languages-simplified-examples-array @@ -20,7 +20,7 @@ exposed-modules: Phonetic.Languages.Simplified.Array.Ukrainian.FuncRep2RelatedG2, Phonetic.Languages.Simple, Phonetic.Languages.Lines, Phonetic.Languages.GetTextualInfo, Phonetic.Languages.Parsing, Phonetic.Languages.Simplified.Array.Ukrainian.ReadProperties -- other-modules: other-extensions: BangPatterns - build-depends: base >=4.8 && <4.16, ukrainian-phonetics-basic-array >=0.1.2 && <1, phonetic-languages-simplified-base >=0.3 && <1, phonetic-languages-simplified-properties-array >=0.9.2 && <1, phonetic-languages-ukrainian-array >=0.6.1 && <1, phonetic-languages-filters-array >=0.1 && <1, uniqueness-periods-vector-stats >=0.2.1 && <1, parallel >=3.2.0.6 && <4, phonetic-languages-plus >=0.4.1 && <1, subG >= 0.4 && < 1, phonetic-languages-rhythmicity >=0.9.1 && <1, phonetic-languages-permutations-array >= 0.2 && <1, heaps >= 0.3.6.1 && <1, phonetic-languages-constraints-array >=0.1 && <1, phonetic-languages-simplified-examples-common >=0.2 && <1, mmsyn2-array >= 0.1.3 && <1, string-interpreter >=0.5.4.1 && <1 + build-depends: base >=4.8 && <4.16, ukrainian-phonetics-basic-array >=0.1.2 && <1, phonetic-languages-simplified-base >=0.3 && <1, phonetic-languages-simplified-properties-array >=0.9.2 && <1, phonetic-languages-ukrainian-array >=0.6.1 && <1, phonetic-languages-filters-array >=0.1 && <1, uniqueness-periods-vector-stats >=0.2.1 && <1, parallel >=3.2.0.6 && <4, phonetic-languages-plus >=0.5.1 && <1, subG >= 0.4 && < 1, phonetic-languages-rhythmicity >=0.9.1 && <1, phonetic-languages-permutations-array >= 0.2 && <1, heaps >= 0.3.6.1 && <1, phonetic-languages-constraints-array >=0.1 && <1, phonetic-languages-simplified-examples-common >=0.2 && <1, mmsyn2-array >= 0.1.3 && <1, string-interpreter >=0.5.4.1 && <1 -- hs-source-dirs: default-language: Haskell2010 @@ -28,7 +28,7 @@ main-is: Main.hs other-modules: Phonetic.Languages.Simplified.Array.Ukrainian.FuncRep2RelatedG2, Phonetic.Languages.Simple, Phonetic.Languages.Parsing, Phonetic.Languages.Simplified.Array.Ukrainian.ReadProperties other-extensions: BangPatterns - build-depends: base >=4.8 && <4.16, ukrainian-phonetics-basic-array >=0.1.2 && <1, phonetic-languages-simplified-base >=0.3 && <1, phonetic-languages-simplified-properties-array >=0.9.2 && <1, phonetic-languages-ukrainian-array >=0.6.1 && <1, phonetic-languages-filters-array >=0.1 && <1, phonetic-languages-plus >=0.4.1 && <1, subG >=0.4 && < 1, mmsyn2-array >= 0.1.3 && <1, phonetic-languages-constraints-array >=0.1 && <1, phonetic-languages-permutations-array >= 0.2 && <1, heaps >= 0.3.6.1 && <1, phonetic-languages-simplified-examples-common >=0.2 && <1, string-interpreter >=0.5.4.1 && <1, mmsyn2-array >= 0.1.3 && <1 + build-depends: base >=4.8 && <4.16, ukrainian-phonetics-basic-array >=0.1.2 && <1, phonetic-languages-simplified-base >=0.3 && <1, phonetic-languages-simplified-properties-array >=0.9.2 && <1, phonetic-languages-ukrainian-array >=0.6.1 && <1, phonetic-languages-filters-array >=0.1 && <1, phonetic-languages-plus >=0.5.1 && <1, subG >=0.4 && < 1, mmsyn2-array >= 0.1.3 && <1, phonetic-languages-constraints-array >=0.1 && <1, phonetic-languages-permutations-array >= 0.2 && <1, heaps >= 0.3.6.1 && <1, phonetic-languages-simplified-examples-common >=0.2 && <1, string-interpreter >=0.5.4.1 && <1, mmsyn2-array >= 0.1.3 && <1 ghc-options: -threaded -rtsopts hs-source-dirs: ., Simple default-language: Haskell2010 @@ -37,7 +37,7 @@ main-is: Main.hs other-modules: Phonetic.Languages.Simplified.Array.Ukrainian.FuncRep2RelatedG2, Phonetic.Languages.Lines, Phonetic.Languages.Parsing, Phonetic.Languages.Simplified.Array.Ukrainian.ReadProperties other-extensions: BangPatterns - build-depends: base >=4.8 && <4.16, ukrainian-phonetics-basic-array >=0.1.2 && <1, phonetic-languages-simplified-base >=0.3 && <1, phonetic-languages-simplified-properties-array >=0.9.2 && <1, phonetic-languages-ukrainian-array >=0.6.1 && <1, phonetic-languages-filters-array >=0.1 && <1, phonetic-languages-plus >=0.4.1 && <1, subG >= 0.4 && < 1, phonetic-languages-rhythmicity >=0.9.1 && <1, phonetic-languages-constraints-array >=0.1 && <1, phonetic-languages-permutations-array >= 0.2 && <1, heaps >= 0.3.6.1 && <1, phonetic-languages-simplified-examples-common >=0.2 && <1, mmsyn2-array >= 0.1.3 && <1, string-interpreter >=0.5.4.1 && <1 + build-depends: base >=4.8 && <4.16, ukrainian-phonetics-basic-array >=0.1.2 && <1, phonetic-languages-simplified-base >=0.3 && <1, phonetic-languages-simplified-properties-array >=0.9.2 && <1, phonetic-languages-ukrainian-array >=0.6.1 && <1, phonetic-languages-filters-array >=0.1 && <1, phonetic-languages-plus >=0.5.1 && <1, subG >= 0.4 && < 1, phonetic-languages-rhythmicity >=0.9.1 && <1, phonetic-languages-constraints-array >=0.1 && <1, phonetic-languages-permutations-array >= 0.2 && <1, heaps >= 0.3.6.1 && <1, phonetic-languages-simplified-examples-common >=0.2 && <1, mmsyn2-array >= 0.1.3 && <1, string-interpreter >=0.5.4.1 && <1 ghc-options: -threaded -rtsopts hs-source-dirs: ., Lines default-language: Haskell2010 @@ -46,7 +46,7 @@ main-is: Main.hs other-modules: Phonetic.Languages.Simplified.Array.Ukrainian.FuncRep2RelatedG2, Phonetic.Languages.GetTextualInfo, Phonetic.Languages.Parsing, Phonetic.Languages.Simplified.Array.Ukrainian.ReadProperties other-extensions: BangPatterns - build-depends: base >=4.8 && <4.16, ukrainian-phonetics-basic-array >=0.1.2 && <1, phonetic-languages-simplified-base >=0.3 && <1, phonetic-languages-simplified-properties-array >=0.9.2 && <1, phonetic-languages-ukrainian-array >=0.6.1 && <1, phonetic-languages-filters-array >=0.1 && <1, uniqueness-periods-vector-stats >=0.2.1 && <1, parallel >=3.2.0.6 && <4, phonetic-languages-plus >=0.4.1 && <1, subG >= 0.4 && < 1, phonetic-languages-rhythmicity >=0.9.1 && <1, phonetic-languages-permutations-array >= 0.2 && <1, heaps >= 0.3.6.1 && <1, phonetic-languages-constraints-array >=0.1 && <1, phonetic-languages-simplified-examples-common >=0.2 && <1, mmsyn2-array >= 0.1.3 && <1, string-interpreter >=0.5.4.1 && <1 + build-depends: base >=4.8 && <4.16, ukrainian-phonetics-basic-array >=0.1.2 && <1, phonetic-languages-simplified-base >=0.3 && <1, phonetic-languages-simplified-properties-array >=0.9.2 && <1, phonetic-languages-ukrainian-array >=0.6.1 && <1, phonetic-languages-filters-array >=0.1 && <1, uniqueness-periods-vector-stats >=0.2.1 && <1, parallel >=3.2.0.6 && <4, phonetic-languages-plus >=0.5.1 && <1, subG >= 0.4 && < 1, phonetic-languages-rhythmicity >=0.9.1 && <1, phonetic-languages-permutations-array >= 0.2 && <1, heaps >= 0.3.6.1 && <1, phonetic-languages-constraints-array >=0.1 && <1, phonetic-languages-simplified-examples-common >=0.2 && <1, mmsyn2-array >= 0.1.3 && <1, string-interpreter >=0.5.4.1 && <1 ghc-options: -threaded -rtsopts hs-source-dirs: ., GetInfo default-language: Haskell2010