Changed the handling of the "sans" and "roman" class options, to be reflected at the beginning of the document and override style font choices

2012-07-29 14:25:16 +02:00
parent a2fc3c3623
commit 5872ae6b68
10 changed files with 3 additions and 3 deletions
--- a/examples/template-es.pdf
+++ b/examples/template-es.pdf
--- a/examples/template-zh.pdf
+++ b/examples/template-zh.pdf
--- a/examples/template.pdf
+++ b/examples/template.pdf
--- a/examples/template_banking_black.pdf
+++ b/examples/template_banking_black.pdf
--- a/examples/template_banking_red.pdf
+++ b/examples/template_banking_red.pdf
--- a/examples/template_casual_orange.pdf
+++ b/examples/template_casual_orange.pdf
--- a/examples/template_classic_green.pdf
+++ b/examples/template_classic_green.pdf
--- a/examples/template_multibib.pdf
+++ b/examples/template_multibib.pdf
--- a/examples/template_oldstyle_grey.pdf
+++ b/examples/template_oldstyle_grey.pdf
--- a/moderncv.cls
+++ b/moderncv.cls
@ -51,15 +51,15 @@
 \DeclareOption{12pt}{\renewcommand\@ptsize{2}}
 % font type options
-\DeclareOption{sans}{\renewcommand{\familydefault}{\sfdefault}}
+\DeclareOption{sans}{\AtBeginDocument{\renewcommand{\familydefault}{\sfdefault}}}
-\DeclareOption{roman}{\renewcommand{\familydefault}{\rmdefault}}
+\DeclareOption{roman}{\AtBeginDocument{\renewcommand{\familydefault}{\rmdefault}}}
 % draft/final option
 \DeclareOption{draft}{\setlength\overfullrule{5pt}}
 \DeclareOption{final}{\setlength\overfullrule{0pt}}
 % execute default options
-\ExecuteOptions{a4paper,11pt,sans,final}
+\ExecuteOptions{a4paper,11pt,final}
 % process given options
 \ProcessOptions\relax