diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -271,3 +271,8 @@ the need to recompute the values if they are important and not the result. Updated the documentation with the new data. +## 0.20.1.0 --2022-08-22 + +* The twentieth version revised A. Fixed issues with the rearrangements of the intervals. Some documentation improvements. + + diff --git a/Phonetic/Languages/Simple.hs b/Phonetic/Languages/Simple.hs --- a/Phonetic/Languages/Simple.hs +++ b/Phonetic/Languages/Simple.hs @@ -17,6 +17,7 @@ module Phonetic.Languages.Simple where +import Data.Char import Phonetic.Languages.Array.Ukrainian.Common import Phonetic.Languages.Parsing import Numeric @@ -28,7 +29,6 @@ import Phonetic.Languages.Simplified.DataG.Partir import Phonetic.Languages.Filters (unsafeSwapVecIWithMaxI) import Phonetic.Languages.Simplified.StrictVG.Base -import Data.Char (isDigit,isAlpha,isLetter) import qualified Data.List as L (span,sort,zip4,isPrefixOf,nub,sortBy,intersperse) import Phonetic.Languages.Simplified.Array.Ukrainian.FuncRep2RelatedG2 import Phonetic.Languages.Permutations.Arr @@ -47,7 +47,6 @@ import Phonetic.Languages.Permutations.Represent import Languages.Ukrainian.Data import Phonetic.Languages.Emphasis -import Data.List (sortBy) forMultiplePropertiesF :: [String] -> [(String,[String])] forMultiplePropertiesF (xs:xss) @@ -379,7 +378,7 @@ return . fst . (if any (== 'G') choice then partitioningR2 arg0 else maximumGroupsClassificationR_2 (fromMaybe 1 (readMaybe arg0::Maybe Int))) . map (toResultR2 frep2) $ map Str variants1 show2 verbose jjs@(R2 x y z:_) = show1 bs - where bs = sortBy (\(R2 xs d1 k1) (R2 ys d2 k2) -> case verbose of + where bs = L.sortBy (\(R2 xs d1 k1) (R2 ys d2 k2) -> case verbose of 2 -> compare d2 d1 1 -> compare xs ys 3 -> compare k2 k1 diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -6,22 +6,30 @@ The short (possibly) instruction how to use the programs of the package phonetic-languages-simplified-examples-array in Ukrainian is here: -https://oleksandrzhabenko.github.io/uk/rhythmicity/InstructionUkr.20.pdf +https://oleksandrzhabenko.github.io/uk/rhythmicity/InstructionUkr.20.1.pdf or here: -(try -https://web.archive.org/web/20220809192249/https://oleksandrzhabenko.github.io/uk/rhythmicity/InstructionUkr.20.pdf). +(try https://web.archive.org/web/20220822182842/https://oleksandrzhabenko.github.io/uk/rhythmicity/InstructionUkr.20.1.pdf +or https://web.archive.org/web/20220822182940/https://oleksandrzhabenko.github.io/uk/rhythmicity/InstructionUkr.20.1.html + +in html format +). + The instruction in English is here: -https://oleksandrzhabenko.github.io/uk/rhythmicity/InstructionEng.20.pdf +https://oleksandrzhabenko.github.io/uk/rhythmicity/InstructionEng.20.1.pdf or here: -(try -https://web.archive.org/web/20220809192412/https://oleksandrzhabenko.github.io/uk/rhythmicity/InstructionEng.20.pdf). +(try https://web.archive.org/web/20220822183103/https://oleksandrzhabenko.github.io/uk/rhythmicity/InstructionEng.20.1.pdf +or https://web.archive.org/web/20220822183226/https://oleksandrzhabenko.github.io/uk/rhythmicity/InstructionEng.20.1.html + +in html format +). + Since the version 0.20.0.0 added the second major mode of operation -- SaaW (syllable-as-a-whole), additionally to the previous functionality of PhoPaaW (phonetic-phenomena-as-a-whole). @@ -86,26 +94,61 @@ More partucular example of the abovementioned one: -lineVariantsG3 10.0\_1.2 zz2 садок вишневий коло хати хрущі над вишнями -гудуть (the Ukrainian text here and further is from the Taras Shevchenko -poem) +lineVariantsG3 10.0_1.2 yy2 садок вишневий коло хати хрущі над вишнями гудуть -lineVariantsG3 10.0\_1.2 5 5 1 2 04z садок вишневий коло хати хрущі над -вишнями гудуть +lineVariantsG3 +m 02y 3 03y 3 y0 10 -m +bl . -lineVariantsG3 +m 02y 3 03z 3 y0 10 -m +bl `` +lineVariantsG3 +i +m 02y 10 03y 10 y0 35 -m +bl садок вишневий коло хати хрущі над вишнями гудуть -lineVariantsG3 +i +bl 4.3\_ +m 02y 3 0y 3 y0 20 y2 40 04z 3 -m садок -вишневий коло хати хрущі над вишнями гудуть +lineVariantsG3 +f hello.txt +bl +m 02y 10 0y 10 y0 40 -m садок вишневий коло хати хрущі над вишнями гудуть -lineVariantsG3 +f hello.txt +bl +m 02y 3 0y 3 04y 5 y0 40 z4 50 -m садок -вишневий коло хати хрущі над вишнями гудуть +lineVariantsG3 +r 3 w02 +t 70 "sadok.txt" "other_poem.txt" "just_text.txt" ^t +lineVariantsG3 +r 3 w02 +t 70 + +lineVariantsG3 +r 3 w02 +f "fileForSaving.txt" +t 50 + +lineVariantsG3 +d 56.csv 11 HI32 весна уже прийшла і спів пташок лунає звідусіль + +lineVariantsG3 +d 56.csv +m GHI32 01 HI32 20000 -m весна уже прийшла і спів пташок лунає звідусіль + +lineVariantsG3 +r +d 56.csv +u 01 GHI32 весна уже прийшла і спів пташок лунає звідусіль + +lineVariantsG3 +r +d 56.csv +u 01 GHK32 весна { уже / вже } прийшла і спів пташок { лунає / звучить } \ звідусіль + +lineVariantsG3 +d 56.csv 3 HK02 Для дерева затих той теплий рух + +lineVariantsG3 +d 56.csv +m GHK02 2118 HK02 15 -m Для дерева затих той теплий рух + +lineVariantsG3 +d 56.csv +m GHK02 2118 HK02 15 GHK02 23 -m Для дерева затих той теплий рух + +lineVariantsG3 3 +i a01y +s 1 десь тут була подоляночка + +lineVariantsG3 0.001_100.0 3 +i a01y +s 1 десь тут була подоляночка + +lineVariantsG3 3 aw01 +s 1 садок вишневий колохати + +lineVariantsG3 100.0_-100.0 3 a02y +s 2 хрущі над вишнями гудуть + +lineVariantsG3 100.0_0.0 3 a02y +s 2 хрущі над вишнями гудуть + +lineVariantsG3 3 a02y +s 2 хрущі над вишнями гудуть + +lineVariantsG3 100.0_0.001 +m a01x 5 02y 20 -m +s 1 +v 3 якісь цікаві ми отримуємо результати + +lineVariantsG3 10.0_0.0 +m a01x 5 a02x 5 a03x 5 -m +s 3 +v 3 хрущі над вишнями гудуть + +lineVariantsG3 +r 3 as01 +s 1 +u малювати щось гарне це цікаве заняття + +lineVariantsG3 +m as01 3 w02 10 -m +s 1 +v 1 +u малювати щось гарне це цікаве заняття + To get the Ukrainian informational messages during the work of the -executable (instead of the default English ones), please, use the "+U" +executable (instead of the default English ones), please, use the "+u" command line option anywhere not inside the groups of the options. -You can also use multiple variations mode to look at the synonyms, +For more information, please, refer to the text in the instructions above. + +For example, you can also use multiple variations mode to look at the synonyms, paraphrases etc. For this, use instead of just the text as the last arguments the 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.20.0.0 +version: 0.20.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. 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.6.0.0, phonetic-languages-simplified-base ==0.6.0.0, phonetic-languages-basis ==0.1.1.0, phonetic-languages-simplified-properties-array ==0.15.0.0, phonetic-languages-simplified-properties-array-common ==0.2.0.0, phonetic-languages-ukrainian-array ==0.9.3.0, phonetic-languages-filters-array ==0.4.0.0, uniqueness-periods-vector-stats ==0.3.0.0, parallel >=3.2.0.6 && <4, phonetic-languages-plus ==0.6.0.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.5.0.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.6.0.0, phonetic-languages-simplified-base ==0.6.0.0, phonetic-languages-basis ==0.1.1.0, phonetic-languages-simplified-properties-array ==0.15.0.0, phonetic-languages-simplified-properties-array-common ==0.2.0.0, phonetic-languages-ukrainian-array ==0.9.3.0, phonetic-languages-filters-array ==0.5.0.0, uniqueness-periods-vector-stats ==0.3.0.0, parallel >=3.2.0.6 && <4, phonetic-languages-plus ==0.6.0.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.5.0.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.6.0.0, phonetic-languages-simplified-base ==0.6.0.0, phonetic-languages-basis ==0.1.1.0, phonetic-languages-simplified-properties-array ==0.15.0.0, phonetic-languages-simplified-properties-array-common ==0.2.0.0, phonetic-languages-ukrainian-array ==0.9.3.0, phonetic-languages-filters-array ==0.4.0.0, uniqueness-periods-vector-stats ==0.3.0.0, parallel >=3.2.0.6 && <4, phonetic-languages-plus ==0.6.0.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.5.0.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.6.0.0, phonetic-languages-simplified-base ==0.6.0.0, phonetic-languages-basis ==0.1.1.0, phonetic-languages-simplified-properties-array ==0.15.0.0, phonetic-languages-simplified-properties-array-common ==0.2.0.0, phonetic-languages-ukrainian-array ==0.9.3.0, phonetic-languages-filters-array ==0.5.0.0, uniqueness-periods-vector-stats ==0.3.0.0, parallel >=3.2.0.6 && <4, phonetic-languages-plus ==0.6.0.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.5.0.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.6.0.0, phonetic-languages-simplified-base ==0.6.0.0, phonetic-languages-basis ==0.1.1.0, phonetic-languages-simplified-properties-array ==0.15.0.0, phonetic-languages-simplified-properties-array-common ==0.2.0.0, phonetic-languages-ukrainian-array ==0.9.3.0, phonetic-languages-filters-array ==0.4.0.0, uniqueness-periods-vector-stats ==0.3.0.0, parallel >=3.2.0.6 && <4, phonetic-languages-plus ==0.6.0.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.5.0.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.6.0.0, phonetic-languages-simplified-base ==0.6.0.0, phonetic-languages-basis ==0.1.1.0, phonetic-languages-simplified-properties-array ==0.15.0.0, phonetic-languages-simplified-properties-array-common ==0.2.0.0, phonetic-languages-ukrainian-array ==0.9.3.0, phonetic-languages-filters-array ==0.5.0.0, uniqueness-periods-vector-stats ==0.3.0.0, parallel >=3.2.0.6 && <4, phonetic-languages-plus ==0.6.0.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.5.0.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.6.0.0, phonetic-languages-simplified-base ==0.6.0.0, phonetic-languages-basis ==0.1.1.0, phonetic-languages-simplified-properties-array ==0.15.0.0, phonetic-languages-simplified-properties-array-common ==0.2.0.0, phonetic-languages-ukrainian-array ==0.9.3.0, phonetic-languages-filters-array ==0.4.0.0, uniqueness-periods-vector-stats ==0.3.0.0, parallel >=3.2.0.6 && <4, phonetic-languages-plus ==0.6.0.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.5.0.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.6.0.0, phonetic-languages-simplified-base ==0.6.0.0, phonetic-languages-basis ==0.1.1.0, phonetic-languages-simplified-properties-array ==0.15.0.0, phonetic-languages-simplified-properties-array-common ==0.2.0.0, phonetic-languages-ukrainian-array ==0.9.3.0, phonetic-languages-filters-array ==0.5.0.0, uniqueness-periods-vector-stats ==0.3.0.0, parallel >=3.2.0.6 && <4, phonetic-languages-plus ==0.6.0.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.5.0.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