Added UTF-8 support to web interface

cpp-tutor · cpp-tutor · commit 307a3365f7cc · 2022-07-22T12:47:17.000+01:00
diff --git a/pscweb.html b/pscweb.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en-GB"><!-- https://github.com/cpp-tutor/pseudocode-compiler/ -->
 <head>
-<meta charset="UTF-8">
+<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
 <title>Pseudocode to JavaScript Compiler</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <link href="pscweb.css" type="text/css" rel="stylesheet" />
@@ -14,7 +14,7 @@
 <h2 align="center">Pseudocode to JavaScript Compiler</h2>
 </div>
 <div class="window">
-<form id="input">
+<form id="input" accept-charset="utf-8">
 <label for="program_source_id"><h3 align="center">Type your program in here</h3>
 <textarea name="program_source"></textarea>
 </label>
diff --git a/pscweb.js b/pscweb.js
@@ -36,9 +36,17 @@ function clear_output() {
     document.getElementById('program_output').innerHTML = '';
 }
 
-function base64enc(rawutf8) {
+function toutf8(str) {
+    var urifmt = '' + encodeURIComponent(str), x = function(s) {
+        return String.fromCharCode(parseInt(s.substring(1), 16));
+    }
+    return urifmt.replace(/%../g, x);
+}
+
+function base64enc(input) {
     let encweb = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_=';
-    var enc = '', pos = 0, len = rawutf8.length;
+    var rawutf8 = toutf8(input), enc = '', pos = 0;
+    let len = rawutf8.length;
     while ((len - pos) > 2) {
         enc += encweb[(rawutf8.charCodeAt(pos) >> 2) & 0x3f];
         enc += encweb[((rawutf8.charCodeAt(pos) << 4) | (rawutf8.charCodeAt(pos + 1) >> 4)) & 0x3f];
