From dd52b12e7920cb00286ea5ff3394b5d3b70d3e94 Mon Sep 17 00:00:00 2001
From: Christoph Hauert <hauert@math.ubc.ca>
Date: Sun, 19 Nov 2023 22:30:42 -0800
Subject: [PATCH] replace &nbsp; by &#xA0; for ePubs

---
 user/src/com/google/gwt/layout/client/LayoutImpl.java       | 2 +-
 .../src/com/google/gwt/logging/client/HtmlLogFormatter.java | 2 +-
 user/src/com/google/gwt/user/client/ui/Grid.java            | 6 +++---
 user/src/com/google/gwt/user/client/ui/TabBar.java          | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/user/src/com/google/gwt/layout/client/LayoutImpl.java b/user/src/com/google/gwt/layout/client/LayoutImpl.java
index cdef1441975..751fae748f4 100644
--- a/user/src/com/google/gwt/layout/client/LayoutImpl.java
+++ b/user/src/com/google/gwt/layout/client/LayoutImpl.java
@@ -54,7 +54,7 @@ class LayoutImpl {
 
   protected static DivElement createRuler(Unit widthUnit, Unit heightUnit) {
     DivElement ruler = Document.get().createDivElement();
-    ruler.setInnerHTML("&nbsp;");
+    ruler.setInnerHTML("&#xA0;");
     Style style = ruler.getStyle();
     style.setPosition(Position.ABSOLUTE);
     style.setZIndex(-32767);
diff --git a/user/src/com/google/gwt/logging/client/HtmlLogFormatter.java b/user/src/com/google/gwt/logging/client/HtmlLogFormatter.java
index ff70f1ed721..3681860e08b 100644
--- a/user/src/com/google/gwt/logging/client/HtmlLogFormatter.java
+++ b/user/src/com/google/gwt/logging/client/HtmlLogFormatter.java
@@ -102,7 +102,7 @@ private String getColor(int logLevel) {
   private String getEscaped(String text) {
     text = text.replaceAll("<", "&lt;");
     text = text.replaceAll(">", "&gt;");
-    text = text.replaceAll("\t", "&nbsp;&nbsp;&nbsp;");
+    text = text.replaceAll("\t", "&#xA0;&#xA0;&#xA0;");
     return text;
   }
 
diff --git a/user/src/com/google/gwt/user/client/ui/Grid.java b/user/src/com/google/gwt/user/client/ui/Grid.java
index 176a2c9583f..b2bd24160a2 100644
--- a/user/src/com/google/gwt/user/client/ui/Grid.java
+++ b/user/src/com/google/gwt/user/client/ui/Grid.java
@@ -75,7 +75,7 @@ public class Grid extends HTMLTable {
    */
   private static native void addRows(Element table, int rows, int columns) /*-{
      var td = $doc.createElement("td");
-     td.innerHTML = "&nbsp;";
+     td.innerHTML = "&#xA0;";
      var row = $doc.createElement("tr");
      for(var cellNum = 0; cellNum < columns; cellNum++) {
        var cell = td.cloneNode(true);
@@ -130,7 +130,7 @@ public Grid(int rows, int columns) {
   public boolean clearCell(int row, int column) {
     Element td = getCellFormatter().getElement(row, column);
     boolean b = internalClearCell(td, false);
-    td.setInnerHTML("&nbsp;");
+    td.setInnerHTML("&#xA0;");
     return b;
   }
 
@@ -271,7 +271,7 @@ protected com.google.gwt.user.client.Element createCell() {
 
     // Add a non-breaking space to the TD. This ensures that the cell is
     // displayed.
-    td.setInnerHTML("&nbsp;");
+    td.setInnerHTML("&#xA0;");
     return DOM.asOld(td);
   }
 
diff --git a/user/src/com/google/gwt/user/client/ui/TabBar.java b/user/src/com/google/gwt/user/client/ui/TabBar.java
index eaa64f81526..402c7694f90 100644
--- a/user/src/com/google/gwt/user/client/ui/TabBar.java
+++ b/user/src/com/google/gwt/user/client/ui/TabBar.java
@@ -208,7 +208,7 @@ public TabBar() {
 
     panel.setVerticalAlignment(HasVerticalAlignment.ALIGN_BOTTOM);
 
-    HTML first = new HTML("&nbsp;", true), rest = new HTML("&nbsp;", true);
+    HTML first = new HTML("&#xA0;", true), rest = new HTML("&#xA0;", true);
     first.setStyleName("gwt-TabBarFirst");
     rest.setStyleName("gwt-TabBarRest");
     first.setHeight("100%");