centered figures in mdBook

JacquesCarette · Jul 30, 2024 · f25cf3a · f25cf3a
1 parent ced8dff
commit f25cf3a
Show file tree

Hide file tree

Showing 29 changed files with 280 additions and 141 deletions.
diff --git a/code/drasil-printers/lib/Language/Drasil/Markdown/Helpers.hs b/code/drasil-printers/lib/Language/Drasil/Markdown/Helpers.hs
@@ -8,7 +8,8 @@ import Text.PrettyPrint (Doc, text, empty, (<>), (<+>), hcat,
 import Data.Map (lookup)
 import Language.Drasil.Printing.Helpers (ast, ($^$), vsep)
 import Language.Drasil.Printing.LayoutObj (RefMap)
-import Language.Drasil.HTML.Helpers (wrap', wrapGen', Variation(Id, Align))
+import Language.Drasil.HTML.Helpers (wrap', wrapGen', Variation(Id, Align),
+  wrapInside, tagR)
 
 -- | Angled brackets
 ang :: Doc -> Doc
@@ -32,9 +33,15 @@ ul = wrap' "ul" []
 divTag :: Doc -> Doc
 divTag l = wrapGen' hcat Id "div" l [""] empty
 
--- | Helper for setting up div for defn heading
-defnHTag :: Doc -> Doc
-defnHTag = wrapGen' vsep Align "div" (text "center") [""]
+-- | Helper for setting up centered div tags
+centeredDiv :: Doc -> Doc
+centeredDiv = wrapGen' vsep Align "div" (text "center") [""]
+
+-- | Helper for setting up centered div tags with an Id
+centeredDivId :: Doc -> Doc -> Doc
+centeredDivId l con = vsep [wrapInside "div" atrs, con, tagR "div"]
+  where
+    atrs = [(show Id, l), (show Align, text "center")]
 
 -- | Helper for setting up links to references
 reflink :: RefMap -> String -> Doc -> Doc
@@ -55,7 +62,7 @@ reflinkURI ref txt = if ref == txt then ang ref
 
 -- | Helper for setting up figures
 image :: Doc -> Doc -> Doc
-image f c =  text "!" <> reflinkURI fp c $^$ bold (caption c)
+image f c =  text "!" <> reflinkURI fp c $^$ bold c
   where
     fp = text $ "./assets/" ++ takeFileName (show f)
 

diff --git a/code/drasil-printers/lib/Language/Drasil/Markdown/Print.hs b/code/drasil-printers/lib/Language/Drasil/Markdown/Print.hs
@@ -31,8 +31,8 @@ import Language.Drasil.HTML.Helpers(BibFormatter(..))
 import Language.Drasil.TeX.Helpers(commandD, command2D, mkEnv)
 
 import Language.Drasil.Markdown.Helpers (heading, image, li, reflink,
-  reflinkURI, reflinkInfo, caption, bold, ul, docLength, divTag, defnHTag, em,
-  h, h')
+  reflinkURI, reflinkInfo, caption, bold, ul, docLength, divTag, centeredDiv, 
+  em, h, h', centeredDivId)
 
 -----------------------------------------------------------------
 ------------------------- mdBook SRS ----------------------------
@@ -233,7 +233,7 @@ mkDocDefn rm = map (\(f, d) -> [text f, makeLO rm (f,d)])
 
 -- | Renders the title/header of the definition table
 makeDHeaderText :: RefMap -> [(String, [LayoutObj])] -> Doc -> Doc
-makeDHeaderText rm ps l = defnHTag header
+makeDHeaderText rm ps l = centeredDiv header
   where
     lo = lookup "Label" ps
     c = maybe l (\lo' -> makeLO rm ("Label", lo')) lo 
@@ -307,7 +307,7 @@ item rm (Nested s l) = vcat [pSpec rm s, makeList rm l 0]
 
 -- | Renders figures in Markdown
 makeFigure :: Doc -> Doc -> Doc -> Doc
-makeFigure r c f = divTag r $^$ image f c
+makeFigure r c f = centeredDivId r (image f c)
 
 -----------------------------------------------------------------
 ------------------ Bibliography Printing ------------------------

diff --git a/code/stable/dblpend/SRS/mdBook/src/SecPhysSyst.md b/code/stable/dblpend/SRS/mdBook/src/SecPhysSyst.md
diff --git a/code/stable/dblpend/SRS/mdBook/src/SecSysContext.md b/code/stable/dblpend/SRS/mdBook/src/SecSysContext.md
diff --git a/code/stable/dblpend/SRS/mdBook/src/SecTraceMatrices.md b/code/stable/dblpend/SRS/mdBook/src/SecTraceMatrices.md
diff --git a/code/stable/gamephysics/SRS/mdBook/src/SecSysContext.md b/code/stable/gamephysics/SRS/mdBook/src/SecSysContext.md
diff --git a/code/stable/gamephysics/SRS/mdBook/src/SecTraceMatrices.md b/code/stable/gamephysics/SRS/mdBook/src/SecTraceMatrices.md
diff --git a/code/stable/glassbr/SRS/mdBook/src/SecAppendix.md b/code/stable/glassbr/SRS/mdBook/src/SecAppendix.md
diff --git a/code/stable/glassbr/SRS/mdBook/src/SecPhysSyst.md b/code/stable/glassbr/SRS/mdBook/src/SecPhysSyst.md
diff --git a/code/stable/glassbr/SRS/mdBook/src/SecSysContext.md b/code/stable/glassbr/SRS/mdBook/src/SecSysContext.md
diff --git a/code/stable/glassbr/SRS/mdBook/src/SecTraceMatrices.md b/code/stable/glassbr/SRS/mdBook/src/SecTraceMatrices.md
diff --git a/code/stable/pdcontroller/SRS/mdBook/src/SecPhysSyst.md b/code/stable/pdcontroller/SRS/mdBook/src/SecPhysSyst.md
diff --git a/code/stable/pdcontroller/SRS/mdBook/src/SecSysContext.md b/code/stable/pdcontroller/SRS/mdBook/src/SecSysContext.md