X-Git-Url: http://git.megacz.com/?p=wix.git;a=blobdiff_plain;f=src%2FDoc.scala;h=3eca3a5c1aedd7232c734f514e427d5e490a29bb;hp=1a6d322008d595d2302809d5617743713d363dee;hb=HEAD;hpb=d130478a35696e78eb2fd6e55b09e6885a9c2a23

diff --git a/src/Doc.scala b/src/Doc.scala
index 1a6d322..3eca3a5 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))
@@ -290,6 +291,8 @@ abstract class Text extends ToHtml
         case "nu"      =>     "&#x03Bd;"
         case "pi"      =>     "&#x03c0;"
         case "rho"     =>     "&#x03c1;"
+//25a1
+        case "Box"     =>     "&#x20de;"
         // TO DO: integrate stixfonts stuff
         case "cent"    =>     "&#189;"
         case "euro"    =>     "&#8364;"
@@ -338,6 +341,7 @@ abstract class Glyph extends ToHtml
   case object CircleC extends Glyph { override def toHtml = "&#174;" }
   case object TradeMark extends Glyph { override def toHtml = "&#8482;" }
   case object ServiceMark extends Glyph { override def toHtml = "&#8482;" }
+  case object Endash extends Glyph { override def toHtml = "&ndash;" }
   case object Emdash extends Glyph { override def toHtml = "&mdash;" }
   case object Ellipsis extends Glyph { override def toHtml = "&#0133;"  /* &cdots;? */ }
   case object Cent extends Glyph { override def toHtml = "&#189;" }