Implement HasUID class to LabelledContents and Section #1071
Conversation
| @@ -172,7 +172,7 @@ dataConstraintParagraph hasUncertainty tableRef middleSent trailingSent = mkPara | |||
| -- makes a list of references to tables takes | |||
| -- l list of layout objects that can be referenced | |||
| -- outputs a sentence containing references to the layout objects | |||
| listofTablesToRefs :: (HasShortName l, Referable l) => [l] -> Sentence | |||
| listofTablesToRefs :: (HasUID l, HasShortName l, Referable l) => [l] -> Sentence | |||
There was a problem hiding this comment.
I think this HasUID constraint can be lifted now.
| @@ -45,7 +45,7 @@ roc_temp_simp_deriv_sentences = map foldlSentCol [ | |||
| QT.temp vol [makeRef2S newA3, makeRef2S newA4, makeRef2S newA5], | |||
| genDefDesc5 density mass vol] | |||
|
|
|||
| genDefDesc1 :: (HasShortName x, Referable x) => x -> UnitalChunk -> [Sentence] | |||
| genDefDesc1 :: (HasUID x, HasShortName x, Referable x) => x -> UnitalChunk -> [Sentence] | |||
There was a problem hiding this comment.
And this one too? Though we might consider making HasUID a pre-condition of Referable.
| @@ -344,7 +344,7 @@ phys_sys_desc_p1 = physSystIntro slope how intrslce slice | |||
| (S "slice base") fig_indexconv | |||
| where how = S "as a series of" +:+ phrase slice +:+. plural element | |||
|
|
|||
| physSystIntro :: (NamedIdea a, NamedIdea b, NamedIdea c, HasShortName d, Referable d) => | |||
| physSystIntro :: (NamedIdea a, NamedIdea b, NamedIdea c, HasUID d, HasShortName d, Referable d) => | |||
|
|
||
| makeCiteS :: Citation -> Sentence | ||
| makeCiteS = Ref2 . makeCite | ||
|
|
||
| -- | Create a reference for a URI | ||
| makeURI :: String -> ShortName -> Reference2 | ||
| makeURI ra sn = Reference2 URI ra sn | ||
| makeURI ra sn = Reference2 "fixme" URI ra sn |
There was a problem hiding this comment.
I don't really want to accept a PR with a "fixme" like that in it...
| @@ -434,7 +437,10 @@ goal_statements_list' = map (foldlSent) [goal_statements_G_linear, | |||
| goal_statements_G_angular, goal_statements_G_detectCollision, | |||
| goal_statements_G_collision] | |||
|
|
|||
| goal_statements_list = enumSimple 1 (getAcc goalStmt) goal_statements_list' | |||
| goal_label :: Label | |||
| goal_label = mkLabelRALst "goalGM" "goalGM" | |||
There was a problem hiding this comment.
It seems that goal_label (and solution_label and ...) are duplicated for each example. They should be pulled out into drasil-docLang.
|
If you could do this change soon, that would be nice, so that I can indeed merge this in. There is some code I'd like to do [I've caught at least one case of a |
|
Sorry I didn't put the priority on this because I really wanted to push on my process so that some fixes wouldn't kill my patience. Does putting labels in docLang is enough? Or even take the constructor to docLang? @JacquesCarette |
|
Branch merged - should I also delete it, because the work on this (addUID) is 'done'? |
|
Yes, please. We are done with |
|
Done. |
In this PR:
HasUIDclass. Since they both havelabelfield andlabelhas a UID, the HasUID directly pulls the UID from the label to attach to the Chunk.Question:
Since there were some labels created for
list, do we remove them to keep them as unlabelled contents? @JacquesCarette