feat: switching to new Fedran theme

BREAKING CHANGE: the new theme causes page numbers to change

.gitlab-ci.yml

@@ -1,12 +1,12 @@
-image: dmoonfire/mfgames-writing-js:1.1.1
+image: dmoonfire/mfgames-writing-js:2.0.0
 
 stages:
     - publish
 
 publish:
     stage: publish
-    tags:
+    only: [master]
-        - docker
+    tags: [docker]
     script:
         # Install the basic requirements including the free fonts.
         - npm ci
@@ -18,7 +18,7 @@ publish:
         # "previously" chapter.
         - mkdir -p build/repos
         - git clone https://oauth2:$fedranAccessKey@gitlab.com/fedran/fedran-covers.git build/repos/fedran-covers
-        - git clone https://oauth2:$fedranAccessKey@gitlab.com/fedran/sand-and-blood.git build/repos/sand-and-ash
+        - git clone https://oauth2:$fedranAccessKey@gitlab.com/fedran/sand-and-ash.git build/repos/sand-and-ash
         - 'echo "---" > build/previously.markdown'
         - 'echo "title: Previously" >> build/previously.markdown'
         - 'echo "---" >> build/previously.markdown'
@@ -27,11 +27,8 @@ publish:
         # Trigger the release if needed.
         - npx semantic-release
 
-# Build the files.
+        # Build the files.
-        - npm run build
+        - npm run upload
-
-        # Trigger the Fedran website to rebuild.
-        - "curl -X POST -F token=$fedranAccessKey -F ref=master https://gitlab.com/api/v4/projects/4027285/trigger/pipeline"
 
     artifacts:
         expire_in: 1 week

backmatter/colophon.markdown

@@ -6,6 +6,6 @@ Each chapter of this book was written and edited using Atom, a Javascript-based
 
 These individual chapters were combined together using a Typescript-based framework (`mfgames-writing-js`) which produces the EPUB, MOBI, and PDF (via WeasyPrint) versions of the novel. These are built using GitLab's Continuous Integration runners.
 
-The cover was created using Inkscape. The color scheme uses eight colors of a monochromatic scale. These colors are shared among all of the Rutejìmo novels. Likewise, the "100-02" along the spine indicates this is the third published book ("02") with Rutejìmo as the main character ("100").
+The cover was created using Inkscape. The color scheme uses eight colors of a monochromatic scale. These colors are shared among all of the Rutejìmo novels. Likewise, the "0100-02" along the spine indicates this is the third published book ("02") with Rutejìmo as the main character ("0100").
 
-The font used on the cover and interior is Corda in various weights and styles.
+The font used on the cover and interior is Source Serif Pro in various weights and styles. The IPA details are set in Source Sans Pro.

frontmatter/bastard.html

@@ -1,9 +0,0 @@
----
-title: title
----
-
-<div class="title">
-    <div class="large">Sand</div>
-    <div class="medium">and</div>
-    <div class="large">Bone</div>
-</div>

frontmatter/title.html

@@ -3,9 +3,11 @@ title: Title
 ---
 
 <div class="title">
-    <div class="large">Sand</div>
+    <div class="title-area">
-    <div class="medium">and</div>
+        <div class="large">Sand</div>
-    <div class="large">Bone</div>
+        <div class="medium">and</div>
+        <div class="large">Bone</div>
+    </div>
 
     <div class="author">D. Moonfire</div>
 

package.json

@@ -1,6 +1,5 @@
 {
   "name": "sand-and-bone",
-  "private": true,
   "version": "1.1.0",
   "fedran": {
     "pov": "0100",
@@ -22,27 +21,32 @@
     "build:docx": "sed 's@&#173;@@g' < dmoonfire-$npm_package_fedran_pov-$npm_package_fedran_vol-$npm_package_name-$npm_package_version.html | pandoc -f html -t docx -o dmoonfire-$npm_package_fedran_pov-$npm_package_fedran_vol-$npm_package_name-$npm_package_version.docx",
     "build:mobi": "kindlegen dmoonfire-$npm_package_fedran_pov-$npm_package_fedran_vol-$npm_package_name-$npm_package_version.epub",
     "build:html": "mfgames-writing-format build html",
-    "commitmsg": "commitlint -E GIT_PARAMS"
+    "prebuild:mobi": "npm run build:epub",
+    "prebuild": "rm -f $npm_package_name-*.* $npm_package_name.tar.bz2",
+    "bundle": "tar -cjf $npm_package_name.tar.bz2 *.epub *.pdf",
+    "prebundle": "npm run build",
+    "upload": "aws --endpoint-url https://$AWS_ENDPOINT s3 cp --acl public-read $npm_package_name.tar.bz2 s3://$AWS_BUCKET/$npm_package_name.tar.bz2",
+    "preupload": "npm run bundle"
   },
   "dependencies": {
     "@fedran/writing-hyphen": "^1.0.0",
-    "@fedran/writing-theme": "^2.0.2",
+    "@fedran/writing-theme": "^3.0.5",
     "@mfgames-writing/epub2": "^1.1.3",
     "@mfgames-writing/format": "^2.0.0",
     "@mfgames-writing/guillemet": "^1.0.0",
     "@mfgames-writing/html": "^0.1.1",
     "@mfgames-writing/hyphen": "^0.4.3",
-    "@mfgames-writing/weasyprint": "^3.0.2"
+    "@mfgames-writing/weasyprint": "^4.0.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "^7.5.2",
+    "@commitlint/cli": "^7.6.1",
-    "@commitlint/config-conventional": "^7.5.0",
+    "@commitlint/config-conventional": "^7.6.0",
-    "@semantic-release/changelog": "^3.0.2",
+    "@semantic-release/changelog": "^3.0.6",
-    "@semantic-release/git": "^7.0.8",
+    "@semantic-release/git": "^7.0.18",
     "commitizen": "^2.10.1",
     "cz-conventional-changelog": "^2.1.0",
     "husky": "^0.14.3",
-    "semantic-release": "^15.13.3"
+    "semantic-release": "^15.14.0"
   },
   "release": {
     "branch": "master",
@@ -71,5 +75,11 @@
     "commitizen": {
       "path": "./node_modules/cz-conventional-changelog"
     }
-  }
+  },
+  "husky": {
+    "hooks": {
+      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
+    }
+  },
+  "private": true
 }

publication.yaml

@@ -40,7 +40,7 @@ contents:
           editions: [pdf]
           toc: true
     - element: bastard
-      source: frontmatter/bastard.html
+      source: frontmatter/title.html
       linear: false
       exclude:
           editions: [epub]