Merge branch 'feature/hold-vars' into main

Author: escapism

build.mjs

@@ -41,7 +41,8 @@ glob.sync(`${pattern}.js`, {
 		banner += `//DESCRIPTION:${resource.description}\n\n`
 	}
 
-	banner += "#target indesign\n\n"
+	banner += `#target indesign
+#targetengine 'utsutsunogare'\n\n`
 	banner += `var NAME = '${filename}';\n`
 
 	const inputOptions = {
@@ -50,7 +51,7 @@ glob.sync(`${pattern}.js`, {
 	};
 	const outputOptions = {
 		format: "es",
-		file: path.resolve(distDir, `${filename}.jsx`),
+		file: path.resolve(distDir, `${resource.name}.jsx`),
 		banner
 	};
 	await build(inputOptions, outputOptions);

dist/CSVRubyProcessor.jsx dist/CSVルビ一括設定.jsxdist/CSVRubyProcessor.jsx renamed to dist/CSVルビ一括設定.jsx

@@ -1,6 +1,6 @@
 /*
  * CSVRubyProcessor
- * Version 1.0
+ * Version 1.1
  *
  * (c) 2022 uco
  *
@@ -11,6 +11,7 @@
 //DESCRIPTION:CSVファイルでルビを一括設定
 
 #target indesign
+#targetengine 'utsutsunogare'
 
 var NAME = 'CSVRubyProcessor';
 
@@ -199,6 +200,10 @@ var NameValueList = function () {
     this.value = this.values[this.list.selection.index];
   };
 
+  _proto.getIndex = function getIndex() {
+    return this.list.selection.index;
+  };
+
   return NameValueList;
 }();
 
@@ -287,6 +292,18 @@ var RubySetting = function () {
     };
   };
 
+  _proto.getSettings = function getSettings() {
+    return {
+      alignments: this.alignList.getIndex(),
+      position: this.positionList.getIndex(),
+      overhang: this.overhangList.getIndex(),
+      parentspacing: this.parentSpacingList.getIndex(),
+      xOffset: this.xOffset,
+      yOffset: this.yOffset,
+      skipmode: this.isSkip()
+    };
+  };
+
   _proto.isSkip = function isSkip() {
     return this.inputSkipmode.value;
   };
@@ -352,13 +369,29 @@ var DEFAULT = loadconfig(NAME, {
   parentspacing: 2,
   xOffset: 0,
   yOffset: 0,
-  skipmode: false
+  skipmode: false,
+  keepParameter: true
 });
 app.doScript(main, ScriptLanguage.JAVASCRIPT, [], UndoModes.FAST_ENTIRE_SCRIPT);
 
 function main() {
+  var _this = this;
+
   var dialog = new Window('dialog', 'ルビ設定');
-  var rubySettings = new RubySetting(dialog, DEFAULT, true);
+
+  var settings = function () {
+    if (DEFAULT.keepParameter) {
+      if (typeof CSVRubyProcessor !== 'undefined') {
+        return CSVRubyProcessor;
+      } else {
+        _this.CSVRubyProcessor = null;
+      }
+    }
+
+    return DEFAULT;
+  }();
+
+  var rubySettings = new RubySetting(dialog, settings, true);
   new ActionButtons(dialog, {
     width: 96,
     height: 24
@@ -371,6 +404,11 @@ function main() {
 
   var rubyOption = rubySettings.getValues();
   var skipmode = rubySettings.isSkip();
+
+  if (DEFAULT.keepParameter) {
+    CSVRubyProcessor = rubySettings.getSettings();
+  }
+
   var fileObj = File.openDialog('', function () {
     if (/^windows/i.test($.os)) {
       return '*.csv';

dist/pixivRubyConverter.jsx dist/pixivルビ変換.jsxdist/pixivRubyConverter.jsx renamed to dist/pixivルビ変換.jsx

@@ -1,6 +1,6 @@
 /*
  * pixivRubyConverter
- * Version 1.0
+ * Version 1.1
  *
  * (c) 2022 uco
  *
@@ -11,6 +11,7 @@
 //DESCRIPTION:pixivのルビ書式を変換
 
 #target indesign
+#targetengine 'utsutsunogare'
 
 var NAME = 'pixivRubyConverter';
 
@@ -123,6 +124,10 @@ var NameValueList = function () {
     this.value = this.values[this.list.selection.index];
   };
 
+  _proto.getIndex = function getIndex() {
+    return this.list.selection.index;
+  };
+
   return NameValueList;
 }();
 
@@ -211,6 +216,18 @@ var RubySetting = function () {
     };
   };
 
+  _proto.getSettings = function getSettings() {
+    return {
+      alignments: this.alignList.getIndex(),
+      position: this.positionList.getIndex(),
+      overhang: this.overhangList.getIndex(),
+      parentspacing: this.parentSpacingList.getIndex(),
+      xOffset: this.xOffset,
+      yOffset: this.yOffset,
+      skipmode: this.isSkip()
+    };
+  };
+
   _proto.isSkip = function isSkip() {
     return this.inputSkipmode.value;
   };
@@ -275,13 +292,29 @@ var DEFAULT = loadconfig(NAME, {
   overhang: 1,
   parentspacing: 2,
   xOffset: 0,
-  yOffset: 0
+  yOffset: 0,
+  keepParameter: true
 });
 app.doScript(main, ScriptLanguage.JAVASCRIPT, [], UndoModes.FAST_ENTIRE_SCRIPT);
 
 function main() {
+  var _this = this;
+
   var dialog = new Window('dialog', 'ルビ設定');
-  var rubySettings = new RubySetting(dialog, DEFAULT);
+
+  var settings = function () {
+    if (DEFAULT.keepParameter) {
+      if (typeof pixivRubyConverter !== 'undefined') {
+        return pixivRubyConverter;
+      } else {
+        _this.pixivRubyConverter = null;
+      }
+    }
+
+    return DEFAULT;
+  }();
+
+  var rubySettings = new RubySetting(dialog, settings);
   new ActionButtons(dialog, {
     width: 96,
     height: 24
@@ -293,6 +326,11 @@ function main() {
   }
 
   var rubyOption = rubySettings.getValues();
+
+  if (DEFAULT.keepParameter) {
+    pixivRubyConverter = rubySettings.getSettings();
+  }
+
   var PATTERN = '\\[\\[rb: *(.+?) *> *(.+?) *\\]\\]';
   app.findGrepPreferences = NothingEnum.nothing;
   app.findChangeGrepOptions.kanaSensitive = true;

resourcedata.mjs

@@ -1,10 +1,12 @@
 export default {
 	CSVRubyProcessor: {
-		ver: '1.0',
+    name: 'CSVルビ一括設定',
+		ver: '1.1',
 		description: 'CSVファイルでルビを一括設定',
 	},
 	pixivRubyConverter: {
-		ver: '1.0',
+    name: 'pixivルビ変換',
+		ver: '1.1',
 		description: 'pixivのルビ書式を変換',
 	}
 }