From 28b087364ee570fae88822d07469d98c5402059d Mon Sep 17 00:00:00 2001
From: Frank Dellaert <dellaert@gmail.com>
Date: Sun, 9 Jan 2022 16:38:05 -0500
Subject: [PATCH 1/3] Bump version

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 21d8d1b60..d040f9e82 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ endif()
 set (GTSAM_VERSION_MAJOR 4)
 set (GTSAM_VERSION_MINOR 2)
 set (GTSAM_VERSION_PATCH 0)
-set (GTSAM_PRERELEASE_VERSION "a1")
+set (GTSAM_PRERELEASE_VERSION "a2")
 math (EXPR GTSAM_VERSION_NUMERIC "10000 * ${GTSAM_VERSION_MAJOR} + 100 * ${GTSAM_VERSION_MINOR} + ${GTSAM_VERSION_PATCH}")
 
 if (${GTSAM_VERSION_PATCH} EQUAL 0)

From f76cb6d1f3add2de1c2b0764a1bd91aeff6eaf9f Mon Sep 17 00:00:00 2001
From: Frank Dellaert <dellaert@gmail.com>
Date: Sun, 9 Jan 2022 15:59:40 -0500
Subject: [PATCH 2/3] Fix failing test

---
 gtsam_unstable/discrete/tests/testLoopyBelief.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gtsam_unstable/discrete/tests/testLoopyBelief.cpp b/gtsam_unstable/discrete/tests/testLoopyBelief.cpp
index 6561949b1..eac0d834e 100644
--- a/gtsam_unstable/discrete/tests/testLoopyBelief.cpp
+++ b/gtsam_unstable/discrete/tests/testLoopyBelief.cpp
@@ -8,6 +8,7 @@
 #include <CppUnitLite/TestHarness.h>
 #include <gtsam/discrete/DecisionTreeFactor.h>
 #include <gtsam/discrete/DiscreteFactorGraph.h>
+#include <gtsam/discrete/DiscreteConditional.h>
 #include <gtsam/inference/VariableIndex.h>
 
 #include <boost/assign/list_of.hpp>

From f1f3c04c2e8ac19648066819e97082f129588500 Mon Sep 17 00:00:00 2001
From: Frank Dellaert <dellaert@gmail.com>
Date: Sun, 9 Jan 2022 17:00:41 -0500
Subject: [PATCH 3/3] Fix single quotes

---
 gtsam/discrete/DecisionTreeFactor.cpp       | 2 +-
 gtsam/discrete/DiscreteConditional.cpp      | 2 +-
 gtsam/discrete/DiscreteValues.cpp           | 4 ++--
 gtsam/discrete/tests/testDiscreteValues.cpp | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gtsam/discrete/DecisionTreeFactor.cpp b/gtsam/discrete/DecisionTreeFactor.cpp
index c50811a50..ad4cbad43 100644
--- a/gtsam/discrete/DecisionTreeFactor.cpp
+++ b/gtsam/discrete/DecisionTreeFactor.cpp
@@ -226,7 +226,7 @@ namespace gtsam {
     stringstream ss;
 
     // Print out preamble.
-    ss << "<div>\n<table class=\'DecisionTreeFactor\'>\n  <thead>\n";
+    ss << "<div>\n<table class='DecisionTreeFactor'>\n  <thead>\n";
 
     // Print out header row.
     ss << "    <tr>";
diff --git a/gtsam/discrete/DiscreteConditional.cpp b/gtsam/discrete/DiscreteConditional.cpp
index 82018abea..0bdc7d7b5 100644
--- a/gtsam/discrete/DiscreteConditional.cpp
+++ b/gtsam/discrete/DiscreteConditional.cpp
@@ -396,7 +396,7 @@ string DiscreteConditional::html(const KeyFormatter& keyFormatter,
   }
 
   // Print out preamble.
-  ss << "<table class=\'DiscreteConditional\'>\n  <thead>\n";
+  ss << "<table class='DiscreteConditional'>\n  <thead>\n";
 
   // Print out header row.
   ss << "    <tr>";
diff --git a/gtsam/discrete/DiscreteValues.cpp b/gtsam/discrete/DiscreteValues.cpp
index 8a09de742..5d0c8dd3d 100644
--- a/gtsam/discrete/DiscreteValues.cpp
+++ b/gtsam/discrete/DiscreteValues.cpp
@@ -65,7 +65,7 @@ string DiscreteValues::html(const KeyFormatter& keyFormatter,
   stringstream ss;
 
   // Print out preamble.
-  ss << "<div>\n<table class=\'DiscreteValues\'>\n  <thead>\n";
+  ss << "<div>\n<table class='DiscreteValues'>\n  <thead>\n";
 
   // Print out header row.
   ss << "    <tr><th>Variable</th><th>value</th></tr>\n";
@@ -76,7 +76,7 @@ string DiscreteValues::html(const KeyFormatter& keyFormatter,
   // Print out all rows.
   for (const auto& kv : *this) {
     ss << "    <tr>";
-    ss << "<th>" << keyFormatter(kv.first) << "</th><td>\'"
+    ss << "<th>" << keyFormatter(kv.first) << "</th><td>"
        << Translate(names, kv.first, kv.second) << "</td>";
     ss << "</tr>\n";
   }
diff --git a/gtsam/discrete/tests/testDiscreteValues.cpp b/gtsam/discrete/tests/testDiscreteValues.cpp
index 5e7c0ac6f..c8a1fa168 100644
--- a/gtsam/discrete/tests/testDiscreteValues.cpp
+++ b/gtsam/discrete/tests/testDiscreteValues.cpp
@@ -57,8 +57,8 @@ TEST(DiscreteValues, htmlWithValueFormatter) {
       "    <tr><th>Variable</th><th>value</th></tr>\n"
       "  </thead>\n"
       "  <tbody>\n"
-      "    <tr><th>B</th><td>'-</td></tr>\n"
-      "    <tr><th>A</th><td>'One</td></tr>\n"
+      "    <tr><th>B</th><td>-</td></tr>\n"
+      "    <tr><th>A</th><td>One</td></tr>\n"
       "  </tbody>\n"
       "</table>\n"
       "</div>";