From 873f66c66133f4703b1374aa554ed2b01ca10e59 Mon Sep 17 00:00:00 2001
From: Sina Atalay <sinatalay@hotmail.com>
Date: Fri, 16 Feb 2024 18:02:59 +0100
Subject: [PATCH] finalize classic theme

---
 rendercv/themes/classic/EducationEntry.j2.tex   |  4 ++--
 rendercv/themes/classic/ExperienceEntry.j2.tex  |  4 ++--
 rendercv/themes/classic/Header.j2.tex           | 10 +++++-----
 rendercv/themes/classic/NormalEntry.j2.tex      |  4 ++--
 rendercv/themes/classic/Preamble.j2.tex         |  4 ++++
 rendercv/themes/classic/PublicationEntry.j2.tex |  4 ++--
 rendercv/themes/classic/TextEntry.j2.tex        | 14 +++++++-------
 7 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/rendercv/themes/classic/EducationEntry.j2.tex b/rendercv/themes/classic/EducationEntry.j2.tex
index 96bfa53..ec3776d 100644
--- a/rendercv/themes/classic/EducationEntry.j2.tex
+++ b/rendercv/themes/classic/EducationEntry.j2.tex
@@ -11,13 +11,13 @@
     ((# preamble: first column, second column, third column #))
         ((# first column: p{0.55cm}; constant width, ragged left column #))
         ((# second column: K{<<design.margins.entry_area.left_and_right>>}; variable width, justified column #))
-        ((# third column: R{<<design.date_and_location_width>>}; constant widthm ragged right column #))
+        ((# third column: R{<<design.margins.entry_area.date_and_location_width>>}; constant widthm ragged right column #))
 \begin{tabularx}{
     \textwidth-<<design.margins.entry_area.left_and_right|divide_length_by(0.5)>>-0.13cm
 }{
     L{0.85cm}
     K{<<design.margins.entry_area.left_and_right>>}
-    R{<<design.date_and_location_width>>}
+    R{<<design.margins.entry_area.date_and_location_width>>}
 }
     \textbf{<<entry.degree>>}
     &
diff --git a/rendercv/themes/classic/ExperienceEntry.j2.tex b/rendercv/themes/classic/ExperienceEntry.j2.tex
index 5497b91..3cd5043 100644
--- a/rendercv/themes/classic/ExperienceEntry.j2.tex
+++ b/rendercv/themes/classic/ExperienceEntry.j2.tex
@@ -10,12 +10,12 @@
     ((# width: \textwidth #))
     ((# preamble: first column, second column #))
         ((# first column:: K{<<design.margins.entry_area.left_and_right>>}; variable width, justified column #))
-        ((# second column: R{<<design.date_and_location_width>>}; constant width ragged right column #))
+        ((# second column: R{<<design.margins.entry_area.date_and_location_width>>}; constant width ragged right column #))
 \begin{tabularx}{
     \textwidth-<<design.margins.entry_area.left_and_right|divide_length_by(0.5)>>-0.13cm
 }{
     K{<<design.margins.entry_area.left_and_right>>}
-    R{<<design.date_and_location_width>>}
+    R{<<design.margins.entry_area.date_and_location_width>>}
 }
     \textbf{<<entry.company>>}, <<entry.position>>
 
diff --git a/rendercv/themes/classic/Header.j2.tex b/rendercv/themes/classic/Header.j2.tex
index e973eb9..b3f14d6 100644
--- a/rendercv/themes/classic/Header.j2.tex
+++ b/rendercv/themes/classic/Header.j2.tex
@@ -16,19 +16,19 @@
     \normalsize
 ((* if cv.phone *))
     \mbox{\hrefWithoutArrow{<<cv.phone|replace("-","")>>}{{\footnotesize\faPhone*}\hspace{0.13cm}<<cv.phone|replace("tel:", "")|replace("-"," ")>>}}
-    \hspace{<<design.space_between_connection_objects>>}
+    \hspace{<<design.margins.header.horizontal_between_connections>>}
 ((* endif *))
 ((* if cv.email *))
     \mbox{\hrefWithoutArrow{mailto:<<cv.email>>}{{\small\faEnvelope[regular]}\hspace{0.13cm}<<cv.email>>}}
-    \hspace{<<design.space_between_connection_objects>>}
+    \hspace{<<design.margins.header.horizontal_between_connections>>}
 ((* endif *))
 ((* if cv.location *))
     \mbox{{\small\faMapMarker*}\hspace{0.13cm}<<cv.location>>}
-    \hspace{<<design.space_between_connection_objects>>}
+    \hspace{<<design.margins.header.horizontal_between_connections>>}
 ((* endif *))
 ((* if cv.website *))
     \mbox{\hrefWithoutArrow{<<cv.website>>}{{\small\faLink}\hspace{0.13cm}<<cv.website|replace("https://","")|reverse|replace("/", "", 1)|reverse>>}}
-    \hspace{<<design.space_between_connection_objects>>}
+    \hspace{<<design.margins.header.horizontal_between_connections>>}
 ((* endif *))
 ((*
     set icon_dictionary = {
@@ -42,7 +42,7 @@
     ((* for network in cv.social_networks *))
         ((* if network.network in icon_dictionary *))
     \mbox{\hrefWithoutArrow{<<network.url>>}{{\small<<icon_dictionary[network.network]>>}\hspace{0.13cm}<<network.username>>}}
-    \hspace{<<design.space_between_connection_objects>>}
+    \hspace{<<design.margins.header.horizontal_between_connections>>}
         ((* endif *))
     ((* endfor *))
 ((* endif *))
diff --git a/rendercv/themes/classic/NormalEntry.j2.tex b/rendercv/themes/classic/NormalEntry.j2.tex
index 7e6edb9..03eb128 100644
--- a/rendercv/themes/classic/NormalEntry.j2.tex
+++ b/rendercv/themes/classic/NormalEntry.j2.tex
@@ -35,12 +35,12 @@
     ((# width: \textwidth #))
     ((# preamble: first column, second column #))
         ((# first column:: K{<<design.margins.entry_area.left_and_right>>}; variable width, justified column #))
-        ((# second column: R{<<design.date_and_location_width>>}; constant width ragged right column #))
+        ((# second column: R{<<design.margins.entry_area.date_and_location_width>>}; constant width ragged right column #))
 \begin{tabularx}{
     \textwidth-<<design.margins.entry_area.left_and_right|divide_length_by(0.5)>>-0.13cm
 }{
     K{<<design.margins.entry_area.left_and_right>>}
-    R{<<design.date_and_location_width>>}
+    R{<<design.margins.entry_area.date_and_location_width>>}
 }
     \textbf{<<entry.name>>}
 
diff --git a/rendercv/themes/classic/Preamble.j2.tex b/rendercv/themes/classic/Preamble.j2.tex
index 140327a..e55ae57 100644
--- a/rendercv/themes/classic/Preamble.j2.tex
+++ b/rendercv/themes/classic/Preamble.j2.tex
@@ -123,5 +123,9 @@
 
 \renewenvironment{tabularx}{\bgroup\centering\originalTabularx}{\originalEndTabularx\par\egroup}
 
+% For TextEntrys (see https://tex.stackexchange.com/a/600/287984):
+\def\changemargin#1#2{\list{}{\rightmargin#2\leftmargin#1\topsep=0pt\itemsep=0pt\parsep=0pt\parskip=0pt\labelwidth=0pt\itemindent=0pt\labelsep=0pt}\item[]}
+\let\endchangemargin=\endlist 
+
 % Ensure that generate pdf is machine readable/ATS parsable
 \pdfgentounicode=1
\ No newline at end of file
diff --git a/rendercv/themes/classic/PublicationEntry.j2.tex b/rendercv/themes/classic/PublicationEntry.j2.tex
index 237501a..0c2201f 100644
--- a/rendercv/themes/classic/PublicationEntry.j2.tex
+++ b/rendercv/themes/classic/PublicationEntry.j2.tex
@@ -5,8 +5,8 @@
     ((# width: \textwidth #))
     ((# preamble: first column, second column #))
         ((# first column:: K{<<design.margins.entry_area.left_and_right>>}; variable width, justified column #))
-        ((# second column: R{<<design.date_and_location_width>>}; constant width ragged right column #))
-\begin{tabularx}{\textwidth-<<design.margins.entry_area.left_and_right|divide_length_by(0.5)>>-0.13cm}{K{<<design.margins.entry_area.left_and_right>>} R{<<design.date_and_location_width>>}}
+        ((# second column: R{<<design.margins.entry_area.date_and_location_width>>}; constant width ragged right column #))
+\begin{tabularx}{\textwidth-<<design.margins.entry_area.left_and_right|divide_length_by(0.5)>>-0.13cm}{K{<<design.margins.entry_area.left_and_right>>} R{<<design.margins.entry_area.date_and_location_width>>}}
     \textbf{<<entry.title>>}
 
     \vspace{<<design.margins.highlights_area.vertical_between_bullet_points>>}
diff --git a/rendercv/themes/classic/TextEntry.j2.tex b/rendercv/themes/classic/TextEntry.j2.tex
index 6f40ea9..4c72719 100644
--- a/rendercv/themes/classic/TextEntry.j2.tex
+++ b/rendercv/themes/classic/TextEntry.j2.tex
@@ -1,15 +1,15 @@
 ((* if not is_first_entry *))
 \vspace{<<design.margins.entry_area.vertical_between>>}
 ((* endif *))
-{
+\begin{changemargin}{<<design.margins.entry_area.left_and_right>>}{<<design.margins.entry_area.left_and_right>>}
 ((* if design.text_alignment == "left-aligned" *))
 \raggedright
 ((* endif *))
-\setlength{\leftskip}{<<design.margins.entry_area.left_and_right>>}
-\setlength{\rightskip}{<<design.margins.entry_area.left_and_right>>}
-
 <<entry>>
+((* if design.text_alignment == "left-aligned" *))
+\par
+((* endif *))
+\end{changemargin}
+
+
 
-\setlength{\leftskip}{0cm}
-\setlength{\rightskip}{0cm}
-}