fix(latex): fix merge conflicts

This commit is contained in:
nuluh
2025-05-12 00:45:30 +07:00
parent 6105da57f0
commit 190cd0904e

View File

@@ -43,7 +43,7 @@
\setmonofont{Courier New} \setmonofont{Courier New}
% Metadata commands % Metadata commands
\input{metadata} % Load metadata from external file \input{metadata}
\newcommand{\setthesisinfo}[7]{% \newcommand{\setthesisinfo}[7]{%
\renewcommand{\thesistitle}{#1}% \renewcommand{\thesistitle}{#1}%
@@ -55,7 +55,7 @@
\renewcommand{\yearofsubmission}{#7}% \renewcommand{\yearofsubmission}{#7}%
} }
% Header and footer % % Header and footer
\fancypagestyle{fancy}{% \fancypagestyle{fancy}{%
\fancyhf{} \fancyhf{}
\fancyhead[R]{\nouppercase{\rightmark}} \fancyhead[R]{\nouppercase{\rightmark}}
@@ -73,11 +73,17 @@
} }
% Chapter formatting % Chapter formatting
\titlespacing{\chapter}{0pt}{0pt}{*1.5}
\titleformat{\chapter}[display] \titleformat{\chapter}[display]
{\bfseries\Large\centering} {\normalsize\bfseries\centering}
{BAB~\Roman{chapter}} % << display format {BAB~\Roman{chapter}} % << display format
{1ex} {1ex}
{\MakeUppercase} {\MakeUppercase}
\titleformat{\section}
{\normalsize\bfseries}{\thesection}{1em}{}
\titleformat{\subsection}
{\normalsize\bfseries}{\thesubsection}{1em}{}
% Ensure chapter reference in TOC matches % Ensure chapter reference in TOC matches
\renewcommand{\cftchappresnum}{BAB~} \renewcommand{\cftchappresnum}{BAB~}
@@ -89,18 +95,19 @@
\renewcommand{\maketitle}{\input{frontmatter/maketitle}} \renewcommand{\maketitle}{\input{frontmatter/maketitle}}
% Chapter & Section format % Chapter & Section format
\renewcommand{\cftchapfont}{\bfseries\MakeUppercase} \renewcommand{\cftchapfont}{\normalsize\MakeUppercase}
% \renewcommand{\cftsecfont}{} % \renewcommand{\cftsecfont}{}
% \renewcommand{\cftsubsecfont}{\itshape} % \renewcommand{\cftsubsecfont}{\itshape}
% \renewcommand{\thesection}{\textup{\Roman{chapter}}.\arabic{section}} % \renewcommand{\thesection}{\textup{\Roman{chapter}}.\arabic{section}}
% Dot leaders, spacing, indentation % Dot leaders, spacing, indentation
\setlength{\cftbeforechapskip}{0em} \setlength{\cftbeforechapskip}{0em}
\setlength{\cftchapindent}{0pt} \setlength{\cftchapindent}{0pt}
\setlength{\cftsecindent}{0em} \setlength{\cftsecindent}{0em}
\setlength{\cftsubsecindent}{3em} \setlength{\cftsubsecindent}{2.5em}
\setlength{\cftchapnumwidth}{4em} \setlength{\cftchapnumwidth}{3.5em}
\setlength{\cftsecnumwidth}{2.5em} \setlength{\cftsecnumwidth}{3.5em}
\setlength{\cftsubsecnumwidth}{2.5em} \setlength{\cftsubsecnumwidth}{2.5em}
\renewcommand \cftchapdotsep{4.5} % https://tex.stackexchange.com/a/273764 \renewcommand \cftchapdotsep{4.5} % https://tex.stackexchange.com/a/273764
\renewcommand{\cftchapleader}{\normalfont\cftdotfill{\cftsecdotsep}} \renewcommand{\cftchapleader}{\normalfont\cftdotfill{\cftsecdotsep}}
@@ -114,23 +121,36 @@
\renewcommand{\thefigure}{\arabic{chapter}.\arabic{figure}} \renewcommand{\thefigure}{\arabic{chapter}.\arabic{figure}}
\renewcommand{\thetable}{\arabic{chapter}.\arabic{table}} \renewcommand{\thetable}{\arabic{chapter}.\arabic{table}}
% Table of Contents (TOC) Title styling % Table of Content (TOC) Title styling
\renewcommand{\contentsname}{DAFTAR ISI} \renewcommand{\contentsname}{DAFTAR ISI}
\renewcommand{\cfttoctitlefont}{\bfseries\MakeUppercase} \renewcommand{\cfttoctitlefont}{\hfill\bfseries\MakeUppercase}
\renewcommand{\cftaftertoctitle}{\hfill} % https://tex.stackexchange.com/a/255699/394075 \renewcommand{\cftaftertoctitle}{\hfill} % https://tex.stackexchange.com/a/255699/394075
% \renewcommand{\cfttoctitlefont}{\bfseries\MakeUppercase}
% \renewcommand{\cftaftertoctitle}{\vskip 2em} % \renewcommand{\cftaftertoctitle}{\vskip 2em}
% Frontmatter Macro (Toggle TOC Inclusion) % Frontmatter Macro (Toggle TOC Inclusion)
\newcommand{\frontmattersection}[3]{% \newcommand{\frontmattersection}[3]{%
\centering % \begin{titlepage}
\ifstrequal{#1}{toc}{\thispagestyle{fancyplainfrontmatter}\addcontentsline{toc}{chapter}{#2}}{\chapter*{#2}}% \ifstrequal{#1}{toc}{\thispagestyle{fancyplainfrontmatter}\addcontentsline{toc}{chapter}{#2}}{\chapter*{#2}}%
\input{frontmatter/#3} \input{frontmatter/#3}
% \end{titlepage}
\clearpage \clearpage
} }
% Wrapper Command for Each Page % Wrapper Command for Each Page
\newcommand{\theendorsementpage}[1]{\frontmattersection{#1}{Pengesahan}{endorsement}} \newcommand{\theacknowledgementpage}[1]{\frontmattersection{#1}{LEMBAR PERNYATAAN}{acknowledgement}}
\newcommand{\originalitystatement}[1]{\frontmattersection{#1}{Pernyataan Keaslian}{originality}} \newcommand{\theapprovalpage}[1]{\frontmattersection{#1}{LEMBAR PERSETUJUAN}{approval}}
\newcommand{\theendorsementpage}[1]{\frontmattersection{#1}{LEMBAR PENGESAHAN}{endorsement}}
\newcommand{\originalitystatement}[1]{\frontmattersection{#1}{PERNYATAAN KEASLIAN}{originality}}
% % Apply a custom fancyhdr layout only on the first page of each \chapter, and use no header/footer elsewhere
% % \let\oldchapter\chapter
% % \renewcommand{\chapter}{%
% % \cleardoublepage
% % \pagestyle{fancyplainchapter}%
% % \oldchapter
% % \thispagestyle{fancyplainchapter} % ensure chapter start page uses it
% % \pagestyle{fancyplain}% switch for subsequent pages
% % }
\endinput \endinput