Merge pull request #6983 from albert-github/feature/bug_utf8_nbsp

Special handling of the UTF8 nbsp sequence

1 files changed, 19 insertions, 6 deletions

diff --git a/src/markdown.cpp b/src/markdown.cpp
index f2ec22a..8369d66 100644
--- a/src/markdown.cpp
+++ b/src/markdown.cpp
@@ -2453,19 +2453,32 @@ static QCString detab(const QCString &s,int &refIndent)
         col++;
         break;
       default: // non-whitespace => update minIndent
-        out.addChar(c);
         if (c<0 && i<size) // multibyte sequence
         {
-          out.addChar(data[i++]); // >= 2 bytes
-          if (((uchar)c&0xE0)==0xE0 && i<size)
+          // special handling of the UTF-8 nbsp character 0xc2 0xa0
+          if (c == '\xc2' && data[i] == '\xa0')
           {
-            out.addChar(data[i++]); // 3 bytes
+            out.addStr("&nbsp;");
+            i++;
           }
-          if (((uchar)c&0xF0)==0xF0 && i<size)
+          else
           {
-            out.addChar(data[i++]); // 4 byres
+            out.addChar(c);
+            out.addChar(data[i++]); // >= 2 bytes
+            if (((uchar)c&0xE0)==0xE0 && i<size)
+            {
+              out.addChar(data[i++]); // 3 bytes
+            }
+              if (((uchar)c&0xF0)==0xF0 && i<size)
+            {
+              out.addChar(data[i++]); // 4 byres
+            }
           }
         }
+        else
+        {
+          out.addChar(c);
+        }
         if (col<minIndent) minIndent=col;
         col++;
     }