Basic UI; use r2s switch consistently.

transliterator/rest_api.py

@@ -1,6 +1,6 @@
 from os import environ
 
-from flask import Flask, Response, jsonify, request
+from flask import Flask, Response, jsonify, render_template, request
 
 from transliterator.tables import list_tables, load_table
 from transliterator.trans import transliterate
@@ -22,6 +22,11 @@ def create_app():
 app = create_app()
 
 
+@app.route("/", methods=["GET"])
+def index():
+    return render_template("index.html", languages=list_tables())
+
+
 @app.route("/health", methods=["GET"])
 def health_check():
     return "I'm alive!\n"
@@ -40,13 +45,20 @@ def dump_table(lang):
     return jsonify(load_table(lang))
 
 
-@app.route("/trans/<lang>/r2s", methods=["POST"], defaults={"s2r": False})
+@app.route("/transliterate", methods=["POST"])
+def transliterate_form():
+    """ UI version of the `trans` endpoint. Passes everything via form. """
+    return transliterate_req(
+            request.form["lang"], request.form.get("r2s", False))
+
+
+@app.route("/trans/<lang>/r2s", methods=["POST"], defaults={"r2s": True})
 @app.route("/trans/<lang>", methods=["POST"])
-def transliterate_req(lang, s2r=True):
+def transliterate_req(lang, r2s=False):
     in_txt = request.form["text"]
     if not len(in_txt):
         return ("No input text provided! ", 400)
 
     return Response(
-            transliterate(in_txt, lang, s2r),
+            transliterate(in_txt, lang, r2s),
             content_type="text/plain")

transliterator/static/normalize.css

@@ -0,0 +1,461 @@
+/*! normalize.css v5.0.0 | MIT License | github.com/necolas/normalize.css */
+
+/**
+ * 1. Change the default font family in all browsers (opinionated).
+ * 2. Correct the line height in all browsers.
+ * 3. Prevent adjustments of font size after orientation changes in
+ *    IE on Windows Phone and in iOS.
+ */
+
+/* Document
+   ========================================================================== */
+
+html {
+  font-family: sans-serif; /* 1 */
+  line-height: 1.15; /* 2 */
+  -ms-text-size-adjust: 100%; /* 3 */
+  -webkit-text-size-adjust: 100%; /* 3 */
+}
+
+/* Sections
+   ========================================================================== */
+
+/**
+ * Remove the margin in all browsers (opinionated).
+ */
+
+body {
+  margin: 0;
+}
+
+/**
+ * Add the correct display in IE 9-.
+ */
+
+article,
+aside,
+footer,
+header,
+nav,
+section {
+  display: block;
+}
+
+/**
+ * Correct the font size and margin on `h1` elements within `section` and
+ * `article` contexts in Chrome, Firefox, and Safari.
+ */
+
+h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
+}
+
+/* Grouping content
+   ========================================================================== */
+
+/**
+ * Add the correct display in IE 9-.
+ * 1. Add the correct display in IE.
+ */
+
+figcaption,
+figure,
+main { /* 1 */
+  display: block;
+}
+
+/**
+ * Add the correct margin in IE 8.
+ */
+
+figure {
+  margin: 1em 40px;
+}
+
+/**
+ * 1. Add the correct box sizing in Firefox.
+ * 2. Show the overflow in Edge and IE.
+ */
+
+hr {
+  box-sizing: content-box; /* 1 */
+  height: 0; /* 1 */
+  overflow: visible; /* 2 */
+}
+
+/**
+ * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 2. Correct the odd `em` font sizing in all browsers.
+ */
+
+pre {
+  font-family: monospace, monospace; /* 1 */
+  font-size: 1em; /* 2 */
+}
+
+/* Text-level semantics
+   ========================================================================== */
+
+/**
+ * 1. Remove the gray background on active links in IE 10.
+ * 2. Remove gaps in links underline in iOS 8+ and Safari 8+.
+ */
+
+a {
+  background-color: transparent; /* 1 */
+  -webkit-text-decoration-skip: objects; /* 2 */
+}
+
+/**
+ * Remove the outline on focused links when they are also active or hovered
+ * in all browsers (opinionated).
+ */
+
+a:active,
+a:hover {
+  outline-width: 0;
+}
+
+/**
+ * 1. Remove the bottom border in Firefox 39-.
+ * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
+ */
+
+abbr[title] {
+  border-bottom: none; /* 1 */
+  text-decoration: underline; /* 2 */
+  text-decoration: underline dotted; /* 2 */
+}
+
+/**
+ * Prevent the duplicate application of `bolder` by the next rule in Safari 6.
+ */
+
+b,
+strong {
+  font-weight: inherit;
+}
+
+/**
+ * Add the correct font weight in Chrome, Edge, and Safari.
+ */
+
+b,
+strong {
+  font-weight: bolder;
+}
+
+/**
+ * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 2. Correct the odd `em` font sizing in all browsers.
+ */
+
+code,
+kbd,
+samp {
+  font-family: monospace, monospace; /* 1 */
+  font-size: 1em; /* 2 */
+}
+
+/**
+ * Add the correct font style in Android 4.3-.
+ */
+
+dfn {
+  font-style: italic;
+}
+
+/**
+ * Add the correct background and color in IE 9-.
+ */
+
+mark {
+  background-color: #ff0;
+  color: #000;
+}
+
+/**
+ * Add the correct font size in all browsers.
+ */
+
+small {
+  font-size: 80%;
+}
+
+/**
+ * Prevent `sub` and `sup` elements from affecting the line height in
+ * all browsers.
+ */
+
+sub,
+sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+sup {
+  top: -0.5em;
+}
+
+/* Embedded content
+   ========================================================================== */
+
+/**
+ * Add the correct display in IE 9-.
+ */
+
+audio,
+video {
+  display: inline-block;
+}
+
+/**
+ * Add the correct display in iOS 4-7.
+ */
+
+audio:not([controls]) {
+  display: none;
+  height: 0;
+}
+
+/**
+ * Remove the border on images inside links in IE 10-.
+ */
+
+img {
+  border-style: none;
+}
+
+/**
+ * Hide the overflow in IE.
+ */
+
+svg:not(:root) {
+  overflow: hidden;
+}
+
+/* Forms
+   ========================================================================== */
+
+/**
+ * 1. Change the font styles in all browsers (opinionated).
+ * 2. Remove the margin in Firefox and Safari.
+ */
+
+button,
+input,
+optgroup,
+select,
+textarea {
+  font-family: sans-serif; /* 1 */
+  font-size: 100%; /* 1 */
+  line-height: 1.15; /* 1 */
+  margin: 0; /* 2 */
+}
+
+/**
+ * Show the overflow in IE.
+ * 1. Show the overflow in Edge.
+ */
+
+button,
+input { /* 1 */
+  overflow: visible;
+}
+
+/**
+ * Remove the inheritance of text transform in Edge, Firefox, and IE.
+ * 1. Remove the inheritance of text transform in Firefox.
+ */
+
+button,
+select { /* 1 */
+  text-transform: none;
+}
+
+/**
+ * 1. Prevent a WebKit bug where (2) destroys native `audio` and `video`
+ *    controls in Android 4.
+ * 2. Correct the inability to style clickable types in iOS and Safari.
+ */
+
+button,
+html [type="button"], /* 1 */
+[type="reset"],
+[type="submit"] {
+  -webkit-appearance: button; /* 2 */
+}
+
+/**
+ * Remove the inner border and padding in Firefox.
+ */
+
+button::-moz-focus-inner,
+[type="button"]::-moz-focus-inner,
+[type="reset"]::-moz-focus-inner,
+[type="submit"]::-moz-focus-inner {
+  border-style: none;
+  padding: 0;
+}
+
+/**
+ * Restore the focus styles unset by the previous rule.
+ */
+
+button:-moz-focusring,
+[type="button"]:-moz-focusring,
+[type="reset"]:-moz-focusring,
+[type="submit"]:-moz-focusring {
+  outline: 1px dotted ButtonText;
+}
+
+/**
+ * Change the border, margin, and padding in all browsers (opinionated).
+ */
+
+fieldset {
+  border: 1px solid #c0c0c0;
+  margin: 0 2px;
+  padding: 0.35em 0.625em 0.75em;
+}
+
+/**
+ * 1. Correct the text wrapping in Edge and IE.
+ * 2. Correct the color inheritance from `fieldset` elements in IE.
+ * 3. Remove the padding so developers are not caught out when they zero out
+ *    `fieldset` elements in all browsers.
+ */
+
+legend {
+  box-sizing: border-box; /* 1 */
+  color: inherit; /* 2 */
+  display: table; /* 1 */
+  max-width: 100%; /* 1 */
+  padding: 0; /* 3 */
+  white-space: normal; /* 1 */
+}
+
+/**
+ * 1. Add the correct display in IE 9-.
+ * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera.
+ */
+
+progress {
+  display: inline-block; /* 1 */
+  vertical-align: baseline; /* 2 */
+}
+
+/**
+ * Remove the default vertical scrollbar in IE.
+ */
+
+textarea {
+  overflow: auto;
+}
+
+/**
+ * 1. Add the correct box sizing in IE 10-.
+ * 2. Remove the padding in IE 10-.
+ */
+
+[type="checkbox"],
+[type="radio"] {
+  box-sizing: border-box; /* 1 */
+  padding: 0; /* 2 */
+}
+
+/**
+ * Correct the cursor style of increment and decrement buttons in Chrome.
+ */
+
+[type="number"]::-webkit-inner-spin-button,
+[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
+
+/**
+ * 1. Correct the odd appearance in Chrome and Safari.
+ * 2. Correct the outline style in Safari.
+ */
+
+[type="search"] {
+  -webkit-appearance: textfield; /* 1 */
+  outline-offset: -2px; /* 2 */
+}
+
+/**
+ * Remove the inner padding and cancel buttons in Chrome and Safari on macOS.
+ */
+
+[type="search"]::-webkit-search-cancel-button,
+[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+/**
+ * 1. Correct the inability to style clickable types in iOS and Safari.
+ * 2. Change font properties to `inherit` in Safari.
+ */
+
+::-webkit-file-upload-button {
+  -webkit-appearance: button; /* 1 */
+  font: inherit; /* 2 */
+}
+
+/* Interactive
+   ========================================================================== */
+
+/*
+ * Add the correct display in IE 9-.
+ * 1. Add the correct display in Edge, IE, and Firefox.
+ */
+
+details, /* 1 */
+menu {
+  display: block;
+}
+
+/*
+ * Add the correct display in all browsers.
+ */
+
+summary {
+  display: list-item;
+}
+
+/* Scripting
+   ========================================================================== */
+
+/**
+ * Add the correct display in IE 9-.
+ */
+
+canvas {
+  display: inline-block;
+}
+
+/**
+ * Add the correct display in IE.
+ */
+
+template {
+  display: none;
+}
+
+/* Hidden
+   ========================================================================== */
+
+/**
+ * Add the correct display in IE 10-.
+ */
+
+[hidden] {
+  display: none;
+}

transliterator/templates/index.html

@@ -0,0 +1,20 @@
+{% extends "layout.html" %}
+{% set title ='Transliterate string' %}
+{% block body %}
+    <form action="/transliterate" method="POST">
+        <fieldset>
+            <label for="text">Input text</label>
+            <textarea id="text" name="text"></textarea>
+            <label for="lang">Language</label>
+            <select id="lang" name="lang">
+                {% for k, v in languages.items() %}
+                    <option value="{{ k }}">{{ v["name"] }}</option>
+                {% endfor %}
+            </select>
+            <label class="label-inline" for="r2s">Roman-to-Script</label>
+            <input type="checkbox" id="r2s" name="r2s">
+            <input class="button-primary" type="submit" value="Transliterate!">
+        </fieldset>
+    </form>
+    </div>
+{% endblock %}

transliterator/templates/layout.html

@@ -0,0 +1,25 @@
+<!doctype html>
+<html>
+    <head>
+        <title>{{ title }} — LoC Transliterator</title>
+        <link rel="stylesheet"
+                href="{{ url_for('static', filename='normalize.css') }}">
+        <link rel="stylesheet"
+                href="{{ url_for('static', filename='milligram.min.css') }}">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+    </head>
+    <body>
+        <main class="wrapper">
+          <section class="section">
+            <div class="container">
+            {% block header %}
+                <h1 class="title is-1">{{ title }}</h1>
+            {% endblock %}
+                <div class="content">
+                {% block body %}{% endblock %}
+                </div>
+            </div>
+          </section>
+        </main>
+    </body>
+</html>

transliterator/templates/navbar.html

@@ -0,0 +1,30 @@
+<nav class="navigation">
+        <ul class="menu">
+            <li><a href="/">Index</a></li>
+            <li>
+              <a>About</a>
+              <ul class="submenu">
+                <li><a href="/page/local:about_lii">LII</a></li>
+                <li><a href="/page/local:about_author">The Author</a></li>
+                <li><a href="/page/local:about_mindmap">This Site</a></li>
+                <li><a href="/page/local:contact">Contact</a></li>
+              </ul>
+            </li>
+            <li>
+              <a>Browse Types</a>
+              <ul class="submenu">
+              {% for type in types %}
+                  <li>
+                      <a href="/browse/type/{{ type }}">
+                        {{ type }}
+                      </a>
+                  </li>
+              {% endfor %}
+              </ul>
+            </li>
+            <li><a href="/view/random">Random Pick</a></li>
+            <li><a href="/page/local:ontology">Ontology</a></li>
+        </ul>
+
+</nav>
+

transliterator/trans.py

@@ -11,7 +11,7 @@ MULTI_WS_RE = re.compile(r"\s{2,}")
 logger = logging.getLogger(__name__)
 
 
-def transliterate(src, lang, s2r=True):
+def transliterate(src, lang, r2s=False):
     """
     Transliterate a single string.
 
@@ -21,16 +21,16 @@ def transliterate(src, lang, s2r=True):
         lang (str): Language name.
 
     Keyword args:
-        s2r (bool): If True (the default), the source is considered to be a
+        r2s (bool): If False (the default), the source is considered to be a
         non-latin script in the language and script specified, and the output
-        the Romanization thereof; if False, the source is considered to be
+        the Romanization thereof; if True, the source is considered to be
         romanized text to be transliterated into the specified script/language.
 
     Return:
         str: The transliterated string.
     """
-    source_str = "Latin" if s2r else lang
-    target_str = lang if s2r else "Latin"
+    source_str = "Latin" if r2s else lang
+    target_str = lang if r2s else "Latin"
     logger.info(f"Transliteration is from {source_str} to {target_str}.")
 
     cfg = load_table(lang)
@@ -39,22 +39,22 @@ def transliterate(src, lang, s2r=True):
     # General directives.
     # general_dir = cfg.get("directives", {})
 
-    if s2r and "script_to_roman" not in cfg:
+    if not r2s and "script_to_roman" not in cfg:
         raise NotImplementedError(
             f"Script-to-Roman transliteration not yet supported for {lang}."
         )
-    elif not s2r and "roman_to_script" not in cfg:
+    elif r2s and "roman_to_script" not in cfg:
         raise NotImplementedError(
             f"Roman-to-script transliteration not yet supported for {lang}."
         )
 
-    langsec = cfg["script_to_roman"] if s2r else cfg["roman_to_script"]
+    langsec = cfg["script_to_roman"] if not r2s else cfg["roman_to_script"]
     langsec_dir = langsec.get("directives", {})
 
     i = 0
     dest_ls = []
-    # Loop through source characters. The increment of each loop depends on the
-    # length of the token that eventually matches.
+    # Loop through source characters. The increment of each loop depends on
+    # the length of the token that eventually matches.
     ignore_list = langsec.get("ignore", [])  # Only present in R2S
     while i < len(src):
         # Check ignore list first. Find as many subsequent ignore tokens