Skip to content

Commit

Permalink
removed 's10'; updated references to 's10'; removed warning
Browse files Browse the repository at this point in the history
  • Loading branch information
@niazim3
niazim3 committed Aug 2, 2017
1 parent 0ac7640 commit 0b7d75c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
19 changes: 9 additions & 10 deletions code/Example/Drasil/GlassBR/Body.hs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ import Drasil.Sections.ScopeOfTheProject
import Drasil.Sections.Requirements
import Drasil.Sections.GeneralSystDesc
import Drasil.Sections.SpecificSystemDescription
import Drasil.Sections.AuxiliaryConstants

this_si :: [UnitDefn]
this_si = map UU [metre, second, kilogram] ++ map UU [pascal, newton]
Expand Down Expand Up @@ -128,7 +127,7 @@ glassBR_mg = mgDoc glassBRProg (for'' titleize phrase) mg_authors mgBod

s4, s5,
s6, s6_1, s6_1_1, s6_1_2, s6_1_3, s6_2,
s7, s7_1, s7_2, s8, s9, s10, s11, s12 :: Section
s7, s7_1, s7_2, s8, s9, s11, s12 :: Section

s5_1_table,
s6_1_2_list, s6_2_intro, s6_2_5_table1,
Expand Down Expand Up @@ -397,9 +396,10 @@ s6_2 = solChSpecF gLassBR (s6_1, s8) (EmptyS)
(EmptyS, dataConstraintUncertainty, end)
(s6_2_1_list, s6_2_2_TMods, [], s6_2_4_DDefns, s6_2_3_IMods,
[s6_2_5_table1, s6_2_5_table2]) []
where end = foldlSent [(makeRef s10), S "gives",
(plural value `ofThe` S "specification"), plural parameter,
S "used in" +:+. (makeRef s6_2_5_table1)] +:+ s6_2_5_intro2
where end = foldlSent [(makeRef (SRS.valsOfAuxCons SRS.missingP [])),
S "gives", (plural value `ofThe` S "specification"),
plural parameter, S "used in" +:+. (makeRef s6_2_5_table1)]
+:+ s6_2_5_intro2

s6_2_intro = foldlSP [S "This", phrase section_, S "explains all the",
plural assumption, S "considered" `sAnd` S "the", plural thModel,
Expand Down Expand Up @@ -452,9 +452,10 @@ a3Desc = foldlSent [S "This", phrase system,

a4Desc :: UnitaryChunk -> Sentence
a4Desc mainIdea = foldlSent [S "The", plural value, S "provided in",
makeRef s10, S "are assumed for the", phrase mainIdea,
sParen (getS mainIdea) `sC` S "and the", plural materialProprty `sOf`
foldlList (map getS (take 3 assumption4_constants))]
(makeRef (SRS.valsOfAuxCons SRS.missingP [])), S "are assumed for the",
phrase mainIdea, sParen (getS mainIdea) `sC` S "and the",
plural materialProprty `sOf` foldlList (map getS
(take 3 assumption4_constants))]

a5Desc :: Sentence
a5Desc = foldlSent [at_start glass, S "under consideration",
Expand Down Expand Up @@ -853,8 +854,6 @@ fig_4 = figureLabel 4 (traceyMatrix)

{--VALUES OF AUXILIARY CONSTANTS--}

s10 = valsOfAuxConstantsF gLassBR auxiliaryConstants

{--REFERENCES--}

s11 = SRS.reference [s11_list] []
Expand Down
1 change: 1 addition & 0 deletions code/drasil.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ executable tiny
, Drasil.DocumentLanguage
, Drasil.DocumentLanguage.Chunk.GenDefn
, Drasil.DocumentLanguage.Definitions
, Drasil.Sections.AuxiliaryConstants
, Drasil.Sections.TableOfUnits
, Drasil.Template.DD
, Drasil.Template.Helpers
Expand Down

6 comments on commit 0b7d75c

@niazim3
Copy link
Collaborator Author

@niazim3 niazim3 commented on 0b7d75c Aug 2, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note to self: How will we be referencing sections when everything is automatically generated? Related to #368.

@JacquesCarette
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to generate "labels" for sections, and then use those for reference. They should be a new chunk type, and they'll be stored in a table, like the current symbol table.

@niazim3
Copy link
Collaborator Author

@niazim3 niazim3 commented on 0b7d75c Aug 3, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll create a new issue for the removal of the missingP hack that is being used in some of the examples for section referencing.

@niazim3
Copy link
Collaborator Author

@niazim3 niazim3 commented on 0b7d75c Aug 3, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Clarification request @JacquesCarette : "The labels should be stored in a table like the table of symbols", does that mean the labels will be a separate table displayed in the documentation? Would a reader want to view a list of section labels? Or do you mean something similar to a table of contents for the documentation?

@JacquesCarette
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. This would just be internal information used for rendering of references. I meant "haskell table" rather than "document table".

@niazim3
Copy link
Collaborator Author

@niazim3 niazim3 commented on 0b7d75c Aug 3, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Issue #374 created.

Please sign in to comment.