Skip to content

Commit

Permalink
add FIg and table command and change report cls
Browse files Browse the repository at this point in the history
  • Loading branch information
@being24
being24 committed Oct 23, 2024
1 parent d0f23a2 commit b5e6660
Show file tree
Hide file tree
Showing 6 changed files with 106 additions and 28 deletions.
72 changes: 57 additions & 15 deletions classes/report.cls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@

\PassOptionsToPackage{hyphens}{url}
\RequirePackage{setspace} % 行間設定用パッケージ
\RequirePackage{caption} % キャプションとサブキャプションのパッケージ
\RequirePackage{subcaption}
\RequirePackage{here} % 好きな位置にfigなどを置くためのパッケージ
\RequirePackage{bm} % ベクトルを大文字で書くためのパッケージ
\RequirePackage[hyphens]{xurl} % URLを表示するためのパッケージ、ハイフンでの改行を許可
Expand All @@ -33,6 +31,7 @@
\RequirePackage{paralist} % インラインリストのパッケージ
\RequirePackage{amssymb, amsmath} % 高度な数式記述用パッケージ
\RequirePackage{mathtools} % 高度な数式記述用パッケージ
\RequirePackage{amsthm} % 定理環境を使用するためのパッケージ
\RequirePackage{newtxtext,newtxmath} % Times系フォントを使用するためのパッケージ
\RequirePackage{tabularray} % 高度な表組み用パッケージ
% \RequirePackage{minted} % ソースコード表示の用パッケージ
Expand Down Expand Up @@ -85,25 +84,68 @@


% キャプションとサブキャプションの設定
\captionsetup[figure]{labelsep=space, labelformat=simple, name=Fig.}
\captionsetup[subfigure]{labelsep=space, labelformat=simple, name=Fig.}
\RequirePackage{silence}
\WarningFilter{caption}{Unknown document class (or package)}
\RequirePackage{caption}
\RequirePackage{subcaption}
\captionsetup[figure]{labelsep=quad, labelformat=simple, name=Fig.}
\captionsetup[subfigure]{labelsep=quad, labelformat=simple, name=Fig.}
\renewcommand*{\thesubfigure}{(\alph{subfigure})}
\captionsetup[table]{labelsep=space, labelformat=simple, name=Table}
\captionsetup[table]{labelsep=quad, labelformat=simple, name=Table}

% 本文中のFigureとTableの表記統一のため，\Fig・\Tableを定義
% 引数としてlabelを受け取り，それを使ってFigureやTableを参照する
% \FigTableEqマクロの定義
\newcommand{\FigTableEq}[3][]{%
\def\temp{#1}%
\ifx\temp\empty
{#2~\ref{#3}}%
\else
\textbf{#2~\ref{#3}}%
\fi
}

% \Figマクロの定義
\newcommand{\Fig}[2][]{%
\FigTableEq[#1]{Fig.}{#2}%
}

% \Figureマクロの定義
\newcommand{\Figure}[2][]{%
\FigTableEq[#1]{Figure}{#2}%
}

% \Tableマクロの定義
\newcommand{\Table}[2][]{%
\FigTableEq[#1]{Table}{#2}%
}

% \Equationマクロの定義
\newcommand{\Eq}[2][]{%
\FigTableEq[#1]{Eq.}{#2}%
}

% sectionのサイズを合わせる
\RenewBlockHeading{chapter}{0}{indent=1\jlreq@zw,lines=6,label_format={第\thechapter 章},font={\huge},after_label_space=1\jlreq@zw,second_heading_text_indent={-1\jlreq@zw,1\jlreq@zw},subtitle_font={\jlreq@keepbaselineskip{\Large}}}
\RenewBlockHeading{section}{1}{font={\jlreq@keepbaselineskip{\normalsize\bfseries}},after_label_space=1\jlreq@zw}
\RenewBlockHeading{subsection}{2}{font={\jlreq@keepbaselineskip{\normalsize\bfseries}},after_label_space=1\jlreq@zw}
\RenewBlockHeading{subsubsection}{3}{font={\jlreq@keepbaselineskip{\normalsize\bfseries}},after_label_space=1\jlreq@zw}
\RenewBlockHeading{chapter}{0}{lines=6,label_format={第\thechapter 章},font={\jlreq@keepbaselineskip{\Huge\bfseries}},after_label_space=1\jlreq@zw,second_heading_text_indent={-1\jlreq@zw,1\jlreq@zw},subtitle_font={\jlreq@keepbaselineskip{\Large}}}
\RenewBlockHeading{section}{1}{font=\huge,after_label_space=1\jlreq@zw}
\RenewBlockHeading{subsection}{2}{font=\LARGE,after_label_space=1\jlreq@zw}
\RenewBlockHeading{subsubsection}{3}{font=\Large,after_label_space=1\jlreq@zw}

% セクション類の空白の設定
% \ModifyHeading{section}{before_space=5pt, after_space=5pt}
% \ModifyHeading{subsection}{before_space=5pt, after_space=5pt}
% \ModifyHeading{subsubsection}{before_space=5pt, after_space=5pt}
\ModifyHeading{section}{before_space=15pt, after_space=15pt}
\ModifyHeading{subsection}{before_space=10pt, after_space=10pt}
\ModifyHeading{subsubsection}{before_space=10pt, after_space=10pt}
% セクションタイトルが一行以下なら下、２行以上なら上
\ModifyHeading{section}{lines=1}
\ModifyHeading{subsection}{lines=1}
\ModifyHeading{subsubsection}{lines=1}
% \ModifyHeading{section}{lines=1}
% \ModifyHeading{subsection}{lines=1}
% \ModifyHeading{subsubsection}{lines=1}

% セクションが連続する際の行取りを設定
\SetBlockHeadingSpaces{
{_chapter{*},_section{before_space=0pt, after_space=15pt}},
{_section{*},_subsection{before_space=0pt, after_space=5pt}}
{_subsection{*},_subsubsection{before_space=0pt, after_space=5pt}}
}

\setcounter{tocdepth}{2}
\setcounter{secnumdepth}{4}
41 changes: 35 additions & 6 deletions classes/resume.cls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

% 2カラム,A4,フォントサイズ9pt
\LoadClass[
two column,
twocolumn,
paper=a4,
fontsize=9pt,
disablejfam,
Expand All @@ -24,8 +24,6 @@
\sectiondot{subsection}
\RequirePackage{setspace} % 行間設定用パッケージ
\setstretch{0.8} % 行間設定
\RequirePackage{caption} % キャプションとサブキャプションのパッケージ
\RequirePackage{subcaption}
\RequirePackage{here} % 好きな位置にfigなどを置くためのパッケージ
\RequirePackage{bm} % ベクトルを大文字で書くためのパッケージ
\RequirePackage[hyphens]{xurl} % URLを表示するためのパッケージ、ハイフンでの改行を許可
Expand Down Expand Up @@ -91,10 +89,41 @@
\setlength{\intextsep}{0pt}

% キャプションとサブキャプションの設定
\captionsetup[figure]{labelsep=space, labelformat=simple, name=Fig., skip=3pt, font={stretch=0.8}}
\captionsetup[subfigure]{labelsep=space, labelformat=simple, name=Fig., skip=3pt, font={stretch=0.8}}
\RequirePackage{silence}
\WarningFilter{caption}{Unknown document class (or package)}
\RequirePackage{caption}
\RequirePackage{subcaption}
\captionsetup[figure]{labelsep=quad, labelformat=simple, name=\bfseries Fig., skip=5pt, font={stretch=0.8}, belowskip=0pt}
\captionsetup[subfigure]{labelsep=space, labelformat=simple, name=\bfseries Fig., skip=3pt, font={stretch=0.8}, belowskip=0pt}
\renewcommand*{\thesubfigure}{(\alph{subfigure})}
\captionsetup[table]{labelsep=space, labelformat=simple, name=Table, skip=3pt, font={stretch=0.8}}
\captionsetup[table]{labelsep=quad, labelformat=simple, name=\bfseries Table, skip=5pt, font={stretch=0.8}, belowskip=0pt}

% 本文中のFigureとTableの表記統一のため，\Fig・\Tableを定義
% 引数としてlabelを受け取り，それを使ってFigureやTableを参照する
% \FigTableマクロの定義
\newcommand{\FigTable}[3][]{%
\def\temp{#1}%
\ifx\temp\empty
{#2~\ref{#3}}%
\else
\textbf{#2~\ref{#3}}%
\fi
}

% \Figマクロの定義
\newcommand{\Fig}[2][]{%
\FigTable[#1]{Fig.}{#2}%
}

% \Figureマクロの定義
\newcommand{\Figure}[2][]{%
\FigTable[#1]{Figure}{#2}%
}

% \Tableマクロの定義
\newcommand{\Table}[2][]{%
\FigTable[#1]{Table}{#2}%
}

% sectionのサイズを合わせる
\RenewBlockHeading{section}{1}{font={\jlreq@keepbaselineskip{\normalsize\bfseries}},after_label_space=0\jlreq@zw}
Expand Down
4 changes: 3 additions & 1 deletion example/tex/resume_template.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ \subsection{その次に}
本節では，○○について述べる．
\subsubsection{最後に}
最後に，○○について述べる．
\Fig{fig:fig1}に示すように，○○である．
\Table{tab:sample}に示すように，○○である．

% 図の挿入
\begin{figure}[htbp]
Expand All @@ -32,6 +34,7 @@ \subsubsection{最後に}

\begin{table}[h]
\centering
\caption{Sample Table}
\begin{tabular}{|c|c|c|}
\hline
1 & 2 & 3 \\
Expand All @@ -41,7 +44,6 @@ \subsubsection{最後に}
7 & 8 & 9 \\
\hline
\end{tabular}
\caption{Sample Table}
\label{tab:sample}
\end{table}

Expand Down
Binary file modified main.pdf
View file
Binary file not shown.
12 changes: 9 additions & 3 deletions sections/main_issue.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@
\documentclass[main]{subfiles}

\begin{document}
\chapter{本論hoge}
ここに本論を書くa \cite{ref:yao2017integrated} \cite{ref:ugarte1992curling} \cite{ref:nomura2022uwb}
\section{fuga}
\chapter{本論}
\section{セクション}
ここに本論を書く \cite{ref:yao2017integrated} \cite{ref:ugarte1992curling} \cite{ref:nomura2022uwb}．
\Fig{fig:label}と \Eq{eq:label}はに示すように，hogeである．

\subsection{サブセクション}

\begin{figure}[htbp]
\centering
Expand All @@ -13,6 +16,8 @@ \section{fuga}
\label{fig:label}
\end{figure}

\subsubsection{サブサブセクション}

色は匂へど散りぬるを 我が世誰ぞ常ならむ 有為の奥山今日越えて 浅き夢見じ酔ひもせず


Expand All @@ -23,6 +28,7 @@ \section{fuga}
\left( \int_{0}^\infty \frac{\sin x}{\sqrt {x}} dx \right)^{2}
= \sum_{k = 0}^\infty \frac{(2k)!}{2^{2k}(k!)^{2}} \frac{1}{2k + 1}
= \prod_{k = 1}^\infty \frac{4k^{2}}{4k^{2} - 1} = \frac{\pi}{2}
\label{eq:label}
\end{equation}

\end{document}
5 changes: 2 additions & 3 deletions sections/title.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
\fontsize{30pt}{30pt} \selectfont

\centering
\Huge
令和○年度
\vspace{15pt}

Expand All @@ -17,10 +16,10 @@
\vspace{45pt}

○○所属
\vspace{15pt}
\vspace{20pt}

○○課程 ○○専攻
\vspace{15pt}
\vspace{20pt}

○○分野
\vspace{45pt}
Expand Down

0 comments on commit b5e6660

Please sign in to comment.