diff --git a/code/drasil-printers/Language/Drasil/HTML/Print.hs b/code/drasil-printers/Language/Drasil/HTML/Print.hs index 278789cee3..b03aec786a 100644 --- a/code/drasil-printers/Language/Drasil/HTML/Print.hs +++ b/code/drasil-printers/Language/Drasil/HTML/Print.hs @@ -150,7 +150,7 @@ uSymb (L.US ls) = formatu t b pExpr :: Expr -> Doc pExpr (Dbl d) = text $ showEFloat Nothing d "" pExpr (Int i) = text $ show i -pExpr (Str s) = text s +pExpr (Str s) = text $ """ ++ s ++ """ pExpr (Div a b) = fraction (pExpr a) (pExpr b) pExpr (Case ps) = cases ps pExpr pExpr (Mtx a) = text "\n" <> pMatrix a <> text "
" diff --git a/code/drasil-printers/Language/Drasil/TeX/Print.hs b/code/drasil-printers/Language/Drasil/TeX/Print.hs index 152699e6cb..0b8f799410 100644 --- a/code/drasil-printers/Language/Drasil/TeX/Print.hs +++ b/code/drasil-printers/Language/Drasil/TeX/Print.hs @@ -99,26 +99,26 @@ data OpenClose = Open | Close ----------------------------------------------------------------- -- (Since this is all implicitly in Math, leave it as String for now) pExpr :: Expr -> String -pExpr (Dbl d) = showEFloat Nothing d "" -pExpr (Int i) = show i -pExpr (Str s) = s -- FIXME this is probably the wrong way to print strings -pExpr (Div n d) = "\\frac{" ++ pExpr n ++ "}{" ++ pExpr d ++"}" -pExpr (Case ps) = "\\begin{cases}\n" ++ cases ps ++ "\n\\end{cases}" -pExpr (Mtx a) = "\\begin{bmatrix}\n" ++ pMatrix a ++ "\n\\end{bmatrix}" -pExpr (Row [x]) = brace $ pExpr x -- a bit of a hack... -pExpr (Row l) = concatMap pExpr l -pExpr (Ident s) = s -pExpr (Spec s) = unPL $ L.special s ---pExpr (Gr g) = unPL $ greek g -pExpr (Sub e) = "_" ++ brace (pExpr e) -pExpr (Sup e) = "^" ++ brace (pExpr e) -pExpr (Over Hat s) = "\\hat{" ++ pExpr s ++ "}" -pExpr (MO o) = pOps o -pExpr (Fenced l r m) = fence Open l ++ pExpr m ++ fence Close r -pExpr (Font Bold e) = "\\mathbf{" ++ pExpr e ++ "}" -pExpr (Font Emph e) = pExpr e -- Emph is ignored here because we're in Math mode -pExpr (Spc Thin) = "\\," -pExpr (Sqrt e) = "\\sqrt{" ++ pExpr e ++ "}" +pExpr (Dbl d) = showEFloat Nothing d "" +pExpr (Int i) = show i +pExpr (Str s) = "\\text{``" ++ s ++ "\"}" +pExpr (Div n d) = "\\frac{" ++ pExpr n ++ "}{" ++ pExpr d ++"}" +pExpr (Case ps) = "\\begin{cases}\n" ++ cases ps ++ "\n\\end{cases}" +pExpr (Mtx a) = "\\begin{bmatrix}\n" ++ pMatrix a ++ "\n\\end{bmatrix}" +pExpr (Row [x]) = brace $ pExpr x -- a bit of a hack... +pExpr (Row l) = concatMap pExpr l +pExpr (Ident s) = s +pExpr (Spec s) = unPL $ L.special s +--pExpr (Gr g) = unPL $ greek g +pExpr (Sub e) = "_" ++ brace (pExpr e) +pExpr (Sup e) = "^" ++ brace (pExpr e) +pExpr (Over Hat s) = "\\hat{" ++ pExpr s ++ "}" +pExpr (MO o) = pOps o +pExpr (Fenced l r m) = fence Open l ++ pExpr m ++ fence Close r +pExpr (Font Bold e) = "\\mathbf{" ++ pExpr e ++ "}" +pExpr (Font Emph e) = pExpr e -- Emph is ignored here because we're in Math mode +pExpr (Spc Thin) = "\\," +pExpr (Sqrt e) = "\\sqrt{" ++ pExpr e ++ "}" pOps :: Ops -> String pOps IsIn = "\\in{}" diff --git a/code/stable/glassbr/SRS/GlassBR_SRS.tex b/code/stable/glassbr/SRS/GlassBR_SRS.tex index b9a58be73f..29c5b5f491 100644 --- a/code/stable/glassbr/SRS/GlassBR_SRS.tex +++ b/code/stable/glassbr/SRS/GlassBR_SRS.tex @@ -547,7 +547,7 @@ \subsubsection{Data Definitions} Units & Unitless \\ \midrule \\ Equation & \begin{displaymath} - J=interpZ\left(SDF.txt,AR,\hat{q}\right) + J=interpZ\left(\text{``SDF.txt"},AR,\hat{q}\right) \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} @@ -619,9 +619,9 @@ \subsubsection{Data Definitions} \\ \midrule \\ Equation & \begin{displaymath} GTF=\begin{cases} -1, & g=AN\\ -4, & g=FT\\ -2, & g=HS +1, & g=\text{``AN"}\\ +4, & g=\text{``FT"}\\ +2, & g=\text{``HS"} \end{cases} \end{displaymath} \\ \midrule \\ @@ -694,7 +694,7 @@ \subsubsection{Data Definitions} Units & Unitless \\ \midrule \\ Equation & \begin{displaymath} - {\hat{q}_{tol}}=interpY\left(SDF.txt,AR,{J_{tol}}\right) + {\hat{q}_{tol}}=interpY\left(\text{``SDF.txt"},AR,{J_{tol}}\right) \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} @@ -923,7 +923,7 @@ \subsubsection{Data Definitions} Units & Pa \\ \midrule \\ Equation & \begin{displaymath} - q=interpY\left(TSD.txt,SD,{w_{TNT}}\right) + q=interpY\left(\text{``TSD.txt"},SD,{w_{TNT}}\right) \end{displaymath} \\ \midrule \\ Description & \begin{symbDescription} diff --git a/code/stable/glassbr/Website/GlassBR_SRS.html b/code/stable/glassbr/Website/GlassBR_SRS.html index 97d7685c9c..24e7fb9ee8 100644 --- a/code/stable/glassbr/Website/GlassBR_SRS.html +++ b/code/stable/glassbr/Website/GlassBR_SRS.html @@ -1132,7 +1132,7 @@

Data Definitions

Equation
- J = interpZ(SDF.txt,AR,q̂) + J = interpZ("SDF.txt",AR,q̂)
@@ -1266,9 +1266,9 @@

Data Definitions

GTF = {
- 1 , g = AN - 4 , g = FT - 2 , g = HS + 1 , g = "AN" + 4 , g = "FT" + 2 , g = "HS"
@@ -1402,7 +1402,7 @@

Data Definitions

Equation
- tol = interpY(SDF.txt,AR,Jtol) + tol = interpY("SDF.txt",AR,Jtol)
@@ -1821,7 +1821,7 @@

Data Definitions

Equation
- q = interpY(TSD.txt,SD,wTNT) + q = interpY("TSD.txt",SD,wTNT)
diff --git a/code/stable/projectile/SRS/Projectile_SRS.tex b/code/stable/projectile/SRS/Projectile_SRS.tex index 05db65431b..62555cab2c 100644 --- a/code/stable/projectile/SRS/Projectile_SRS.tex +++ b/code/stable/projectile/SRS/Projectile_SRS.tex @@ -777,9 +777,9 @@ \subsubsection{Instance Models} \\ \midrule \\ Equation & \begin{displaymath} s=\begin{cases} -The target was hit., & |\frac{{d_{offset}}}{{p_{target}}}|<ε\\ -The projectile fell short., & {d_{offset}}<0\\ -The projectile went long., & {d_{offset}}>0 +\text{``The target was hit."}, & |\frac{{d_{offset}}}{{p_{target}}}|<ε\\ +\text{``The projectile fell short."}, & {d_{offset}}<0\\ +\text{``The projectile went long."}, & {d_{offset}}>0 \end{cases} \end{displaymath} \\ \midrule \\ diff --git a/code/stable/projectile/Website/Projectile_SRS.html b/code/stable/projectile/Website/Projectile_SRS.html index 9c579742ff..946fe841f2 100644 --- a/code/stable/projectile/Website/Projectile_SRS.html +++ b/code/stable/projectile/Website/Projectile_SRS.html @@ -1541,26 +1541,26 @@

Instance Models

s = {
- The target was hit. , - |
- - doffset - - - ptarget - -
| < ε -
+ "The target was hit." , + |
+ + doffset + + + ptarget + +
| < ε +
- The projectile fell short. , - doffset < 0 - + "The projectile fell short." , + doffset < 0 + - The projectile went long. , - doffset > 0 - + "The projectile went long." , + doffset > 0 +