diff --git a/tools/style/base.sty b/tools/style/base.sty index de47000..b1a1bfc 100755 --- a/tools/style/base.sty +++ b/tools/style/base.sty @@ -9,6 +9,7 @@ \RequirePackage{amssymb} \RequirePackage{amsmath} \RequirePackage{amsfonts} +\PassOptionsToPackage{table,usenames,dvipsnames}{xcolor} %\RequirePackage{subfig} \RequirePackage{graphicx} \graphicspath{{./}{/home/lafrite/Cours/Prof/Enseignements/Clipart/}} diff --git a/tools/style/classReport.cls b/tools/style/classReport.cls index 9e9791a..4ae7ee9 100644 --- a/tools/style/classReport.cls +++ b/tools/style/classReport.cls @@ -12,7 +12,7 @@ \RequirePackage{base} \RequirePackage{colorscheme} -\RequirePackage{xcolor,colortbl} +%\RequirePackage{xcolor,colortbl} \pagestyle{empty} diff --git a/tools/style/colorscheme.sty b/tools/style/colorscheme.sty index cd924f7..1951b9a 100755 --- a/tools/style/colorscheme.sty +++ b/tools/style/colorscheme.sty @@ -1,8 +1,9 @@ \NeedsTeXFormat{LaTeX2e} -% Couleurs +% Couleurs, \RequirePackage{xcolor} +\RequirePackage{colortbl} % Couleurs éléments diff --git a/tools/style/myXsim.sty b/tools/style/myXsim.sty index a552361..36bd898 100644 --- a/tools/style/myXsim.sty +++ b/tools/style/myXsim.sty @@ -1,9 +1,8 @@ \NeedsTeXFormat{LaTeX2e} % extensions -\RequirePackage{base} \RequirePackage{colorscheme} -\RequirePackage[table, dvipsnames]{xcolor} +\RequirePackage{base} \RequirePackage{myhdr} \RequirePackage{geometry} diff --git a/tools/style/shortcuts.sty b/tools/style/shortcuts.sty index eda2e83..22b460b 100755 --- a/tools/style/shortcuts.sty +++ b/tools/style/shortcuts.sty @@ -122,15 +122,15 @@ {e}{% } {3}{% - \filldraw[fill=olivegreen] (0, 0) rectangle ++(0.8, 1); - \filldraw[fill=olivegreen] (1, 0) rectangle ++(0.8, 2); - \filldraw[fill=olivegreen] (2, 0) rectangle ++(0.8, 3); - \filldraw[fill=olivegreen] (3, 0) rectangle ++(0.8, 4); + \filldraw[fill=green] (0, 0) rectangle ++(0.8, 1); + \filldraw[fill=green] (1, 0) rectangle ++(0.8, 2); + \filldraw[fill=green] (2, 0) rectangle ++(0.8, 3); + \filldraw[fill=green] (3, 0) rectangle ++(0.8, 4); } {2}{% - \filldraw[fill=Green] (0, 0) rectangle ++(0.8, 1); - \filldraw[fill=Green] (1, 0) rectangle ++(0.8, 2); - \filldraw[fill=Green] (2, 0) rectangle ++(0.8, 3); + \filldraw[fill=green] (0, 0) rectangle ++(0.8, 1); + \filldraw[fill=green] (1, 0) rectangle ++(0.8, 2); + \filldraw[fill=green] (2, 0) rectangle ++(0.8, 3); } {1}{% \filldraw[fill=yellow] (0, 0) rectangle ++(0.8, 1);