diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,35 @@ # citeproc changelog +## 0.14.1 + + * Stop extracting particles from given and family names. + citeproc.js implemented a system by which particles would + be extracted automatically from given and family names (so + that users of Zotero wouldn't have to know about the various + types of particles). The test suite does this unless the + name is enclosed in straight quotes, in which case it is + considered literally. We don't want this feature, because it is + not part of the CSL spec, and the CSL JSON files exported from + Zotero don't put the quotes where they would be needed for this to + work. However, we still remove an outer pair of quotes, in case + there is legacy use of this feature. + See discussion at jgm/pandoc#11911 . + + * Record how known failures fail, instead of just that they fail. A + test we don't yet pass now has an `.expected` file alongside its + `.txt` file, containing the output we currently produce. It counts + as an expected failure only if its output still matches that file + exactly, so a change in a known-bad result is no longer silently + tolerated. This replaces the flat list of expected failures in + test/Spec.hs, five entries of which had gone stale. + + * Two new test-suite options: `--accept` (re)writes the `.expected` file of + every failing test and removes that of every test that now passes, and + `--verbose` reports warnings, passes, and expected failures with diffs, + which are otherwise suppressed. + + * Add five new tests from upstream (all passing). + ## 0.14 * [API change] Replace unlawful Ord Term instance with `termMatches`. diff --git a/citeproc.cabal b/citeproc.cabal --- a/citeproc.cabal +++ b/citeproc.cabal @@ -1,6 +1,6 @@ cabal-version: 2.2 name: citeproc -version: 0.14 +version: 0.14.1 synopsis: Generates citations and bibliography from CSL styles. description: citeproc parses CSL style files and uses them to generate a list of formatted citations and bibliography @@ -21,8 +21,10 @@ locales/locales.json test/NOTES.md test/csl/*.txt + test/csl/*.expected test/extra/*.txt test/overrides/*.txt + test/overrides/*.expected source-repository head type: git diff --git a/src/Citeproc/CslJson.hs b/src/Citeproc/CslJson.hs --- a/src/Citeproc/CslJson.hs +++ b/src/Citeproc/CslJson.hs @@ -259,7 +259,7 @@ go ctx{ useSmallCaps = True } x <> "" CslSup x -> "" <> go ctx x <> "" CslSub x -> "" <> go ctx x <> "" - CslBaseline x -> "" <> go ctx x <> "" + CslBaseline x -> "" <> go ctx x <> "" CslDiv t x -> "
t <> "\">" <> go ctx x <> "
" CslLink t x -> " t <> "\">" <> go ctx x <> "" CslNoCase x -> go ctx x -- nocase is just for internal purposes diff --git a/src/Citeproc/Types.hs b/src/Citeproc/Types.hs --- a/src/Citeproc/Types.hs +++ b/src/Citeproc/Types.hs @@ -1212,10 +1212,9 @@ instance FromJSON Name where parseJSON (String t) = parseCheaterName t parseJSON x = - extractParticles <$> (withObject "Name" $ \v -> Name - <$> (fmap fixApos <$> v .:? "family") - <*> (fmap fixApos <$> v .:? "given") + <$> (fmap (removeOuterQuotes . fixApos) <$> v .:? "family") + <*> (fmap (removeOuterQuotes . fixApos) <$> v .:? "given") <*> (fmap fixApos <$> v .:? "dropping-particle") <*> (fmap fixApos <$> v .:? "non-dropping-particle") <*> (fmap fixApos <$> v .:? "suffix") @@ -1296,6 +1295,13 @@ c == '.' isParticleChar c = isLower c || isParticlePunct c +removeOuterQuotes :: Text -> Text +removeOuterQuotes t + | "\"" `T.isPrefixOf` t + , "\"" `T.isSuffixOf` t + = T.drop 1 $ T.dropEnd 1 t + | otherwise = t + -- cheater syntax for name: used in parsing note: -- editor: Thompson || Hunter S. parseCheaterName :: Text -> Parser Name @@ -1929,7 +1935,7 @@ pCslSub = addVerticalAlign SubAlign . mconcat <$> (P.string "" *> P.manyTill' pCsl (P.string "")) pCslBaseline = addVerticalAlign BaselineAlign . mconcat <$> - (P.string " pSpace *> P.string "style=\"baseline\">" *> + (P.string " pSpace *> P.string "class=\"baseline\">" *> P.manyTill' pCsl (P.string "")) pCslSmallCaps = addFontVariant SmallCapsVariant . mconcat <$> ((P.string " pSpace *> diff --git a/test/NOTES.md b/test/NOTES.md --- a/test/NOTES.md +++ b/test/NOTES.md @@ -1,3 +1,20 @@ +## Known failures + +A test that we know we do not yet pass has, alongside its `.txt` file, an +`.expected` file containing the output we currently produce (which differs +from the test's own `RESULT` section). Such a test counts as an expected +failure only if its output still matches that file exactly; any other +output is an unexpected failure and fails the suite. A test that passes +but still has an `.expected` file is reported as an unexpected pass, and +the file should be deleted. + +By default only unexpected results are reported. Pass `--verbose` to also +report warnings, passes, and expected failures with their diffs. + +`cabal test --test-options=--accept` rewrites the `.expected` file of every +failing test with its current output and removes the file of every test +that now passes. Review the resulting diff before committing it. + ## Notes on failures ### test/csl/bugreports_UnisaHarvardInitialization.txt diff --git a/test/Spec.hs b/test/Spec.hs --- a/test/Spec.hs +++ b/test/Spec.hs @@ -7,12 +7,12 @@ import Citeproc.CslJson import Data.Algorithm.DiffContext import System.TimeIt (timeIt) -import Control.Monad (unless) +import Control.Monad (unless, when) import Control.Monad.Trans.State import Control.Monad.IO.Class (liftIO) import System.Environment (getArgs) import System.Exit -import System.Directory (getDirectoryContents, doesFileExist) +import System.Directory (getDirectoryContents, doesFileExist, removeFile) import Data.Text (Text) import qualified Data.Set as Set import qualified Text.PrettyPrint as Pretty @@ -49,6 +49,7 @@ , citations :: Maybe [Citation a] , abbreviations :: Maybe Abbreviations , skipReason :: Maybe Text + , expectedFailure :: Maybe Text , options :: Maybe TestOptions } deriving (Show) @@ -73,9 +74,17 @@ | Errored CiteprocError deriving (Show, Eq) -runTest :: CiteprocTest (CslJson Text) +-- | Command line options of the test suite itself. +data SpecOptions = + SpecOptions + { accept :: Bool -- ^ record failures in .expected files + , verbose :: Bool -- ^ report warnings, passes and expected failures + } deriving (Show) + +runTest :: SpecOptions + -> CiteprocTest (CslJson Text) -> StateT Counts IO TestResult -runTest test = do +runTest specOpts test = do let opts = fromMaybe defaultTestOptions . options $ test let cites = case citations test of @@ -116,16 +125,16 @@ let loc = mergeLocales Nothing style let actual = citeproc (testCiteprocOpts opts) style Nothing (input test) cites - unless (null (resultWarnings actual)) $ do + when (verbose specOpts && not (null (resultWarnings actual))) $ liftIO $ do TIO.putStrLn $ "[WARNING] " <> T.pack (path test) mapM_ (TIO.putStrLn . ("==> " <>)) $ resultWarnings actual case mode test of - "citation" -> compareTest test + "citation" -> compareTest specOpts test (T.intercalate "\n" $ map (renderCslJson' loc) (resultCitations actual)) - "bibliography" -> compareTest test + "bibliography" -> compareTest specOpts test (T.intercalate "\n" (addDivs $ map (renderCslJson' loc . snd) (resultBibliography actual))) @@ -176,28 +185,55 @@ c == '[' || c == ']' || isDigit c) -compareTest :: CiteprocTest (CslJson Text) +compareTest :: SpecOptions + -> CiteprocTest (CslJson Text) -> Text -> StateT Counts IO TestResult -compareTest test actual = do +compareTest specOpts test actual = do let expected = if mode test == "citation" && isJust (citations test) then removeCitationNums $ result test else result test + let expectedFailureFile = expectedFailurePath (path test) if actual == expected then do modify $ \st -> st{ passed = (category test, path test) : passed st } - -- suppress PASSED messages - -- liftIO $ TIO.putStrLn $ "[PASSED] " <> path test + when (verbose specOpts) $ + liftIO $ TIO.putStrLn $ "[PASSED] " <> T.pack (path test) + case expectedFailure test of + Nothing -> return () + Just _ + | accept specOpts -> liftIO $ do + removeFile expectedFailureFile + putStrLn $ "[REMOVED] " <> expectedFailureFile + | otherwise -> modify $ \st -> + st{ unexpectedPasses = path test : unexpectedPasses st } return Passed else do modify $ \st -> st{ failed = (category test, path test) : failed st } - liftIO $ do - TIO.putStrLn $ (if path test `elem` expectedFailures - then "[FAILED:EXPECTED] " - else "[FAILED:UNEXPECTED] ") <> T.pack (path test) - showDiff expected actual + if expectedFailure test == Just actual + then when (verbose specOpts) $ liftIO $ do + TIO.putStrLn $ "[FAILED:EXPECTED] " <> T.pack (path test) + showDiff expected actual + else if accept specOpts + then liftIO $ do + TIO.writeFile expectedFailureFile (actual <> "\n") + putStrLn $ "[ACCEPTED] " <> expectedFailureFile + else do + modify $ \st -> + st{ unexpectedFailures = + path test : unexpectedFailures st } + liftIO $ do + TIO.putStrLn $ + "[FAILED:UNEXPECTED] " <> T.pack (path test) + showDiff expected actual return $ Failed actual expected +-- A test that is known to fail has, alongside its .txt file, an .expected +-- file containing the output we currently produce. The failure counts as +-- an expected failure only if the output still matches this file exactly. +expectedFailurePath :: FilePath -> FilePath +expectedFailurePath fp = fp -<.> ".expected" + splitSections :: ByteString -> [(Text, ByteString)] splitSections = snd . foldl' go startingState . B.lines . removeBOM where @@ -234,6 +270,13 @@ if exists then Just <$> TIO.readFile (fp <> ".skip") else return Nothing + expectedFail <- do + let expectedFp = expectedFailurePath fp + exists <- doesFileExist expectedFp + if exists + -- the file has a final newline, the test output does not + then Just . T.dropWhileEnd (== '\n') <$> TIO.readFile expectedFp + else return Nothing return CiteprocTest { name = T.pack $ dropExtension $ takeBaseName fp , path = fp @@ -254,6 +297,7 @@ , abbreviations = fromJSON "ABBREVIATIONS" <$> lookup "abbreviations" sections , skipReason = reason + , expectedFailure = expectedFail , options = fromJSON "TESTOPTIONS" <$> lookup "options" sections } @@ -281,12 +325,18 @@ main :: IO () main = do args <- getArgs + -- with --accept, the .expected file of every failing test is (re)written + -- with its current output, and that of every passing test is removed; + -- with --verbose, passes and expected failures are reported too + let specOpts = SpecOptions{ accept = "--accept" `elem` args + , verbose = "--verbose" `elem` args } + let patterns = filter (`notElem` ["--accept", "--verbose"]) args let matchesPattern x = takeExtension x == ".txt" && - case args of + case patterns of [] -> True - _ -> any (\arg -> map toLower arg `isInfixOf` map toLower x) args - overrides <- if any ('/' `elem`) args + _ -> any (\arg -> map toLower arg `isInfixOf` map toLower x) patterns + overrides <- if any ('/' `elem`) patterns then return [] else filter matchesPattern <$> getDirectoryContents overrideDir @@ -295,8 +345,8 @@ then overrideDir fp else testDir fp - testFiles <- if any ('/' `elem`) args - then return args + testFiles <- if any ('/' `elem`) patterns + then return patterns else do cslTests <- map addDir . filter matchesPattern <$> getDirectoryContents testDir @@ -307,11 +357,13 @@ testCases <- sortOn name <$> mapM loadTestCase testFiles (_,counts) <- timeIt $ - runStateT (mapM_ runTest testCases) + runStateT (mapM_ (runTest specOpts) testCases) Counts{ failed = [] , errored = [] , passed = [] - , skipped = [] } + , skipped = [] + , unexpectedFailures = [] + , unexpectedPasses = [] } putStrLn "" let categories = sort $ Set.toList $ foldr (Set.insert . category) mempty testCases @@ -343,23 +395,19 @@ (length (failed counts)) (length (errored counts)) (length (skipped counts)) - let unexpectedFailures = - filter ((`notElem` expectedFailures) . snd) (failed counts) - let unexpectedPasses = - filter ((`elem` expectedFailures) . snd) (passed counts) - unless (null unexpectedFailures) $ do + unless (null (unexpectedFailures counts)) $ do putStrLn "" putStrLn "Unexpected failures" putStrLn "-------------------" - mapM_ (putStrLn . snd) unexpectedFailures + mapM_ putStrLn (unexpectedFailures counts) putStrLn "" - unless (null unexpectedPasses) $ do + unless (null (unexpectedPasses counts)) $ do putStrLn "" putStrLn "Unexpected passes" putStrLn "-----------------" - mapM_ (putStrLn . snd) unexpectedPasses + mapM_ putStrLn (unexpectedPasses counts) putStrLn "" - case length unexpectedFailures + length (errored counts) of + case length (unexpectedFailures counts) + length (errored counts) of 0 -> do putStrLn "(All failures were expected failures.)" exitSuccess @@ -371,6 +419,8 @@ , errored :: [(Text,FilePath)] , passed :: [(Text,FilePath)] , skipped :: [(Text,FilePath)] + , unexpectedFailures :: [FilePath] -- failed, but not as recorded + , unexpectedPasses :: [FilePath] -- passed, though a failure was recorded } deriving (Show) showDiff :: Text -> Text -> IO () @@ -385,70 +435,3 @@ (Pretty.text "actual") (Pretty.text . T.unpack . unnumber) $ getContextDiff Nothing (T.lines expected) (T.lines actual) - -expectedFailures :: [FilePath] -expectedFailures = [ - "test/csl/bugreports_OverwriteCitationItems.txt", - "test/csl/bugreports_SingleQuoteXml.txt", - "test/csl/bugreports_SmallCapsEscape.txt", - "test/csl/bugreports_SortedIeeeItalicsFail.txt", - "test/csl/bugreports_ikeyOne.txt", - "test/csl/date_NegativeDateSort.txt", - "test/csl/date_NegativeDateSortViaMacro.txt", - "test/csl/date_NegativeDateSortViaMacroOnYearMonthOnly.txt", - "test/csl/date_YearSuffixImplicitWithNoDate.txt", - "test/csl/date_YearSuffixWithNoDate.txt", - "test/csl/disambiguate_DifferentSpacingInInitials.txt", - "test/csl/disambiguate_DisambiguationHang.txt", - "test/csl/disambiguate_IncrementalExtraText.txt", - "test/csl/disambiguate_InitializeWithButNoDisambiguation.txt", - "test/csl/disambiguate_YearCollapseWithInstitution.txt", - "test/csl/disambiguate_YearSuffixAtTwoLevels.txt", - "test/csl/disambiguate_YearSuffixWithEtAlSubequent.txt", - "test/csl/disambiguate_YearSuffixWithEtAlSubsequent.txt", - "test/csl/flipflop_LeadingMarkupWithApostrophe.txt", - "test/csl/flipflop_OrphanQuote.txt", - "test/overrides/fullstyles_ABdNT.txt", - "test/csl/integration_FirstReferenceNoteNumberPositionChange.txt", - "test/csl/integration_IbidOnInsert.txt", - "test/csl/magic_CapitalizeFirstOccurringTerm.txt", - "test/csl/magic_PunctuationInQuoteNested.txt", - "test/csl/magic_SubsequentAuthorSubstituteNotFooled.txt", - "test/csl/magic_TermCapitalizationWithPrefix.txt", - "test/csl/name_CiteGroupDelimiterWithYearSuffixCollapse2.txt", - "test/csl/name_EtAlWithCombined.txt", - "test/csl/name_HebrewAnd.txt", - "test/csl/name_InTextMarkupInitialize.txt", - "test/csl/name_InTextMarkupNormalizeInitials.txt", - "test/csl/number_OrdinalSpacing.txt", - "test/csl/number_PlainHyphenOrEnDashAlwaysPlural.txt", - "test/csl/position_FirstTrueOnlyOnce.txt", - "test/csl/position_IbidInText.txt", - "test/csl/position_IbidSeparateCiteSameNote.txt", - "test/csl/position_IbidWithLocator.txt", - "test/csl/position_IbidWithMultipleSoloCitesInBackref.txt", - "test/csl/position_IfIbidWithLocatorIsTrueThenIbidIsTrue.txt", - "test/csl/position_NearNoteSameNote.txt", - "test/csl/position_ResetNoteNumbers.txt", - "test/csl/punctuation_FullMontyQuotesIn.txt", - "test/csl/quotes_QuotesUnderQuotesFalse.txt", - "test/csl/sort_BibliographyCitationNumberDescending.txt", - "test/csl/sort_BibliographyCitationNumberDescendingViaCompositeMacro.txt", - "test/csl/sort_BibliographyCitationNumberDescendingViaMacro.txt", - "test/csl/sort_LeadingApostropheOnNameParticle.txt", - "test/csl/sort_OmittedBibRefMixedNumericStyle.txt", - "test/csl/sort_OmittedBibRefNonNumericStyle.txt", - "test/csl/sort_RangeUnaffected.txt", - "test/csl/substitute_SubstituteOnlyOnceTermEmpty.txt", - "test/csl/bugreports_NoCaseEscape.txt", - "test/csl/bugreports_LegislationCrash.txt", - "test/csl/bugreports_EnvAndUrb.txt", - "test/csl/bugreports_DemoPageFullCiteCruftOnSubsequent.txt", - "test/csl/bugreports_ChicagoAuthorDateLooping.txt", - "test/csl/bugreports_AutomaticallyDeleteItemsFails.txt", - "test/csl/affix_WithCommas.txt", - "test/csl/affix_CommaAfterQuote.txt", - "test/overrides/flipflop_NumericField.txt", - "test/csl/testers_SecondAutoGeneratedZoteroPluginTest.txt", - "test/csl/testers_FirstAutoGeneratedZoteroPluginTest.txt" - ] diff --git a/test/csl/affix_CommaAfterQuote.expected b/test/csl/affix_CommaAfterQuote.expected new file mode 100644 --- /dev/null +++ b/test/csl/affix_CommaAfterQuote.expected @@ -0,0 +1,1 @@ +“quote,” Hello Thing diff --git a/test/csl/affix_WithCommas.expected b/test/csl/affix_WithCommas.expected new file mode 100644 --- /dev/null +++ b/test/csl/affix_WithCommas.expected @@ -0,0 +1,3 @@ +John Smith, Book C, 2000, and David Jones, Book D, 2000. +Smith, Book C is one source,; Jones, Book D is another. +Smith, Book C, 23 is one source,; Jones, Book D is another. diff --git a/test/csl/bugreports_AutomaticallyDeleteItemsFails.expected b/test/csl/bugreports_AutomaticallyDeleteItemsFails.expected new file mode 100644 --- /dev/null +++ b/test/csl/bugreports_AutomaticallyDeleteItemsFails.expected @@ -0,0 +1,11 @@ +
+
+
[1]
J. Doe, Book A, 2000.
+
+
+
[2]
J. Doe, Book B, 2000.
+
+
+
[3]
R. Snoakes, Book C, 2000.
+
+
diff --git a/test/csl/bugreports_ChicagoAuthorDateLooping.expected b/test/csl/bugreports_ChicagoAuthorDateLooping.expected new file mode 100644 --- /dev/null +++ b/test/csl/bugreports_ChicagoAuthorDateLooping.expected @@ -0,0 +1,1 @@ +(Manstein 1982; Anon.; Anon.) diff --git a/test/csl/bugreports_DemoPageFullCiteCruftOnSubsequent.expected b/test/csl/bugreports_DemoPageFullCiteCruftOnSubsequent.expected new file mode 100644 --- /dev/null +++ b/test/csl/bugreports_DemoPageFullCiteCruftOnSubsequent.expected @@ -0,0 +1,1 @@ +Nolan J. Malone, U.S. Bureau of the Census, Evaluating Components of International Migration: Consistency of 2000 Nativity Data (New York: Routledge, 2001). diff --git a/test/csl/bugreports_EnvAndUrb.expected b/test/csl/bugreports_EnvAndUrb.expected new file mode 100644 --- /dev/null +++ b/test/csl/bugreports_EnvAndUrb.expected @@ -0,0 +1,3 @@ +Baines, T S, O Benedettini and J M Kay, ‘Title One’; Baines, T S, F Gump and J M Kay, ‘Title Two’. +See reference 1, Baines et al., ‘Title One’. +See reference 1, Baines et al., ‘Title Two’. diff --git a/test/csl/bugreports_LegislationCrash.expected b/test/csl/bugreports_LegislationCrash.expected new file mode 100644 --- /dev/null +++ b/test/csl/bugreports_LegislationCrash.expected @@ -0,0 +1,3 @@ +
+
Arrêté du 23 mars 1992 relatif au programme des études conduisant au diplôme d’État d’infirmier, 1992.
+
diff --git a/test/csl/bugreports_NoCaseEscape.expected b/test/csl/bugreports_NoCaseEscape.expected new file mode 100644 --- /dev/null +++ b/test/csl/bugreports_NoCaseEscape.expected @@ -0,0 +1,8 @@ +
+
+
Aalto, Alan
N.d.a
“‘PIAAC-Longitudinal (PIAAC-L) 2015.’”
+
+
+
N.d.b
“PIAAC-Longitudinal (PIAAC-Lx) 2015”.
+
+
diff --git a/test/csl/bugreports_OverwriteCitationItems.expected b/test/csl/bugreports_OverwriteCitationItems.expected new file mode 100644 --- /dev/null +++ b/test/csl/bugreports_OverwriteCitationItems.expected @@ -0,0 +1,2 @@ +Title Two; Title Three +Title Four; Title Five diff --git a/test/csl/bugreports_SingleQuoteXml.expected b/test/csl/bugreports_SingleQuoteXml.expected new file mode 100644 --- /dev/null +++ b/test/csl/bugreports_SingleQuoteXml.expected @@ -0,0 +1,1 @@ +[Cite with a composer ; O A. “hello” Book Title] diff --git a/test/csl/bugreports_SmallCapsEscape.expected b/test/csl/bugreports_SmallCapsEscape.expected new file mode 100644 --- /dev/null +++ b/test/csl/bugreports_SmallCapsEscape.expected @@ -0,0 +1,5 @@ +
+
+
Aalto, Alan
N.d.
Here.
+
+
diff --git a/test/csl/bugreports_SortedIeeeItalicsFail.txt b/test/csl/bugreports_SortedIeeeItalicsFail.txt --- a/test/csl/bugreports_SortedIeeeItalicsFail.txt +++ b/test/csl/bugreports_SortedIeeeItalicsFail.txt @@ -7,13 +7,13 @@ >>===== RESULT =====>>
-
[1]
J. Doe, “His Anonymous Article,” Journal of Obscurity, vol. 100, p. 15, Jun. 1965.
+
[1]
J. Doe, “His Anonymous Article,” Journal of Obscurity, vol. 100, p. 15, June. 1965.
-
[2]
G. Everhardt, “His Anonymous Article,” Journal of Obscurity, vol. 100, p. 15, Jun. 1965.
+
[2]
G. Everhardt, “His Anonymous Article,” Journal of Obscurity, vol. 100, p. 15, June. 1965.
-
[3]
J. Roe, “His Anonymous Article,” Journal of Obscurity, vol. 100, p. 15, Jun. 1965.
+
[3]
J. Roe, “His Anonymous Article,” Journal of Obscurity, vol. 100, p. 15, June. 1965.
<<===== RESULT =====<< @@ -369,4 +369,3 @@ >>===== VERSION =====>> 1.0 <<===== VERSION =====<< - diff --git a/test/csl/bugreports_ikeyOne.expected b/test/csl/bugreports_ikeyOne.expected new file mode 100644 --- /dev/null +++ b/test/csl/bugreports_ikeyOne.expected @@ -0,0 +1,2 @@ +(John Smith) +(James Smith) diff --git a/test/csl/bugreports_parseName.expected b/test/csl/bugreports_parseName.expected new file mode 100644 --- /dev/null +++ b/test/csl/bugreports_parseName.expected @@ -0,0 +1,4 @@ +
+
van Happel, Eduard 2008
+
von Hoppel, Gustav 2008
+
diff --git a/test/csl/date_NegativeDateSort.txt b/test/csl/date_NegativeDateSort.txt --- a/test/csl/date_NegativeDateSort.txt +++ b/test/csl/date_NegativeDateSort.txt @@ -9,12 +9,12 @@ (whether ascending or descending). >>===== RESULT =====>> -100BC-7-13, 44BC-3-15, 54AD-10-13, 68AD-6-11 +100 BC-7-13, 44 BC-3-15, 54 AD-10-13, 68 AD-6-11 <<===== RESULT =====<< >>===== CSL =====>> -