app/Main.hs

@@ -63,7 +63,7 @@ app = serve (Proxy :: Proxy API) server
 type API =
   "utf8" :> Capture "bytes" Text :> Get '[PlainText, HTML] Utf8Model
   :<|> "codepoints" :> Capture "codepoints" Text :> Get '[PlainText, HTML] CodepointsModel
-  :<|> "text" :> Capture "text" Text :> Get '[PlainText, HTML] TextModel
+  :<|> "text" :> Capture "text" Text :> Get '[HTML] TextModel
 
 server :: Server API
 server =
@@ -102,7 +102,7 @@ instance MimeRender PlainText Utf8Model where
             Right c ->
               [ Text.pack [c]
               , Text.pack $ printf "U+%04X" c
-              , Text.pack $ intercalate ", " $ allNames c
+              , Text.pack $ intercalate ", " $ maybeToList (UnicodeNames.name c) ++ map (++ "*") (UnicodeNames.nameAliases c)
               , Text.pack $ fromMaybe "" $ blockName c
               ]
           )
@@ -121,7 +121,7 @@ instance MimeRender HTML Utf8Model where
           Right c -> do
             H.td $ H.input ! A.class_ "charbox" ! A.value (H.toValue [c])
             H.td $ H.code $ printfHtml "U+%04X" c
-            H.td $ H.code $ H.toHtml $ intercalate ", " $ allNames c
+            H.td $ H.code $ H.toHtml $ intercalate ", " $ maybeToList (UnicodeNames.name c) ++ map (++ "*") (UnicodeNames.nameAliases c)
             H.td $ H.code $ H.toHtml $ fromMaybe "" $ blockName c
 
 -- /codepoints/<codepoints>
@@ -159,7 +159,7 @@ instance MimeRender PlainText CodepointsModel where
         Right c ->
           [ Text.pack [c]
           , Text.pack $ printf "U+%04X" c
-          , Text.pack $ intercalate ", " $ allNames c
+          , Text.pack $ intercalate ", " $ maybeToList (UnicodeNames.name c) ++ map (++ "*") (UnicodeNames.nameAliases c)
           , Text.pack $ fromMaybe "" $ blockName c
           ]
       )
@@ -177,7 +177,7 @@ instance MimeRender HTML CodepointsModel where
           Right c -> do
             H.td $ H.input ! A.class_ "charbox" ! A.value (H.toValue [c])
             H.td $ H.code $ printfHtml "U+%04X" c
-            H.td $ H.code $ H.toHtml $ intercalate ", " $ allNames c
+            H.td $ H.code $ H.toHtml $ intercalate ", " $ maybeToList (UnicodeNames.name c) ++ map (++ "*") (UnicodeNames.nameAliases c)
             H.td $ H.code $ H.toHtml $ fromMaybe "" $ blockName c
 
 -- /text/<text>
@@ -192,21 +192,9 @@ instance MimeRender HTML TextModel where
       H.tr $ do
         H.td $ H.input ! A.class_ "charbox" ! A.value (H.toValue [c])
         H.td $ H.code $ printfHtml "U+%04X" c
-        H.td $ H.code $ H.toHtml $ intercalate ", " $ allNames c
+        H.td $ H.code $ H.toHtml $ intercalate ", " $ maybeToList (UnicodeNames.name c) ++ map (++ "*") (UnicodeNames.nameAliases c)
         H.td $ H.code $ H.toHtml $ fromMaybe "" $ blockName c
 
-instance MimeRender PlainText TextModel where
-  mimeRender _ model = renderText $ Table.render "  "
-    [ map (Table.cl)
-      [ Text.pack [c]
-      , Text.pack $ printf "U+%04X" c
-      , Text.pack $ intercalate ", " $ allNames c
-      , Text.pack $ fromMaybe "" $ blockName c
-      ]
-    | c <- Text.unpack model.text
-    ]
-
-
 -- Utilities
 
 renderText :: Text -> BL.ByteString
@@ -218,12 +206,6 @@ showByteHex = printf "      %02X"
 showByteBin :: Word8 -> String
 showByteBin = printf "%08b"
 
--- | Retrieve name and aliases (suffixed with @*@) of a 'Char'.
-allNames :: Char -> [String]
-allNames c =
-  maybeToList (UnicodeNames.name c)
-  ++ map (++ "*") (UnicodeNames.nameAliases c)
-
 blockName :: Char -> Maybe String
 blockName c = UnicodeBlocks.blockName . UnicodeBlocks.blockDefinition <$> UnicodeBlocks.block c
 

src/UToy/Table.hs

@@ -17,7 +17,7 @@ cr :: Text -> Cell
 cr = C AlignRight
 
 render :: Text -> [[Cell]] -> Text
-render delim cells = Text.unlines $ map showRow cells
+render delim cells = Text.intercalate "\n" $ map showRow cells
   where
     showRow = Text.intercalate delim . map showCell . zipLongest columnWidths