Use \$ instead of just $ in lambda expressions.

This prevents vim's syntax highlighting from screwing up.

diff --git a/Chapters/Normalization.tex b/Chapters/Normalization.tex
index 0f6d0eb23ecdff6c32920ee5b4ea20b6ee67ec68..e2f3a968dec9a656c8970f2439375e6ec7868302 100644 (file)
--- a/Chapters/Normalization.tex
+++ b/Chapters/Normalization.tex
@@ -958,12 +958,12 @@
 
         \startbuffer[from]
         (+) :: Word -> Word -> Word
 
         \startbuffer[from]
         (+) :: Word -> Word -> Word

-        (+) = GHC.Num.(+) @Word $dNum
+        (+) = GHC.Num.(+) @Word \$dNum

         ~
         (+) a b
         \stopbuffer
         \startbuffer[to]
         ~
         (+) a b
         \stopbuffer
         \startbuffer[to]

-        GHC.Num.(+) @ Alu.Word $dNum a b
+        GHC.Num.(+) @ Alu.Word \$dNum a b

         \stopbuffer
 
         \transexample{toplevelinline}{Top level binding inlining}{from}{to}
         \stopbuffer
 
         \transexample{toplevelinline}{Top level binding inlining}{from}{to}

diff --git a/Chapters/Prototype.tex b/Chapters/Prototype.tex
index ac4cc93e29023e8d319b54537cfa2a0f45eb968f..139b93e56be69f2637efcffc785935e95bb77b9c 100644 (file)
--- a/Chapters/Prototype.tex
+++ b/Chapters/Prototype.tex
@@ -666,12 +666,12 @@
         instance declaration. This dictionary, as well as the binder
         introduced by a lambda that introduces a dictionary, have the
         predicate type as their type. These binders are usually named starting
         instance declaration. This dictionary, as well as the binder
         introduced by a lambda that introduces a dictionary, have the
         predicate type as their type. These binders are usually named starting

-        with a \lam{$}. Usually the name of the type concerned is not
+        with a \lam{\$}. Usually the name of the type concerned is not

         reflected in the name of the dictionary, but the name of the type
         class is. The Haskell expression \hs{show True} thus becomes:
 
         \startlambda
         reflected in the name of the dictionary, but the name of the type
         class is. The Haskell expression \hs{show True} thus becomes:
 
         \startlambda

-        show @Bool $dShow True
+        show @Bool \$dShow True

         \stoplambda
       \stopdesc
 
         \stoplambda
       \stopdesc
 

diff --git a/Utils/Shortcuts.tex b/Utils/Shortcuts.tex
index f7def7331819f50b200130d580cd9687cc02ab0b..5c46d3709e567227be9668978d1969dc70ee66bb 100644 (file)
--- a/Utils/Shortcuts.tex
+++ b/Utils/Shortcuts.tex
@@ -33,4 +33,7 @@
 \def\VHDL{\small{VHDL}\autoinsertnextspace}
 \def\GHC{\small{GHC}\autoinsertnextspace}
 
 \def\VHDL{\small{VHDL}\autoinsertnextspace}
 \def\GHC{\small{GHC}\autoinsertnextspace}
 

+% TODO: Use this instead of $ to fool syntax highlighting
+\def\${\char36}
+

 % vim: set sw=2 sts=2 expandtab:
 % vim: set sw=2 sts=2 expandtab:

diff --git a/pret-lam.lua b/pret-lam.lua
index ba3829c2a7bc77fdc50f63bbbc3b1cde67788eeb..d44c5b3933b1302d60a8d9bd19d484dc43c4a6f2 100644 (file)
--- a/pret-lam.lua
+++ b/pret-lam.lua
@@ -28,7 +28,6 @@ local symbols = {
     ['*'] = {repr = '\\ast'},
     ['~'] = {repr = '\\HDLine[width=.20 * \\the\\textwidth]'},
     ['|'] = {repr = '\\char' .. utf.byte('|')},
     ['*'] = {repr = '\\ast'},
     ['~'] = {repr = '\\HDLine[width=.20 * \\the\\textwidth]'},
     ['|'] = {repr = '\\char' .. utf.byte('|')},

-    ['$'] = {repr = '\\char' .. utf.byte('$')},

     -- Use ▶ from our roman font, since Iwona doesn't have the glyph
     ['▶'] = {repr = '{\\rm{}▶}'},
 }
     -- Use ▶ from our roman font, since Iwona doesn't have the glyph
     ['▶'] = {repr = '{\\rm{}▶}'},
 }