Skip to content

Commit

Permalink
fix: build error
Browse files Browse the repository at this point in the history
  • Loading branch information
YasunoriMATSUOKA committed Jan 18, 2024
1 parent 6466e09 commit 1109155
Show file tree
Hide file tree
Showing 12 changed files with 51 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ executors:
vvakame-executor:
working_directory: ~/review
docker:
- image: vvakame/review:5.7
- image: vvakame/review:5.8

# -------------------------
# COMMANDS
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"image": "vvakame/review:5.7",
"image": "vvakame/review:5.8",
"settings": {
"editor.wordWrap": "on"
},
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/on_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ jobs:
name:
runs-on: ubuntu-latest
steps:
# uses v2 Stable version
# uses v3 Stable version
# https://github.com/actions/checkout
- name: checkout source
uses: actions/checkout@v2
uses: actions/checkout@v3
# Build Artifacts
- name: Build distribution file
uses: TechBooster/ReVIEW-build-artifact-action@master
# Upload Distribution file
- name: Upload distribution file to github artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: Output documents
path: ./articles/*.pdf
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
image: vvakame/review:5.7
image: vvakame/review:5.8

build-pdf:
script: # build-in-docker.sh の終盤と同じもの
Expand Down
2 changes: 1 addition & 1 deletion .gitpod.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
image: vvakame/review:5.7
image: vvakame/review:5.8
tasks:
- command: ./setup.sh
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# A sample Gemfile
source "https://rubygems.org"

gem 'review', '5.7.0'
gem 'review', '5.8.0'
gem 'pandoc2review'
gem 'playwright-runner'
gem 'rake'
# gem 'review-peg', '0.2.2'
gem 'unicode-display_width'
13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

技術書典14で頒布する「今日から現場で使える速習Symbolブロックチェーン」の原稿管理用リポジトリです。こちらのリポジトリで技術的な検証ができ次第、後述するNEMTUSのOrganizationでのリポジトリの管理に移行する可能性があります。

TechBoosterのRe:VIEW用の書籍テンプレート[https://github.com/TechBooster/ReVIEW-Template](https://github.com/TechBooster/ReVIEW-Template)を利用しています。Re:VIEWバージョン5.7に対応します
TechBoosterのRe:VIEW用の書籍テンプレート[https://github.com/TechBooster/ReVIEW-Template](https://github.com/TechBooster/ReVIEW-Template)を利用しています。Re:VIEWバージョン5.8に対応します

## 速習Symbolとは

Expand Down Expand Up @@ -144,8 +144,8 @@ TeXの環境構築が困難な場合、一式セットアップ済みのDocker
Dockerがうまく動くようになっている場合、以下のコマンドで細かい準備なしにビルドを行うことができます。

```
$ docker pull ghcr.io/vvakame/review:5.7 (ghcrからのダウンロードの場合)
$ docker pull vvakame/review:5.7 (Docker Hubからのダウンロードの場合)
$ docker pull ghcr.io/vvakame/review:5.8 (ghcrからのダウンロードの場合)
$ docker pull vvakame/review:5.8 (Docker Hubからのダウンロードの場合)
$ ./build-in-docker.sh
```

Expand Down Expand Up @@ -239,10 +239,10 @@ Re:VIEW 3以降のプロジェクトは、review-updateコマンドで簡単に

```
$ review-update
** review-update はプロジェクトを 5.7.0 に更新します **
** review-update はプロジェクトを 5.8.0 に更新します **
config.yml: 'review_version' を '5.0' に更新しますか? [y]/n
プロジェクト/sty/review-base.sty は Re:VIEW バージョンのもの (/var/lib/gems/2.7.0/gems/review-5.7.0/templates/latex/review-jsbook/review-base.sty) で置き換えられます。本当に進めますか? [y]/n
プロジェクト/sty/review-jsbook.cls は Re:VIEW バージョンのもの (/var/lib/gems/2.7.0/gems/review-5.7.0/templates/latex/review-jsbook/review-jsbook.cls) で置き換えられます。本当に進めますか? [y]/n
プロジェクト/sty/review-base.sty は Re:VIEW バージョンのもの (/var/lib/gems/2.7.0/gems/review-5.8.0/templates/latex/review-jsbook/review-base.sty) で置き換えられます。本当に進めますか? [y]/n
プロジェクト/sty/review-jsbook.cls は Re:VIEW バージョンのもの (/var/lib/gems/2.7.0/gems/review-5.8.0/templates/latex/review-jsbook/review-jsbook.cls) で置き換えられます。本当に進めますか? [y]/n
完了しました。
```

Expand Down Expand Up @@ -287,6 +287,7 @@ layouts/layouts.tex.erbやsty/techbooster-doujin.styに何らかのカスタマ

Re:VIEW 3以降で変わったことの詳細については、以下を参照してください。

* [Re:VIEW 5.8 での変更点](https://review-knowledge-ja.readthedocs.io/ja/latest/releases/review580.html)
* [Re:VIEW 5.7 での変更点](https://review-knowledge-ja.readthedocs.io/ja/latest/releases/review570.html)
* [Re:VIEW 5.6 での変更点](https://review-knowledge-ja.readthedocs.io/ja/latest/releases/review560.html)
* [Re:VIEW 5.5 での変更点](https://review-knowledge-ja.readthedocs.io/ja/latest/releases/review550.html)
Expand Down
13 changes: 13 additions & 0 deletions articles/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,19 @@ direction: "ltr"
# 追加する<meta>要素のプロパティとその値
# opf_meta: {"ebpaj:guide-version": "1.1.3"}

# Playwrightの利用オプション
playwright_options:
# playwrightコマンドのパス
# playwright_path: "./node_modules/.bin/playwright"
# DockerのRe:VIEWではplaywrightをプリインストールしているためデフォルトを/usr/binのものに変更
playwright_path: "/usr/bin/playwright"
# playwright-runnerの切り取りを使う。pdfcropを使う場合はfalseにする
# selfcrop: true
# pdfcropコマンドのパス
# pdfcrop_path: "pdfcrop"
# pdftocairoコマンドのパス
# pdftocairo_path: "pdftocairo"

# 以下のパラメータを有効にするときには、
# epubmaker:
# パラメータ: 値
Expand Down
14 changes: 14 additions & 0 deletions articles/sty/review-jsbook.cls
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,20 @@
]{hyperref}
\RequirePackage{pxjahyper}

%% better line breaks for long urls
\AtBeginDocument{%
%% modified url.sty
\def\UrlBreaks{%
\do\0\do\1\do\2\do\3\do\4\do\5\do\6\do\7\do\8\do\9%
\do\A\do\B\do\C\do\D\do\E\do\F\do\G\do\H\do\I\do\J\do\K\do\L\do\M\do\N%
\do\O\do\P\do\Q\do\R\do\S\do\T\do\U\do\V\do\W\do\X\do\Y\do\Z%
\do\a\do\b\do\c\do\d\do\e\do\f\do\g\do\h\do\i\do\j\do\k\do\l\do\m\do\n%
\do\o\do\p\do\q\do\r\do\s\do\t\do\u\do\v\do\w\do\x\do\y\do\z%
%%
\do\.\do\@\do\\\do\/\do\!\do\_\do\|\do\;\do\>\do\]%
\do\)\do\,\do\?\do\&\do\'\do+\do\=\do\#}%
}

%% more useful macros
%% ----------
%% include fullpage graphics
Expand Down
7 changes: 4 additions & 3 deletions articles/sty/techbooster-doujin-base.sty
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@
\renewcommand{\captionsize}{\fontsize{9}{9}\selectfont}
\newlength{\captionnumwidth}
\setlength{\captionnumwidth}{6zw}
%\newlength{\captionwidth}

\newlength{\captionwidth}
\setlength{\captionwidth}{\textwidth}
\addtolength{\captionwidth}{-\captionnumwidth}
\def\captionhead{\sffamily{\color{black!30!white}{▲}}}
Expand Down Expand Up @@ -92,15 +93,15 @@

\renewcommand{\reviewsourcecaption}[1]{%
{\def\captionhead{\sffamily{\color{black!30!white}{▼}}}
\medskip{\listcaption#1\relax}\vspace*{-1.3zw}}}
\medskip{\buildcaption{}{}{#1}\relax}\vspace*{-1.3zw}}}

\renewcommand{\reviewemlistcaption}[1]{%
{\def\captionhead{\sffamily{\color{black!30!white}{▼}}}
\medskip{\buildcaption{}{}{#1}\relax}\vspace*{-1.3zw}}}

\renewcommand{\reviewcmdcaption}[1]{%
{\def\captionhead{\sffamily{\color{black!30!white}{▼}}}
\medskip{\listcaption#1\relax}\vspace*{-1.3zw}}}
\medskip{\buildcaption{}{}{#1}\relax}\vspace*{-1.3zw}}}

\renewcommand{\reviewindepimagecaption}[1]{%
\begin{center}#1\end{center}}
Expand Down
4 changes: 2 additions & 2 deletions build-in-docker-with-config-ebook.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
[ ! -z $REVIEW_CONFIG_FILE ] || REVIEW_CONFIG_FILE=config-ebook.yml

# コマンド手打ちで作業したい時は以下の通り /book に pwd がマウントされます
# docker run -i -t -v $(pwd):/book vvakame/review:5.7 /bin/bash
# docker run -i -t -v $(pwd):/book vvakame/review:5.8 /bin/bash

docker run -t --rm -v $(pwd):/book vvakame/review:5.7 /bin/bash -ci "cd /book && ./setup.sh && REVIEW_CONFIG_FILE=$REVIEW_CONFIG_FILE npm run pdf"
docker run -t --rm -v $(pwd):/book vvakame/review:5.8 /bin/bash -ci "cd /book && ./setup.sh && REVIEW_CONFIG_FILE=$REVIEW_CONFIG_FILE npm run pdf"
4 changes: 2 additions & 2 deletions build-in-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
# [ ! -z $REVIEW_CONFIG_FILE ] || REVIEW_CONFIG_FILE=config-ebook.yml

# コマンド手打ちで作業したい時は以下の通り /book に pwd がマウントされます
# docker run -i -t -v $(pwd):/book vvakame/review:5.7 /bin/bash
# docker run -i -t -v $(pwd):/book vvakame/review:5.8 /bin/bash

docker run -t --rm -v $(pwd):/book vvakame/review:5.7 /bin/bash -ci "cd /book && ./setup.sh && REVIEW_CONFIG_FILE=$REVIEW_CONFIG_FILE npm run pdf"
docker run -t --rm -v $(pwd):/book vvakame/review:5.8 /bin/bash -ci "cd /book && ./setup.sh && REVIEW_CONFIG_FILE=$REVIEW_CONFIG_FILE npm run pdf"

0 comments on commit 1109155

Please sign in to comment.