From 3773774aa4a345cdd171e8ec48dd31eb3b755c64 Mon Sep 17 00:00:00 2001
From: Nathaniel Wesley Filardo <nwfilardo@gmail.com>
Date: Sat, 19 Mar 2022 13:00:20 +0000
Subject: [PATCH] Fix moderncv include for "headxlii" and friends.

The fix for https://github.com/xdanaux/moderncv/issues/1, namely
https://github.com/xdanaux/moderncv/commit/c91b6ca77c7fe422f8519a433d13db6c3c715384,
switched the \moderncv{head,body,foot} macros from using \romannumeral,
which operates on at least a large number of counting numbers, to just
handling numbers 1 through 10.

Notably, 42 and 43 are outside that range, so just minimally fix this up
by doing a few rounds of macro expansion by hand and directly using
\RequirePackage ourselves.  And since we're doing that, there's no need
to use a number, so move to something that won't clash with upstream
moderncv.
---
 moderncvbodyxliii.sty => moderncvbodyfriggeri.sty | 2 +-
 moderncvheadxlii.sty => moderncvheadacademic.sty  | 6 +++---
 moderncvheadxliii.sty => moderncvheadfriggeri.sty | 4 ++--
 moderncvstyleacademic.sty                         | 2 +-
 moderncvstylefriggeri.sty                         | 5 ++---
 5 files changed, 9 insertions(+), 10 deletions(-)
 rename moderncvbodyxliii.sty => moderncvbodyfriggeri.sty (98%)
 rename moderncvheadxlii.sty => moderncvheadacademic.sty (90%)
 rename moderncvheadxliii.sty => moderncvheadfriggeri.sty (98%)

diff --git a/moderncvbodyxliii.sty b/moderncvbodyfriggeri.sty
similarity index 98%
rename from moderncvbodyxliii.sty
rename to moderncvbodyfriggeri.sty
index d00891a..72949eb 100644
--- a/moderncvbodyxliii.sty
+++ b/moderncvbodyfriggeri.sty
@@ -2,7 +2,7 @@
 %                identification
 %-------------------------------------------------------------------------------
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvbodyxliii}
+\ProvidesPackage{moderncvbodyfriggeri}
 
 
 %-------------------------------------------------------------------------------
diff --git a/moderncvheadxlii.sty b/moderncvheadacademic.sty
similarity index 90%
rename from moderncvheadxlii.sty
rename to moderncvheadacademic.sty
index a20d6da..0c8ef08 100644
--- a/moderncvheadxlii.sty
+++ b/moderncvheadacademic.sty
@@ -1,10 +1,10 @@
-%% start of file `moderncvheadxlii.sty'.
+%% start of file `moderncvheadacademic.sty'.
 
 %-------------------------------------------------------------------------------
 %                identification
 %-------------------------------------------------------------------------------
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvheadxlii}[2016/08/28 v1.0.0 modern curriculum vitae and letter header variant: 42]
+\ProvidesPackage{moderncvheadacademic}[2016/08/28 v1.0.0 modern curriculum vitae and letter header variant: 42]
 
 % head section alignment options: "left" (default) or "right"
 \@initializecommand{\moderncvstyleheadoptions}{}
@@ -46,4 +46,4 @@
 \endinput
 
 
-%% end of file `moderncvheadxlii.sty'.
+%% end of file `moderncvheadacademic.sty'.
diff --git a/moderncvheadxliii.sty b/moderncvheadfriggeri.sty
similarity index 98%
rename from moderncvheadxliii.sty
rename to moderncvheadfriggeri.sty
index 650d051..660cd7d 100644
--- a/moderncvheadxliii.sty
+++ b/moderncvheadfriggeri.sty
@@ -1,10 +1,10 @@
-%% start of file `moderncvheadxliii.sty'.
+%% start of file `moderncvheadfriggeri.sty'.
 
 %-------------------------------------------------------------------------------
 %                identification
 %-------------------------------------------------------------------------------
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{moderncvheadxliii}
+\ProvidesPackage{moderncvheadfriggeri}
 
 % details options: "details" (default) or "nodetails"
 \@initializeif{\if@details}\@detailsfalse
diff --git a/moderncvstyleacademic.sty b/moderncvstyleacademic.sty
index 3ffe88c..c98dcc9 100644
--- a/moderncvstyleacademic.sty
+++ b/moderncvstyleacademic.sty
@@ -46,7 +46,7 @@
 %-------------------------------------------------------------------------------
 %                header, body & footer
 %-------------------------------------------------------------------------------
-\moderncvhead[\moderncvstyleheadoptions]{42}
+\RequirePackage[\moderncvstyleheadoptions]{moderncvheadacademic}
 \moderncvbody{1}
 
 %-------------------------------------------------------------------------------
diff --git a/moderncvstylefriggeri.sty b/moderncvstylefriggeri.sty
index 05303c3..ef6b0cb 100644
--- a/moderncvstylefriggeri.sty
+++ b/moderncvstylefriggeri.sty
@@ -27,9 +27,8 @@
 %-------------------------------------------------------------------------------
 %                header, body & footer
 %-------------------------------------------------------------------------------
-\moderncvhead[\moderncvstyleheadoptions]{43}
-\moderncvbody{43}
-
+\RequirePackage[\moderncvstyleheadoptions]{moderncvheadfriggeri}
+\RequirePackage{moderncvbodyfriggeri}
 
 \endinput
 
-- 
2.50.1