From cb848b5425d038494bffb361e7f99e4996599723 Mon Sep 17 00:00:00 2001 From: Adam Megacz Date: Sun, 23 Jan 2011 17:57:40 -0800 Subject: [PATCH] fix emdash/endash confusion --- src/Doc.scala | 4 +++- src/wix.g | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Doc.scala b/src/Doc.scala index 1a6d322..7912eb3 100644 --- a/src/Doc.scala +++ b/src/Doc.scala @@ -52,7 +52,8 @@ object Doc { case Tree("(r)", _ ,_) => Seq(new GlyphText(CircleR)) case Tree("(c)", _ ,_) => Seq(new GlyphText(CircleC)) case Tree("(tm)", _ ,_) => Seq(new GlyphText(TradeMark)) - case Tree("--", _ ,_) => Seq(new GlyphText(Emdash)) + case Tree("--", _ ,_) => Seq(new GlyphText(Endash)) + case Tree("---", _ ,_) => Seq(new GlyphText(Emdash)) case Tree("<-", _ ,_) => Seq(new GlyphText(LeftArrow)) case Tree("<=", _ ,_) => Seq(new GlyphText(DoubleLeftArrow)) case Tree("=>", _ ,_) => Seq(new GlyphText(DoubleRightArrow)) @@ -338,6 +339,7 @@ abstract class Glyph extends ToHtml case object CircleC extends Glyph { override def toHtml = "®" } case object TradeMark extends Glyph { override def toHtml = "™" } case object ServiceMark extends Glyph { override def toHtml = "™" } + case object Endash extends Glyph { override def toHtml = "–" } case object Emdash extends Glyph { override def toHtml = "—" } case object Ellipsis extends Glyph { override def toHtml = "…" /* &cdots;? */ } case object Cent extends Glyph { override def toHtml = "½" } diff --git a/src/wix.g b/src/wix.g index 003cd36..348ce40 100644 --- a/src/wix.g +++ b/src/wix.g @@ -92,7 +92,7 @@ styled = Underline:: "__" Text "__" | Keyword:: "!" Atom | Italic:: "**" (Text & ((~[\*]! | "*" -> ~[\*])*)) "**" -glyph = ^"(e)" | ^"(r)" | ^"(c)" | ^"(tm)" | ^"--" +glyph = ^"(e)" | ^"(r)" | ^"(c)" | ^"(tm)" | ^"--" | ^"---" | ^"..." | ^"<-" | ^"<=" | ^"=>" | ^"<->" | ^"<=>" | ^"<-" | ^"^o" // ^"->" -- 1.7.10.4