diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -152,3 +152,10 @@ additionally a power of 10 for the multiplier that affects the value and groupping. Use for this +q with Int number as the next command line argument in the range [2..6]. The default value is 4. +## 0.13.0.0 -- 2023-11-17 + +* Thirteenth version. Added a possibility to change the durations of the selected syllables +using the ={set of digits} precisely after the needed syllable. For more information, see +https://hackage.haskell.org/package/phladiprelio-ukrainian-simple-0.14.0.0/src/Main.hs +This significantly extends the general possibilities of the program, especially for the music composing. + diff --git a/Phladiprelio/General/Simple.hs b/Phladiprelio/General/Simple.hs --- a/Phladiprelio/General/Simple.hs +++ b/Phladiprelio/General/Simple.hs @@ -18,7 +18,7 @@ import Data.List hiding (foldr) import Data.Maybe (fromMaybe, mapMaybe, catMaybes,isNothing,fromJust) import Data.Tuple (fst,snd) -import Data.Char (isDigit,isAlpha) +import Data.Char (isDigit,isAlpha,isSpace) import CLI.Arguments import CLI.Arguments.Get import CLI.Arguments.Parsing @@ -34,7 +34,7 @@ import Data.ReversedScientific import Control.Concurrent.Async (mapConcurrently) import Phladiprelio.Tests -import Phladiprelio.General.Datatype (readBasic3, readBasic4, readBasic1G) +import Phladiprelio.General.Datatype3 -- (readBasic3, readBasic4, readBasic1G) import Phladiprelio.General.Distance import Phladiprelio.UniquenessPeriodsG @@ -74,8 +74,8 @@ let syllN = countSyll wrs arr us vs initstr -- universalSet = map unwords . permutations $ rss f ldc compards grps mxms - | null selStr = (if null compards then (sum . countHashes2G hashStep hc grps mxms) else (round . (*10^power10) . distanceSqrG2 ldc compards)) . readBasic3 (h . createSyllablesPL wrs ks arr gs us vs) (mconcat) - | otherwise = fromIntegral . diverse2GGL (selectSounds selFun selStr) (us `mappend` vs) . concatMap string1 . stringToXG wrs . filter (\c -> not (isDigit c) && c /= '_') + | null selStr = (if null compards then (sum . countHashes2G hashStep hc grps mxms) else (round . (*10^power10) . distanceSqrG2 ldc compards)) . read3 (not . null . filter (not . isSpace)) 1.0 (mconcat . h . createSyllablesPL wrs ks arr gs us vs) + | otherwise = fromIntegral . diverse2GGL (selectSounds selFun selStr) (us `mappend` vs) . concatMap string1 . stringToXG wrs . filter (\c -> not (isDigit c) && c /= '_' && c /= '=') hSetNewlineMode stdout universalNewlineMode if numTest >= 0 && numTest <= 179 && numTest /= 1 && null compards then do putStrLn "Feet Val Stat Proxim" @@ -110,7 +110,7 @@ sylls = createSyllablesPL wrs ks arr gs us vs textP if code >= 10 && code <= 19 && grps == 2 then do - let qqs = readBasic4 (h . createSyllablesPL wrs ks arr gs us vs) (mconcat) (mconcat . createSyllablesPL wrs ks arr gs us vs) (map (map charS)) . readBasic1G $ textP + let qqs = readEq4 (mconcat . h . createSyllablesPL wrs ks arr gs us vs) (map (map charS) . mconcat . createSyllablesPL wrs ks arr gs us vs) . basicSplit $ textP (breaks,rs) = showZerosFor2PeriodMusic qqs putStrLn textP putStrLn breaks @@ -193,7 +193,7 @@ let (argsC, args) = takeCs1R ('+','-') cSpecs args0 (argsB, args11) = takeBsR bSpecs args line2comparewith = unwords . getC "+l2" $ argsC - basecomp = readBasic3 (h . createSyllablesPL wrs ks arr gs us vs) (mconcat) line2comparewith + basecomp = read3 (not . null . filter (not . isSpace)) 1.0 (mconcat . h . createSyllablesPL wrs ks arr gs us vs) line2comparewith prepare = any (== "-p") args11 emptyline = any (== "+l") args11 splitting = fromMaybe 50 (readMaybe (concat . getB "+w" $ argsB)::Maybe Int8) @@ -246,7 +246,7 @@ | null argCs = genPermutationsL l | otherwise = decodeLConstraints argCs . genPermutationsL $ l basiclineoption = unwords arg3s - example = readBasic3 (h . createSyllablesPL wrs ks arr gs us vs) (mconcat) (unwords arg3s) + example = read3 (not . null . filter (not . isSpace)) 1.0 (mconcat . h . createSyllablesPL wrs ks arr gs us vs) (unwords arg3s) le = length example lb = length basecomp gcd1 = gcd le lb diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -58,6 +58,16 @@ similarity measure) for the line options using the +l2 ... -l2 command line group of options. It is generally a completely new functionality for the package. +Since the version 0.13.0.0 there is a possibility to change the durations of the selected syllables +using the ={set of digits} precisely after the needed syllable. For more information, see the output +of the call of the program with the -h command line argument. This significantly extends the general +possibilities of the program, especially for the music composing. + +Since the version 0.13.0.0 there is a possibility to change the durations of the selected syllables +using the ={set of digits} precisely after the needed syllable. For more information, see the output +of the call of the program with the -h command line argument. This significantly extends the general +possibilities of the program, especially for the music composing. + For the list of bash aliases a few of which are used in the videos, see: https://github.com/Oleksandr-Zhabenko/phladiprelio-alias/blob/main/.bashrc diff --git a/phladiprelio-general-simple.cabal b/phladiprelio-general-simple.cabal --- a/phladiprelio-general-simple.cabal +++ b/phladiprelio-general-simple.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: phladiprelio-general-simple -version: 0.12.2.0 +version: 0.13.0.0 -- A short (one-line) description of the package. synopsis: A generalized functionality of PhLADiPreLiO for different languages that uses hash algorithms. @@ -28,7 +28,7 @@ -- LANGUAGE extensions used by modules in this package. other-extensions: NoImplicitPrelude, BangPatterns - build-depends: base >=4.13 && <5, rhythmic-sequences ==0.4.1.0, phonetic-languages-phonetics-basics ==0.10.1.0, phladiprelio-general-shared ==0.1.1.0, cli-arguments ==0.7.0.0, phonetic-languages-permutations-array ==0.4.0.0, phonetic-languages-constraints-array ==0.7.3.0, phonetic-languages-simplified-base ==0.7.1.0, halfsplit ==0.4.2.0, directory >=1.3.4.0 && <2, rev-scientific ==0.2.1.0, async >=2.2.2 && <3, phladiprelio-tests ==0.1.0.0, phladiprelio-general-datatype ==0.4.1.0, phonetic-languages-basis ==0.3.0.0 + build-depends: base >=4.13 && <5, rhythmic-sequences ==0.4.1.0, phonetic-languages-phonetics-basics ==0.10.1.0, phladiprelio-general-shared ==0.1.1.0, cli-arguments ==0.7.0.0, phonetic-languages-permutations-array ==0.4.0.0, phonetic-languages-constraints-array ==0.7.3.0, phonetic-languages-simplified-base ==0.7.1.0, halfsplit ==0.4.2.0, directory >=1.3.4.0 && <2, rev-scientific ==0.2.1.0, async >=2.2.2 && <3, phladiprelio-tests ==0.1.0.0, phladiprelio-general-datatype ==0.5.1.0, phonetic-languages-basis ==0.3.0.0 hs-source-dirs: . default-language: Haskell2010