Merge branch 'master' into testing

1 files changed, 21 insertions, 5 deletions

diff --git a/ext/fg/js/source.js b/ext/fg/js/source.js
index ee4f58e2..c3da9f46 100644
--- a/ext/fg/js/source.js
+++ b/ext/fg/js/source.js
@@ -229,13 +229,29 @@ class TextSourceRange {
     }
 
     static getElementWritingMode(element) {
-        if (element === null) {
-            return 'horizontal-tb';
+        if (element !== null) {
+            const style = window.getComputedStyle(element);
+            const writingMode = style.writingMode;
+            if (typeof writingMode === 'string') {
+                return TextSourceRange.normalizeWritingMode(writingMode);
+            }
         }
+        return 'horizontal-tb';
+    }
 
-        const style = window.getComputedStyle(element);
-        const writingMode = style.writingMode;
-        return typeof writingMode === 'string' ? writingMode : 'horizontal-tb';
+    static normalizeWritingMode(writingMode) {
+        switch (writingMode) {
+            case 'lr':
+            case 'lr-tb':
+            case 'rl':
+                return 'horizontal-tb';
+            case 'tb':
+                return 'vertical-lr';
+            case 'tb-rl':
+                return 'vertical-rl';
+            default:
+                return writingMode;
+        }
     }
 
     static getNodesInRange(range) {