diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -249,3 +249,7 @@ ## 0.18.0.1 -- 2022-04-25 * The eighteenth version revised A. Tried to fix the README.md so no {=html} is present in the visual output. + +## 0.18.0.2 -- 2022-04-25 + +* The eighteenth version revised B. Fixed the not included dependencies changes. diff --git a/GetInfo/Main.hs b/GetInfo/Main.hs --- a/GetInfo/Main.hs +++ b/GetInfo/Main.hs @@ -65,7 +65,7 @@ generalProc fileDu pairwisePermutations (gr1,gr2) lstW multiples lInes coeffs coeffsWX file gzS printLine toOneLine choice else do contents <- readFile file - fLinesNIO (if pairwisePermutations /= P 0 then 10 else 7) contents + fLinesNIO (if pairwisePermutations /= Phonetic.Languages.Permutations.Represent.P 0 then 10 else 7) contents else do let !file = concat . take 1 $ args if null numbersJustPrint then do @@ -76,7 +76,7 @@ generalProc fileDu pairwisePermutations (gr1,gr2) lstW multiples lInes coeffs coeffsWX file gzS printLine toOneLine choice else do contents <- readFile file - fLinesNIO (if pairwisePermutations /= P 0 then 10 else 7) contents + fLinesNIO (if pairwisePermutations /= Phonetic.Languages.Permutations.Represent.P 0 then 10 else 7) contents aSpecs :: CLSpecifications aSpecs = [("+b",0)] diff --git a/Phonetic/Languages/GetTextualInfo.hs b/Phonetic/Languages/GetTextualInfo.hs --- a/Phonetic/Languages/GetTextualInfo.hs +++ b/Phonetic/Languages/GetTextualInfo.hs @@ -80,13 +80,13 @@ syllableDurationsDs <- readSyllableDurations fileDu contents <- readFile file let !flines - | gr1 == 0 = fLinesN (if pairwisePermutations /= P 0 then 10 else 7) toOneLine contents - | otherwise = prepareGrowTextMN gr1 gr2 . unlines . fLinesN (if pairwisePermutations /= P 0 then 10 else 7) toOneLine $ contents + | gr1 == 0 = fLinesN (if pairwisePermutations /= Phonetic.Languages.Permutations.Represent.P 0 then 10 else 7) toOneLine contents + | otherwise = prepareGrowTextMN gr1 gr2 . unlines . fLinesN (if pairwisePermutations /= Phonetic.Languages.Permutations.Represent.P 0 then 10 else 7) toOneLine $ contents getData3 syllableDurationsDs pairwisePermutations lstW coeffs coeffsWX (getIntervalsNS lstW gzS flines) printLine choice multiples2 flines | otherwise = do syllableDurationsDs <- readSyllableDurations fileDu contents <- readFile file - let !flines = (if gr1 == 0 then id else prepareGrowTextMN gr1 gr2 . unlines) . fLinesN (if pairwisePermutations /= P 0 then 10 else 7) toOneLine . unlines . linesFromArgsG lInes . fLinesN (if pairwisePermutations /= P 0 then 10 else 7) 0 $ contents + let !flines = (if gr1 == 0 then id else prepareGrowTextMN gr1 gr2 . unlines) . fLinesN (if pairwisePermutations /= Phonetic.Languages.Permutations.Represent.P 0 then 10 else 7) toOneLine . unlines . linesFromArgsG lInes . fLinesN (if pairwisePermutations /= Phonetic.Languages.Permutations.Represent.P 0 then 10 else 7) 0 $ contents getData3 syllableDurationsDs pairwisePermutations lstW coeffs coeffsWX (getIntervalsNS lstW gzS flines) printLine choice multiples2 flines linesFromArgs1 :: Int -> String -> [String] -> [String] @@ -110,7 +110,7 @@ -> [String] -> [String] -> IO () -getData3 syllableDurationsDs pairwisePermutations lstW coeffs coeffsWX gz printLine choice multiples3 zss = let !permsV4 = case pairwisePermutations of { P 2 -> genPairwisePermutationsArrLN 10; P 1 -> genElementaryPermutationsArrLN1 10; ~rrr -> genPermutationsArrL } in putStrLn (replicate (length multiples3 + 1) '\t' `mappend` show gz) >> mapM_ (process1Line syllableDurationsDs lstW coeffs coeffsWX gz printLine choice multiples3 permsV4) zss +getData3 syllableDurationsDs pairwisePermutations lstW coeffs coeffsWX gz printLine choice multiples3 zss = let !permsV4 = case pairwisePermutations of { Phonetic.Languages.Permutations.Represent.P 2 -> genPairwisePermutationsArrLN 10; Phonetic.Languages.Permutations.Represent.P 1 -> genElementaryPermutationsArrLN1 10; ~rrr -> genPermutationsArrL } in putStrLn (replicate (length multiples3 + 1) '\t' `mappend` show gz) >> mapM_ (process1Line syllableDurationsDs lstW coeffs coeffsWX gz printLine choice multiples3 permsV4) zss process1Line :: [[[[Sound8]]] -> [[Double]]] -- ^ Whether to use the own provided durations. 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.18.0.1 +version: 0.18.0.2 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. To present the created text you can use e. g. html-presentation-text package: https://hackage.haskell.org/package/html-presentation-text . 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 && <5, ukrainian-phonetics-basic-array ==0.5.3.0, phonetic-languages-simplified-base ==0.4.6.0, phonetic-languages-simplified-properties-array ==0.13.1.0, phonetic-languages-ukrainian-array ==0.9.3.0, phonetic-languages-filters-array ==0.4.0.0, uniqueness-periods-vector-stats ==0.2.2.0, parallel >=3.2.0.6 && <4, phonetic-languages-plus ==0.5.3.0, subG == 0.5.3.0, phonetic-languages-rhythmicity ==0.9.2.0, phonetic-languages-permutations-array == 0.3.4.0, heaps >= 0.3.6.1 && <1, phonetic-languages-constraints-array ==0.1.1.0, phonetic-languages-simplified-examples-common ==0.4.4.0, mmsyn2-array == 0.3.0.0, string-interpreter ==0.6.0.0, cli-arguments == 0.6.0.0, mmsyn2-array-ukrainian-data == 0.1.0.0, lists-flines == 0.1.2.0 + build-depends: base >=4.8 && <5, ukrainian-phonetics-basic-array ==0.5.3.0, phonetic-languages-simplified-base ==0.4.6.0, phonetic-languages-simplified-properties-array ==0.13.1.0, phonetic-languages-ukrainian-array ==0.9.3.0, phonetic-languages-filters-array ==0.4.0.0, uniqueness-periods-vector-stats ==0.2.2.0, parallel >=3.2.0.6 && <4, phonetic-languages-plus ==0.5.3.0, subG == 0.5.3.0, phonetic-languages-rhythmicity ==0.9.2.0, phonetic-languages-permutations-array == 0.3.4.0, heaps >= 0.3.6.1 && <1, phonetic-languages-constraints-array ==0.1.2.0, phonetic-languages-simplified-examples-common ==0.4.6.0, mmsyn2-array == 0.3.0.0, string-interpreter ==0.6.0.0, cli-arguments == 0.6.0.0, mmsyn2-array-ukrainian-data == 0.1.0.0, lists-flines == 0.1.2.0 -- 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 && <5, ukrainian-phonetics-basic-array ==0.5.3.0, phonetic-languages-simplified-base ==0.4.6.0, phonetic-languages-simplified-properties-array ==0.13.1.0, phonetic-languages-ukrainian-array ==0.9.3.0, phonetic-languages-filters-array ==0.4.0.0, uniqueness-periods-vector-stats ==0.2.2.0, parallel >=3.2.0.6 && <4, phonetic-languages-plus ==0.5.3.0, subG == 0.5.3.0, phonetic-languages-rhythmicity ==0.9.2.0, phonetic-languages-permutations-array == 0.3.4.0, heaps >= 0.3.6.1 && <1, phonetic-languages-constraints-array ==0.1.1.0, phonetic-languages-simplified-examples-common ==0.4.4.0, mmsyn2-array == 0.3.0.0, string-interpreter ==0.6.0.0, cli-arguments == 0.6.0.0, mmsyn2-array-ukrainian-data == 0.1.0.0, lists-flines == 0.1.2.0 + build-depends: base >=4.8 && <5, ukrainian-phonetics-basic-array ==0.5.3.0, phonetic-languages-simplified-base ==0.4.6.0, phonetic-languages-simplified-properties-array ==0.13.1.0, phonetic-languages-ukrainian-array ==0.9.3.0, phonetic-languages-filters-array ==0.4.0.0, uniqueness-periods-vector-stats ==0.2.2.0, parallel >=3.2.0.6 && <4, phonetic-languages-plus ==0.5.3.0, subG == 0.5.3.0, phonetic-languages-rhythmicity ==0.9.2.0, phonetic-languages-permutations-array == 0.3.4.0, heaps >= 0.3.6.1 && <1, phonetic-languages-constraints-array ==0.1.2.0, phonetic-languages-simplified-examples-common ==0.4.6.0, mmsyn2-array == 0.3.0.0, string-interpreter ==0.6.0.0, cli-arguments == 0.6.0.0, mmsyn2-array-ukrainian-data == 0.1.0.0, lists-flines == 0.1.2.0 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 && <5, ukrainian-phonetics-basic-array ==0.5.3.0, phonetic-languages-simplified-base ==0.4.6.0, phonetic-languages-simplified-properties-array ==0.13.1.0, phonetic-languages-ukrainian-array ==0.9.3.0, phonetic-languages-filters-array ==0.4.0.0, uniqueness-periods-vector-stats ==0.2.2.0, parallel >=3.2.0.6 && <4, phonetic-languages-plus ==0.5.3.0, subG == 0.5.3.0, phonetic-languages-rhythmicity ==0.9.2.0, phonetic-languages-permutations-array == 0.3.4.0, heaps >= 0.3.6.1 && <1, phonetic-languages-constraints-array ==0.1.1.0, phonetic-languages-simplified-examples-common ==0.4.4.0, mmsyn2-array == 0.3.0.0, string-interpreter ==0.6.0.0, cli-arguments == 0.6.0.0, mmsyn2-array-ukrainian-data == 0.1.0.0, lists-flines == 0.1.2.0 + build-depends: base >=4.8 && <5, ukrainian-phonetics-basic-array ==0.5.3.0, phonetic-languages-simplified-base ==0.4.6.0, phonetic-languages-simplified-properties-array ==0.13.1.0, phonetic-languages-ukrainian-array ==0.9.3.0, phonetic-languages-filters-array ==0.4.0.0, uniqueness-periods-vector-stats ==0.2.2.0, parallel >=3.2.0.6 && <4, phonetic-languages-plus ==0.5.3.0, subG == 0.5.3.0, phonetic-languages-rhythmicity ==0.9.2.0, phonetic-languages-permutations-array == 0.3.4.0, heaps >= 0.3.6.1 && <1, phonetic-languages-constraints-array ==0.1.2.0, phonetic-languages-simplified-examples-common ==0.4.6.0, mmsyn2-array == 0.3.0.0, string-interpreter ==0.6.0.0, cli-arguments == 0.6.0.0, mmsyn2-array-ukrainian-data == 0.1.0.0, lists-flines == 0.1.2.0 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 && <5, ukrainian-phonetics-basic-array ==0.5.3.0, phonetic-languages-simplified-base ==0.4.6.0, phonetic-languages-simplified-properties-array ==0.13.1.0, phonetic-languages-ukrainian-array ==0.9.3.0, phonetic-languages-filters-array ==0.4.0.0, uniqueness-periods-vector-stats ==0.2.2.0, parallel >=3.2.0.6 && <4, phonetic-languages-plus ==0.5.3.0, subG == 0.5.3.0, phonetic-languages-rhythmicity ==0.9.2.0, phonetic-languages-permutations-array == 0.3.4.0, heaps >= 0.3.6.1 && <1, phonetic-languages-constraints-array ==0.1.1.0, phonetic-languages-simplified-examples-common ==0.4.4.0, mmsyn2-array == 0.3.0.0, string-interpreter ==0.6.0.0, cli-arguments == 0.6.0.0, mmsyn2-array-ukrainian-data == 0.1.0.0, lists-flines == 0.1.2.0 + build-depends: base >=4.8 && <5, ukrainian-phonetics-basic-array ==0.5.3.0, phonetic-languages-simplified-base ==0.4.6.0, phonetic-languages-simplified-properties-array ==0.13.1.0, phonetic-languages-ukrainian-array ==0.9.3.0, phonetic-languages-filters-array ==0.4.0.0, uniqueness-periods-vector-stats ==0.2.2.0, parallel >=3.2.0.6 && <4, phonetic-languages-plus ==0.5.3.0, subG == 0.5.3.0, phonetic-languages-rhythmicity ==0.9.2.0, phonetic-languages-permutations-array == 0.3.4.0, heaps >= 0.3.6.1 && <1, phonetic-languages-constraints-array ==0.1.2.0, phonetic-languages-simplified-examples-common ==0.4.6.0, mmsyn2-array == 0.3.0.0, string-interpreter ==0.6.0.0, cli-arguments == 0.6.0.0, mmsyn2-array-ukrainian-data == 0.1.0.0, lists-flines == 0.1.2.0 ghc-options: -threaded -rtsopts hs-source-dirs: ., GetInfo default-language: Haskell2010