Remove the last traces of deprecated MG generation and unlink the Req…

…Chunks and ModuleChunks from the Examples

code/Example/Drasil/GamePhysics/Body.hs

@@ -1,7 +1,5 @@
 module Drasil.GamePhysics.Body where
 
-import Drasil.Template.MG 
-import Drasil.Template.DD
 import Control.Lens ((^.))
 import Language.Drasil
 import Data.Drasil.SI_Units
@@ -40,10 +38,6 @@ import Drasil.GamePhysics.TMods (cpTMods)
 import Drasil.GamePhysics.IMods (iModels)
 import Drasil.GamePhysics.DataDefs (cpDDefs, cpQDefs)
 
-import Drasil.GamePhysics.Modules (modules)
-import Drasil.GamePhysics.Changes (unlikelyChanges, likelyChanges)
-import Drasil.GamePhysics.Reqs (reqs)
-
 import Drasil.DocumentLanguage 
 import Drasil.Sections.SpecificSystemDescription (specSysDescr)
 import Drasil.Sections.SolutionCharacterSpec
@@ -96,12 +90,6 @@ chipmunkSysInfo = SI {
 chipUnits :: [UnitDefn]
 chipUnits = map UU [metre, kilogram, second] ++ map UU [newton, radian]
 
-chipmunkMG :: Document
-chipmunkMG = mgDoc chipmunk (for'' titleize short) auths mgBod
-
-mgBod :: [Section]
-(mgBod, _) = makeDD likelyChanges unlikelyChanges reqs modules
-
 everything :: ChunkDB
 everything = cdb cpSymbolsAll (map nw cpSymbolsAll ++ map nw cpAcronyms)
 

code/Example/Drasil/GamePhysics/Main.hs

@@ -1,14 +1,12 @@
 module Main where
 
-import Language.Drasil (DocType(SRS, MG, Website), Recipe(..), gen)
+import Language.Drasil (DocType(SRS, Website), Recipe(..), gen)
 
-import Drasil.GamePhysics.Body (chipmunkSRS', chipmunkMG, everything)
+import Drasil.GamePhysics.Body (chipmunkSRS', everything)
 
 docs :: [Recipe]
 docs = [Recipe (SRS "Chipmunk_SRS") chipmunkSRS',
- Recipe (Website "Chipmunk_SRS") chipmunkSRS',
- -- Recipe (Website "Chipmunk_MG") chipmunkMG,
- Recipe (MG "Chipmunk_MG") chipmunkMG
+ Recipe (Website "Chipmunk_SRS") chipmunkSRS'
  ]
 
 main :: IO ()

code/Example/Drasil/SSP/Body.hs

@@ -1,4 +1,4 @@
-module Drasil.SSP.Body (ssp_srs, ssp_mg, ssp_code, sspSymMap) where
+module Drasil.SSP.Body (ssp_srs, ssp_code, sspSymMap) where
 
 import Language.Drasil
 import Data.Drasil.SI_Units
@@ -8,7 +8,6 @@ import Prelude hiding (sin, cos, tan)
 import Data.Drasil.People (henryFrankis)
 
 import Drasil.SSP.Assumptions (sspAssumptions)
-import Drasil.SSP.Changes (likelyChanges, unlikelyChanges)
 import Drasil.SSP.DataDefs (sspDataDefs, resShrDerivation,
  mobShrDerivation, stfMtrxDerivation)
 import Drasil.SSP.DataDesc (sspInputMod)
@@ -20,9 +19,7 @@ import Drasil.SSP.Goals (sspGoals)
 import Drasil.SSP.IMods (instModIntro1, instModIntro2,
  sspIMods, fctSftyDerivation, nrmShrDerivation,
  intrSlcDerivation, rigDisDerivation, rigFoSDerivation)
-import Drasil.SSP.Modules (modules)
 import Drasil.SSP.References (sspCitations)
-import Drasil.SSP.Reqs (reqs)
 import Drasil.SSP.Requirements (sspRequirements, sspInputDataTable)
 import Drasil.SSP.TMods (sspTMods)
 import Drasil.SSP.Unitals (sspSymbols, sspInputs, sspOutputs,
@@ -64,9 +61,6 @@ import Data.Drasil.Utils (symbolMapFun,
 import Data.Drasil.SentenceStructures (sOr, acroDD,
  foldlSent, ofThe, sAnd, foldlSP, foldlList, foldlSent_)
 
-import Drasil.Template.MG (mgDoc)
-import Drasil.Template.DD (makeDD)
-
 --type declarations for sections--
 s3, s4, s5, s6, s7 :: Section
 
@@ -114,12 +108,8 @@ mkSRS = RefSec (RefProg intro
  --FIXME: issue #235
  map Verbatim [s3, s4, s5, s6, s7] ++ [Bibliography sspCitations]
 
-ssp_srs, ssp_mg :: Document
+ssp_srs :: Document
 ssp_srs = mkDoc mkSRS (for) ssp_si
-ssp_mg = mgDoc ssa (for'' titleize titleize) (name henryFrankis) mgBod
-
-mgBod :: [Section]
-(mgBod, _) = makeDD likelyChanges unlikelyChanges reqs modules
 
 sspChoices :: Choices
 sspChoices = Choices {

code/Example/Drasil/SSP/Main.hs

@@ -1,14 +1,12 @@
 module Main (main) where
 
-import Language.Drasil (DocType(SRS,MG,Website), Recipe(Recipe), gen)
+import Language.Drasil (DocType(SRS,Website), Recipe(Recipe), gen)
 
-import Drasil.SSP.Body (ssp_srs, ssp_mg, sspSymMap)
+import Drasil.SSP.Body (ssp_srs, sspSymMap)
 
 docs :: [Recipe]
 docs = [Recipe (Website "SSP_SRS") ssp_srs,
- Recipe (SRS "SSP_SRS") ssp_srs,
- --Recipe (Website "SSP_MG") ssp_mg,
- Recipe (MG "SSP_MG") ssp_mg
+ Recipe (SRS "SSP_SRS") ssp_srs
  ]
 
 main :: IO () 

code/Language/Drasil.hs

@@ -54,7 +54,7 @@ module Language.Drasil (
  , ModuleChunk, makeRecord, makeImpModule, makeImpModuleNoGen, makeUnimpModule
  , imp, hier, field, formatName, method, secret, uses
  -- Chunk.Req
- , ReqChunk(..), emptyN
+ , ReqChunk(..)
  -- Chunk.LC
  , LCChunk(..)
  -- Chunk.Other

code/Language/Drasil/Chunk/Req.hs

@@ -1,13 +1,11 @@
-module Language.Drasil.Chunk.Req(ReqChunk(..), emptyN) where
+module Language.Drasil.Chunk.Req(ReqChunk(..)) where
 
 import Control.Lens (Simple, Lens)
 import Prelude hiding (id)
 import Language.Drasil.Chunk
-import Language.Drasil.Chunk.NamedIdea (NamedIdea(term,getA), npnc)
+import Language.Drasil.Chunk.NamedIdea (NamedIdea(term,getA))
 import Language.Drasil.Chunk.Module
 import Language.Drasil.Chunk.Wrapper (NWrapper)
-import Language.Drasil.NounPhrase (cn)
-import Language.Drasil.Chunk.Wrapper (nw)
 
 -- BEGIN REQCHUNK --
 -- | Requirement Chunks contain a NamedIdea (as an NWrapper) and a list of
@@ -28,6 +26,3 @@ instance NamedIdea ReqChunk where
 -- don't export this
 cl :: Simple Lens ReqChunk NWrapper
 cl f (ReqChunk a b) = fmap (\x -> ReqChunk x b) (f a)
-
-emptyN :: NWrapper
-emptyN = nw $ npnc "" (cn "")

code/Makefile

@@ -77,7 +77,7 @@ tiny_diff: tiny_build
 
 ssp_diff: ssp_build
  - $(DIFF) ./stable/ssp/$(SSP_PREF)SRS.tex ./build/$(SSP_DIR)/SRS/$(SSP_PREF)SRS.tex &> $(SSP_PREF)log.log
- - $(DIFF) ./stable/ssp/$(SSP_PREF)MG.tex ./build/$(SSP_DIR)/MG/$(SSP_PREF)MG.tex >> $(SSP_PREF)log.log 2>&1
+# - $(DIFF) ./stable/ssp/$(SSP_PREF)MG.tex ./build/$(SSP_DIR)/MG/$(SSP_PREF)MG.tex >> $(SSP_PREF)log.log 2>&1
  - $(DIFF) ./stable/ssp/$(SSP_PREF)SRS.css ./build/$(SSP_DIR)/Website/$(SSP_PREF)SRS.css >> $(SSP_PREF)log.log 2>&1
  - $(DIFF) ./stable/ssp/$(SSP_PREF)SRS.html ./build/$(SSP_DIR)/Website/$(SSP_PREF)SRS.html >> $(SSP_PREF)log.log 2>&1
 
@@ -89,7 +89,7 @@ glassbr_diff: glassbr_build
 
 gamephys_diff: gamephys_build
  - $(DIFF) ./stable/gamephys/$(GAME_PREF)SRS.tex ./build/$(GAME_DIR)/SRS/$(GAME_PREF)SRS.tex &> $(GAME_PREF)log.log
- - $(DIFF) ./stable/gamephys/$(GAME_PREF)MG.tex ./build/$(GAME_DIR)/MG/$(GAME_PREF)MG.tex >> $(GAME_PREF)log.log 2>&1
+# - $(DIFF) ./stable/gamephys/$(GAME_PREF)MG.tex ./build/$(GAME_DIR)/MG/$(GAME_PREF)MG.tex >> $(GAME_PREF)log.log 2>&1
  - $(DIFF) ./stable/gamephys/$(GAME_PREF)SRS.css ./build/$(GAME_DIR)/Website/$(GAME_PREF)SRS.css >> $(GAME_PREF)log.log 2>&1
  - $(DIFF) ./stable/gamephys/$(GAME_PREF)SRS.html ./build/$(GAME_DIR)/Website/$(GAME_PREF)SRS.html >> $(GAME_PREF)log.log 2>&1
 

code/drasil.cabal

@@ -139,7 +139,6 @@ executable tiny
  other-modules:
  Drasil.HGHC.HGHC
  , Drasil.HGHC.HeatTransfer
- , Drasil.HGHC.Modules
  , Drasil.Sections.TableOfSymbols
  , Drasil.Sections.ReferenceMaterial
  , Drasil.Sections.TableOfAbbAndAcronyms
@@ -241,9 +240,7 @@ executable ssp
  , Drasil.SSP.GenDefs
  , Drasil.SSP.Goals
  , Drasil.SSP.IMods
- , Drasil.SSP.Modules
  , Drasil.SSP.References
- , Drasil.SSP.Reqs
  , Drasil.SSP.Requirements
  , Drasil.SSP.TMods
  , Drasil.SSP.Unitals
@@ -334,8 +331,6 @@ executable chipmunkdocs
  , Drasil.GamePhysics.Changes
  , Drasil.GamePhysics.Concepts
  , Drasil.GamePhysics.DataDefs
- , Drasil.GamePhysics.Modules
- , Drasil.GamePhysics.Reqs
  , Drasil.GamePhysics.TMods
  , Drasil.GamePhysics.Unitals
  , Drasil.GamePhysics.IMods