From ba05c94d7bcb339cec0c3fd6313aec828735208b Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Mon, 27 May 2024 12:45:37 +0200 Subject: [PATCH] parse color: fixed color formula doc --- language-cz.cpp | 11 ++++++----- language-fr.cpp | 11 ++++++----- language-pl.cpp | 13 +++++++------ pattern2.cpp | 7 +++++-- 4 files changed, 24 insertions(+), 18 deletions(-) diff --git a/language-cz.cpp b/language-cz.cpp index 7b64e2e0..906c3207 100644 --- a/language-cz.cpp +++ b/language-cz.cpp @@ -9037,19 +9037,20 @@ S("display only chessboard white", "zobrazit pouze bílá políčka šachovnice" S("display only chessboard black", "zobrazit pouze černá políčka šachovnice") S( - "This lets you specify the color pattern as a function of the cell. " + "This lets you specify the color pattern as a function of the cell.\n", + + "Zde můžeš specifikovat barevný vzor jako funkci políčka.\n") + +S( "Available parameters:\n\n" "x, y, z (hyperboloid/sphere/plane coordinates in non-crystal geometries)\n" "ex, ey, ez (in Euclidean geometries)\n" - "x0, x1, x2... (crystal geometry only)\n" - "0 is black, 1 is white, rgb(1,0,0) is red, ifp(p-2,1,0) is blue (p=1 for red, 2 for green, 3 for blue).", + "x0, x1, x2... (crystal geometry only)\n", - "Zde můžeš specifikovat barevný vzor jako funkci políčka. " "Dostupné parametry:\n\n" "x, y, z (souřadnice hyperboloidu/koule/roviny v nekrystalových geometriích)\n" "ex, ey, ez (v eukleidovských geometriích)\n" "x0, x1, x2... (pouze v krystalové geometrii)\n" - "0 je černá, 1 bílá, rbg(1,0,0) červená, ifp(p-2,1,0) modrá (p=1 pro červenou, 2 pro zelenou, 3 pro modrou)." ) S( diff --git a/language-fr.cpp b/language-fr.cpp index e96ec2d3..5201f36e 100644 --- a/language-fr.cpp +++ b/language-fr.cpp @@ -8652,19 +8652,20 @@ S("display only chessboard white", "afficher seulement le plateau d'échec blanc S("display only chessboard black", "afficher seulement le plateau d'échec noir") S( - "This lets you specify the color pattern as a function of the cell. " + "This lets you specify the color pattern as a function of the cell.\n", + + "Vous laisse choisir le motif de couleur comme fonction de la case.\n") + +S( "Available parameters:\n\n" "x, y, z (hyperboloid/sphere/plane coordinates in non-crystal geometries)\n" "ex, ey, ez (in Euclidean geometries)\n" - "x0, x1, x2... (crystal geometry only)\n" - "0 is black, 1 is white, rgb(1,0,0) is red, ifp(p-2,1,0) is blue (p=1 for red, 2 for green, 3 for blue).", + "x0, x1, x2... (crystal geometry only)\n", - "Vous laisse choisir le motif de couleur comme fonction de la case. " "Paramètres disponibles : \n\n" "x, y, z (coordonnées hyperboloïde/sphère/plan dans des géométries non-cristallines)\n" "ex, ey, ez (dans une géométrie euclidienne)\n" "x0, x1, x2... (dans les géométries cristallines seulement)\n" - "0 est noir, 1 est blanc, rgb(1,0,0) est rouge, ifp(p-2,1,0) est bleu (p=1 pour rouge, 2 pour vert, 3 pour bleu)." ) S( diff --git a/language-pl.cpp b/language-pl.cpp index 88f2d78b..0ceedd8f 100644 --- a/language-pl.cpp +++ b/language-pl.cpp @@ -8756,20 +8756,21 @@ S("display only chessboard white", "tylko białe pola szachownicy") S("display only chessboard black", "tylko czarne pola szachownicy") S( - "This lets you specify the color pattern as a function of the cell. " + "This lets you specify the color pattern as a function of the cell.\n", + "Tu możesz określić wzór jako funkcję komórki.\n") + +S( "Available parameters:\n\n" "x, y, z (hyperboloid/sphere/plane coordinates in non-crystal geometries)\n" "ex, ey, ez (in Euclidean geometries)\n" - "x0, x1, x2... (crystal geometry only)\n" - "0 is black, 1 is white, rgb(1,0,0) is red, ifp(p-2,1,0) is blue (p=1 for red, 2 for green, 3 for blue).", + "x0, x1, x2... (crystal geometry only)\n", - "Tu możesz określić wzór jako funkcję komórki. Dostępne parametry:\n\n" + "Dostępne parametry:\n\n" "x, y, z (współrzędne hiperboloidy/sfery/powierczni, poza kryształami)\n" "ex, ey, ez (w geometriach euklidesowych)\n" "x0, x1, x2... (w kryształach)\n" - "0 to czarny, 1 to biały, rgb(1,0,0) to czerwony, ifp(p-2,1,0) to niebieski (p=1 to czerwony, 2 to zielony, 3 to niebieski)." ) - + S( "w (fourth coordinate)\n" "wallif(condition, color)\n", diff --git a/pattern2.cpp b/pattern2.cpp index eba9ac70..f799ea24 100644 --- a/pattern2.cpp +++ b/pattern2.cpp @@ -1884,12 +1884,15 @@ EX namespace ccolor { void config_formula(bool instant) { string s = XLAT( - "This lets you specify the color pattern as a function of the cell. " + "This lets you specify the color pattern as a function of the cell.\n"); + s += XLAT("rgb(r,g,b)\n"); + s += XLAT("indexed(f) (where f is a function of p, p=1 for red, 2 for green, 3 for blue)"); + s += XLAT( "Available parameters:\n\n" "x, y, z (hyperboloid/sphere/plane coordinates in non-crystal geometries)\n" "ex, ey, ez (in Euclidean geometries)\n" "x0, x1, x2... (crystal geometry only)\n" - "0 is black, 1 is white, rgb(1,0,0) is red, ifp(p-2,1,0) is blue (p=1 for red, 2 for green, 3 for blue)."); + ); if(MDIM == 4) s += XLAT( "w (fourth coordinate)\n"