From 3aba09659885ef61c13da9af3056ea084ac36c42 Mon Sep 17 00:00:00 2001 From: Rhiannon Morris Date: Wed, 28 Apr 2021 12:34:32 +0200 Subject: [PATCH] use .ipa on gloss pronunciation --- langfilter/langfilter.hs | 20 ++++++++++---------- style/page.css | 4 ---- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/langfilter/langfilter.hs b/langfilter/langfilter.hs index 3fade8e..0772f75 100644 --- a/langfilter/langfilter.hs +++ b/langfilter/langfilter.hs @@ -52,6 +52,10 @@ glosses = \case [RawBlock (Format "html") ""] b -> [b] +pattern Gloss l g w t = BulletList [[Plain l], [Plain g], [Plain w], [Plain t]] +pattern PGloss l p g w t = + BulletList [[Plain l], [Plain p], [Plain g], [Plain w], [Plain t]] + glossTable :: Block -> Maybe Block glossTable = \case Gloss l s g t -> Just $ make l Nothing s g t @@ -68,16 +72,16 @@ glossTable = \case Table ("", ["gloss"], []) (Caption Nothing []) colspecs (TableHead mempty []) [TableBody mempty (RowHeadColumns 0) [] $ concat - [[row "gloss-lang" [l']], - maybe [] (pure . row "gloss-pron" . pure) p', - [row "gloss-split" ss], - [row "gloss-gloss" gs], - [row "gloss-trans" [t']]]] + [[row ["gloss-lang", "lang"] [l']], + maybe [] (pure . row ["gloss-pron", "ipa"] . pure) p', + [row ["gloss-split", "lang"] ss], + [row ["gloss-gloss"] gs], + [row ["gloss-trans"] [t']]]] (TableFoot mempty []) cell is = Cell mempty AlignDefault (RowSpan 1) (ColSpan 1) [Plain is] cell1 n is = Cell mempty AlignDefault (RowSpan 1) (ColSpan n) [Plain is] cells = map (cell . concatMap abbrs) . splitInlines - row c = Row ("", [c], []) + row c = Row ("", c, []) endash :: Text -> Text endash = Text.map \case '-' -> '–'; '_' -> ' '; c -> c @@ -102,10 +106,6 @@ splitInlines is = filter (not . null) $ go is where let (is1, is') = break (== Space) is in fromList is1 : splitInlines (dropWhile (== Space) is') -pattern Gloss l g w t = BulletList [[Plain l], [Plain g], [Plain w], [Plain t]] -pattern PGloss l p g w t = - BulletList [[Plain l], [Plain p], [Plain g], [Plain w], [Plain t]] - makeFigures :: Block -> [Block] makeFigures (Div ("", ["figure"], []) blks) = diff --git a/style/page.css b/style/page.css index 12e0cb8..d3d8820 100644 --- a/style/page.css +++ b/style/page.css @@ -164,10 +164,6 @@ figure table { border: none; text-align: left; } -.gloss-lang, .gloss-pron, .gloss-split { - font-family: var(--ipa-font); - line-height: 115%; -} figure ul { text-align: left;