From b8040738a1fbaaa0edcaddbae9942ee3554a7408 Mon Sep 17 00:00:00 2001
From: Iosif Takakura <takakura.yusuke@gmail.com>
Date: Tue, 14 May 2024 23:51:06 +0900
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E9=9D=A2=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/jobs.yml   |  4 ++--
 config-print-pdf.yml         |  2 +-
 config-vivliostyle.yml       |  2 +-
 sass/common/_typography.scss | 17 +++++++++++++++--
 sass/vivliostyle-a6.scss     |  2 +-
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/jobs.yml b/.github/workflows/jobs.yml
index cc1edaa..a9758c5 100644
--- a/.github/workflows/jobs.yml
+++ b/.github/workflows/jobs.yml
@@ -117,7 +117,7 @@ jobs:
       - name: Show .svg.log
         run: cat .svg.log
       - name: Build PDF.
-        run: REVIEW_CONFIG_FILE=config-ebook-pdf.yml REVIEW_CATALOG_FILE=catalog-download.yml bundle exec rake pdf
+        run: REVIEW_CONFIG_FILE=config-ebook-pdf.yml bundle exec rake pdf
       - name: Upload artifact.
         uses: actions/upload-artifact@v3
         with:
@@ -143,7 +143,7 @@ jobs:
       - name: Show .plantuml.log
         run: cat .plantuml.log
       - name: Build EPUB.
-        run: REVIEW_CONFIG_FILE=config-epub.yml REVIEW_CATALOG_FILE=catalog-download.yml bundle exec rake epub
+        run: REVIEW_CONFIG_FILE=config-epub.yml bundle exec rake epub
       - name: Upload artifact.
         uses: actions/upload-artifact@v3
         with:
diff --git a/config-print-pdf.yml b/config-print-pdf.yml
index 29283d1..606837a 100644
--- a/config-print-pdf.yml
+++ b/config-print-pdf.yml
@@ -1,4 +1,4 @@
 inherit: ["config.yml"]
 bookname: book-print-pdf
 # prt: ねこのしっぽ
-texdocumentclass: ["review-jlreq", "media=print,paper=b5,fontsize=9pt,serial_pagination=true,hiddenfolio=shippo,startpage=3,tate,twoside,onecolumn,openany"]
\ No newline at end of file
+texdocumentclass: ["review-jlreq", "media=print,paper=b6,fontsize=8pt,serial_pagination=true,hiddenfolio=shippo,startpage=3,tate,twoside,onecolumn,openany"]
\ No newline at end of file
diff --git a/config-vivliostyle.yml b/config-vivliostyle.yml
index d4f3a9d..292eb44 100644
--- a/config-vivliostyle.yml
+++ b/config-vivliostyle.yml
@@ -1,5 +1,5 @@
 inherit: ["config.yml"]
-stylesheet: vivliostyle-a5.css
+stylesheet: vivliostyle-a6.css
 # catalogfile: catalog.yml
 bookname: book
 highlight:
diff --git a/sass/common/_typography.scss b/sass/common/_typography.scss
index dd28c6e..5e5a471 100644
--- a/sass/common/_typography.scss
+++ b/sass/common/_typography.scss
@@ -16,7 +16,7 @@ h1 {
   /* フォント */
   font-weight: bold;
   /* フォントサイズ */
-  font-size: 11.5pt;
+  font-size: 1.35rem;
   /* 字下げ */
   text-indent: 0;
   /* 直後の改ページ・改段禁止 */
@@ -39,7 +39,7 @@ h2 {
   /* フォント */
   font-weight: normal;
   /* フォントサイズ */
-  font-size: 10pt;
+  font-size: 1.18rem;
   /* 字下げ */
   text-indent: 6em;
   /* 直後の改ページ・改段禁止 */
@@ -53,6 +53,19 @@ h1 + h2 {
   margin-block-start: $base-line-height;
 }
 
+h2 {
+  /* フォント */
+  font-weight: normal;
+  /* フォントサイズ */
+  font-size: 1rem;
+  /* 字下げ */
+  text-indent: 8em;
+  /* 直後の改ページ・改段禁止 */
+  break-after: avoid;
+  // 2行取り
+  line-height: $base-line-height * 2;
+}
+
 ruby > rt {
   font-size: 50%;
 }
diff --git a/sass/vivliostyle-a6.scss b/sass/vivliostyle-a6.scss
index 1a7f382..279f59e 100644
--- a/sass/vivliostyle-a6.scss
+++ b/sass/vivliostyle-a6.scss
@@ -4,7 +4,7 @@
 // 基本フォントサイズ
 $base-font-size: 8pt;
 // 基本行送り
-$base-line-height: 16pt;
+$base-line-height: 1.4rem;
 // 基本フォントファミリー
 //$base-font-family: "EB Garamond", "Yakumono", "Nanum Myeongjo", "Noto Serif CJK jp", serif;
 $base-font-family: "EB Garamond", "Yakumono", "Noto Serif CJK jp", serif;