Skip to content

Commit

Permalink
Merge pull request #528 from JacquesCarette/redundant-file-rmvl
Browse files Browse the repository at this point in the history
Plurals.hs is no longer used
  • Loading branch information
JacquesCarette authored May 15, 2018
2 parents 4a1c4f8 + 8af2d2a commit 24a63b3
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 18 deletions.
9 changes: 0 additions & 9 deletions code/Data/Drasil/Plurals.hs

This file was deleted.

3 changes: 2 additions & 1 deletion code/Example/Drasil/SSP/Body.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions code/Example/Drasil/SSP/DataDefs.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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" +:+.
Expand Down Expand Up @@ -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"],
Expand All @@ -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"
4 changes: 3 additions & 1 deletion code/Example/Drasil/SSP/Defs.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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: 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)?
-- (related to issue #129)
slope = nc "slope" (cn' "slope")
soil = nc "soil" (cn "soil")

Expand Down
1 change: 0 additions & 1 deletion code/drasil.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 24a63b3

Please sign in to comment.