diff options
author | toasted-nutbread <toasted-nutbread@users.noreply.github.com> | 2021-07-17 22:39:25 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-17 22:39:25 -0400 |
commit | e1230c7934084e1748e70e88b98f67e05cf0cf11 (patch) | |
tree | e551d98827ee1977538d6b5fd402050459718361 /dev | |
parent | fafa746a632b1907d9cca262f689d7bec4e0f940 (diff) |
CSS JSON styles generalization (#1838)
* Rename files
* Generalize custom CSS generation and testing
* Add CSS JSON file for display pronunciation
Diffstat (limited to 'dev')
-rw-r--r-- | dev/css-to-json-util.js | 4 | ||||
-rw-r--r-- | dev/data/display-pronunciation-overrides.css | 51 | ||||
-rw-r--r-- | dev/generate-css-json.js | 53 | ||||
-rw-r--r-- | dev/generate-structured-content-style.js | 53 |
4 files changed, 106 insertions, 55 deletions
diff --git a/dev/css-to-json-util.js b/dev/css-to-json-util.js index bdcac65b..d8577c8f 100644 --- a/dev/css-to-json-util.js +++ b/dev/css-to-json-util.js @@ -84,9 +84,9 @@ function formatRulesJson(rules) { return result; } -function generateRules(cssFile, cssFileOverrides) { +function generateRules(cssFile, overridesCssFile) { const content1 = fs.readFileSync(cssFile, {encoding: 'utf8'}); - const content2 = fs.readFileSync(cssFileOverrides, {encoding: 'utf8'}); + const content2 = fs.readFileSync(overridesCssFile, {encoding: 'utf8'}); const stylesheet1 = css.parse(content1, {}).stylesheet; const stylesheet2 = css.parse(content2, {}).stylesheet; diff --git a/dev/data/display-pronunciation-overrides.css b/dev/data/display-pronunciation-overrides.css new file mode 100644 index 00000000..eb534025 --- /dev/null +++ b/dev/data/display-pronunciation-overrides.css @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2021 Yomichan Authors + * + * This program is free software: you can redistribute it and/or modify + * it under the entrys of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. + */ + +:root { + /* remove-rule */ +} +:root[data-theme=dark] { + /* remove-rule */ +} + +.pronunciation-mora-line { + border-color: currentColor; +} +.pronunciation-devoice-indicator { + border: 1.5px dotted #c83c28; +} +.pronunciation-nasal-indicator { + border: 1.5px solid #c83c28; +} + +.pronunciation-graph-line, +.pronunciation-graph-line-tail { + stroke: currentColor; +} +.pronunciation-graph-dot { + fill: currentColor; + stroke: currentColor; +} +.pronunciation-graph-dot-downstep1 { + stroke: currentColor; +} +.pronunciation-graph-dot-downstep2 { + fill: currentColor; +} +.pronunciation-graph-triangle { + stroke: currentColor; +} diff --git a/dev/generate-css-json.js b/dev/generate-css-json.js new file mode 100644 index 00000000..5d0b0da6 --- /dev/null +++ b/dev/generate-css-json.js @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2021 Yomichan Authors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. + */ + +const fs = require('fs'); +const path = require('path'); +const {testMain} = require('./util'); +const {formatRulesJson, generateRules} = require('./css-to-json-util'); + +function getTargets() { + return [ + { + cssFile: path.join(__dirname, '..', 'ext/css/structured-content.css'), + overridesCssFile: path.join(__dirname, 'data/structured-content-overrides.css'), + outputPath: path.join(__dirname, '..', 'ext/data/structured-content-style.json') + }, + { + cssFile: path.join(__dirname, '..', 'ext/css/display-pronunciation.css'), + overridesCssFile: path.join(__dirname, 'data/display-pronunciation-overrides.css'), + outputPath: path.join(__dirname, '..', 'ext/data/pronunciation-style.json') + } + ]; +} + +function main() { + for (const {cssFile, overridesCssFile, outputPath} of getTargets()) { + const json = formatRulesJson(generateRules(cssFile, overridesCssFile)); + fs.writeFileSync(outputPath, json, {encoding: 'utf8'}); + } +} + + +if (require.main === module) { + testMain(main, process.argv.slice(2)); +} + + +module.exports = { + getTargets +}; diff --git a/dev/generate-structured-content-style.js b/dev/generate-structured-content-style.js deleted file mode 100644 index baa1a513..00000000 --- a/dev/generate-structured-content-style.js +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) 2021 Yomichan Authors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <https://www.gnu.org/licenses/>. - */ - -const fs = require('fs'); -const path = require('path'); -const {testMain} = require('./util'); -const {formatRulesJson, generateRules: generateRulesGeneric} = require('./css-to-json-util'); - -function generateRules() { - const cssFile = path.join(__dirname, '..', 'ext/css/structured-content.css'); - const cssFileOverrides = path.join(__dirname, 'data/structured-content-overrides.css'); - return generateRulesGeneric(cssFile, cssFileOverrides); -} - -function generateRulesJson() { - return formatRulesJson(generateRules()); -} - -function getOutputPath() { - return path.join(__dirname, '..', 'ext/data/structured-content-style.json'); -} - -function main() { - const outputFileName = getOutputPath(); - const json = generateRulesJson(); - fs.writeFileSync(outputFileName, json, {encoding: 'utf8'}); -} - - -if (require.main === module) { - testMain(main, process.argv.slice(2)); -} - - -module.exports = { - generateRules, - generateRulesJson, - getOutputPath -}; |