Index: compile_rules.py ================================================================== --- compile_rules.py +++ compile_rules.py @@ -433,11 +433,11 @@ elif sLine.startswith("OPTCOLOR/"): m = re.match("OPTCOLOR/([a-z0-9]+):(.+)$", sLine) for i, sColor in enumerate(m.group(2).split()): lOptColor[i][1][m.group(1)] = sColor elif sLine.startswith("COLOR/"): - m = re.match("COLOR/([a-z0-9]+):(.+)$", sLine) + m = re.match("COLOR/([a-zA-Z0-9_]+):(.+)$", sLine) dColor[m.group(1)] = [ int(s) for s in m.group(2).strip().split(",") ] elif sLine.startswith("OPTPRIORITY/"): m = re.match("OPTPRIORITY/([a-z0-9]+): *([0-9])$", sLine) dOptPriority[m.group(1)] = int(m.group(2)) elif sLine.startswith("OPTLANG/"): Index: gc_lang/fr/rules.grx ================================================================== --- gc_lang/fr/rules.grx +++ gc_lang/fr/rules.grx @@ -105,48 +105,54 @@ # COLORS are must be described with the HSL format (0-360, 0-100 %, 0-100 %) [don’t write the sign %] COLOR/orange: 30,70,50 COLOR/orange2: 40,90,50 COLOR/violet: 270,45,35 -COLOR/blue: 210,50,50 +COLOR/bleu: 210,50,50 COLOR/fuschia: 300,30,40 COLOR/cyan: 180,50,40 COLOR/grey: 0,50,50 +COLOR/orange_vif: 30,100,40 +COLOR/orange2_vif: 50,100,40 +COLOR/violet_vif: 270,100,40 +COLOR/bleu_vif: 210,100,30 +COLOR/vert_vif: 120,100,30 +COLOR/cyan_vif: 180,100,40 OPTCOLORTHEME: Default Writer -OPTCOLOR/typo: orange orange -OPTCOLOR/apos: orange2 orange2 -OPTCOLOR/esp: orange orange -OPTCOLOR/tab: orange orange -OPTCOLOR/nbsp: orange orange -OPTCOLOR/tu: orange orange -OPTCOLOR/maj: orange orange -OPTCOLOR/num: orange orange -OPTCOLOR/virg: orange orange -OPTCOLOR/poncfin: orange orange -OPTCOLOR/unit: orange orange -OPTCOLOR/nf: orange orange -OPTCOLOR/liga: orange orange -OPTCOLOR/mapos: orange orange -OPTCOLOR/chim: orange orange -OPTCOLOR/ocr: violet violet -OPTCOLOR/conf: violet violet -OPTCOLOR/sgpl: blue blue -OPTCOLOR/gn: blue blue -OPTCOLOR/infi: fuschia fuschia -OPTCOLOR/conj: fuschia fuschia -OPTCOLOR/ppas: fuschia fuschia -OPTCOLOR/imp: fuschia fuschia -OPTCOLOR/inte: fuschia fuschia -OPTCOLOR/vmode: fuschia fuschia -OPTCOLOR/bs: cyan cyan -OPTCOLOR/pleo: cyan cyan -OPTCOLOR/redon1: cyan cyan -OPTCOLOR/redon2: cyan cyan -OPTCOLOR/neg: cyan cyan -OPTCOLOR/date: cyan cyan -OPTCOLOR/mc: cyan cyan +OPTCOLOR/typo: orange orange_vif +OPTCOLOR/apos: orange2 orange2_vif +OPTCOLOR/esp: orange orange_vif +OPTCOLOR/tab: orange orange_vif +OPTCOLOR/nbsp: orange orange_vif +OPTCOLOR/tu: orange orange_vif +OPTCOLOR/maj: orange orange_vif +OPTCOLOR/num: orange orange_vif +OPTCOLOR/virg: orange orange_vif +OPTCOLOR/poncfin: orange orange_vif +OPTCOLOR/unit: orange orange_vif +OPTCOLOR/nf: orange orange_vif +OPTCOLOR/liga: orange orange_vif +OPTCOLOR/mapos: orange orange_vif +OPTCOLOR/chim: orange orange_vif +OPTCOLOR/ocr: violet violet_vif +OPTCOLOR/conf: violet violet_vif +OPTCOLOR/sgpl: bleu bleu_vif +OPTCOLOR/gn: bleu bleu_vif +OPTCOLOR/infi: fuschia vert_vif +OPTCOLOR/conj: fuschia vert_vif +OPTCOLOR/ppas: fuschia vert_vif +OPTCOLOR/imp: fuschia vert_vif +OPTCOLOR/inte: fuschia vert_vif +OPTCOLOR/vmode: fuschia vert_vif +OPTCOLOR/bs: cyan cyan_vif +OPTCOLOR/pleo: cyan cyan_vif +OPTCOLOR/redon1: cyan cyan_vif +OPTCOLOR/redon2: cyan cyan_vif +OPTCOLOR/neg: cyan cyan_vif +OPTCOLOR/date: cyan cyan_vif +OPTCOLOR/mc: cyan cyan_vif OPTDEFAULTUILANG: fr_FR # Labels