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.

diff --git a/moderncvbodyxliii.sty b/moderncvbodyfriggeri.sty
similarity index 98%
rename from moderncvbodyxliii.sty
rename to moderncvbodyfriggeri.sty
index d00891a27effc59029fc57b036aca10e91911653..72949eb813d9c35d358b9903086343d2ad2e95fc 100644 (file)
--- 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 a20d6da450e0bc8814d173931d81d3e405e7aa10..0c8ef08493eb9886a6a2899e711c50a6280839bc 100644 (file)
--- 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 650d051dfd625fa2cc18ea7b49d4fbb143c1196e..660cd7d04d9402b0ec7e5e0e04ceb6ab6c6e5826 100644 (file)
--- 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 3ffe88c92c2b99c44089434b55021339c842c1ae..c98dcc93ffdf793a23d26edb146afbf5585554b8 100644 (file)
--- 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 05303c320080416acde7398eb4aaa2bf9e80ef71..ef6b0cb58073002b5cbf0cf5cee2cf0c7c93b6ec 100644 (file)
--- a/moderncvstylefriggeri.sty
+++ b/moderncvstylefriggeri.sty
@@ -27,9 +27,8 @@
 %-------------------------------------------------------------------------------
 %                header, body & footer
 %-------------------------------------------------------------------------------
-\moderncvhead[\moderncvstyleheadoptions]{43}
-\moderncvbody{43}
-
+\RequirePackage[\moderncvstyleheadoptions]{moderncvheadfriggeri}
+\RequirePackage{moderncvbodyfriggeri}
 
 \endinput