From f72f94a77cee82ec18ee2f8e7bdf33929fd89884 Mon Sep 17 00:00:00 2001
From: Xavier Danaux <xdanaux@gmail.com>
Date: Sat, 10 Dec 2011 22:17:51 +0100
Subject: [PATCH] Added checking for lmodern and automatic loading only if
 present.

---
 CHANGELOG    |  2 ++
 moderncv.cls | 14 ++++----------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 737c73c..e4bd927 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 version 0.15 (xx December 2011)
  - corrects list spacing.
  - corrects inconsistent use of sans serif fonts in roman layout option.
+ - the lmodern fonts are now automatically loaded only if installed on the system.
+ The "nolmodern" option is now therefore obsolete.
 
 version 0.14 (04 December 2011)
  - adds support for CJK, thanks to the help of P. D'Apice.
diff --git a/moderncv.cls b/moderncv.cls
index dd7a4a9..d8d522f 100644
--- a/moderncv.cls
+++ b/moderncv.cls
@@ -60,10 +60,6 @@
 \DeclareOption{draft}{\setlength\overfullrule{5pt}}
 \DeclareOption{final}{\setlength\overfullrule{0pt}}
 
-% nolmodern option
-\newif\if@lmodern\@lmoderntrue
-\DeclareOption{nolmodern}{\@lmodernfalse}
-
 % execute default options
 \ExecuteOptions{a4paper,11pt,color,final}
 
@@ -88,12 +84,10 @@
 % color
 \RequirePackage{color}
 
-% font encoding
-\RequirePackage[T1]{fontenc}
-
-% latin modern fonts
-\if@lmodern
-  \RequirePackage{lmodern}\fi
+% automatic loading of latin modern fonts if present on the system
+\IfFileExists{lmodern.sty}
+  {\RequirePackage[T1]{fontenc}\RequirePackage{lmodern}}
+  {}
 
 % symbols like \Telefon, \Mobilefone, \Letter and \Email
 \RequirePackage{marvosym}