From 190cd0904ef864ec67247602d04b88e34740f1cc Mon Sep 17 00:00:00 2001
From: nuluh <dam.ar@outlook.com>
Date: Mon, 12 May 2025 00:45:30 +0700
Subject: [PATCH] fix(latex): fix merge conflicts

---
 latex/thesis.cls | 44 ++++++++++++++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/latex/thesis.cls b/latex/thesis.cls
index cf7bbd3..0210074 100644
--- a/latex/thesis.cls
+++ b/latex/thesis.cls
@@ -43,7 +43,7 @@
 \setmonofont{Courier New}
 
 % Metadata commands
-\input{metadata} % Load metadata from external file
+\input{metadata}
 
 \newcommand{\setthesisinfo}[7]{%
   \renewcommand{\thesistitle}{#1}%
@@ -55,7 +55,7 @@
   \renewcommand{\yearofsubmission}{#7}%
 }
 
-% Header and footer
+% % Header and footer
 \fancypagestyle{fancy}{%
     \fancyhf{}
     \fancyhead[R]{\nouppercase{\rightmark}}
@@ -73,11 +73,17 @@
 }
 
 % Chapter formatting
+\titlespacing{\chapter}{0pt}{0pt}{*1.5}
 \titleformat{\chapter}[display]
-  {\bfseries\Large\centering}
+  {\normalsize\bfseries\centering}
   {BAB~\Roman{chapter}} % << display format
   {1ex}
   {\MakeUppercase}
+\titleformat{\section}
+    {\normalsize\bfseries}{\thesection}{1em}{}
+
+\titleformat{\subsection}
+    {\normalsize\bfseries}{\thesubsection}{1em}{}
 
 % Ensure chapter reference in TOC matches
 \renewcommand{\cftchappresnum}{BAB~}
@@ -89,18 +95,19 @@
 \renewcommand{\maketitle}{\input{frontmatter/maketitle}}
 
 % Chapter & Section format
-\renewcommand{\cftchapfont}{\bfseries\MakeUppercase}
+\renewcommand{\cftchapfont}{\normalsize\MakeUppercase}
 % \renewcommand{\cftsecfont}{}
 % \renewcommand{\cftsubsecfont}{\itshape}
 % \renewcommand{\thesection}{\textup{\Roman{chapter}}.\arabic{section}}
 
+
 % Dot leaders, spacing, indentation
 \setlength{\cftbeforechapskip}{0em}
 \setlength{\cftchapindent}{0pt}
 \setlength{\cftsecindent}{0em}
-\setlength{\cftsubsecindent}{3em}
-\setlength{\cftchapnumwidth}{4em}
-\setlength{\cftsecnumwidth}{2.5em}
+\setlength{\cftsubsecindent}{2.5em}
+\setlength{\cftchapnumwidth}{3.5em}
+\setlength{\cftsecnumwidth}{3.5em}
 \setlength{\cftsubsecnumwidth}{2.5em}
 \renewcommand \cftchapdotsep{4.5} % https://tex.stackexchange.com/a/273764
 \renewcommand{\cftchapleader}{\normalfont\cftdotfill{\cftsecdotsep}}
@@ -114,23 +121,36 @@
 \renewcommand{\thefigure}{\arabic{chapter}.\arabic{figure}}
 \renewcommand{\thetable}{\arabic{chapter}.\arabic{table}}
 
-% Table of Contents (TOC) Title styling
+% Table of Content (TOC) Title styling
 \renewcommand{\contentsname}{DAFTAR ISI}
-\renewcommand{\cfttoctitlefont}{\bfseries\MakeUppercase}
+\renewcommand{\cfttoctitlefont}{\hfill\bfseries\MakeUppercase}
 \renewcommand{\cftaftertoctitle}{\hfill} % https://tex.stackexchange.com/a/255699/394075
+% \renewcommand{\cfttoctitlefont}{\bfseries\MakeUppercase}
 % \renewcommand{\cftaftertoctitle}{\vskip 2em}
 
 % Frontmatter Macro (Toggle TOC Inclusion)
 \newcommand{\frontmattersection}[3]{%
-  \centering
+  % \begin{titlepage}
   \ifstrequal{#1}{toc}{\thispagestyle{fancyplainfrontmatter}\addcontentsline{toc}{chapter}{#2}}{\chapter*{#2}}%
   \input{frontmatter/#3}
+  % \end{titlepage}
   \clearpage
 }
 
 % Wrapper Command for Each Page
-\newcommand{\theendorsementpage}[1]{\frontmattersection{#1}{Pengesahan}{endorsement}}
-\newcommand{\originalitystatement}[1]{\frontmattersection{#1}{Pernyataan Keaslian}{originality}}
+\newcommand{\theacknowledgementpage}[1]{\frontmattersection{#1}{LEMBAR PERNYATAAN}{acknowledgement}}
+\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
\ No newline at end of file