phladiprelio-ukrainian-simple 0.14.0.0 → 0.14.1.0

raw patch · 3 files changed

+13/−7 lines, 3 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• CHANGELOG.md +4/−0
• Main.hs +8/−6
• phladiprelio-ukrainian-simple.cabal +1/−1

@@ -192,3 +192,7 @@ 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. +## 0.1.1.0 -- 2023-11-23++* Fourteenth version revised A. Fixed issues with incorrectly computed arguments.+

@@ -7,9 +7,11 @@ import GHC.Base import GHC.Num (abs,(+),(-),(*)) import Text.Read (readMaybe)+import Text.Show (show) -- Added in 0.14.1.0 import System.IO (putStrLn,readFile) import Rhythmicity.MarkerSeqs hiding (id)  import Data.List hiding (foldr)+import Data.Char (isSpace) import Data.Maybe (fromMaybe,catMaybes)  import Data.Tuple (snd) import Phladiprelio.Ukrainian.PrepareText @@ -22,7 +24,7 @@ import Phladiprelio.PermutationsArr import Phladiprelio.StrictVG import Phladiprelio.Ukrainian.IO-import Phladiprelio.General.Datatype (readBasic3)+import Phladiprelio.General.Datatype3 (read3) import GHC.Real ((/),quot,gcd) import Phladiprelio.Ukrainian.Syllable  import Phladiprelio.Ukrainian.SyllableDouble@@ -37,8 +39,8 @@       sylD = let k = snd (fromMaybe 2 (readMaybe (concat . getB "+s" $ argsB)::Maybe Int) `quotRemInt` 4) in if k == 0 then 4 else k   syllableDurationsDs <- readSyllableDurations fileDu   let line2comparewith = unwords . getC "+l2" $ argsC-      basecomp = readBasic3 ((if null fileDu then case sylD of { 1 -> syllableDurationsD; 2 -> syllableDurationsD2; 3 -> syllableDurationsD3; 4 -> syllableDurationsD4} -                         else  if length syllableDurationsDs >= sylD then syllableDurationsDs !! (sylD - 1) else syllableDurationsD2) . createSyllablesUkrS) (mconcat) line2comparewith+      basecomp = read3 (not . null . filter (not . isSpace)) 1.0 (mconcat . (if null fileDu then case sylD of { 1 -> syllableDurationsD; 2 -> syllableDurationsD2; 3 -> syllableDurationsD3; 4 -> syllableDurationsD4} +                         else  if length syllableDurationsDs >= sylD then syllableDurationsDs !! (sylD - 1) else syllableDurationsD2) . createSyllablesUkrS) line2comparewith       maxNumWords = let k = fromMaybe 7 (readMaybe (concat . getB "+x" $ argsB)::Maybe Int) in if k == 0 || abs k >= 9 then 9 else max (abs k) 2       hc = readHashCorrections . concat . getB "+c" $ argsB       dcspecs = getB "+dc" argsB@@ -84,12 +86,12 @@                   | otherwise = lns !! (ln1 - 1)            return $ (words lineF, line_1F,line1F)        else return (arg2s, [], [])-  let example = readBasic3 ((if null fileDu then case sylD of { 1 -> syllableDurationsD; 2 -> syllableDurationsD2; 3 -> syllableDurationsD3; 4 -> syllableDurationsD4} -                         else  if length syllableDurationsDs >= sylD then syllableDurationsDs !! (sylD - 1) else syllableDurationsD2) . createSyllablesUkrS) (mconcat) (unwords arg3s)+  let example = read3 (not . null . filter (not . isSpace)) 1.0 (mconcat . (if null fileDu then case sylD of { 1 -> syllableDurationsD; 2 -> syllableDurationsD2; 3 -> syllableDurationsD3; 4 -> syllableDurationsD4} +                         else  if length syllableDurationsDs >= sylD then syllableDurationsDs !! (sylD - 1) else syllableDurationsD2) . createSyllablesUkrS) (unwords arg3s)       le = length example       lb = length basecomp       gcd1 = gcd le lb-      ldc = le * lb `quot` gcd1+      ldc = (le * lb) `quot` gcd1       mulp = ldc `quot` lb       max2 = maximum basecomp       compards = concatMap (replicate mulp . (/ max2)) basecomp

@@ -1,6 +1,6 @@ cabal-version:      2.4 name:               phladiprelio-ukrainian-simple-version:            0.14.0.0+version:            0.14.1.0  -- A short (one-line) description of the package. synopsis:           A PhLADiPreLiO implementation for Ukrainian that uses hashes and asynchronous concurrency.