From 724d8e8471bcfcf7544850dcfb9daddd713858fd Mon Sep 17 00:00:00 2001 From: Maryyam Niazi Date: Tue, 15 May 2018 10:25:10 -0400 Subject: [PATCH 1/3] Plurals.hs is no longer used --- code/Data/Drasil/Plurals.hs | 9 --------- code/drasil.cabal | 1 - 2 files changed, 10 deletions(-) delete mode 100644 code/Data/Drasil/Plurals.hs diff --git a/code/Data/Drasil/Plurals.hs b/code/Data/Drasil/Plurals.hs deleted file mode 100644 index a9ad7f366e..0000000000 --- a/code/Data/Drasil/Plurals.hs +++ /dev/null @@ -1,9 +0,0 @@ -module Data.Drasil.Plurals where - -import qualified Data.Map as Map - -irregularPlurals :: Map.Map String String -irregularPlurals = Map.fromList [ - ("body" , "bodies"), - ("velocity", "velocities") - ] diff --git a/code/drasil.cabal b/code/drasil.cabal index 813c8f6fc0..8772dcad04 100644 --- a/code/drasil.cabal +++ b/code/drasil.cabal @@ -11,7 +11,6 @@ library Language.Drasil.Code, Data.Drasil.People Data.Drasil.Citations - Data.Drasil.Plurals Data.Drasil.Constraints Data.Drasil.SentenceStructures Data.Drasil.SI_Units From 75d20770fd487633eaefb6e37a9e4aa1ec73fe6f Mon Sep 17 00:00:00 2001 From: Maryyam Niazi Date: Tue, 15 May 2018 11:26:04 -0400 Subject: [PATCH 2/3] minor commenting/naming updates to SSP --- code/Example/Drasil/SSP/Body.hs | 3 ++- code/Example/Drasil/SSP/DataDefs.hs | 12 ++++++------ code/Example/Drasil/SSP/Defs.hs | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/code/Example/Drasil/SSP/Body.hs b/code/Example/Drasil/SSP/Body.hs index 64cb47e3d4..9c43e34a91 100644 --- a/code/Example/Drasil/SSP/Body.hs +++ b/code/Example/Drasil/SSP/Body.hs @@ -98,7 +98,8 @@ ssp_si = SI { } sspRefDB :: ReferenceDB -sspRefDB = rdb [] [] [] [] [] sspCitations -- FIXME: Convert the rest to new chunk types +sspRefDB = rdb [] [] [] [] [] sspCitations +-- FIXME: Convert the rest to new chunk types (similar to issues #446 and #447) mkSRS :: DocDesc mkSRS = RefSec (RefProg intro diff --git a/code/Example/Drasil/SSP/DataDefs.hs b/code/Example/Drasil/SSP/DataDefs.hs index 56b3e7a8b9..8d96d8db1a 100644 --- a/code/Example/Drasil/SSP/DataDefs.hs +++ b/code/Example/Drasil/SSP/DataDefs.hs @@ -362,8 +362,8 @@ stfMtrxDerivation = [ S "are left in their standard coordinate system" `sC` S "and therefore are described by the same", phrase equation, S "from" +:+. acroGD 8, S "Seen as", getES shrStiffIntsl, S "in" +:+. - acroDD 12, isElMx shrStiffIntsl "shear" `sC` --FIXEME: add matrix symbols? - S "and", isElMx nrmStiffIntsl "normal" `sC` S "calculated as in", acroDD 14], + acroDD 12, isElemInMx shrStiffIntsl "shear" `sC` --FIXEME: add matrix symbols? + S "and", isElemInMx nrmStiffIntsl "normal" `sC` S "calculated as in", acroDD 14], foldlSP [S "For basal surfaces the stiffness constants" `sAnd` S "displacements refer to a system rotated for the base angle alpha" +:+. @@ -402,8 +402,8 @@ stfMtrxDerivation = [ --FIXME: add symbol? S "as derived in", eqN 7, S "is defined in" +:+. eqN 9, S "This is seen as matrix", getES shrStiffBase, S "in" +:+. - acroGD 12, isElMx shrStiffBase "shear" `sC` S "and", - isElMx nrmStiffBase "normal" `sC` S "calculated as in" +:+. acroDD 14, + acroGD 12, isElemInMx shrStiffBase "shear" `sC` S "and", + isElemInMx nrmStiffBase "normal" `sC` S "calculated as in" +:+. acroDD 14, S "The notation is simplified by", S "introduction" `ofThe` S "constants", getES effStiffA `sAnd` getES effStiffB `sC` S "defined in", eqN 10 `sAnd` eqN 11, S "respectively"], @@ -427,5 +427,5 @@ stfMtrxDerivation = [ ] -isElMx :: (Quantity a) => a -> String -> Sentence -isElMx sym kword = getES sym `isThe` S kword +:+ S "element in the matrix" +isElemInMx :: (Quantity a) => a -> String -> Sentence +isElemInMx sym kword = getES sym `isThe` S kword +:+ S "element in the matrix" diff --git a/code/Example/Drasil/SSP/Defs.hs b/code/Example/Drasil/SSP/Defs.hs index 706aa5b253..58b33b2ebe 100644 --- a/code/Example/Drasil/SSP/Defs.hs +++ b/code/Example/Drasil/SSP/Defs.hs @@ -22,7 +22,7 @@ soil, material, intrslce, slip, slope, slice, morPrice, rgFnElm :: NamedChunk intrslce = nc "interslice" (cn' "interslice") material = nc "material" (cn' "material") slice = nc "slice" (cn' "slice") -slip = nc "slip" (cn "slip") --FIXME: adjective? +slip = nc "slip" (cn "slip") --FIXME: verb (escape or get loose from (a means of restraint))/noun (an act of sliding unintentionally for a short distance)? slope = nc "slope" (cn' "slope") soil = nc "soil" (cn "soil") From 8af2d2a10c431fec5c17426405e51d30ff6cc23a Mon Sep 17 00:00:00 2001 From: Maryyam Niazi Date: Tue, 15 May 2018 11:51:36 -0400 Subject: [PATCH 3/3] comment update --- code/Example/Drasil/SSP/Defs.hs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/Example/Drasil/SSP/Defs.hs b/code/Example/Drasil/SSP/Defs.hs index 58b33b2ebe..2141877da1 100644 --- a/code/Example/Drasil/SSP/Defs.hs +++ b/code/Example/Drasil/SSP/Defs.hs @@ -22,7 +22,9 @@ soil, material, intrslce, slip, slope, slice, morPrice, rgFnElm :: NamedChunk intrslce = nc "interslice" (cn' "interslice") material = nc "material" (cn' "material") slice = nc "slice" (cn' "slice") -slip = nc "slip" (cn "slip") --FIXME: verb (escape or get loose from (a means of restraint))/noun (an act of sliding unintentionally for a short distance)? +slip = nc "slip" (cn "slip") --FIXME: verb (escape or get loose from (a means of restraint))/noun + -- (an act of sliding unintentionally for a short distance)? + -- (related to issue #129) slope = nc "slope" (cn' "slope") soil = nc "soil" (cn "soil")