From 19df7ff3c0ff94f59291940a1a00dcf16dadb9d7 Mon Sep 17 00:00:00 2001 From: Takashi Suwa Date: Fri, 5 Jan 2024 17:57:11 +0900 Subject: [PATCH] fix `annot`, `code`, and `font-*` --- .../annot.0.0.1/package.satysfi-lock-expected | 10 ---- .../annot.0.0.1/saphe.lock.yaml.expected | 11 ++++ .../packages/annot/annot.0.0.1/saphe.yaml | 22 ++++++++ .../satysfi-envelope.yaml.expected | 5 ++ .../code.0.0.1/package.satysfi-lock-expected | 18 ------- .../code/code.0.0.1/saphe.lock.yaml.expected | 11 ++++ .../packages/code/code.0.0.1/saphe.yaml | 27 ++++++++++ .../code.0.0.1/satysfi-envelope.yaml.expected | 5 ++ .../package.satysfi-lock-expected | 2 - .../saphe.lock.yaml.expected | 3 ++ .../font-ipa-ex/font-ipa-ex.0.0.1/saphe.yaml | 24 +++++++++ .../satysfi-envelope.yaml.expected | 11 ++++ .../package.satysfi-lock-expected | 2 - .../font-junicode.0.0.1/saphe.yaml | 50 +++++++++---------- .../package.satysfi-lock-expected | 2 - .../font-latin-modern-math.0.0.1/saphe.yaml | 16 +++--- .../package.satysfi-lock-expected | 2 - .../saphe.lock.yaml.expected | 3 ++ .../font-latin-modern.0.0.1/saphe.yaml | 24 +++++++++ .../satysfi-envelope.yaml.expected | 11 ++++ .../packages/stdlib/stdlib.0.0.1/satysfi.yaml | 2 +- 21 files changed, 191 insertions(+), 70 deletions(-) delete mode 100644 lib-satysfi/packages/annot/annot.0.0.1/package.satysfi-lock-expected create mode 100644 lib-satysfi/packages/annot/annot.0.0.1/saphe.lock.yaml.expected create mode 100644 lib-satysfi/packages/annot/annot.0.0.1/saphe.yaml create mode 100644 lib-satysfi/packages/annot/annot.0.0.1/satysfi-envelope.yaml.expected delete mode 100644 lib-satysfi/packages/code/code.0.0.1/package.satysfi-lock-expected create mode 100644 lib-satysfi/packages/code/code.0.0.1/saphe.lock.yaml.expected create mode 100644 lib-satysfi/packages/code/code.0.0.1/saphe.yaml create mode 100644 lib-satysfi/packages/code/code.0.0.1/satysfi-envelope.yaml.expected delete mode 100644 lib-satysfi/packages/font-ipa-ex/font-ipa-ex.0.0.1/package.satysfi-lock-expected create mode 100644 lib-satysfi/packages/font-ipa-ex/font-ipa-ex.0.0.1/saphe.lock.yaml.expected create mode 100644 lib-satysfi/packages/font-ipa-ex/font-ipa-ex.0.0.1/saphe.yaml create mode 100644 lib-satysfi/packages/font-ipa-ex/font-ipa-ex.0.0.1/satysfi-envelope.yaml.expected delete mode 100644 lib-satysfi/packages/font-junicode/font-junicode.0.0.1/package.satysfi-lock-expected delete mode 100644 lib-satysfi/packages/font-latin-modern-math/font-latin-modern-math.0.0.1/package.satysfi-lock-expected delete mode 100644 lib-satysfi/packages/font-latin-modern/font-latin-modern.0.0.1/package.satysfi-lock-expected create mode 100644 lib-satysfi/packages/font-latin-modern/font-latin-modern.0.0.1/saphe.lock.yaml.expected create mode 100644 lib-satysfi/packages/font-latin-modern/font-latin-modern.0.0.1/saphe.yaml create mode 100644 lib-satysfi/packages/font-latin-modern/font-latin-modern.0.0.1/satysfi-envelope.yaml.expected diff --git a/lib-satysfi/packages/annot/annot.0.0.1/package.satysfi-lock-expected b/lib-satysfi/packages/annot/annot.0.0.1/package.satysfi-lock-expected deleted file mode 100644 index 22b630ca5..000000000 --- a/lib-satysfi/packages/annot/annot.0.0.1/package.satysfi-lock-expected +++ /dev/null @@ -1,10 +0,0 @@ -language: ^0.1.0 -locks: -- name: registered.d9b4b850ab61a7b68961c6315048b351.stdlib.0.0.1 - contents: - type: registered - registry_hash_value: d9b4b850ab61a7b68961c6315048b351 - package_name: stdlib - version: 0.0.1 - dependencies: [] - test_only: false diff --git a/lib-satysfi/packages/annot/annot.0.0.1/saphe.lock.yaml.expected b/lib-satysfi/packages/annot/annot.0.0.1/saphe.lock.yaml.expected new file mode 100644 index 000000000..9a9d8bcfd --- /dev/null +++ b/lib-satysfi/packages/annot/annot.0.0.1/saphe.lock.yaml.expected @@ -0,0 +1,11 @@ +ecosystem: ^0.0.1 +locks: +- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.stdlib.0.0.1 + dependencies: [] + test_only: false + registered: + registry_hash_value: 6f2b80e9bb7c4e8af2104999fc25dbb3 + package_name: stdlib + version: 0.0.1 +dependencies: +- registered.6f2b80e9bb7c4e8af2104999fc25dbb3.stdlib.0.0.1 diff --git a/lib-satysfi/packages/annot/annot.0.0.1/saphe.yaml b/lib-satysfi/packages/annot/annot.0.0.1/saphe.yaml new file mode 100644 index 000000000..3187f4b42 --- /dev/null +++ b/lib-satysfi/packages/annot/annot.0.0.1/saphe.yaml @@ -0,0 +1,22 @@ +ecosystem: "^0.0.1" +language: "^0.1.0" +name: "annot" +authors: + - "Daiki Matsunaga <@matsud224>" + - "Takashi Suwa <@gfngfn>" +registries: + - name: "default" + git: + url: "https://github.com/SATySFi/default-registry" + branch: "temp-dev-saphe" +contents: + library: + main_module: "Annot" + source_directories: + - "./src" + dependencies: + - used_as: "Stdlib" + registered: + registry: "default" + name: "stdlib" + requirement: "^0.0.1" diff --git a/lib-satysfi/packages/annot/annot.0.0.1/satysfi-envelope.yaml.expected b/lib-satysfi/packages/annot/annot.0.0.1/satysfi-envelope.yaml.expected new file mode 100644 index 000000000..36b1fd1fc --- /dev/null +++ b/lib-satysfi/packages/annot/annot.0.0.1/satysfi-envelope.yaml.expected @@ -0,0 +1,5 @@ +library: + main_module: Annot + source_directories: + - ./src + test_directories: [] diff --git a/lib-satysfi/packages/code/code.0.0.1/package.satysfi-lock-expected b/lib-satysfi/packages/code/code.0.0.1/package.satysfi-lock-expected deleted file mode 100644 index afd0f0594..000000000 --- a/lib-satysfi/packages/code/code.0.0.1/package.satysfi-lock-expected +++ /dev/null @@ -1,18 +0,0 @@ -language: ^0.1.0 -locks: -- name: registered.d9b4b850ab61a7b68961c6315048b351.font-latin-modern.0.0.1 - contents: - type: registered - registry_hash_value: d9b4b850ab61a7b68961c6315048b351 - package_name: font-latin-modern - version: 0.0.1 - dependencies: [] - test_only: false -- name: registered.d9b4b850ab61a7b68961c6315048b351.stdlib.0.0.1 - contents: - type: registered - registry_hash_value: d9b4b850ab61a7b68961c6315048b351 - package_name: stdlib - version: 0.0.1 - dependencies: [] - test_only: false diff --git a/lib-satysfi/packages/code/code.0.0.1/saphe.lock.yaml.expected b/lib-satysfi/packages/code/code.0.0.1/saphe.lock.yaml.expected new file mode 100644 index 000000000..9a9d8bcfd --- /dev/null +++ b/lib-satysfi/packages/code/code.0.0.1/saphe.lock.yaml.expected @@ -0,0 +1,11 @@ +ecosystem: ^0.0.1 +locks: +- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.stdlib.0.0.1 + dependencies: [] + test_only: false + registered: + registry_hash_value: 6f2b80e9bb7c4e8af2104999fc25dbb3 + package_name: stdlib + version: 0.0.1 +dependencies: +- registered.6f2b80e9bb7c4e8af2104999fc25dbb3.stdlib.0.0.1 diff --git a/lib-satysfi/packages/code/code.0.0.1/saphe.yaml b/lib-satysfi/packages/code/code.0.0.1/saphe.yaml new file mode 100644 index 000000000..f72d35e0d --- /dev/null +++ b/lib-satysfi/packages/code/code.0.0.1/saphe.yaml @@ -0,0 +1,27 @@ +ecosystem: "^0.0.1" +language: "^0.1.0" +name: "code" +authors: + - "Takashi Suwa <@gfngfn>" + - "Naoki Kaneko <@puripuri2100>" +registries: + - name: "default" + git: + url: "https://github.com/SATySFi/default-registry" + branch: "temp-dev-saphe" +contents: + library: + main_module: "Code" + source_directories: + - "./src" + dependencies: + - used_as: "Stdlib" + registered: + registry: "default" + name: "stdlib" + requirement: "^0.0.1" + - used_as: "FontLatinModern" + registered: + registry: "default" + name: "font-latin-modern" + requirement: "^0.0.1" diff --git a/lib-satysfi/packages/code/code.0.0.1/satysfi-envelope.yaml.expected b/lib-satysfi/packages/code/code.0.0.1/satysfi-envelope.yaml.expected new file mode 100644 index 000000000..0d383b35a --- /dev/null +++ b/lib-satysfi/packages/code/code.0.0.1/satysfi-envelope.yaml.expected @@ -0,0 +1,5 @@ +library: + main_module: Code + source_directories: + - ./src + test_directories: [] diff --git a/lib-satysfi/packages/font-ipa-ex/font-ipa-ex.0.0.1/package.satysfi-lock-expected b/lib-satysfi/packages/font-ipa-ex/font-ipa-ex.0.0.1/package.satysfi-lock-expected deleted file mode 100644 index cac2e8573..000000000 --- a/lib-satysfi/packages/font-ipa-ex/font-ipa-ex.0.0.1/package.satysfi-lock-expected +++ /dev/null @@ -1,2 +0,0 @@ -language: ^0.1.0 -locks: [] diff --git a/lib-satysfi/packages/font-ipa-ex/font-ipa-ex.0.0.1/saphe.lock.yaml.expected b/lib-satysfi/packages/font-ipa-ex/font-ipa-ex.0.0.1/saphe.lock.yaml.expected new file mode 100644 index 000000000..a2658c9dc --- /dev/null +++ b/lib-satysfi/packages/font-ipa-ex/font-ipa-ex.0.0.1/saphe.lock.yaml.expected @@ -0,0 +1,3 @@ +ecosystem: ^0.0.1 +locks: [] +dependencies: [] diff --git a/lib-satysfi/packages/font-ipa-ex/font-ipa-ex.0.0.1/saphe.yaml b/lib-satysfi/packages/font-ipa-ex/font-ipa-ex.0.0.1/saphe.yaml new file mode 100644 index 000000000..f54281146 --- /dev/null +++ b/lib-satysfi/packages/font-ipa-ex/font-ipa-ex.0.0.1/saphe.yaml @@ -0,0 +1,24 @@ +ecosystem: "^0.0.1" +language: "^0.1.0" +name: "font-ipa-ex" +authors: [] +external_sources: + - name: "IPAexfont00401" + zip: + url: "https://moji.or.jp/wp-content/ipafont/IPAexfont/IPAexfont00401.zip" + checksum: "57f2631833c1049ea89320971cc74ce5" + extractions: + - from: "IPAexfont00401/ipaexg.ttf" + to: "./fonts/ipaexg.ttf" + - from: "IPAexfont00401/ipaexm.ttf" + to: "./fonts/ipaexm.ttf" +contents: + font: + main_module: "FontIpaEx" + files: + - path: "./fonts/ipaexm.ttf" + opentype_single: + name: "mincho" + - path: "./fonts/ipaexg.ttf" + opentype_single: + name: "gothic" diff --git a/lib-satysfi/packages/font-ipa-ex/font-ipa-ex.0.0.1/satysfi-envelope.yaml.expected b/lib-satysfi/packages/font-ipa-ex/font-ipa-ex.0.0.1/satysfi-envelope.yaml.expected new file mode 100644 index 000000000..cbfc8b84d --- /dev/null +++ b/lib-satysfi/packages/font-ipa-ex/font-ipa-ex.0.0.1/satysfi-envelope.yaml.expected @@ -0,0 +1,11 @@ +font: + main_module: FontIpaEx + files: + - path: ./fonts/ipaexm.ttf + opentype_single: + name: mincho + math: false + - path: ./fonts/ipaexg.ttf + opentype_single: + name: gothic + math: false diff --git a/lib-satysfi/packages/font-junicode/font-junicode.0.0.1/package.satysfi-lock-expected b/lib-satysfi/packages/font-junicode/font-junicode.0.0.1/package.satysfi-lock-expected deleted file mode 100644 index cac2e8573..000000000 --- a/lib-satysfi/packages/font-junicode/font-junicode.0.0.1/package.satysfi-lock-expected +++ /dev/null @@ -1,2 +0,0 @@ -language: ^0.1.0 -locks: [] diff --git a/lib-satysfi/packages/font-junicode/font-junicode.0.0.1/saphe.yaml b/lib-satysfi/packages/font-junicode/font-junicode.0.0.1/saphe.yaml index 01f05f810..4ffa02167 100644 --- a/lib-satysfi/packages/font-junicode/font-junicode.0.0.1/saphe.yaml +++ b/lib-satysfi/packages/font-junicode/font-junicode.0.0.1/saphe.yaml @@ -2,33 +2,33 @@ ecosystem: "^0.0.1" language: "^0.1.0" name: "font-junicode" authors: [] -external_sources: +external_resources: - name: "junicode-1.002" - type: "zip" - url: "http://downloads.sourceforge.net/project/junicode/junicode/junicode-1.002/junicode-1.002.zip" - checksum: "b1d6ed8796d8d1eacd733c0d568d939f" - extractions: - - from: "Junicode.ttf" - to: "./fonts/Junicode.ttf" - - from: "Junicode-Bold.ttf" - to: "./fonts/Junicode-Bold.ttf" - - from: "Junicode-Italic.ttf" - to: "./fonts/Junicode-Italic.ttf" - - from: "Junicode-BoldItalic.ttf" - to: "./fonts/Junicode-BoldItalic.ttf" + zip: + url: "http://downloads.sourceforge.net/project/junicode/junicode/junicode-1.002/junicode-1.002.zip" + checksum: "b1d6ed8796d8d1eacd733c0d568d939f" + extractions: + - from: "Junicode.ttf" + to: "./fonts/Junicode.ttf" + - from: "Junicode-Bold.ttf" + to: "./fonts/Junicode-Bold.ttf" + - from: "Junicode-Italic.ttf" + to: "./fonts/Junicode-Italic.ttf" + - from: "Junicode-BoldItalic.ttf" + to: "./fonts/Junicode-BoldItalic.ttf" contents: font: main_module: "FontJunicode" files: - - path: "./fonts/Junicode.ttf" - opentype_single: - name: "normal" - - path: "./fonts/Junicode-Bold.ttf" - opentype_single: - name: "bold" - - path: "./fonts/Junicode-Italic.ttf" - opentype_single: - name: "italic" - - path: "./fonts/Junicode-BoldItalic.ttf" - opentype_single: - name: "bold-italic" + - path: "./fonts/Junicode.ttf" + opentype_single: + name: "normal" + - path: "./fonts/Junicode-Bold.ttf" + opentype_single: + name: "bold" + - path: "./fonts/Junicode-Italic.ttf" + opentype_single: + name: "italic" + - path: "./fonts/Junicode-BoldItalic.ttf" + opentype_single: + name: "bold-italic" diff --git a/lib-satysfi/packages/font-latin-modern-math/font-latin-modern-math.0.0.1/package.satysfi-lock-expected b/lib-satysfi/packages/font-latin-modern-math/font-latin-modern-math.0.0.1/package.satysfi-lock-expected deleted file mode 100644 index cac2e8573..000000000 --- a/lib-satysfi/packages/font-latin-modern-math/font-latin-modern-math.0.0.1/package.satysfi-lock-expected +++ /dev/null @@ -1,2 +0,0 @@ -language: ^0.1.0 -locks: [] diff --git a/lib-satysfi/packages/font-latin-modern-math/font-latin-modern-math.0.0.1/saphe.yaml b/lib-satysfi/packages/font-latin-modern-math/font-latin-modern-math.0.0.1/saphe.yaml index 6254922bb..8ba7b34ae 100644 --- a/lib-satysfi/packages/font-latin-modern-math/font-latin-modern-math.0.0.1/saphe.yaml +++ b/lib-satysfi/packages/font-latin-modern-math/font-latin-modern-math.0.0.1/saphe.yaml @@ -2,19 +2,19 @@ ecosystem: "^0.0.1" language: "^0.1.0" name: "font-latin-modern-math" authors: [] -external_sources: +external_resources: - name: "latinmodern-math-1959" zip: url: "http://www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip" checksum: "bc82f6d4184ec0ea3ba2c0798e6be719" - extractions: - - from: "latinmodern-math-1959/otf/latinmodern-math.otf" - to: "./fonts/latinmodern-math.otf" + extractions: + - from: "latinmodern-math-1959/otf/latinmodern-math.otf" + to: "./fonts/latinmodern-math.otf" contents: font: main_module: "FontLatinModernMath" files: - - path: "./fonts/latinmodern-math.otf" - opentype_single: - name: "main" - math: true + - path: "./fonts/latinmodern-math.otf" + opentype_single: + name: "main" + math: true diff --git a/lib-satysfi/packages/font-latin-modern/font-latin-modern.0.0.1/package.satysfi-lock-expected b/lib-satysfi/packages/font-latin-modern/font-latin-modern.0.0.1/package.satysfi-lock-expected deleted file mode 100644 index cac2e8573..000000000 --- a/lib-satysfi/packages/font-latin-modern/font-latin-modern.0.0.1/package.satysfi-lock-expected +++ /dev/null @@ -1,2 +0,0 @@ -language: ^0.1.0 -locks: [] diff --git a/lib-satysfi/packages/font-latin-modern/font-latin-modern.0.0.1/saphe.lock.yaml.expected b/lib-satysfi/packages/font-latin-modern/font-latin-modern.0.0.1/saphe.lock.yaml.expected new file mode 100644 index 000000000..a2658c9dc --- /dev/null +++ b/lib-satysfi/packages/font-latin-modern/font-latin-modern.0.0.1/saphe.lock.yaml.expected @@ -0,0 +1,3 @@ +ecosystem: ^0.0.1 +locks: [] +dependencies: [] diff --git a/lib-satysfi/packages/font-latin-modern/font-latin-modern.0.0.1/saphe.yaml b/lib-satysfi/packages/font-latin-modern/font-latin-modern.0.0.1/saphe.yaml new file mode 100644 index 000000000..b9ac7f831 --- /dev/null +++ b/lib-satysfi/packages/font-latin-modern/font-latin-modern.0.0.1/saphe.yaml @@ -0,0 +1,24 @@ +ecosystem: "^0.0.1" +language: "^0.1.0" +name: "font-latin-modern" +authors: [] +external_resources: + - name: "lm2.004otf" + zip: + url: "https://www.gust.org.pl/projects/e-foundry/latin-modern/download/lm2.004otf.zip" + checksum: "0bc81a83fe37416b67b69ab3a6593ef5" + extractions: + - from: "lmmono10-regular.otf" + to: "./fonts/lmmono10-regular.otf" + - from: "lmsans10-regular.otf" + to: "./fonts/lmsans10-regular.otf" +contents: + font: + main_module: "FontLatinModern" + files: + - path: "./fonts/lmmono10-regular.otf" + opentype_single: + name: "mono" + - path: "./fonts/lmsans10-regular.otf" + opentype_single: + name: "sans" diff --git a/lib-satysfi/packages/font-latin-modern/font-latin-modern.0.0.1/satysfi-envelope.yaml.expected b/lib-satysfi/packages/font-latin-modern/font-latin-modern.0.0.1/satysfi-envelope.yaml.expected new file mode 100644 index 000000000..a134d4ecf --- /dev/null +++ b/lib-satysfi/packages/font-latin-modern/font-latin-modern.0.0.1/satysfi-envelope.yaml.expected @@ -0,0 +1,11 @@ +font: + main_module: FontLatinModern + files: + - path: ./fonts/lmmono10-regular.otf + opentype_single: + name: mono + math: false + - path: ./fonts/lmsans10-regular.otf + opentype_single: + name: sans + math: false diff --git a/lib-satysfi/packages/stdlib/stdlib.0.0.1/satysfi.yaml b/lib-satysfi/packages/stdlib/stdlib.0.0.1/satysfi.yaml index 6efe97745..c560fa662 100644 --- a/lib-satysfi/packages/stdlib/stdlib.0.0.1/satysfi.yaml +++ b/lib-satysfi/packages/stdlib/stdlib.0.0.1/satysfi.yaml @@ -8,7 +8,7 @@ registries: remote: type: "git" url: "https://github.com/SATySFi/default-registry" - branch: "temp-dev-saphe" + branch: "format-1" contents: type: "library" main_module: "Stdlib"