Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

マークダウンテンプレートと表紙に関する更新 #88

Merged
merged 4 commits into from
Mar 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/articles_branch_ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,7 @@ jobs:
run: |
cd ${{ steps.extract_branch.outputs.branch }}
if [ -f ./main.md ]; then
if [ ! -f ./main.tex ]; then
echo "exist=true" >> $GITHUB_OUTPUT
fi
echo "exist=true" >> $GITHUB_OUTPUT
fi
id: main_md

Expand Down
11 changes: 1 addition & 10 deletions .github/workflows/master_branch_ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,7 @@ jobs:

# 事前にarticlesフォルダ内のmarkdownファイルに対してpandocを実行する
- name: convert markdown to latex
run: |
for filepath in $PWD/articles/*; do
cd $filepath
if [ -f ./main.md ]; then
if [ ! -f ./main.tex ]; then
echo $filepath
make pandoc
fi
fi
done
run: ./scripts/all_pandoc.sh

- name: build master branch
run: |
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
*.omc
*.out
*.blg
*.bbl
*.bcf
.omakedb*
*.ps
!articles/*/jisb5.ps
Expand Down
4 changes: 3 additions & 1 deletion articles/cover/main.tex
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
%以下をコメントアウトし、cover.jpgを置き換えるなどして使用してください。
% jpg,png,pdfなど形式は大体対応しています。

%\includegraphics[width=\paperwidth, height=\paperheight]{cover.jpg}
%\begin{tikzpicture}[remember picture, overlay]
% \node at (current page.center) {\includegraphics[width=1.00\paperwidth, height=1.00\paperheight]{cover.jpg}};
%\end{tikzpicture}

\end{document}
1 change: 1 addition & 0 deletions articles/hinagata-markdown/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
main.tex
1 change: 0 additions & 1 deletion articles/hinagata-markdown/main.md
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ make pandoc

とすることで生成することができます。

main.texファイルがあるとmarkdown変換処理が行われないため、main.texファイルをコミットしないように気を付けてください

# その他情報

Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ version: '3.4'
services:
article_build:
image: ghcr.io/word-coins/latex-build:latest
command: "/bin/sh -c 'fc-cache && WORD_FONT=sourcehan-jp make'"
command: "/bin/sh -c 'fc-cache && ./scripts/all_pandoc.sh && WORD_FONT=sourcehan-jp make'"
volumes:
- .:/workdir
11 changes: 11 additions & 0 deletions scripts/all_pandoc.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/usr/bin/env bash

# 全ての記事を検査してmain.mdファイルがあったら変換する

for filepath in $PWD/articles/*; do
cd $filepath
if [ -f ./main.md ]; then
echo $filepath
make pandoc
fi
done
Loading