Apply UID to more chunks, but need to be verified.

code/drasil-data/Data/Drasil/Utils.hs

@@ -36,10 +36,10 @@ import Data.Drasil.Concepts.Documentation (fterms, input_, output_, symbol_,
 import Data.Drasil.Concepts.Math (unit_)
 
 eqUnR :: Expr -> Label -> LabelledContent
-eqUnR e lbl = llcc lbl $ EqnBlock e
+eqUnR e lbl = llcc lbl $ EqnBlock "fixme" e
 
 eqUnR' :: Expr -> Contents
-eqUnR' e = UlC $ ulcc $ EqnBlock e
+eqUnR' e = UlC $ ulcc $ EqnBlock "fixme" e
 
 -- | fold helper functions applies f to all but the last element, applies g to
 -- last element and the accumulator
@@ -138,14 +138,14 @@ bulletNested t l = Bullet . map (\(h,c) -> (Nested h c, Nothing)) $ zip t l
 
 -- | enumBullet apply Enumeration, Bullet and Flat to a list
 enumBullet :: [Sentence] -> Contents --FIXME: should Enumeration be labelled?
-enumBullet s = UlC $ ulcc $ Enumeration $ bulletFlat s
+enumBullet s = UlC $ ulcc $ Enumeration "fixme" $ bulletFlat s
 
 -- | enumSimple enumerates a list and applies simple and enumeration to it
 -- s - start index for the enumeration
 -- t - title of the list
 -- l - list to be enumerated
 enumSimple :: Integer -> Sentence -> [Sentence] -> Contents --FIXME: should Enumeration be labelled?
-enumSimple s t l = UlC $ ulcc $ Enumeration $ Simple $ noRefsLT $ mkEnumAbbrevList s t l
+enumSimple s t l = UlC $ ulcc $ Enumeration "fixme" $ Simple $ noRefsLT $ mkEnumAbbrevList s t l
 
 -- | interweaves two lists together [[a,b,c],[d,e,f]] -> [a,d,b,e,c,f]
 weave :: [[a]] -> [a]

code/drasil-docLang/Drasil/DocumentLanguage.hs

@@ -353,7 +353,7 @@ tuIntro x = mkParagraph $ foldr ((+:+) . tuI) EmptyS x
 -- | mkEnumSimple is a convenience function for converting lists into
 -- Simple-type Enumerations.
 mkEnumSimple :: (a -> ListTuple) -> [a] -> [Contents]
-mkEnumSimple f = replicate 1 . UlC . ulcc . Enumeration . Simple . map f
+mkEnumSimple f = replicate 1 . UlC . ulcc . Enumeration "fixme". Simple . map f
 
 -- | mkEnumSimpleD is a convenience function for transforming types which are
 -- instances of the constraints Referable, HasShortName, and Definition, into

code/drasil-docLang/Drasil/DocumentLanguage/Definitions.hs

@@ -47,23 +47,23 @@ data InclUnits = IncludeUnits -- In description field (for other symbols)
 -- | Create a theoretical model using a list of fields to be displayed, a database of symbols,
 -- and a RelationConcept (called automatically by 'SCSSub' program)
 tmodel :: HasSymbolTable ctx => Fields -> ctx -> TheoryModel -> LabelledContent
-tmodel fs m t = mkRawLC (Defini TM (foldr (mkTMField t m) [] fs)) (t ^. getLabel)
+tmodel fs m t = mkRawLC (Defini "fixme" TM (foldr (mkTMField t m) [] fs)) (t ^. getLabel)
 
 -- | Create a data definition using a list of fields, a database of symbols, and a
 -- QDefinition (called automatically by 'SCSSub' program)
 ddefn :: HasSymbolTable ctx => Fields -> ctx -> DataDefinition -> LabelledContent
-ddefn fs m d = mkRawLC (Defini DD (foldr (mkDDField d m) [] fs)) (d ^. getLabel)
+ddefn fs m d = mkRawLC (Defini "fixme" DD (foldr (mkDDField d m) [] fs)) (d ^. getLabel)
 
 -- | Create a general definition using a list of fields, database of symbols,
 -- and a 'GenDefn' (general definition) chunk (called automatically by 'SCSSub'
 -- program)
 gdefn :: HasSymbolTable ctx => Fields -> ctx -> GenDefn -> LabelledContent
-gdefn fs m g = mkRawLC (Defini General (foldr (mkGDField g m) [] fs)) (g ^. getLabel)
+gdefn fs m g = mkRawLC (Defini "fixme" General (foldr (mkGDField g m) [] fs)) (g ^. getLabel)
 
 -- | Create an instance model using a list of fields, database of symbols,
 -- and an 'InstanceModel' chunk (called automatically by 'SCSSub' program)
 instanceModel :: HasSymbolTable ctx => Fields -> ctx -> InstanceModel -> LabelledContent
-instanceModel fs m i = mkRawLC (Defini Instance (foldr (mkIMField i m) [] fs)) (i ^. getLabel)
+instanceModel fs m i = mkRawLC (Defini "fixme" Instance (foldr (mkIMField i m) [] fs)) (i ^. getLabel)
 
 -- | Create a derivation from a chunk's attributes. This follows the TM, DD, GD,
 -- or IM definition automatically (called automatically by 'SCSSub' program)
@@ -73,7 +73,7 @@ derivation g = map makeDerivationContents (g ^. derivations)
 -- | Helper function for creating the layout objects
 -- (paragraphs and equation blocks) for a derivation.
 makeDerivationContents :: Sentence -> Contents
-makeDerivationContents (E e) = LlC $ llcc (mkEmptyLabel EqnB) (EqnBlock e) --FIXME: Derivation needs labels for it's equation
+makeDerivationContents (E e) = LlC $ llcc (mkEmptyLabel EqnB) (EqnBlock "fixme" e) --FIXME: Derivation needs labels for it's equation
 makeDerivationContents s     = UlC $ ulcc $ Paragraph s
 
 -- | Synonym for easy reading. Model rows are just 'String',['Contents'] pairs
@@ -122,14 +122,14 @@ buildDescription :: HasSymbolTable ctx => Verbosity -> InclUnits -> Expr -> ctx
   [Contents]
 buildDescription Succinct _ _ _ _ = []
 buildDescription Verbose u e m cs = (UlC $ ulcc $
-  Enumeration (Definitions (descPairs u (vars e m)))) : cs
+  Enumeration "fixme" (Definitions (descPairs u (vars e m)))) : cs
 
 -- | Create the description field (if necessary) using the given verbosity and
 -- including or ignoring units for a data definition
 buildDDescription' :: HasSymbolTable ctx => Verbosity -> InclUnits -> DataDefinition -> ctx ->
   [Contents]
-buildDDescription' Succinct u d _ = map (UlC . ulcc) [Enumeration (Definitions $ (firstPair' u d):[])]
-buildDDescription' Verbose u d m = map (UlC . ulcc) [Enumeration (Definitions
+buildDDescription' Succinct u d _ = map (UlC . ulcc) [Enumeration "fixme" (Definitions $ (firstPair' u d):[])]
+buildDDescription' Verbose u d m = map (UlC . ulcc) [Enumeration "fixme" (Definitions
   (firstPair' u d : descPairs u (vars (d^.defnExpr) m)))]
 
 -- | Create the fields for a general definition from a 'GenDefn' chunk.
@@ -164,9 +164,9 @@ mkIMField i _ l@(Input) fs =
   (_:_) -> (show l, [mkParagraph $ foldl (sC) x xs]) : fs
   where (x:xs) = map (P . eqSymb) (i ^. imInputs)
 mkIMField i _ l@(InConstraints) fs  = 
-  (show l, foldr ((:) . UlC . ulcc . EqnBlock) [] (i ^. inCons)) : fs
+  (show l, foldr ((:) . UlC . ulcc . EqnBlock "fixme") [] (i ^. inCons)) : fs
 mkIMField i _ l@(OutConstraints) fs = 
-  (show l, foldr ((:) . UlC . ulcc . EqnBlock) [] (i ^. outCons)) : fs
+  (show l, foldr ((:) . UlC . ulcc . EqnBlock "fixme") [] (i ^. outCons)) : fs
 mkIMField i _ l@(Notes) fs = 
   nonEmpty fs (\ss -> (show l, map mkParagraph ss) : fs) (i ^. getNotes)
 mkIMField _ _ label _ = error $ "Label " ++ show label ++ " not supported " ++

code/drasil-docLang/Drasil/ExtractDocDesc.hs

@@ -36,9 +36,9 @@ egetCon' :: Contents -> [Expr]
 egetCon' c = egetCon (c ^. accessContents)
 
 egetCon :: RawContent -> [Expr]
-egetCon (EqnBlock e) = [e]
-egetCon (Defini _ []) = []
-egetCon (Defini dt (hd:tl)) = concatMap egetCon' (snd hd) ++ egetCon (Defini dt tl)
+egetCon (EqnBlock _ e) = [e]
+egetCon (Defini _ _ []) = []
+egetCon (Defini u dt (hd:tl)) = concatMap egetCon' (snd hd) ++ egetCon (Defini u dt tl)
 egetCon _ = []
 
 egetLblCon :: LabelledContent -> [Expr]
@@ -181,14 +181,14 @@ getCon' c = getCon (c ^. accessContents)
 getCon :: RawContent -> [Sentence]
 getCon (Table _ s1 s2 t _) = isVar (s1, transpose s2) ++ [t]
 getCon (Paragraph s)       = [s]
-getCon (EqnBlock _)      = []
-getCon (Enumeration lst)   = getLT lst
+getCon (EqnBlock _ _)      = []
+getCon (Enumeration _ lst)   = getLT lst
 getCon (Figure _ l _ _)    = [l]
 getCon (Assumption _ b _) = [b]
 getCon (Bib bref)          = getBib bref
 getCon (Graph _ [(s1, s2)] _ _ l) = s1 : s2 : [l]
-getCon (Defini _ []) = []
-getCon (Defini dt (hd:fs)) = concatMap getCon' (snd hd) ++ getCon (Defini dt fs)
+getCon (Defini _ _ []) = []
+getCon (Defini u dt (hd:fs)) = concatMap getCon' (snd hd) ++ getCon (Defini u dt fs)
 getCon  _ = []
 
 -- This function is used in collecting sentence from table.

code/drasil-example/Drasil/GamePhysics/Body.hs

@@ -301,7 +301,7 @@ sysCtxResp = [titleize user +:+ S "Responsibilities",
   short chipmunk +:+ S "Responsibilities"]
 
 sysCtxList :: Contents
-sysCtxList = UlC $ ulcc $ Enumeration $ bulletNested sysCtxResp $
+sysCtxList = UlC $ ulcc $ Enumeration "fixme" $ bulletNested sysCtxResp $
   map bulletFlat [sysCtxUsrResp, sysCtxSysResp]
 
 --------------------------------

code/drasil-example/Drasil/GlassBR/Body.hs

@@ -200,7 +200,7 @@ inputDataConstraints, outputDataConstraints, traceMatsAndGraphsTable1, traceMats
 
 --------------------------------------------------------------------------------
 termsAndDescBullets :: Contents
-termsAndDescBullets = UlC $ ulcc $ Enumeration $ 
+termsAndDescBullets = UlC $ ulcc $ Enumeration "fixme"$ 
   Numeric $
   noRefs $ map tAndDOnly termsWithDefsOnly
   ++
@@ -358,7 +358,7 @@ sysCtxResp = [titleize user +:+ S "Responsibilities",
   short gLassBR +:+ S "Responsibilities"]
 
 sysCtxList :: Contents
-sysCtxList = UlC $ ulcc $ Enumeration $ bulletNested sysCtxResp $
+sysCtxList = UlC $ ulcc $ Enumeration "fixme" $ bulletNested sysCtxResp $
   map bulletFlat [sysCtxUsrResp, sysCtxSysResp]
 
 {--User Characteristics--}

code/drasil-example/Drasil/NoPCM/Body.hs

@@ -320,7 +320,7 @@ probDescIntro pro cp wa sw = foldlSP [getAcc pro, S "is a",
 termAndDefn = termDefnF Nothing [termAndDefnBullets]
 
 termAndDefnBullets :: Contents
-termAndDefnBullets = UlC $ ulcc $ Enumeration $ Bullet $ noRefs $ 
+termAndDefnBullets = UlC $ ulcc $ Enumeration "fixme" $ Bullet $ noRefs $ 
   map (\x -> Flat $
   at_start x :+: S ":" +:+ (x ^. defn))
   [ht_flux, heat_cap_spec, thermal_conduction, transient]

code/drasil-example/Drasil/SSP/Body.hs

@@ -296,7 +296,7 @@ sysCtxResp = [titleize user +:+ S "Responsibilities",
   short ssp +:+ S "Responsibilities"]
 
 sysCtxList :: Contents
-sysCtxList = UlC $ ulcc $ Enumeration $ bulletNested sysCtxResp $
+sysCtxList = UlC $ ulcc $ Enumeration "fixme" $ bulletNested sysCtxResp $
   map bulletFlat [sysCtxUsrResp, sysCtxSysResp]
 
 -- SECTION 3.2 --
@@ -328,7 +328,7 @@ problem_desc = probDescF EmptyS ssa ending [termi_defi, phys_sys_desc, goal_stmt
 -- SECTION 4.1.1 --
 termi_defi = termDefnF Nothing [termi_defi_list]
 
-termi_defi_list = UlC $ ulcc $ Enumeration $ Simple $ noRefsLT $
+termi_defi_list = UlC $ ulcc $ Enumeration "fixme" $ Simple $ noRefsLT $
   map (\x -> (titleize $ x, Flat $ x ^. defn))
   [fs_concept, crtSlpSrf, stress, strain, normForce, shearForce, plnStrn]
   -- most of these are in concepts (physics or solidMechanics)

code/drasil-example/Drasil/SWHS/Body.hs

@@ -266,7 +266,7 @@ systCont = SRS.sysCont [systCContents progName, LlC sys_context_fig, systCIntro
   progName user, systContRespBullets] []
 
 systContRespBullets :: Contents
-systContRespBullets = UlC $ ulcc $ Enumeration $ Bullet $ noRefs [userResp input_ datum,
+systContRespBullets = UlC $ ulcc $ Enumeration "fixme"$ Bullet $ noRefs [userResp input_ datum,
   swhsResp]
 
 --------------------------------
@@ -301,7 +301,7 @@ termAndDefn = termDefnF Nothing [termAndDefnBullets]
 -- GlassBR has an additional sentence with a reference at the end.)
 
 termAndDefnBullets :: Contents
-termAndDefnBullets = UlC $ ulcc $ Enumeration $ Bullet $ noRefs $ map tAndDMap
+termAndDefnBullets = UlC $ ulcc $ Enumeration "fixme"$ Bullet $ noRefs $ map tAndDMap
   [CT.ht_flux, phase_change_material, CT.heat_cap_spec,
   CT.thermal_conduction, transient]
 

code/drasil-lang/Language/Drasil/Document.hs

@@ -37,22 +37,27 @@ sectionci    = commonIdeaWithDict "sectionci"    (cn' "section")
 -- which hold the contents of the document
 data Document = Document Title Author [Section]
 
-{--data RawContent = Table [Sentence] [[Sentence]] Title Bool
+{--data RawContent = Table UID [Sentence] [[Sentence]] Title Bool
   -- ^ table has: header-row data(rows) label/caption showlabel?
                | Paragraph Sentence -- ^ Paragraphs are just sentences.
-               | EqnBlock Expr
-               | Enumeration ListType -- ^ Lists
-               | Defini DType [(Identifier, [Contents])]
-               | Figure Lbl Filepath MaxWidthPercent -- ^ Should use relative file path.
+               | EqnBlock UID Expr
+               | Enumeration UID ListType -- ^ Lists
+               | Defini UID DType [(Identifier, [Contents])]
+               | Figure UID Lbl Filepath MaxWidthPercent -- ^ Should use relative file path.
                | Assumption UID Sentence Label -- FIXME: hack, remove
                | Bib BibRef
-               | Graph [(Sentence, Sentence)] (Maybe Width) (Maybe Height) Lbl--}
+               | Graph UID [(Sentence, Sentence)] (Maybe Width) (Maybe Height) Lbl--}
 
 helpUIDfrmRaw :: RawContent -> UID
 helpUIDfrmRaw (Table u _ _ _ _) = u
 helpUIDfrmRaw (Figure u _ _ _)  = u
 helpUIDfrmRaw (Graph u _ _ _ _) = u
-helpUIDfrmRaw (_)   = error "This chunk doesn't have a UID." 
+helpUIDfrmRaw (EqnBlock u _)    = u
+helpUIDfrmRaw (Enumeration u _) = u
+helpUIDfrmRaw (Defini u _ _)    = u
+helpUIDfrmRaw (Assumption u _ _)= u
+helpUIDfrmRaw (Bib _)           = error "This chunk doesn't have a UID."
+helpUIDfrmRaw (Paragraph _)     = error "This chunk doesn't have a UID." 
 
 -- | Smart constructor for labelled content chunks
 llcc :: Label -> RawContent -> LabelledContent

code/drasil-lang/Language/Drasil/Document/Core.hs

@@ -54,9 +54,9 @@ data Contents = UlC UnlabelledContent
 data RawContent = Table UID [Sentence] [[Sentence]] Title Bool
   -- ^ table has: header-row data(rows) label/caption showlabel?
                | Paragraph Sentence -- ^ Paragraphs are just sentences.
-               | EqnBlock Expr
-               | Enumeration ListType -- ^ Lists
-               | Defini DType [(Identifier, [Contents])]
+               | EqnBlock UID Expr
+               | Enumeration UID ListType -- ^ Lists
+               | Defini UID DType [(Identifier, [Contents])]
                | Figure UID Lbl Filepath MaxWidthPercent -- ^ Should use relative file path.
                | Assumption UID Sentence Label -- FIXME: hack, remove
                | Bib BibRef

code/drasil-lang/Language/Drasil/Reference.hs

@@ -177,10 +177,10 @@ refLabelledCon :: RawContent -> IRefProg
 refLabelledCon (Table _ _ _ _ _)       = raw "Table:" +::+ name 
 refLabelledCon (Figure _ _ _ _)        = raw "Fig:" +::+ name
 refLabelledCon (Graph _ _ _ _ _)       = raw "Fig:" +::+ name
-refLabelledCon (Defini _ _)          = raw "Def:" +::+ name
+refLabelledCon (Defini _ _ _)          = raw "Def:" +::+ name
 refLabelledCon (Assumption _ _ _)    = raw "Assump:" +::+ name
-refLabelledCon (EqnBlock _)          = raw "EqnB:" +::+ name
-refLabelledCon (Enumeration _)       = raw "Lst:" +::+ name 
+refLabelledCon (EqnBlock _ _)          = raw "EqnB:" +::+ name
+refLabelledCon (Enumeration _ _)       = raw "Lst:" +::+ name 
 refLabelledCon (Paragraph _)         = error "Shouldn't reference paragraphs"
 refLabelledCon (Bib _)               = error $ 
     "Bibliography list of references cannot be referenced. " ++
@@ -190,10 +190,10 @@ temp :: RawContent -> RefType
 temp (Table _ _ _ _ _)       = Tab
 temp (Figure _ _ _ _)        = Fig
 temp (Graph _ _ _ _ _)       = Fig
-temp (Defini x _)          = Def x
+temp (Defini _ x _)          = Def x
 temp (Assumption _ _ _)    = Assump -- hard-code, will disappear
-temp (EqnBlock _)          = EqnB
-temp (Enumeration _)       = Lst 
+temp (EqnBlock _ _)          = EqnB
+temp (Enumeration _ _)       = Lst 
 temp (Paragraph _)         = error "Shouldn't reference paragraphs"
 temp (Bib _)               = error $
     "Bibliography list of references cannot be referenced. " ++

code/drasil-printers/Language/Drasil/Printing/Import.hs

@@ -349,7 +349,7 @@ layLabelled sm x@(LblC _ _ (Table _ hdr lls t b)) = T.Table ["table"]
   ((map (spec sm) hdr) : (map (map (spec sm)) lls)) 
   (P.S $ getAdd (x ^. getRefAdd))
   b (spec sm t)
-layLabelled sm x@(LblC _ _ (EqnBlock c))          = T.HDiv ["equation"] 
+layLabelled sm x@(LblC _ _ (EqnBlock _ c))          = T.HDiv ["equation"] 
   [T.EqnBlock (P.E (expr c sm))] 
   (P.S $ getAdd (x ^. getRefAdd))
 layLabelled sm x@(LblC _ _ (Figure _ c f wp))     = T.Figure 
@@ -368,12 +368,12 @@ layLabelled sm x@(LblC _ _ (Assumption _ b c))        = T.ALUR T.Assumption
 layLabelled sm x@(LblC _ _ (Graph _ ps w h t))    = T.Graph 
   (map (\(y,z) -> (spec sm y, spec sm z)) ps) w h (spec sm t)
   (P.S $ getAdd (x ^. getRefAdd))
-layLabelled sm x@(LblC _ _ (Defini dtyp pairs)) = T.Definition 
+layLabelled sm x@(LblC _ _ (Defini _ dtyp pairs)) = T.Definition 
   dtyp (layPairs pairs) 
   (P.S $ getAdd (x ^. getRefAdd))
   where layPairs = map (\(x',y) -> (x', map (lay sm) y))
 layLabelled sm (LblC _ _ (Paragraph c))           = T.Paragraph (spec sm c)
-layLabelled sm (LblC _ _ (Enumeration cs))        = T.List $ makeL sm cs
+layLabelled sm (LblC _ _ (Enumeration _ cs))        = T.List $ makeL sm cs
 layLabelled sm (LblC _ _ (Bib bib))               = T.Bib $ map (layCite sm) bib
 
 -- | Translates from Contents to the Printing Representation of LayoutObj.
@@ -383,16 +383,16 @@ layUnlabelled :: (HasSymbolTable ctx, HasTermTable ctx, HasDefinitionTable ctx,
 layUnlabelled sm (Table _ hdr lls t b) = T.Table ["table"]
   ((map (spec sm) hdr) : (map (map (spec sm)) lls)) (P.S "nolabel0") b (spec sm t)
 layUnlabelled sm (Paragraph c)          = T.Paragraph (spec sm c)
-layUnlabelled sm (EqnBlock c)         = T.HDiv ["equation"] [T.EqnBlock (P.E (expr c sm))] P.EmptyS
-layUnlabelled sm (Enumeration cs)       = T.List $ makeL sm cs
+layUnlabelled sm (EqnBlock _ c)         = T.HDiv ["equation"] [T.EqnBlock (P.E (expr c sm))] P.EmptyS
+layUnlabelled sm (Enumeration _ cs)       = T.List $ makeL sm cs
 layUnlabelled sm (Figure _ c f wp)    = T.Figure (P.S "nolabel2") (spec sm c) f wp
 -- layUnlabelled sm (Requirement r)      = T.ALUR T.Requirement
 --   (spec sm $ requires r) (P.S "nolabel3") (spec sm $ getShortName r)
 layUnlabelled sm (Assumption _ b c)       = T.ALUR T.Assumption
   (spec sm b) (P.S "nolabel4") (spec sm $ getShortName c)
 layUnlabelled sm (Graph _ ps w h t)   = T.Graph (map (\(y,z) -> (spec sm y, spec sm z)) ps)
                                w h (spec sm t) (P.S "nolabel6")
-layUnlabelled sm (Defini dtyp pairs)  = T.Definition dtyp (layPairs pairs) (P.S "nolabel7")
+layUnlabelled sm (Defini _ dtyp pairs)  = T.Definition dtyp (layPairs pairs) (P.S "nolabel7")
   where layPairs = map (\(x,y) -> (x, map temp y ))
         temp  y   = layUnlabelled sm (y ^. accessContents)
 layUnlabelled sm (Bib bib)              = T.Bib $ map (layCite sm) bib