@@ -1,3 +1,3 @@
-htmlgen 48d80e10b46e365a90e0850def000eb96a70a961
-draft 4ba4e9c2c04b7680ac2a56b65c241ec10c427c3f
-b14728a927933621a1b672b5ef1b11b51028392d  htmlgen.patch
+htmlgen 9c905f8066fb4552eb2094653328fa93964c20ac
+draft 1f1b97852aa23f0948511f56b7c0a39d04fe35e5
+641685c492f33df18ba911a592c06acdd91a1517  htmlgen.patch
@@ -1,6 +1,6 @@
-From 930c81fc41ab216427ca3357f00e25487ea8af28 Mon Sep 17 00:00:00 2001
+From e0f3f9cd912388b97561e3b4d689de5231b137ef Mon Sep 17 00:00:00 2001
 From: timsong-cpp <rs2740@gmail.com>
-Date: Thu, 26 Oct 2017 16:16:40 -0400
+Date: Mon, 9 Apr 2018 17:09:31 -0400
 Subject: [PATCH] Hacks for cxxdraft-htmlgen
 
 ---
@@ -9,7 +9,8 @@ Subject: [PATCH] Hacks for cxxdraft-htmlgen
  intro.tex      |  6 ++---
  macros.tex     |  8 +++----
  statements.tex | 69 ++++++++++++++++++++++++++--------------------------------
- 5 files changed, 38 insertions(+), 50 deletions(-)
+ utilities.tex  | 12 +++++-----
+ 6 files changed, 44 insertions(+), 56 deletions(-)
 
 diff --git a/concepts.tex b/concepts.tex
 index c389226..24af097 100644
@@ -212,6 +213,64 @@ index 4329d5b..7126163 100644
  or \tcode{constexpr}. The \grammarterm{decl-specifier-seq} shall not define a
  class or enumeration.
 -\end{quote}
+diff --git a/utilities.tex b/utilities.tex
+index b608a28..c6374bd 100644
+--- a/utilities.tex
++++ b/utilities.tex
+@@ -242,7 +242,7 @@ struct equal_to {
+ 
+ \begin{itemdescr}
+ \pnum
+-\tcode{operator()} has effects equivalent to: \tcode{return equal_to<>{}(x, y);}
++\tcode{operator()} has effects equivalent to: \tcode{return equal_to<>@\{\}@(x, y);}
+ \end{itemdescr}
+ 
+ \indexlibrary{\idxcode{not_equal_to}}%
+@@ -256,7 +256,7 @@ struct not_equal_to {
+ 
+ \begin{itemdescr}
+ \pnum
+-\tcode{operator()} has effects equivalent to: \tcode{return !equal_to<>{}(x, y);}
++\tcode{operator()} has effects equivalent to: \tcode{return !equal_to<>@\{\}@(x, y);}
+ \end{itemdescr}
+ 
+ \indexlibrary{\idxcode{greater}}%
+@@ -270,7 +270,7 @@ struct greater {
+ 
+ \begin{itemdescr}
+ \pnum
+-\tcode{operator()} has effects equivalent to: \tcode{return less<>{}(y, x);}
++\tcode{operator()} has effects equivalent to: \tcode{return less<>@\{\}@(y, x);}
+ \end{itemdescr}
+ 
+ \indexlibrary{\idxcode{less}}%
+@@ -284,7 +284,7 @@ struct less {
+ 
+ \begin{itemdescr}
+ \pnum
+-\tcode{operator()} has effects equivalent to: \tcode{return less<>{}(x, y);}
++\tcode{operator()} has effects equivalent to: \tcode{return less<>@\{\}@(x, y);}
+ \end{itemdescr}
+ 
+ \indexlibrary{\idxcode{greater_equal}}%
+@@ -298,7 +298,7 @@ struct greater_equal {
+ 
+ \begin{itemdescr}
+ \pnum
+-\tcode{operator()} has effects equivalent to: \tcode{return !less<>{}(x, y);}
++\tcode{operator()} has effects equivalent to: \tcode{return !less<>@\{\}@(x, y);}
+ \end{itemdescr}
+ 
+ \indexlibrary{\idxcode{less_equal}}%
+@@ -312,7 +312,7 @@ struct less_equal {
+ 
+ \begin{itemdescr}
+ \pnum
+-\tcode{operator()} has effects equivalent to: \tcode{return !less<>{}(y, x);}
++\tcode{operator()} has effects equivalent to: \tcode{return !less<>@\{\}@(y, x);}
+ \end{itemdescr}
+ 
+ \indexlibrary{\idxcode{equal_to<>}}%
 -- 
 2.7.4