v1.17.0

ifrost · Nov 7, 2020 · 2b7c1b9 · 2b7c1b9
1 parent e14d061
commit 2b7c1b9
Show file tree

Hide file tree

Showing 13 changed files with 152 additions and 17,220 deletions.
diff --git a/afterwriting.zip b/afterwriting.zip
diff --git a/bundle/js/afterwriting.js b/bundle/js/afterwriting.js
diff --git a/bundle/js/fonts/courier-prime-cyrillic.js b/bundle/js/fonts/courier-prime-cyrillic.js
diff --git a/bundle/js/fonts/courier-prime.js b/bundle/js/fonts/courier-prime.js
diff --git a/bundle/js/fonts/font-loaders.js b/bundle/js/fonts/font-loaders.js
@@ -0,0 +1,50 @@
+define(function(require) {
+
+    var config = [
+        { name: "Courier", label: "Courier", file: "" },
+        { name: "CourierPrime", label: "Courier Prime", file: "courier-prime" },
+        { name: "CourierPrimeCyrillic", label: "Courier Prime Cyrillic", file: "courier-prime-cyrillic" }
+        // { name: "Kosugi", label: "Kosugi", file: "kosugi", "tmp-ratio": 0.62 }
+    ];
+
+    var loaders = {};
+    config.forEach(function(font) {
+        if (font.file) {
+            if (window) {
+                // BROWSER LOADER
+                // LOCAL
+                if (window.location.protocol === "file:") {
+                    loaders[font.name] = function(callback) {
+                        require(['bundle/js/fonts/' + font.file + '.js?callback=define'], function (fonts) {
+                            callback(fonts);
+                        });
+                    };
+                }
+                // DYNAMIC
+                else {
+                    loaders[font.name] = function(callback) {
+                        require(['js/fonts/' + font.file + '.js?callback=define'], function (fonts) {
+                            callback(fonts);
+                        });
+                    };
+                }
+            } else {
+                // NDOE.JS LOADER
+                loaders[font.name] = function(callback) {
+                    callback(require('fonts/' + font.file));
+                };
+            }
+        } else {
+            // USE PDF SUPPORTED FONT
+            loaders[font.name] = function (callback) {
+                callback(null);
+            };
+        }
+        loaders[font.name].config = font;
+    });
+
+    // list of fonts for settings
+    loaders.fontsList = config;
+
+    return loaders;
+});
diff --git a/bundle/js/fonts/kosugi.js b/bundle/js/fonts/kosugi.js
diff --git a/html/afterwriting.html b/html/afterwriting.html
@@ -3,14 +3,14 @@
 		<title>'afterwriting offline</title>
 		<meta http-equiv="content-type" content="text/html;charset=UTF-8">
 		<link rel="icon" type="image/x-icon" href="gfx/favicon.ico">
-		<link rel="stylesheet" href="bundle/css/afterwriting.css?last_update=2020-10-05_18-12" />
+		<link rel="stylesheet" href="bundle/css/afterwriting.css?last_update=2020-11-07_22-35" />
 
 		<script src="bundle/js/pdfjs/pdf.min.js"></script>
 		<script type="text/javascript">
 			PDFJS.disableWorker = true;
 		</script>
 
-		<script src="bundle/js/afterwriting.js?last_update=2020-10-05_18-12" defer></script>
+		<script src="bundle/js/afterwriting.js?last_update=2020-11-07_22-35" defer></script>
 	</head>
 	<body>
 		<p class="loader">Loading...</p>

diff --git a/html/index.html b/html/index.html
@@ -4,15 +4,15 @@
 		<meta name="description" content="Post-processing Fountain screenplays - PDF creation and statistics">
 		<meta http-equiv="content-type" content="text/html;charset=UTF-8">
 		<link rel="icon" type="image/x-icon" href="gfx/favicon.ico">
-		<link rel="stylesheet" href="bundle/css/afterwriting.css?last_update=2020-10-05_18-12" />
+		<link rel="stylesheet" href="bundle/css/afterwriting.css?last_update=2020-11-07_22-35" />
 
 		<script src="bundle/js/pdfjs/pdf.min.js"></script>
 		<script type="text/javascript">
 			PDFJS.disableWorker = true;
             var JS_TREE_WORKERS_ENABLED = true;
 		</script>
 
-		<script src="bundle/js/afterwriting.js?last_update=2020-10-05_18-12" defer></script>
+		<script src="bundle/js/afterwriting.js?last_update=2020-11-07_22-35" defer></script>
 	</head>
 	<body>
 		<p class="loader">Loading...</p>

diff --git a/index.html b/index.html
@@ -4,15 +4,15 @@
 		<meta name="description" content="Post-processing Fountain screenplays - PDF creation and statistics">
 		<meta http-equiv="content-type" content="text/html;charset=UTF-8">
 		<link rel="icon" type="image/x-icon" href="gfx/favicon.ico">
-		<link rel="stylesheet" href="bundle/css/afterwriting.css?last_update=2020-10-05_18-12" />
+		<link rel="stylesheet" href="bundle/css/afterwriting.css?last_update=2020-11-07_22-35" />
 
 		<script src="bundle/js/pdfjs/pdf.min.js"></script>
 		<script type="text/javascript">
 			PDFJS.disableWorker = true;
             var JS_TREE_WORKERS_ENABLED = true;
 		</script>
 
-		<script src="bundle/js/afterwriting.js?last_update=2020-10-05_18-12" defer></script>
+		<script src="bundle/js/afterwriting.js?last_update=2020-11-07_22-35" defer></script>
 	</head>
 	<body>
 		<p class="loader">Loading...</p>

diff --git a/js/utils/common.js b/js/utils/common.js
@@ -1,7 +1,7 @@
 define(function() {
     return {
         data: {
-            footer: 'version: 1.16.0 (2020/10/31)'
+            footer: 'version: 1.17.0 (2020/11/07)'
         }
     };
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "afterwriting",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "description": "Screewriting tools",
   "keywords": [
     "screenwriting",

diff --git a/samples/compiled.js b/samples/compiled.js