Merge pull request #87 from SIGCOWW/release-kancolle

release
SIGCOWW · Nov 10, 2019 · efb46e4 · efb46e4
2 parents 8469f58 + 5de92bb
commit efb46e4
Show file tree

Hide file tree

Showing 25 changed files with 150 additions and 190 deletions.
diff --git a/Dockerfile.yml b/Dockerfile.yml
@@ -91,7 +91,7 @@
 - dev: 'ruby-dev'
 - dev: 'imagemagick6-dev'
 - run: "find /usr/bin/ -name '*-6' | xargs -L1 -I{} sh -c 'mv {} $(echo {} | sed s/-6//)'"
-- run: 'gem install cuterb -v 0.2.1 -N'
+- run: 'gem install cuterb -v 0.2.2 -N'
 
 # Phonto
 - apk: 'zstd'
@@ -183,7 +183,7 @@
   - name: 'Makefile'
   - name: '*jlreq*'
   - name: '*.pl'
-- run: "find / -name '*.pdf' -type f | grep -v BXcoloremoji | xargs rm -rf"
+- run: "find / -mindepth 2 -name '*.pdf' -type f | grep -v BXcoloremoji | xargs rm -rf"
 - rmrf:
   - '/usr/local/texlive/'
   - name: '*.ps'

diff --git a/docker/Dockerfile b/docker/Dockerfile
diff --git a/docker/extensions/author.rb b/docker/extensions/author.rb
@@ -30,6 +30,8 @@ def headline_prefix(level)
         puts macro('renewcommand', '\\authorname', author)
         puts macro('renewcommand', '\\katagakiname', katagaki)
       end
+      puts macro('renewcommand', '\\authorenable', (level != 1 or @author.nil?) ? '0' : '1')
+      puts macro('renewcommand', '\\katagakienable', @katagaki.nil? ? '0' : '1')
       super
     end
   end

diff --git a/docker/extensions/five-white.pdf b/docker/extensions/five-white.pdf
diff --git a/docker/extensions/five-yryrblack.pdf b/docker/extensions/five-yryrblack.pdf
diff --git a/docker/extensions/five.pdf b/docker/extensions/five.pdf
diff --git a/docker/extensions/four-white.pdf b/docker/extensions/four-white.pdf
diff --git a/docker/extensions/four-yryrblack.pdf b/docker/extensions/four-yryrblack.pdf
diff --git a/docker/extensions/four.pdf b/docker/extensions/four.pdf
diff --git a/docker/extensions/one-white.pdf b/docker/extensions/one-white.pdf
diff --git a/docker/extensions/one-yryrblack.pdf b/docker/extensions/one-yryrblack.pdf
diff --git a/docker/extensions/one.pdf b/docker/extensions/one.pdf
diff --git a/docker/extensions/three-white.pdf b/docker/extensions/three-white.pdf
diff --git a/docker/extensions/three-yryrblack.pdf b/docker/extensions/three-yryrblack.pdf
diff --git a/docker/extensions/three.pdf b/docker/extensions/three.pdf
diff --git a/docker/extensions/two-white.pdf b/docker/extensions/two-white.pdf
diff --git a/docker/extensions/two-yryrblack.pdf b/docker/extensions/two-yryrblack.pdf
diff --git a/docker/extensions/two.pdf b/docker/extensions/two.pdf
diff --git a/template/src/articles/desk/desk.re b/template/src/articles/desk/desk.re
@@ -1,4 +1,4 @@
-= desk
+= deskですくデスクですくですくですくですく
 @<author>{机上 次郎}
 //lead{
 deskを使う上で役立ちそうな情報を載せます。

diff --git a/template/src/articles/intro/intro.re b/template/src/articles/intro/intro.re
@@ -1,7 +1,2 @@
 = はじめに
-何とは言わんが
-
-: Kyash
-  ID「lrks」@<href>{kyash://qr/u/7714590359441332391}
-: MONA
-  @<tt>{P9Na6gkKpFnVc9ytDtXex3KtAaetZUAH8r}
+あのイーハトーヴォのすきとおった風、夏でも底に冷たさをもつ青いそら、うつくしい森で飾られたモリーオ市、郊外のぎらぎらひかる草の波。
diff --git a/template/src/articles/review/review.re b/template/src/articles/review/review.re
@@ -1,5 +1,5 @@
 = Re:VIEW（with desk）文法集
-@<author>{Re:VIEW (, desk) の文法なら任せろー, 分峰 太郎;twitter:hoge}
+@<author>{Re:VIEW (, desk) の文法なら任せろー, hogetaro;twitter:hoge}
 //lead{
 Re:VIEWの文法、およびlrks/deskで拡張した文法を基本編と応用編に分けて紹介します。
 また、開発に役立つ情報も載せます。

diff --git a/template/src/articles/sample/sample.re b/template/src/articles/sample/sample.re
@@ -63,15 +63,16 @@ ucharな三点リーダー@<uchar>{2026}
 == コードブロック
 === TIPS
 TIPSのテストをする
-//tip[キャプション]{
-これは正式な文章の代わりに入れて使うダミーテキストです。
+//tip[ここにキャプションが入りますキャプションキャプションキャプション]{
+■■■■■■■■■■■■■■■■■■■■■■■■■■■
 
-これは正式な文章の代わりに入れて使うダミーテキストです。
-これは正式な文章の代わりに入れて使うダミーテキストです。
-これは正式な文章の代わりに入れて使うダミーテキストです。
+■■■■■■■■■■■■■■■■■■■■■■■■■■■
+■■■■■■■■■■■■■■■■■■■■■■■■■■■
+■■■■■■■■■■■■■■■■■■■■■■■■■■■
 
-これは正式な文章の代わりに入れて使うダミーテキストです。
-これは正式な文章の代わりに入れて使うダミーテキストです。
+■■■■■■■■■■■■■■■■■■■■■■■■■■■
+■■■■■■■■■■■■■■■■■■■■■■■■■■■
+■■■■■■■■■■■■■■■■■■■■■■■■■■■
 //}
 TIPSのテストをしたはずだ。
 

diff --git a/template/src/config.yml b/template/src/config.yml
@@ -11,10 +11,10 @@ edt: "[email protected]"                       # 連絡先 省略可
 feedback: "https://example.com/"                 # 連絡フォーム 省略可
 msg: "https://sigcoww.org/ で既刊紹介中"         # メッセージ 省略可
 
-container_version: "jewelpet"                    # desk のバージョン 省略可
-layout_hash: "6fd9409306cd76f85ff807b2dad53af5"  # layout.tex.erb のMD5ハッシュ 省略可
-sty_hash: "68f40bfda6ec9ddc19ff9b4331f83656"     # sigcoww.sty のMD5ハッシュ 省略可
-titlelatex: '\sigcowwtitle'                      # 扉ページ 省略可
+container_version: "kancolle"                    # desk のバージョン 省略可
+layout_hash: "29c145e8f139ac90a42b623f8c52f37f"  # layout.tex.erb のMD5ハッシュ 省略可
+sty_hash: "c202f8f4271d4302373d63acabe651b2"     # sigcoww.sty のMD5ハッシュ 省略可
+titlelatex: '\sigcowwpage'                       # 扉ページ 省略可
 download: "https://example.sigcoww.org/?key=%s"  # ダウンロードコード用文字列 省略可
 tallymark: false                                 # ページ数を正の字で表現する 省略可
 

diff --git a/template/src/layouts/layout.tex.erb b/template/src/layouts/layout.tex.erb
@@ -59,6 +59,7 @@
 \usepackage{colortbl}
 \usepackage{indentfirst}
 \usepackage{qrcode}
+\usepackage{refcount}
 
 \advance \paperwidth 10truemm
 \advance \paperheight 10truemm
@@ -271,7 +272,7 @@
 <%- if @config["tallymark"] -%>
 \newcommand{\enabletallymark}{}
 <%- end -%>
-
+\newcommand{\sigcowwtitle}{<%= escape_latex(@config.name_of("booktitle")) %>}
 <%- if @config["texstyle"] -%>
 <%-   [@config["texstyle"]].flatten.each do |x| -%>
 \usepackage{<%= x %>}

diff --git a/template/src/layouts/sigcoww.sty b/template/src/layouts/sigcoww.sty
@@ -53,12 +53,13 @@
 \setlength{\marginparpush}{\baselineskip}
 \setlength{\headsep}{11.25truemm}
 \newlength{\headinsep}\setlength{\headinsep}{1.75truemm}
-\setlength{\textheight}{64\baselineskip}
+\setlength{\textheight}{40\baselineskip}
 \setlength{\headheight}{10truemm}
-\newlength{\chapterheight}\setlength{\chapterheight}{60truemm}
+\newlength{\chapterheight}\setlength{\chapterheight}{50truemm}
 \setlength{\marginposadjustment}{2pt}
 \definecolor{yryrblack}{gray}{0.1}
 \definecolor{yryrwhite}{gray}{0.9}
+\definecolor{yryrblackblack}{gray}{0.15}
 %\flushbottom% ... marginparと相性が悪い
 \addtolength{\oddsidemargin}{-1truein}
   \addtolength{\oddsidemargin}{\marginparwidth}
@@ -93,13 +94,13 @@
   \ifdefined\enabletallymark
     \count@\value{page}%
     \loop\ifnum\count@>4
-      \includegraphics[height=\fontcharht\font`2]{../layouts/five-white.pdf}
+      \includegraphics[height=\fontcharht\font`2]{../layouts/five.pdf}
       \advance\count@ by -5
     \repeat
-    \ifnum\count@=1{\includegraphics[height=\fontcharht\font`2]{../layouts/one-white.pdf}}\fi
-    \ifnum\count@=2{\includegraphics[height=\fontcharht\font`2]{../layouts/two-white.pdf}}\fi
-    \ifnum\count@=3{\includegraphics[height=\fontcharht\font`2]{../layouts/three-white.pdf}}\fi
-    \ifnum\count@=4{\includegraphics[height=\fontcharht\font`2]{../layouts/four-white.pdf}}\fi
+    \ifnum\count@=1{\includegraphics[height=\fontcharht\font`2]{../layouts/one.pdf}}\fi
+    \ifnum\count@=2{\includegraphics[height=\fontcharht\font`2]{../layouts/two.pdf}}\fi
+    \ifnum\count@=3{\includegraphics[height=\fontcharht\font`2]{../layouts/three.pdf}}\fi
+    \ifnum\count@=4{\includegraphics[height=\fontcharht\font`2]{../layouts/four.pdf}}\fi
   \else\thepage\fi}
 
 \pagestyle{fancy}
@@ -113,18 +114,18 @@
   \end{scope}\end{tikzpicture}\raisebox{-2\baselineskip}{\textcolor{#2}{#3}}}
 \newcommand{\chaphashira}[1]{\begin{tikzpicture}[remember picture, overlay]%
   \begin{scope}[shift={(current page.north west)}]%
-    \fill[#1] (-100pt, 100pt) rectangle (\paperwidth, -\chapterheight-16pt);
+    \fill[#1] (-100pt, 100pt) rectangle (\paperwidth, -\chapterheight-10pt);
   \end{scope}\end{tikzpicture}}
 \newcommand{\tume}{\if@mainmatter\if@twoside%
   \checkoddpage\ifoddpage%
     \def\tumewidth@{-5mm-5mm}\def\tumeorigin@{east}%
   \else%
     \def\tumewidth@{5mm+5mm}\def\tumeorigin@{west}%
   \fi%
-  \count@\value{chapter}%\advance\count@ by -1%
+  \count@\value{chapter}%
   \begin{tikzpicture}[remember picture, overlay]\begin{scope}[shift={($%
-    (current page.north \tumeorigin@)+(-6pt,-\chapterheight-16pt)+\count@*(0,-10mm)$)}]%
-      \fill[yryrblack] (0, 0) rectangle (\tumewidth@, -10mm);%
+    (current page.north \tumeorigin@)+(-6pt,-\chapterheight-10pt)+\count@*(0,-10mm)$)}]%
+      \fill[yryrblackblack] (0, 0) rectangle (\tumewidth@, 10mm);%
     \end{scope}%
   \end{tikzpicture}\fi\fi}
 
@@ -138,26 +139,26 @@
   \fancyhead[LO]{\hashira{yryrwhite}{yryrblack}{\sffamily\leftmark}}
 \fi
 \fancyfoot{}
-\fancyfoot[LE]{\nombre{yryrblack}{yryrwhite}{\sffamily\noukin}\tume}
-\fancyfoot[RO]{\nombre{yryrblack}{yryrwhite}{\sffamily\noukin}\tume}
+\fancyfoot[LE]{\nombre{yryrwhite}{yryrblack}{\sffamily\noukin}\tume}
+\fancyfoot[RO]{\nombre{yryrwhite}{yryrblack}{\sffamily\noukin}\tume}
 \renewcommand{\footrulewidth}{0pt}
 \renewcommand{\headrulewidth}{0pt}
 
 % chapterあり
 \fancypagestyle{plainhead}{%
-\fancyhead{\chaphashira{yryrblack}}
+\fancyhead{\chaphashira{yryrwhite}}
 \fancyfoot{}
-\fancyfoot[LE]{\nombre{yryrblack}{yryrwhite}{\sffamily\noukin}\tume}
-\fancyfoot[RO]{\nombre{yryrblack}{yryrwhite}{\sffamily\noukin}\tume}
+\fancyfoot[LE]{\nombre{yryrwhite}{yryrblack}{\sffamily\noukin}\tume}
+\fancyfoot[RO]{\nombre{yryrwhite}{yryrblack}{\sffamily\noukin}\tume}
 \renewcommand{\headrulewidth}{0pt}
 \renewcommand{\footrulewidth}{0pt}}
 
 % 扉用
 \fancypagestyle{fancytitle}{%
 \fancyhead{}
 \fancyfoot{}
-\fancyfoot[LE]{\nombre{yryrblack}{yryrwhite}{\sffamily\noukin}}
-\fancyfoot[RO]{\nombre{yryrblack}{yryrwhite}{\sffamily\noukin}}
+\fancyfoot[LE]{\nombre{yryrwhite}{yryrblack}{\sffamily\noukin}}
+\fancyfoot[RO]{\nombre{yryrwhite}{yryrblack}{\sffamily\noukin}}
 \renewcommand{\headrulewidth}{0pt}
 \renewcommand{\footrulewidth}{0pt}}
 %
@@ -167,19 +168,24 @@
 %
 % 見出し
 % 通常版 \chapter{}
+\newlength{\@chapterauthorh}
+\newlength{\@chapterkatagakih}
 \def\@makechapterhead#1{\begin{widepage}%
   {\parindent \z@ \raggedright \normalfont
     \vspace*{-\headsep}\vspace*{-\headheight}\vbox to\chapterheight{\vfill%
-    \ifnum \c@secnumdepth >\m@ne
-      \if@mainmatter
-        \LARGE\headfont\textcolor{white}{\@chapapp\thechapter\@chappos}\par%
-		\textcolor{white}{\katagakiname\authorname}%
-        \par\nobreak
-        \vskip \Cvs
-      \fi
-    \fi
     \interlinepenalty\@M
-    \parbox[c]{\textwidth}{\Huge\headfont\textcolor{white}{#1}}\par\nobreak\vfill}%
+    \parbox[c]{\textwidth}{\Huge\headfont\textcolor{yryrblack}{#1}}\par\nobreak
+    \ifnum\authorenable=0\else\ifnum \c@secnumdepth >\m@ne\if@mainmatter
+      \settoheight{\@chapterauthorh}{\hbox{\authorname}}
+      \ifnum\katagakienable=1%
+        \settoheight{\@chapterkatagakih}{\hbox{\katagakiname}}%
+        \ifdim\@chapterkatagakih>\@chapterauthorh\setlength{\@chapterauthorh}{\@chapterkatagakih}\fi%
+      \fi\vskip 0.75\Cvs
+      \hfill\ifnum\katagakienable=1%
+        \colorbox{white}{\textcolor{yryrblack}{\mathstrut\rule{0pt}{\@chapterauthorh}\katagakiname}}%
+      \fi\colorbox{yryrblack}{\textcolor{white}{\mathstrut\rule{0pt}{\@chapterauthorh}\authorname}}%
+      \par\nobreak
+    \fi\fi\fi\vfill}%
     \vspace*{2\Cvs}}%
   \end{widepage}}
 
@@ -188,7 +194,7 @@
    \parindent \z@ \raggedright\normalfont
    \begin{widepage*}\vbox to\chapterheight{\vfill%
      \interlinepenalty\@M
-     \Huge\headfont\textcolor{white}{#1}\par\nobreak\vfill}\end{widepage*}%
+     \Huge\headfont\textcolor{yryrblack}{#1}\par\nobreak\vfill}\end{widepage*}%
 	 \vskip 2\Cvs}}
 
 % toc
@@ -228,9 +234,6 @@
      \nobreak\hb@xt@\@pnumwidth{\hfil\sffamily#5}\hspace*{9.25pt}\end{widepage}%
    \par\vskip1.5\baselineskip}\fi}
 
-
-
-
 % \section{}
 \def\@startsection#1#2#3#4#5#6{%
   \if@noskipsec \leavevmode \fi
@@ -269,16 +272,6 @@
       \useasboundingbox (0,0) rectangle (0,0);
       \fill[yryrblack] (0,-3pt) rectangle (1.5pt,11pt);
     \end{tikzpicture}\hspace{0.9zw}}}
-
-% \subsubsection{}
-\renewcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}%
-  {\Cvs \@plus.5\Cdp \@minus.2\Cdp}%
-  {\z@}%
-  {\normalfont\normalsize\headfont
-    \begin{tikzpicture}
-      \useasboundingbox (0,0) rectangle (0,0);
-      \fill[yryrwhite] (0,-2pt) rectangle (1.5pt,9pt);
-    \end{tikzpicture}\hspace{1.1zw}}}
 %
 %
 %
@@ -336,12 +329,12 @@
   \ifnum\count@=3{\padding@}\fi%
   \fi}
 %
-\newcommand{\sigcowwtitle}{\begin{eyecatch}{0}SIGCOWW\end{eyecatch}}
+\newcommand{\sigcowwpage}{\begin{eyecatch}{0}\sigcowwtitle\end{eyecatch}}
 \newcommand{\@aftereyecatch}{}
 \newenvironment{eyecatch}[1]{%
   \clearpage
   \renewcommand{\@aftereyecatch}{}
-  \ifnum#1=0\pagecolor{yryrblack}\color{white}\renewcommand{\@aftereyecatch}{\vfill}\fi
+  \ifnum#1=0\pagecolor{yryrwhite}\color{yryrblack}\renewcommand{\@aftereyecatch}{\vfill}\fi
   \ifnum#1=1\pagecolor{yryrwhite}\renewcommand{\@aftereyecatch}{\vfill}\fi
   \ifnum#1=2\pagecolor{yryrwhite}\fi
   \thispagestyle{fancytitle}\ifnum#1=3\else\vspace*{\fill}\fi\begin{widepage}
@@ -350,13 +343,15 @@
   }
 
 % //lead{...//}
-\newenvironment{leadw}{\begin{widepage}\begin{abstract}}{\end{abstract}\end{widepage}}
+\newenvironment{leadw}{\begin{widepage}\begin{abstract}}{\end{abstract}\end{widepage}\vspace{-0.75\baselineskip}}
 
 % @<author>{...}
 \newcommand{\authorname}{}
-\newcommand{\authorsub}[1]{\LARGE#1{\large\hspace{0.5em}著}}
+\newcommand{\authorsub}[1]{\headfont\,{\large#1}\,}
 \newcommand{\katagakiname}{}
-\newcommand{\katagakisub}[1]{\large#1\hspace{0.75em}}
+\newcommand{\katagakisub}[1]{\headfont\,{\large#1}\,}
+\newcommand{\authorenable}{0}
+\newcommand{\katagakienable}{0}
 
 % //image , //imagew
 \renewenvironment{reviewimage}%
@@ -428,7 +423,7 @@
 \renewenvironment{shaded}{%
  \begin{tcolorbox}[colback=yryrwhite,colframe=yryrwhite,boxrule=1pt,top=.5zw,left=.5zw,bottom=.5zw,right=.5zw]}{\end{tcolorbox}}
 \renewenvironment{shadedb}{%
- \begin{tcolorbox}[colback=yryrblack,colframe=yryrblack,colupper=white,boxrule=1pt,top=.5zw,left=.5zw,bottom=.5zw,right=.5zw]}{\end{tcolorbox}}
+ \begin{tcolorbox}[colback=yryrblackblack,colframe=yryrblackblack,colupper=white,boxrule=1pt,top=.5zw,left=.5zw,bottom=.5zw,right=.5zw]}{\end{tcolorbox}}
 
 \renewenvironment{reviewemlist}{%
   \medskip\begin{shaded}\small\setlength{\baselineskip}{1.2zw}\begin{alltt}}{%
@@ -454,8 +449,8 @@
 \newenvironment{tips}[1]%
   {\begin{figure}[!bt]\begin{widepage*}\begin{tcolorbox}[%
     colframe=yryrwhite,colback=yryrwhite,colbacktitle=yryrwhite,coltitle=black,fonttitle=\headfont\large,%
-	title={\vspace{1zw}Tips: #1},boxrule=1pt,top=0pt,left=1zw,bottom=1zw,right=1zw]%
-    \setlength{\columnsep}{0.9zw}\begin{multicols}{2}\setlength{\parindent}{1zw}}%
+    title={\vspace{1zw}\raisebox{0.7pt}{\colorbox{yryrblack}{\textcolor{white}{\small{TIPS}}}}~#1},boxrule=1pt,top=0pt,left=1zw,bottom=1zw,right=1zw]%
+	\setlength{\columnsep}{1.5zw}\setlength{\columnseprule}{0.4pt}\begin{multicols}{2}\setlength{\parindent}{1zw}}%
   {\end{multicols}\end{tcolorbox}\end{widepage*}\end{figure}}
 
 % 便利
@@ -486,7 +481,7 @@
 % QRコード
 \newcommand{\reviewqr}[1]{\vspace{0.5\baselineskip}\\{%
   \setlength\lineskiplimit{0pt}\setlength\normallineskiplimit{0pt}%
-  \qrcode[tight,height=\marginparwidth]{#1}}\vspace{0.5\baselineskip}\\}
+  \hfill\qrcode[tight,height=0.5\marginparwidth]{#1}}\hfill\vspace{0.5\baselineskip}\\}
 
 \renewcommand{\copyright}{\textcopyright}