From cef781f44be4c44d1deabfbf74a78bb63cfdc969 Mon Sep 17 00:00:00 2001 From: cyfraeviolae Date: Sat, 29 May 2021 22:27:28 -0400 Subject: Generalize Le/Lt to support multiple addends --- app/Web.hs | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) (limited to 'app') diff --git a/app/Web.hs b/app/Web.hs index 60b3120..7bc233b 100644 --- a/app/Web.hs +++ b/app/Web.hs @@ -160,35 +160,32 @@ instance ToHtml HomeView where span_ " and variable " code_ "x" span_ ", the following are terms:" - ul_ $ do - li_ $ span_ [class_ "theorem"] "c" - li_ $ span_ [class_ "theorem"] "x" - p_ $ span_ "The following are addends:" ul_ $ do li_ $ span_ [class_ "theorem"] "c" li_ $ span_ [class_ "theorem"] "x" li_ $ span_ [class_ "theorem"] "cx" + p_ $ span_ "The following are relations:" + ul_ $ do + li_ $ span_ [class_ "theorem"] "=" + li_ $ span_ [class_ "theorem"] "!=" + li_ $ span_ [class_ "theorem"] "<=" + li_ $ span_ [class_ "theorem"] "<" + li_ $ span_ [class_ "theorem"] ">=" + li_ $ span_ [class_ "theorem"] ">" p_ $ do - span_ "For addends " + span_ "For terms " code_ "a" span_ " and " code_ "b" - span_ ", terms " - code_ "t" - span_ " and " - code_ "r" + span_ ", relation " + code_ "★" span_ ", and theorems " code_ "φ" span_ " and " code_ "ψ" span_ ", the following are theorems:" ul_ $ do - li_ $ span_ [class_ "theorem"] "a+...=b+..." - li_ $ span_ [class_ "theorem"] "a+...!=b+..." - li_ $ span_ [class_ "theorem"] "t<=r" - li_ $ span_ [class_ "theorem"] "t=r" - li_ $ span_ [class_ "theorem"] "t>r" + li_ $ span_ [class_ "theorem"] "a+...★b+..." li_ $ span_ [class_ "theorem"] "(φ & ψ & ...)" li_ $ span_ [class_ "theorem"] "(φ | ψ | ...)" li_ $ span_ [class_ "theorem"] "(φ -> ψ)" @@ -217,6 +214,3 @@ pageTemplate crumbs body = doctypehtml_ $ do a_ [href_ (homeURI Nothing), class_ "title"] (strong_ "Sumcheck") span_ "@" a_ [href_ "https://cyfraeviolae.org"] "cyfraeviolae.org" - -tshow :: Show a => a -> T.Text -tshow = T.pack . show -- cgit v1.2.3