diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -159,3 +159,7 @@ 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. +## 0.14.0.0 -- 2023-12-01 + +* Fourteenth version. Fixed issue with distance between line options in several branches. Added a possibility to analyse and compare two lines from the same file using either additionally to +m also +m2 group of command line arguments, or +m3 group of arguments instead. + diff --git a/Phladiprelio/General/Simple.hs b/Phladiprelio/General/Simple.hs --- a/Phladiprelio/General/Simple.hs +++ b/Phladiprelio/General/Simple.hs @@ -192,8 +192,6 @@ args0 <- getArgs let (argsC, args) = takeCs1R ('+','-') cSpecs args0 (argsB, args11) = takeBsR bSpecs args - line2comparewith = unwords . getC "+l2" $ argsC - 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) @@ -208,16 +206,31 @@ power10 | power10' < 2 && power10' > 6 = 4 | otherwise = power10' - multiline2 = getB "+m" argsB + (multiline2, multiline2LineNum) + | oneB "+m3" argsB = + let r1ss = getB "+m3" argsB in + if length r1ss == 3 + then let (kss,qss) = splitAt 2 r1ss in + (kss, max 1 (fromMaybe 1 (readMaybe (concat qss)::Maybe Int))) + else (r1ss, 1) + | oneB "+m2" argsB = (getB "+m" argsB, max 1 (fromMaybe 1 (readMaybe (concat . getB "+m2" $ argsB)::Maybe Int))) + | otherwise = (getB "+m" argsB, -1) (fileread,lineNmb) | null multiline2 = ("",-1) | length multiline2 == 2 = (head multiline2, fromMaybe 1 (readMaybe (last multiline2)::Maybe Int)) | otherwise = (head multiline2, 1) - (arg3s,prestr,poststr) <- do + (arg3s,prestr,poststr,linecomp3) <- do if lineNmb /= -1 then do txtFromFile <- readFile fileread let lns = lines txtFromFile + ll1 = length lns ln0 = max 1 (min lineNmb (length lns)) + lm3 + | multiline2LineNum < 1 = -1 + | otherwise = max 1 . min multiline2LineNum $ ll1 + linecomp3 + | lm3 == -1 = [] + | otherwise = lns !! (lm3 - 1) ln_1 | ln0 == 1 = 0 | otherwise = ln0 - 1 @@ -231,9 +244,13 @@ line1F | ln1 == 0 = [] | otherwise = lns !! (ln1 - 1) - return $ (words lineF, line_1F,line1F) - else return (args11, [], []) - let (filesave,codesave) + return $ (words lineF, line_1F,line1F,linecomp3) + else return (args11, [], [],[]) + let line2comparewith + | oneC "+l2" argsC || null linecomp3 = unwords . getC "+l2" $ argsC + | otherwise = linecomp3 + basecomp = read3 (not . null . filter (not . isSpace)) 1.0 (mconcat . h . createSyllablesPL wrs ks arr gs us vs) line2comparewith + (filesave,codesave) | null filedata = ("",-1) | length filedata == 2 = (head filedata, fromMaybe 0 (readMaybe (last filedata)::Maybe Int)) | otherwise = (head filedata,0) @@ -285,7 +302,7 @@ cSpecs = zip ["+a","+b","+l2"] . cycle $ [-1] bSpecs :: CLSpecifications -bSpecs = [("+f",2),("+m",2),("+ul",1),("+w",1),("+dc",2),("+q",1)] +bSpecs = [("+f",2),("+m",2),("+m2",2),("+m3",3),("+ul",1),("+w",1),("+dc",2),("+q",1)] {-| 'selectSounds' converts the argument after \"+ul\" command line argument into a list of sound representations that is used for evaluation of \'uniqueness periods\' properties of the line. Is a modified Phonetic.Languages.Simplified.Array.General.FuncRep2RelatedG2.parsey0Choice from the @phonetic-languages-simplified-generalized-examples-array-0.19.0.1@ package. -} diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -68,6 +68,8 @@ 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.14.0.0 there were fixed issues with distance between line options in several branches and added a possibility to analyse and compare two lines from the same file using either additionally to +m also +m2 group of command line arguments, or +m3 group of arguments instead. + 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 @@ -118,6 +120,8 @@ On the 01/11/2023 there is All Saints Solemnity for Roman Catholics. On the 11/11/2023 there is St. Martin of Tours Day for Roman Catholics and Poland Independence Day. + +The version 0.14.0.0 is also devoted to the bright memory of the Artem Sachuk, who perished as a soldier defending Ukraine from the Russian occupants. Kingdom of God to his soul and eternal memory! Condolences to everybody who knows him. All support is welcome, including donations for the needs of the Ukrainian army, IDPs and refugees. 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.13.0.0 +version: 0.14.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.5.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.2.0, phonetic-languages-basis ==0.3.0.0 hs-source-dirs: . default-language: Haskell2010