Much fixing of stuff. Some of it successful! More work on KeywordsE.

NormanDunbar · Aug 11, 2016 · 643e351 · 643e351
1 parent ba7b8bd
commit 643e351
Show file tree

Hide file tree

Showing 7 changed files with 226 additions and 74 deletions.
diff --git a/arrows.html b/arrows.html
@@ -0,0 +1,14 @@
+<html>
+<head>
+<title>Arrows</title>
+</head>
+<body>
+<ul>
+<li>Lefty &LeftArrow;</li>
+<li>Right &RightArrow;</li>
+<li>Up &UpArrow;</li>
+<li>Down &DownArrow;</li>
+</ul>
+</body>
+</html>
+
diff --git a/arrows.rst b/arrows.rst
@@ -0,0 +1,4 @@
+-  Lefty ←
+-  Right →
+-  Up ↑
+-  Down ↓
diff --git a/errors/KeywordsE.errors.txt b/errors/KeywordsE.errors.txt
@@ -1,9 +1,9 @@
-line 364 column 184 - Warning: trimming empty <span>
-line 364 column 328 - Warning: trimming empty <span>
-line 383 column 184 - Warning: trimming empty <span>
-line 383 column 328 - Warning: trimming empty <span>
-line 1440 column 74 - Warning: trimming empty <span>
-line 1443 column 168 - Warning: trimming empty <span>
+line 370 column 184 - Warning: trimming empty <span>
+line 370 column 328 - Warning: trimming empty <span>
+line 391 column 184 - Warning: trimming empty <span>
+line 391 column 328 - Warning: trimming empty <span>
+line 1522 column 74 - Warning: trimming empty <span>
+line 1525 column 168 - Warning: trimming empty <span>
 Info: Doctype given is "-//W3C//DTD HTML 4.0 Transitional//EN"
 Info: Document content looks like HTML 4.01 Strict
 Info: No system identifier in emitted doctype

diff --git a/sphinx/source/KeywordsE.clean.rst b/sphinx/source/KeywordsE.clean.rst
diff --git a/tools/HTMLTidy.sh b/tools/HTMLTidy.sh
@@ -4,13 +4,17 @@
 
 DIR=`dirname "${0}"`
 HTML="${1}"
+TMP=${HTML}.tmp
 CLEAN="${HTML%%html}clean.html"
 ERRS="${HTML%%html}errors.txt"
 CHECK=0
 
 # Clean up first...
+# PreClean...
+preHTMLTidy < ${HTML} > ${TMP}
+
 echo "Cleaning '${HTML}' as '${CLEAN}', with errors in '${ERRS}'"
-tidy -indent -wrap 1000 -upper -ashtml -utf8 -file "${ERRS}" -output "${CLEAN}" "${HTML}"
+tidy -indent -wrap 1000 -upper -ashtml -utf8 -file "${ERRS}" -output "${CLEAN}" "${TMP}"
 CHECK=${?}
 
 # 1 = Warnings
@@ -42,6 +46,8 @@ then
     exit $?
 fi
 
+# Finished with ${TMP}
+#rm ${TMP} 2>/dev/null
 
 # All done. Sort of. Need to go manual now.
 echo "Done."

diff --git a/tools/fixSyntax.cpp b/tools/fixSyntax.cpp
@@ -100,7 +100,7 @@ void doSyntax(const size_t pos)
         // Read a few more lines. We shouldn't hit EOF here! (FLW!)
         getline(cin, a_line);
         posLocation = a_line.find("Location:", 0, 9);
-        if ((posLocation != string::npos) || (a_line.size() == 0)) {
+        if ((posLocation != string::npos) || (a_line.empty())) {
             break;
         } else {
             buffer += (" " + a_line);
@@ -165,7 +165,7 @@ void doLocation(const size_t pos)
     while (1) {
         // Read a few more lines. We shouldn't hit EOF here! (FLW!)
         getline(cin, a_line);
-        if (a_line.size() == 0) {
+        if (a_line.empty()) {
             break;
         } else {
             buffer += (" " + a_line);

diff --git a/tools/preHTMLTidy.cpp b/tools/preHTMLTidy.cpp
@@ -8,12 +8,15 @@
 //
 //  <br href="..."
 //
-// Whihc is wrongs. These should be:
+// Which is wrong. These should be:
 //
 //  <a href="..."
 //
 // These should be fixed before we get to HTMLTidy.sh.
 //
+// Once the above is fixed, we check for "Location:" and if found
+// scan for the next closing </span> and make sure we have a blank line after it.
+//
 
 using std::string;
 using std::getline;
@@ -32,23 +35,81 @@ int main (int argc, char *argv[])
 {
     // Read stdin until EOF
 	while (1) {
-            getline(cin, a_line);
+        getline(cin, a_line);
 
-            // Check for end of input.
-            if (cin.eof()) {
-                    return 0;
-            }
+        // Check for end of input.
+        if (cin.eof()) {
+                return 0;
+        }
+
+        // Check for '<br href='
+        size_t pos = a_line.find("<br href=", 0, 9);
+
+        if (pos != string::npos) {
+            // We have it. Fix it.
+            a_line = a_line.substr(0, pos) + "<a href=" + a_line.substr(pos + 9, string::npos);
+        }
 
-            // Check for '<br href='
-            size_t pos = a_line.find("<br href=", 0, 9);
+        // We have fixed the faulty <a> tags, check for Location:
+        pos = a_line.find("Location:", 0, 9);
 
+        // Did we find it?
+        if (pos != string::npos) {
+            // See if </span> is on the same line.
+            pos = a_line.find("</span>", pos + 9, 7);
+            if (pos == string::npos) {
+                // Try upper case, just in case.
+                pos = a_line.find("</SPAN>", pos + 9, 7);
+            }
+
+            // Found? Write the current line up to the end of </span>
+            // then write a blank, followed by the rest of the line after the </span>
             if (pos != string::npos) {
-                // We have it. Fix it.
-                a_line = a_line.substr(0, pos) + "<a href=" + a_line.substr(pos + 9, string::npos);
+                cout << a_line.substr(0, pos + 7) << endl << endl; 
+
+                // Check we don't fall off the end.
+                if (pos + 7 <= a_line.size()) {
+                    cout << a_line.substr(pos + 7, string::npos) << endl;
+                }
+
+                // Read and process the next line.
+                continue;
+            }
+
+            // Not found. Write out the whole line, then read and check again.
+            while (1) {
+                cout << a_line << endl;
+
+                getline(cin, a_line);
+
+                // Check for end of input.
+                if (cin.eof()) {
+                        return 0;
+                }
+
+                pos = a_line.find("</span>", 0, 7);
+                if (pos == string::npos) {
+                    pos = a_line.find("</SPAN>", 0, 7);
+                }
+
+                if (pos == string::npos) {
+                    // Write out and loop.
+                    continue;
+                }
+
+                // We finally have it!
+                // Write out with a blank after the </span>.
+                cout << a_line.substr(0, pos + 7) << endl << endl;
+
+                // Reset a_line ready for the break & write.
+                a_line = a_line.substr(pos + 7, string::npos);
+                break;
             }
+
+        }
 
-            // Just write everything else out.
-            cout << a_line << endl;
+        // Finally write everything out.
+        cout << a_line << endl;
 	}
 }