Merge pull request #189 from entrylabs/develop

2.1.9 버전업
entrylabs · Nov 27, 2023 · 0ca06a1 · 0ca06a1
2 parents b0e26a4 + 73b8dcf
commit 0ca06a1
Show file tree

Hide file tree

Showing 16 changed files with 144 additions and 15 deletions.
diff --git a/build/entryx64.nsi b/build/entryx64.nsi
@@ -13,7 +13,7 @@
 !define MUI_UNICON "icon.ico"
 !define PRODUCT_NAME "Entry"
 !define APP_NAME "Entry.exe"
-!define PRODUCT_VERSION "2.1.8"
+!define PRODUCT_VERSION "2.1.9"
 !define PRODUCT_PUBLISHER "EntryLabs"
 !define PRODUCT_WEB_SITE "http://www.playentry.org/"
 

diff --git a/build/entryx86.nsi b/build/entryx86.nsi
@@ -13,7 +13,7 @@
 !define MUI_UNICON "icon.ico"
 !define PRODUCT_NAME "Entry"
 !define APP_NAME "Entry.exe"
-!define PRODUCT_VERSION "2.1.8"
+!define PRODUCT_VERSION "2.1.9"
 !define PRODUCT_PUBLISHER "EntryLabs"
 !define PRODUCT_WEB_SITE "http://www.playentry.org/"
 

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "private": true,
     "productName": "Entry",
     "name": "entry",
-    "version": "2.1.8",
+    "version": "2.1.9",
     "description": "Entry for offline",
     "main": "src/main_build/main.bundle.js",
     "scripts": {
@@ -36,8 +36,8 @@
         "async-csv": "^2.1.3",
         "axios": "^0.19.2",
         "cross-spawn": "^7.0.3",
-        "entry-hw": "git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.46",
-        "entry-js": "git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.8",
+        "entry-hw": "git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.47",
+        "entry-js": "git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.9",
         "entry-tool": "git+https://github.com/entrylabs/entry-tool.git#dist/20231026",
         "excel4node": "^1.7.0",
         "fs-extra": "^8.1.0",

diff --git a/src/renderer/resources/fonts/MaruBuri-Bold.woff b/src/renderer/resources/fonts/MaruBuri-Bold.woff
diff --git a/src/renderer/resources/fonts/MaruBuri-Regular.woff b/src/renderer/resources/fonts/MaruBuri-Regular.woff
diff --git a/src/renderer/resources/fonts/NotoSans-Bold.woff b/src/renderer/resources/fonts/NotoSans-Bold.woff
diff --git a/src/renderer/resources/fonts/NotoSans-Regular.woff b/src/renderer/resources/fonts/NotoSans-Regular.woff
diff --git a/src/renderer/resources/fonts/d2coding-bold-subset.woff b/src/renderer/resources/fonts/d2coding-bold-subset.woff
diff --git a/src/renderer/resources/fonts/d2coding-subset.woff b/src/renderer/resources/fonts/d2coding-subset.woff
diff --git a/src/renderer/resources/fonts/nanumbarunpenB.woff b/src/renderer/resources/fonts/nanumbarunpenB.woff
diff --git a/src/renderer/resources/fonts/nanumbarunpenR.woff b/src/renderer/resources/fonts/nanumbarunpenR.woff
diff --git a/src/renderer/resources/lang/en.json b/src/renderer/resources/lang/en.json
@@ -8114,7 +8114,11 @@
         "sd_mapssi": "Sandoll Mapssi",
         "sd_shabang": "Sandoll Shabang",
         "sd_woodcarving": "Sandoll Woodcarving",
-        "sd_yongbi": "Sandoll Yongbi"
+        "sd_yongbi": "Sandoll Yongbi",
+        "maruburi": "MaruBuri",
+        "nanumbarunpen": "NanumBarunpen.",
+        "notosans": "NotoSans",
+        "d2coding": "D2Coding"
     },
     "Hw": {
         "note": "note",

diff --git a/src/renderer/resources/lang/ko.json b/src/renderer/resources/lang/ko.json
@@ -2600,10 +2600,10 @@
         "jeju_hallasan": "한라산체",
         "gothic_coding": "코딩고딕체",
         "batang": "바탕체",
-        "gothic": "나눔고딕체",
+        "gothic": "나눔고딕",
         "myeongjo": "나눔명조",
         "pen_script": "나눔손글씨",
-        "square_round": "나눔스퀘어라운드체",
+        "square_round": "나눔스퀘어라운드",
         "jalnan": "잘난체",
         "designhouse": "디자인하우스체",
         "malssami815": "말싸미815체",
@@ -2619,7 +2619,11 @@
         "sd_mapssi": "산돌 맵씨",
         "sd_shabang": "산돌 별이샤방샤방",
         "sd_woodcarving": "산돌 목각",
-        "sd_yongbi": "산돌 용비어천가"
+        "sd_yongbi": "산돌 용비어천가",
+        "maruburi": "마루 부리",
+        "nanumbarunpen": "나눔바른펜",
+        "notosans": "본고딕",
+        "d2coding": "D2 Coding"
     },
     "Hw": {
         "note": "음표",

diff --git a/src/renderer/resources/styles/fonts.css b/src/renderer/resources/styles/fonts.css
@@ -159,4 +159,64 @@
   font-weight: 400;
   src: local('잘난체 Regular');
   src: url("../fonts/fonts/JalnanOTF00.woff") format('woff');
-}
+}
+
+@font-face {
+  font-family: 'D2 Coding';
+  font-style: normal;
+  font-weight: 400;
+  src: local('D2 Coding Regular');
+  src: url("../fonts/d2coding-subset.woff") format('woff');
+}
+@font-face {
+  font-family: 'D2 Coding';
+  font-style: normal;
+  font-weight: 600;
+  src: local('D2 Coding Bold');
+  src: url("../fonts/d2coding-bold-subset.woff") format('woff');
+}
+
+@font-face {
+  font-family: 'Nanum Barun Pen';
+  font-style: normal;
+  font-weight: 400;
+  src: local('나눔 바른 펜 Regular');
+  src: url("../fonts/nanumbarunpenR.woff") format('woff');
+}
+@font-face {
+  font-family: 'Nanum Barun Pen';
+  font-style: normal;
+  font-weight: 600;
+  src: local('나눔 바른 펜 Bold');
+  src: url("../fonts/nanumbarunpenB.woff") format('woff');
+}
+
+@font-face {
+  font-family: 'MaruBuri';
+  font-style: normal;
+  font-weight: 400;
+  src: local('마루부리 Regular');
+  src: url("../fonts/MaruBuri-Regular.woff") format('woff');
+}
+@font-face {
+  font-family: 'MaruBuri';
+  font-style: normal;
+  font-weight: 600;
+  src: local('마루부리 Bold');
+  src: url("../fonts/MaruBuri-Bold.woff") format('woff');
+}
+
+@font-face {
+  font-family: 'NotoSans';
+  font-style: normal;
+  font-weight: 400;
+  src: local('NotoSans Regular');
+  src: url("../fonts/NotoSans-Regular.woff") format('woff');
+}
+@font-face {
+  font-family: 'NotoSans';
+  font-style: normal;
+  font-weight: 600;
+  src: local('NotoSans Bold');
+  src: url("../fonts/NotoSans-Bold.woff") format('woff');
+}
diff --git a/src/renderer/resources/styles/fonts.scss b/src/renderer/resources/styles/fonts.scss
@@ -241,3 +241,64 @@
   font-weight: 400;
   src: url("../renderer/resources/fonts/SDChildfundkorea.woff") format('woff');
 }
+
+// D2Coding
+@font-face {
+  font-family: 'D2 Coding';
+  font-style: normal;
+  font-weight: 400;
+  src: local('D2 Coding Regular');
+  src: url("../renderer/resources/fonts/d2coding-subset.woff") format('woff');
+}
+@font-face {
+  font-family: 'D2 Coding';
+  font-style: normal;
+  font-weight: 600;
+  src: local('D2 Coding Bold');
+  src: url("../renderer/resources/fonts/d2coding-bold-subset.woff") format('woff');
+}
+// 나눔바른펜
+@font-face {
+  font-family: 'Nanum Barun Pen';
+  font-style: normal;
+  font-weight: 400;
+  src: local('나눔 바른 펜 Regular');
+  src: url("../renderer/resources/fonts/nanumbarunpenR.woff") format('woff');
+}
+@font-face {
+  font-family: 'Nanum Barun Pen';
+  font-style: normal;
+  font-weight: 600;
+  src: local('나눔 바른 펜 Bold');
+  src: url("../renderer/resources/fonts/nanumbarunpenB.woff") format('woff');
+}
+// 마루 부리
+@font-face {
+  font-family: 'MaruBuri';
+  font-style: normal;
+  font-weight: 400;
+  src: local('마루부리 Regular');
+  src: url("../renderer/resources/fonts/MaruBuri-Regular.woff") format('woff');
+}
+@font-face {
+  font-family: 'MaruBuri';
+  font-style: normal;
+  font-weight: 600;
+  src: local('마루부리 Bold');
+  src: url("../renderer/resources/fonts/MaruBuri-Bold.woff") format('woff');
+}
+// 본고딕
+@font-face {
+  font-family: 'NotoSans';
+  font-style: normal;
+  font-weight: 400;
+  src: local('NotoSans Regular');
+  src: url("../renderer/resources/fonts/NotoSans-Regular.woff") format('woff');
+}
+@font-face {
+  font-family: 'NotoSans';
+  font-style: normal;
+  font-weight: 600;
+  src: local('NotoSans Bold');
+  src: url("../renderer/resources/fonts/NotoSans-Bold.woff") format('woff');
+}
diff --git a/yarn.lock b/yarn.lock
@@ -3393,9 +3393,9 @@ enquirer@^2.3.5:
   dependencies:
     crypto-js "^4.0.0"
 
-"entry-hw@git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.46":
-  version "1.9.46"
-  resolved "git+https://github.com/entrylabs/entry-hw.git#3463e52f5392f465d29c9daf2e74d118b6b04897"
+"entry-hw@git+https://github.com/entrylabs/entry-hw.git#dist/v1.9.47":
+  version "1.9.47"
+  resolved "git+https://github.com/entrylabs/entry-hw.git#9df85b258025584980cf42eaceedf4476065ee04"
   dependencies:
     cross-spawn "^7.0.0"
     fs-extra "^8.1.0"
@@ -3410,9 +3410,9 @@ enquirer@^2.3.5:
     winston "^3.2.1"
     winston-daily-rotate-file "^4.4.2"
 
-"entry-js@git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.8":
+"entry-js@git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.9":
   version "0.0.0"
-  resolved "git+https://github.com/entrylabs/entryjs.git#e376ef4b3bc41a8518163bed4f3d9e70ceb490df"
+  resolved "git+https://github.com/entrylabs/entryjs.git#72bd53c74576aa0bf4237fc456c12f8bd27cfbeb"
 
 "entry-tool@git+https://github.com/entrylabs/entry-tool.git#dist/20231026":
   version "0.0.0"