ommission des lettres isolées sur la dernière ligne

This reverts commit ed1ad0566f, reversing
changes made to 6ee909914d.

.gitignore

@@ -1,2 +1,3 @@
 __pycache__/
 test*.*
+*.py

Grille.php

@@ -1,60 +1,40 @@
 <?php
-
 include_once "dico.php";
 
 
-function melanger_cles($tableau)
+const ECART_TYPE = 5;
-{
+
-    uksort($tableau, function ($a, $b) {
+
-        return mt_rand(-1, 1);
+$randmax = mt_getrandmax() + 1;
-    });
+function gaussienne($moyenne = 0, $ecartType = 1.0): float {
-    return $tableau;
+    global $randmax;
+
+    $u = (mt_rand() + 1) / $randmax;
+    $v = (mt_rand() + 1) / $randmax;
+
+    $z = sqrt(-2.0 * log($u)) * cos(2.0 * M_PI * $v);
+    return $z * $ecartType + $moyenne;
 }
 
 
-class Grille implements Iterator, ArrayAccess {
+class Grille implements ArrayAccess
+{
     public $grille;
     public $hauteur;
     public $largeur;
-    private $grilles;
+    private $dico;
-    private $lettres_suivantes;
     private $positions;
     private $nb_positions;
-    public $lignes;
+    private $lignes = [];
-    public $colonnes;
+    private $colonnes = [];
+    public $valide = false;
+    public $definitions = [];
 
-    public function __construct($hauteur, $largeur, $id = "")
+    public function __construct($hauteur, $largeur)
     {
         $this->hauteur   = $hauteur;
         $this->largeur   = $largeur;
         $this->grille    = array_fill(0, $hauteur, array_fill(0, $largeur, ''));
-        $this->lignes = [];
-        $this->colonnes = [];
-
-        $this->lettres_suivantes = [];
-        foreach ($hauteur == $largeur ? [$hauteur] : [$hauteur, $largeur] as $longueur) {
-            $this->lettres_suivantes[$longueur] = [];
-            foreach (mots_espaces($longueur, $hauteur == $largeur ? MAX_MOTS : MAX_MOTS/2) as $mots) {
-                $mot = implode(" ", $mots);
-                $ref = &$this->lettres_suivantes[$longueur];
-                for ($i = 0; $i < $longueur; $i++) {
-                    $lettre = $mot[$i];
-                    if (!isset($ref[$lettre])) $ref[$lettre] = [];
-                    $ref = &$ref[$lettre];
-                }
-                $ref = [];
-            }
-        }
-
-        $this->positions = [];
-        for ($y = 0; $y < $hauteur; $y++) {
-            for ($x = 0; $x < $largeur; $x++)
-                $this->positions[] = [$x, $y];
-        }
-        $this->nb_positions = count($this->positions);
-
-        mt_srand($id == "" ? null : crc32($id));
-        $this->grilles = $this->generateur();
     }
 
     public function get_ligne($y, $largeur)
@@ -73,50 +53,128 @@ class Grille implements Iterator, ArrayAccess {
         return $colonne;
     }
 
-    public function generateur($i = 0)
+    public function genere($id)
     {
-        global $dico;
+        mt_srand(crc32($id));
 
-        if ($i == $this->nb_positions) {
+        if (!isset($this->dico)) {
-            yield $this;
+            $this->dico = mots_espaces(max($this->hauteur, $this->largeur));
-            return;
         }
 
+        if (!isset($this->positions)) {
+            $this->positions = [];
+            for ($y = 0; $y < $this->hauteur; $y++) {
+                for ($x = 0; $x < $this->largeur; $x++)
+                    $this->positions[] = [$x, $y];
+            }
+            $this->nb_positions = count($this->positions);
+        }
+
+        $grilles = $this->gen_grilles();
+        $grilles->current();
+
+        if ($grilles->valid()) {
+            $this->definitions = [
+                "horizontales" => [],
+                "verticales" => []
+            ];
+            foreach($this->lignes as $y => $mots) {
+                $this->definitions["horizontales"][$y] = [];
+                foreach($mots as $mot) {
+                    $definitions = $this->dico[strlen($mot)][$mot];
+                    if (count($definitions)) {
+                        $this->definitions["horizontales"][$y][] = $definitions[mt_rand(0, count($definitions) - 1)];
+                    }
+                }
+            }
+            foreach($this->colonnes as $x => $mots) {
+                $this->definitions["verticales"][$x] = [];
+                foreach($mots as $mot) {
+                    $definitions = $this->dico[strlen($mot)][$mot];
+                    if (count($definitions)) {
+                        $this->definitions["verticales"][$x][] = $definitions[mt_rand(0, count($definitions) - 1)];
+                    }
+                }
+            }
+            $this->save($id);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public function gen_grilles($i = 0, $lettres_ligne = NULL)
+    {
         [$x, $y] = $this->positions[$i];
 
-        $lettres_suivantes_ligne = $this->lettres_suivantes[$this->largeur];
+        // Recherche de la prochaine lettre possible sur la case courante
-        for ($x2 = 0; $x2 < $x; $x2++)
+        // en ligne
-            $lettres_suivantes_ligne = $lettres_suivantes_ligne[$this->grille[$y][$x2]];
+        if ($x == 0) {
-        $lettres_suivantes_colonne = $this->lettres_suivantes[$this->hauteur];
+            $lettres_ligne = $this->dico[$this->largeur];
-        for ($y2 = 0; $y2 < $y; $y2++)
+        }
-            $lettres_suivantes_colonne = $lettres_suivantes_colonne[$this->grille[$y2][$x]];
+
-        $lettres_communes = melanger_cles(array_intersect_key(
+        // en colonne
-            $lettres_suivantes_ligne,
+        $lettres_colonne = $this->dico[$this->hauteur];
-            $lettres_suivantes_colonne
+        for ($y2 = 0; $y2 < $y; $y2++) {
-        ));
+            $lettres_colonne = $lettres_colonne->branches[$this->grille[$y2][$x]];
+        }
+        $lettres_communes = array_intersect_key(
+            $lettres_ligne->branches,
+            $lettres_colonne->branches
+        );
+        foreach ($lettres_communes as $lettre => $_) {
+            $lettres_communes[$lettre] = count($lettres_ligne->branches[$lettre]) * count($lettres_colonne->branches[$lettre]) * gaussienne(1, ECART_TYPE);
+        }
+        uksort($lettres_communes, function($a, $b) use ($lettres_communes) {
+            return $lettres_communes[$b] <=> $lettres_communes[$a];
+        });
+        $lettres_communes = array_slice($lettres_communes, 0, 3);
 
         foreach ($lettres_communes as $lettre => $_) {
             $this->grille[$y][$x] = $lettre;
 
-            $this->lignes[$y] = [];
+            // Omission des lettres isolées
-            if ($x == $this->largeur - 1) {
+            if ($lettre == CASE_NOIRE) {
-                foreach (explode(" ", $this->get_ligne($y, $this->largeur)) as $rang => $mot) {
+                if (($y < 2 || $this->grille[$y - 2][$x] == CASE_NOIRE)
-                    if (strlen($mot) == 1) continue;
+                    && ($y < 1 || $x == 0 || $this->grille[$y - 1][$x - 1] == CASE_NOIRE)
-                    if (in_array($mot, array_merge(...$this->lignes, ...$this->colonnes))) continue 2;
+                    && ($y < 1 || $x + 1 >= $this->largeur || $this->grille[$y - 1][$x + 1] == CASE_NOIRE)
-                    $this->lignes[$y][$rang] = $mot;
+                ) continue;
-                }
+                if ($y == $this->hauteur - 1
-            }
+                    && ($x < 2 || $this[$y][$x - 2] == CASE_NOIRE)
-            $this->colonnes[$x] = [];
+                    && ($x < 1 || $this[$y - 1][$x - 1] == CASE_NOIRE)
-            if ($y == $this->hauteur - 1) {
+                ) continue;
-                foreach (explode(" ", $this->get_colonne($x, $this->hauteur)) as $rang => $mot) {
+            } else if ($x == $this->largeur - 1 && $y == $this->hauteur - 1
-                    if (strlen($mot) == 1) continue;
+             && $this[$y][$x - 1] == CASE_NOIRE
-                    if (in_array($mot, array_merge(...$this->lignes, ...$this->colonnes))) continue 2;
+             && $this[$y-1][$x] == CASE_NOIRE
-                    $this->colonnes[$x][$rang] = $mot;
+            ) continue;
-                }
+
+            // Omission des doublons
+            $mots = [];
+            if ($x == $this->largeur - 1) $mots = explode(CASE_NOIRE, $this->get_ligne($y, $this->largeur));
+            else if ($lettre == CASE_NOIRE) $mots = explode(CASE_NOIRE, $this->get_ligne($y, $x));
+            else $mots = [];
+            $this->lignes[$y] = array_filter($mots, function ($mot) {
+                return strlen($mot) >= 2;
+            });
+            if (count($this->lignes[$y])) {
+                $mot = array_pop($this->lignes[$y]);
+                if (strlen($mot > 2) && in_array($mot, array_merge(...$this->lignes, ...$this->colonnes))) continue;
+                else $this->lignes[$y][] = $mot;
             }
 
-            if ($i < $this->nb_positions) {
+            if ($y == $this->hauteur - 1) {
-                yield from $this->generateur($i + 1);
+                $mots = explode(CASE_NOIRE, $this->get_colonne($x, $this->hauteur));
+                foreach ($mots as $rang => $mot) {
+                    if (strlen($mot) < 2) continue;
+                    if (strlen($mot > 2) && in_array($mot, array_merge(...$this->lignes, ...$this->colonnes))) continue 2;
+                    else $this->colonnes[$x][$rang] = $mot;
+                }
+            } else {
+                $this->colonnes[$x] = [];
+            }
+
+            if ($i < $this->nb_positions - 1) {
+                yield from $this->gen_grilles($i + 1, $lettres_ligne->branches[$lettre]);
             } else {
                 yield $this;
             }
@@ -131,42 +189,74 @@ class Grille implements Iterator, ArrayAccess {
         return hash('sha256', $string);
     }
 
-    public function current(): mixed
+    public function __toString() {
+        return implode(
+            PHP_EOL,
+            array_map(
+                function ($ligne) {
+                    return implode("", $ligne);
+                },
+                $this->grille
+            )
+        );
+    }
+
+    public function __serialize(): array {
+        return [
+            "grille" => $this->grille,
+            "definitions" => $this->definitions
+        ];
+    }
+
+    public function __unserialize(array $data): void {
+        $this->grille = $data["grille"];
+        $this->definitions = $data["definitions"];
+    }
+
+    public function save($id)
     {
-        return $this->grilles->current();
+        if (session_status() === PHP_SESSION_ACTIVE) {
+            session_write_close();
         }
 
-    public function key(): mixed {
+        session_id("$this->largeur,$this->hauteur,$id");
-        return $this->grilles->key();
+        session_start(["use_cookies" => false]);
+
+        $_SESSION = serialize($this);
     }
 
-    public function next(): void {
+    public function load($id)
-        $this->grilles->next();
-    }
-
-    public function rewind(): void {
-        $this->grilles->rewind();
-    }
-
-    public function valid(): bool
     {
-        return $this->grilles->valid();
+        session_id("$this->largeur,$this->hauteur,$id");
+        session_start(["use_cookies" => false]);
+
+        if (!isset($_SESSION["grille"])) {
+            return false;
         }
 
-    public function offsetExists(mixed $offset): bool {
+        unserialize($_SESSION);
+
+        return true;
+    }
+
+
+    public function offsetExists(mixed $offset): bool
+    {
         return isset($this->grille[$offset]);
     }
 
-    public function offsetGet(mixed $offset): mixed {
+    public function offsetGet(mixed $offset): mixed
+    {
         return $this->grille[$offset];
     }
 
-    public function offsetSet(mixed $offset, mixed $value): void {
+    public function offsetSet(mixed $offset, mixed $value): void
+    {
         $this->grille[$offset] = $value;
     }
 
-    public function offsetUnset(mixed $offset): void {
+    public function offsetUnset(mixed $offset): void
+    {
         unset($this->grille[$offset]);
     }
-
 }

README.md

@@ -1,3 +1,5 @@
-# mots-croises
+# Mots croisés
 
 Générateur de grille de mots croisés en PHP
+
+![screenshot](https://git.malingrey.fr/adrien/mots-croises/raw/branch/main/thumbnail.png)

Trie.php

@@ -0,0 +1,101 @@
+<?php
+
+
+class Trie implements ArrayAccess, IteratorAggregate, Countable {
+    public array $branches = [];
+    private $nb_branches = 0;
+
+    public function arraySet($cles, $valeur) {
+        $cle = $cles[0];
+        $this->nb_branches++;
+        $cles = array_slice($cles, 1);
+        if ($cles == []) {
+            $this->branches[$cle] = $valeur;
+        } else {
+            if (!isset($this->branches[$cle])) $this->branches[$cle] = new Trie();
+            $this->branches[$cle]->arraySet($cles, $valeur);
+        }
+    }
+
+    public function arrayExists($cles) {
+        $cle = $cles[0];
+        $cles = array_slice($cles, 1);
+        if ($cles == []) {
+            return isset($this->branches[$cle]);
+        } else {
+            return isset($this->branches[$cle]) && $this->branches[$cle]->arrayExists($cles);
+        }
+    }
+
+    public function &arrayGet($cles) {
+        $cle = $cles[0];
+        $cles = array_slice($cles, 1);
+        if ($cles == []) {
+            return $this->branches[$cle];
+        } else {
+            return $this->branches[$cle]->arrayGet($cles);
+        }
+    }
+
+    public function arrayUnset($cles) {
+        $cle = $cles[0];
+        $cles = array_slice($cles, 1);
+        if ($cles == []) {
+            unset($this->branches[$cle]);
+            $this->nb_branches--;
+        } else {
+            $this->branches[$cle]->arrayUnset($cles);
+            $this->nb_branches--;
+            if (count($this->branches[$cle]) == 0) {
+                unset($this->branches[$cle]);
+            }
+        }
+    }
+
+    // ArrayAccess
+    public function offsetSet($array, $valeur): void {
+        if (is_string($array)) {
+            $array = str_split($array);
+        }
+        $this->arraySet($array, $valeur);
+    }
+
+    public function offsetExists($array): bool {
+        if (is_string($array)) {
+            $array = str_split($array);
+        }
+        return $this->arrayExists($array);
+    }
+
+    public function &offsetGet($array): mixed {
+        if (is_string($array)) {
+            $array = str_split($array);
+        }
+        return $this->arrayGet($array);
+    }
+
+    public function offsetUnset($array): void {
+        if (is_string($array)) {
+            $array = str_split($array);
+        }
+        $this->arrayUnset($array);
+    }
+
+    // IteratorAggregate
+    public function getIterator(): Traversable {
+        foreach ($this->branches as $cle => $branche) {
+            if ($branche instanceof Trie) {
+                foreach($branche->getIterator() as $sous_cles => $feuille) {
+                    yield array_merge([$cle], $sous_cles) => $feuille;
+                }
+            } else {
+                yield [$cle] => $branche;
+            }
+        }
+    }
+
+    // Countable
+    public function count(): int {
+        return $this->nb_branches;
+    }
+}

apercu.png.php

@@ -0,0 +1,84 @@
+<?php
+
+$largeur  = isset($_GET['largeur']) ? (int)$_GET['largeur'] : 200;
+$hauteur  = isset($_GET['hauteur']) ? (int)$_GET['hauteur'] : 200;
+$lignes   = isset($_GET['lignes']) ? (int)$_GET['lignes'] : 8;
+$colonnes = isset($_GET['colonnes']) ? (int)$_GET['colonnes'] : 8;
+
+$image = imagecreatetruecolor($largeur, $hauteur);
+imagesavealpha($image, true);
+$blanc = imagecolorallocate($image, 255, 255, 255);
+$noir  = imagecolorallocate($image, 0, 0, 0);
+$transparent = imagecolorallocatealpha($image, 0, 0, 0, 127);
+
+// Calculer la taille et la position des cases
+$min_dimension = min($largeur, $hauteur);
+if ($min_dimension <= 16) {
+    $bordure_exterieure = 0;
+} else if ($min_dimension < 32) {
+    $bordure_exterieure = 1;
+} else if ($min_dimension <= 96) {
+    $bordure_exterieure = 2;
+} else if ($min_dimension <= 600) {
+    $bordure_exterieure = 3;
+} else {
+    $bordure_exterieure = 6;
+}
+$cote   = (int)min(($largeur - 2 * $bordure_exterieure) / $colonnes, ($hauteur - 2 * $bordure_exterieure) / $lignes);
+if ($cote < 3) {
+    $bordure_interieure = 0;
+} else if ($min_dimension < 600) {
+    $bordure_interieure = 1;
+} else {
+    $bordure_interieure = 2;
+}
+$haut   = (int)(($hauteur - $lignes * $cote - 2 * $bordure_exterieure) / 2) + (int)$bordure_exterieure;
+$gauche = (int)(($largeur - $colonnes * $cote - 2 * $bordure_exterieure) / 2) + $bordure_exterieure;
+$bas    = $haut + $lignes * $cote - $bordure_interieure;
+$droite = $gauche + $colonnes * $cote - $bordure_interieure;
+
+// Remplir l'image avec un fond transparent
+imagefill($image, 0, 0, $transparent);
+
+// Dessiner les bordures extérieures (3 pixels d'épaisseur)
+$marge1 = ceil($bordure_exterieure / 2);
+$marge2 = floor($bordure_exterieure / 2);
+imagesetthickness($image, $bordure_exterieure);
+imagerectangle($image, $gauche - $marge1, $haut - $marge1, $droite + $marge2 -  1, $bas + $marge2 - 1, $noir);
+imagefilledrectangle($image, $gauche, $haut, $droite - 1, $bas - 1, $blanc);
+
+// Dessiner les lignes et colonnes internes (1 pixel d'épaisseur)
+if ($bordure_interieure >= 1) {
+    imagesetthickness($image, $bordure_interieure);
+    for ($x = $gauche + $cote - ceil($bordure_interieure / 2); $x < $droite; $x += $cote) {
+        imageline($image, $x, $haut, $x, $bas, $noir); // Lignes verticales
+    }
+    for ($y = $haut + $cote - ceil($bordure_interieure / 2); $y < $bas; $y += $cote) {
+        imageline($image, $gauche, $y, $droite, $y, $noir); // Lignes horizontales
+    }
+}
+
+// Noicir les cases
+if (isset($_GET["grille"])) {
+    include_once "Grille.php";
+
+    $grille = new Grille($lignes, $colonnes);
+    $id = htmlspecialchars($_GET["grille"]);
+    $grille->load($id) || $grille->genere($id);
+
+    for ($y = 0; $y < $lignes; $y++) {
+        for ($x = 0; $x < $colonnes; $x++) {
+            if ($grille[$y][$x] == CASE_NOIRE) {
+                imagefilledrectangle($image, $gauche + $x * $cote, $haut + $y * $cote, $gauche + ($x + 1) * $cote - 1, $haut + ($y + 1) * $cote - 1, $noir);
+            }
+        }
+    }
+}
+
+// Envoyer l'image au navigateur
+header('Content-Type: image/png');
+imagepng($image);
+
+// Libérer la mémoire
+imagedestroy($image);
+?>

apercu.svg.php

@@ -0,0 +1,90 @@
+<?php
+
+$lignes   = isset($_GET['lignes']) ? (int)$_GET['lignes'] : 8;
+$colonnes = isset($_GET['colonnes']) ? (int)$_GET['colonnes'] : 8;
+
+$bordure = 2;
+$marge = $bordure / 2;
+$cote = 20;
+
+// Dimensions du SVG
+$width = $colonnes * $cote; // Largeur proportionnelle au nombre de colonnes
+$height = $lignes * $cote;  // Hauteur proportionnelle au nombre de lignes
+$rectRadius = 20;        // Rayon des coins arrondis du rectangle
+
+// Création du document XML
+$doc = new DOMDocument('1.0', 'UTF-8');
+$doc->formatOutput = true;
+
+// Élément SVG principal
+$svg = $doc->createElement('svg');
+$svg->setAttribute('xmlns', 'http://www.w3.org/2000/svg');
+$svg->setAttribute('viewBox', -$marge . " " . -$marge . " " . ($width + $bordure) . " " . ($height + $bordure));
+$svg->setAttribute('width', $width + $bordure);
+$svg->setAttribute('height', $height + $bordure);
+$doc->appendChild($svg);
+
+// Rectangle arrondi
+$rect = $doc->createElement('rect');
+$rect->setAttribute('x', 0);
+$rect->setAttribute('y', 0);
+$rect->setAttribute('width', $width);
+$rect->setAttribute('height', $height);
+$rect->setAttribute('rx', $rectRadius);
+$rect->setAttribute('ry', $rectRadius);
+$rect->setAttribute('fill', 'white');
+$rect->setAttribute('stroke', 'black');
+$rect->setAttribute('stroke-width', $bordure);
+$svg->appendChild($rect);
+
+// Lignes verticales
+for ($i = 1; $i < $colonnes; $i++) {
+    $x = $i * $cote;
+    $line = $doc->createElement('line');
+    $line->setAttribute('x1', $x);
+    $line->setAttribute('y1', $marge);
+    $line->setAttribute('x2', $x);
+    $line->setAttribute('y2', $height - $marge);
+    $line->setAttribute('stroke', '#000');
+    $line->setAttribute('stroke-width', 1);
+    $svg->appendChild($line);
+}
+
+// Lignes horizontales
+for ($i = 1; $i < $lignes; $i++) {
+    $y = $i * $cote;
+    $line = $doc->createElement('line');
+    $line->setAttribute('x1', $marge);
+    $line->setAttribute('y1', $y);
+    $line->setAttribute('x2', $width - $marge);
+    $line->setAttribute('y2', $y);
+    $line->setAttribute('stroke', '#000');
+    $line->setAttribute('stroke-width', 1);
+    $svg->appendChild($line);
+}
+
+// Noicir les cases
+if (isset($_GET["grille"])) {
+    include_once "Grille.php";
+
+    $grille = new Grille($lignes, $colonnes);
+    $id = htmlspecialchars($_GET["grille"]);
+    $grille->load($id) || $grille->genere($id);
+
+    for ($y = 0; $y < $lignes; $y++) {
+        for ($x = 0; $x < $colonnes; $x++) {
+            if ($grille[$y][$x] == CASE_NOIRE) {
+                $rect = $doc->createElement('rect');
+                $rect->setAttribute('x', $x * $cote);
+                $rect->setAttribute('y', $y * $cote);
+                $rect->setAttribute('width', $cote);
+                $rect->setAttribute('height', $cote);
+                $rect->setAttribute('fill', 'black');
+                $svg->appendChild($rect);
+            }
+        }
+    }
+}
+
+header('Content-Type: image/svg+xml');
+echo $doc->saveXML();

dico.php

@@ -1,55 +1,59 @@
 <?php
 
+include_once "Trie.php";
 
-const MIN_LETTRES_MOT_1 = 2;
-const MIN_LETTRES_MOT_2 = 0;
-const MAX_MOTS = 1000000;
 
-$dico = [[]];
+const CASE_NOIRE = " ";
-if (($lecteur = fopen("dico.csv", "r")) !== FALSE) {
+
-    $header = fgetcsv($lecteur, 0, "\t");
+
-    while (($ligne = fgetcsv($lecteur, 0, "\t")) !== FALSE) {
+function dico($longueur_max) {
-        if ($ligne[0] == NULL || substr($ligne[0], 0, 1) == "#") continue;
+    $transliterator = Transliterator::createFromRules(':: Any-Latin; :: Latin-ASCII; :: NFD; :: [:Nonspacing Mark:] Remove; :: Upper(); :: NFC;', Transliterator::FORWARD);
-        switch(count($ligne)) {
+    
-            case 1:
+    $dico = [[new Trie()]];
-                [$mot] = $ligne;
+    for ($longueur = 0; $longueur <= $longueur_max; $longueur++) {
-                $definition = "";
+        $dico[] = new Trie();
-            break;
-            case 2:
-                [$mot, $definition] = $ligne;
-            break;
-            case 3:
-                [$mot, $definition, $auteur] = $ligne;
-                $definition .= " <small><em>$auteur</em></small>";
-            break;
     }
-        $mot = strtoupper($mot);
+    if (($lecteur = fopen("dico.csv", "r")) !== FALSE) {
-        $longueur = strlen($mot);
+        $entete = fgetcsv($lecteur, 0, "\t");
-        if (!isset($dico[$longueur])) $dico[$longueur] = [];
+        while (($ligne = fgetcsv($lecteur, 0, "\t")) !== FALSE) {
-        if (!isset($dico[$longueur][$mot])) $dico[$longueur][$mot] = [];
+            if (
-        if (strlen($definition)) $dico[$longueur][$mot][] = $definition;
+                $ligne[0] == NULL
+                || substr($ligne[0], 0, 1) == "#"
+                || strlen($ligne[0]) > $longueur_max
+            ) continue;
+
+            $mot = $ligne[0];
+            $definitions = array_slice($ligne, 1);
+
+            $mot = str_replace("-", CASE_NOIRE, $mot);
+            $mot = $transliterator->transliterate($mot);
+            if (strpos($mot, CASE_NOIRE) !== false) {
+                $mots = explode(CASE_NOIRE, $mot);
+                $nb_mots = count($mots);
+                $mot = implode("", $mots);
+                foreach($definitions as $i => $definition) {
+                    $definitions[$i] = "$definition#$nb_mots";
+                }
+            }
+
+            $dico[strlen($mot)][$mot] = $definitions;
         }
         fclose($lecteur);
+    }
+    
+    return $dico;
 }
 
-function mots_espaces($longueur, $nb_mots_restants=MAX_MOTS)
+function mots_espaces($longueur_max) {
-{
+    $dico = dico($longueur_max);
-    global $dico;
+    for ($longueur = $longueur_max; $longueur >= 2; $longueur--) {
-
+        for ($position_espace = $longueur - 1; $position_espace >= 1; $position_espace--) {
-    foreach ($dico[$longueur] as $mot => $definition) {
+            $mots_suivants = $dico[$longueur - $position_espace - 1];
-        yield [$mot];
+            foreach ($dico[$position_espace] as $premier_mot => $definition) {
-        if (--$nb_mots_restants <= 0) return;
+                $premier_mot[] = CASE_NOIRE;
-    }
+                $dico[$longueur][$premier_mot] = $mots_suivants;
-    for ($i = MIN_LETTRES_MOT_1; $longueur - $i - 1 >= MIN_LETTRES_MOT_2; $i++) {
-        foreach ($dico[$i] as $mot => $definition) {
-            foreach (mots_espaces($longueur - $i - 1, $nb_mots_restants) as $mots) {
-                if (!in_array($mot, $mots)) {
-                    yield [$mot, ...$mots];
-                    if (--$nb_mots_restants <= 0) return;
-                    yield [...$mots, $mot];
-                    if (--$nb_mots_restants <= 0) return;
-                }
             }
         }
     }
+    return $dico;
 }

favicons/favicon.svg

@@ -21,8 +21,8 @@
      inkscape:pagecheckerboard="0"
      inkscape:deskcolor="#505050"
      inkscape:zoom="8.3124997"
-     inkscape:cx="28.57143"
+     inkscape:cx="32"
-     inkscape:cy="30.977445"
+     inkscape:cy="32"
      inkscape:window-width="1536"
      inkscape:window-height="793"
      inkscape:window-x="0"
@@ -32,19 +32,19 @@
   <path
      fill="#ffffff"
      stroke="#000000"
-     stroke-width="2.03093"
+     stroke-width="2"
      stroke-miterlimit="10"
-     d="m 62.968825,7.9076 v 48.183453 a 6.8777723,6.877772 0 0 1 -6.876426,6.87777 H 7.9089443 a 6.8777723,6.877772 0 0 1 -6.87777,-6.876424 V 7.9076 A 6.8777723,6.877772 0 0 1 7.9075973,1.0311743 H 56.092399 A 6.8777723,6.877772 0 0 1 62.968825,7.9076 Z M 46.910816,17.089183 H 31.999999 v 14.910816 h 14.910817 z"
+     d="m 63,8 v 48 a 7,7 0 0 1 -7,7 H 8 a 7,7 0 0 1 -7,-7 V 9 A 7,7 0 0 1 8,1 H 56 A 7,7 0 0 1 63,8 Z M 47,17 H 32 v 15 h 15 z"
      id="path1" />
   <path
-     d="M 46.910816,17.089183 H 31.999999 v 14.910816 h 14.910817 z"
+     d="M 47,17 H 32 v 15 h 15 z"
      id="path2"
-     style="stroke-width:1.34646" />
+     style="stroke-width:1" />
   <path
      fill="none"
      stroke="#000000"
-     stroke-width="2.06235"
+     stroke-width="2"
      stroke-miterlimit="10"
-     d="M 46.910816,62.968823 V 31.999999 m 0,-14.910815 V 1.0311743 M 31.999999,62.968823 V 31.999999 m 0,-14.910815 V 1.0311743 m -16.058011,0 V 62.968823 M 46.910816,31.999999 h 16.058009 m -30.968826,0 H 1.0311743 M 62.968825,46.910815 H 1.0311743 M 62.968825,15.941991 H 1.0311743"
+     d="M 47,63 V 32 m 0,-15 V 1 M 32,63 V 32 m 0,-15 V 1 m -16,0 V 63 M 47,32 h 16 m -31,0 H 1 M 63,47 H 1 M 63,16 H 1"
      id="path3" />
 </svg>

index.php

@@ -1,19 +1,12 @@
 <?php
 
-if (!isset($_GET["grille"])) {
-    $_GET["grille"] = uniqid();
-    header("Location: " . dirname($_SERVER['DOCUMENT_URI']) . "?" . http_build_query($_GET));
-    exit;
-}
-
-
-include_once "dico.php";
 include_once "Grille.php";
 
-const HAUTEUR_DEFAUT = 7;
+
+const HAUTEUR_DEFAUT = 8;
 const HAUTEUR_MIN = 2;
 const HAUTEUR_MAX = 10;
-const LARGEUR_DEFAUT = 7;
+const LARGEUR_DEFAUT = 8;
 const LARGEUR_MIN = 2;
 const LARGEUR_MAX = 10;
 
@@ -25,6 +18,7 @@ $hauteur = filter_input(INPUT_GET, 'lignes', FILTER_VALIDATE_INT, [
         "max_range" => HAUTEUR_MAX
     ]
 ]);
+
 $largeur = filter_input(INPUT_GET, 'colonnes', FILTER_VALIDATE_INT, [
     "options" => [
         "default" => LARGEUR_DEFAUT,
@@ -32,46 +26,67 @@ $largeur = filter_input(INPUT_GET, 'colonnes', FILTER_VALIDATE_INT, [
         "max_range" => LARGEUR_MAX
     ]
 ]);
-$id = htmlspecialchars($_GET["grille"]);
 
-$grille = new Grille($hauteur, $largeur, $id);
+$grille = new Grille($hauteur, $largeur);
-$grille->current();
+$basedir = $_SERVER["REQUEST_SCHEME"]."://".$_SERVER["HTTP_HOST"].dirname($_SERVER["DOCUMENT_URI"]);
 
-$definitions_horizontales = [];
+if (!isset($_GET["grille"]) || $_GET["grille"] == "") {
-foreach ($grille->lignes as $y => $mots) {
+    do {
-    $definitions_horizontales[$y] = [];
+        $id = uniqid();
-    foreach ($mots as $mot) {
+        $grille_valide = $grille->genere($id);
-        $definitions = $dico[strlen($mot)][$mot];
+    } while (!$grille_valide);
-        if (count($definitions)) {
+
-            $definitions_horizontales[$y][] = $definitions[mt_rand(0, count($definitions) - 1)];
+    $_GET["grille"] = $id;
-        }
+    header("Location: $basedir/?" . http_build_query($_GET));
-    }
+} else {
+    $id = htmlspecialchars($_GET["grille"]);
+    $grille_valide = $grille->load($id) || $grille->genere($id);
 }
-$definitions_verticales = [];
+
-foreach ($grille->colonnes as $x => $mots) {
+function formatter_definition($definition) {
-    $definitions_verticales[$x] = [];
+    if (strpos($definition, "#") !== false) {
-    foreach ($mots as $mot) {
+        [$definition, $nb_mots] = explode("#", $definition);
-        $definitions = $dico[strlen($mot)][$mot];
+        $nb_mots = " <small>($nb_mots mots)</small>";
-        if (count($definitions)) {
+    } else {
-            $definitions_verticales[$x][] = $definitions[mt_rand(0, count($definitions) - 1)];
+        $nb_mots = "";
     }
+    if (strpos($definition, "@") !== false) {
+        [$definition, $auteur] = explode("@", $definition);
+        $auteur = " <small><em>$auteur</em></small>";
+    } else {
+        $auteur = "";
     }
+    return $definition . $nb_mots . $auteur;
 }
 ?>
 <!DOCTYPE HTML>
-<html>
+<html lang="fr-FR" dir="ltr" prefix="og: https://ogp.me/ns#">
 
 <head>
     <meta charset="utf-8">
-    <title>Mots croisés</title>
+    <title>🄼🄾🅃🅂▣🄲🅁🄾🄸🅂🄴🅂</title>
     <link rel="stylesheet" href="style.css">
-    <link rel="icon" href="favicon.svg">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="shortcut icon" href="favicon.ico" />
+    <link rel="icon" type="image/svg+xml" href="apercu.svg.php?grille=<?=$id?>&lignes=<?=$hauteur?>&colonnes=<?=$largeur?>">
+    <link rel="icon" type="image/png" sizes="96x96" href="apercu.png.php?grille=<?=$id?>&lignes=<?=$hauteur?>&colonnes=<?=$largeur?>&largeur=96&hauteur=96" />
+    <link rel="apple-touch-icon" sizes="180x180" href="favicons/apple-touch-icon.png" />
+    <meta name="apple-mobile-web-app-title" content="🄼🄾🅃🅂 🄲🅁🄾🄸🅂🄴🅂" />
+    <link rel="manifest" href="site.webmanifest" />
+    <meta property="og:title" content="🄼🄾🅃🅂▣🄲🅁🄾🄸🅂🄴🅂"/>
+    <meta property="og:type" content="game"/>
+    <meta property="og:url" content="<?=$basedir?>"/>
+    <meta property="og:image" content="<?=$basedir?>/apercu.png.php?grille=<?=$id?>&lignes=<?=$hauteur?>&colonnes=<?=$largeur?>&largeur=1200&hauteur=630"/>
+    <meta property="og:image:width" content="1200"/>
+    <meta property="og:image:height" content="630"/>
+    <meta property="og:locale" content="fr_FR"/>
+    <meta property="og:site_name" content="<?=$_SERVER["HTTP_HOST"]?>"/>
 </head>
 
 <body>
     <form id="grilleForm" method="get" location=".">
         <h1 class="large width">
+            <a href=".">
                 <table>
                     <tbody>
                         <tr>
@@ -97,10 +112,11 @@ foreach ($grille->colonnes as $x => $mots) {
                         </tr>
                     </tbody>
                 </table>
+            </a>
         </h1>
-        <h1 class="small width">Mots croisés</h1>
+        <h1 class="small width"><a href=".">Mots■croisés</a></h1>
         <div class="grille-et-definitions">
-            <?php if ($grille->valid()): ?>
+            <?php if ($grille_valide): ?>
                 <div class="grille">
                     <table>
                         <tr>
@@ -114,14 +130,14 @@ foreach ($grille->colonnes as $x => $mots) {
                             <tr>
                                 <th><?= $y + 1 ?></th>
                                 <?php for ($x = 0; $x < $largeur; $x++): ?>
-                                    <?php if ($grille[$y][$x] == " "): ?>
+                                    <?php if ($grille[$y][$x] == CASE_NOIRE): ?>
                                         <td class="case noire">
-                                            <input id="<?= chr($x + 65) . ($y + 1) ?>" type="text" maxlength="1" size="1" value=" " disabled />
+                                            <input id="<?= chr($x + 65) . ($y + 1) ?>" type="text" maxlength="1" size="1" value="<?= CASE_NOIRE ?>" disabled />
                                         </td>
                                     <?php else: ?>
                                         <td class="case blanche">
-                                            <input id="<?= chr($x + 65) . ($y + 1) ?>" type="text" maxlength="1" size="1" pattern="[A-Z]" placeholder="<?= $grille[$y][$x] ?>"
+                                            <input id="<?= chr($x + 65) . ($y + 1) ?>" type="text" maxlength="1" size="1" pattern="[A-Z]"
-                                                title="<?= "→ " . strip_tags(implode("\n→ ", $definitions_horizontales[$y])) . "\n↓ " . strip_tags(implode("\n↓ ", $definitions_verticales[$x])) ?>" />
+                                                title="<?= strip_tags("→ " . implode("\n→ ", array_map("formatter_definition", $grille->definitions["horizontales"][$y] ?? [])) . "\n↓ " . implode("\n↓ ", array_map("formatter_definition", $grille->definitions["verticales"][$x] ?? []))) ?>" />
                                         </td>
                                     <?php endif; ?>
                                 <?php endfor; ?>
@@ -131,18 +147,20 @@ foreach ($grille->colonnes as $x => $mots) {
                 </div>
                 <div class="definitions horizontales">
                     <h2>Horizontalement</h2>
-                    <ol>
+                    <ol type="1">
-                        <?php foreach ($definitions_horizontales as $y => $definitions): ?>
+                        <?php foreach ($grille->definitions["horizontales"] as $y => $definitions): ?>
                             <li>
+                                <?php if (count($definitions)): ?>
                                     <?php if (count($definitions) == 1): ?>
-                                    <?= $definitions[0] ?>
+                                        <?= formatter_definition($definitions[0]) ?>
                                     <?php else: ?>
                                         <ol>
                                         <?php foreach ($definitions as $definition) : ?>
-                                            <li><?= $definition ?></li>
+                                            <li><?= formatter_definition($definition) ?></li>
                                         <?php endforeach ?>
                                         </ol>
                                     <?php endif ?>
+                                <?php endif ?>
                             </li>
                         <?php endforeach; ?>
                     </ol>
@@ -150,38 +168,42 @@ foreach ($grille->colonnes as $x => $mots) {
                 <div class="definitions verticales">
                     <h2>Verticalement</h2>
                     <ol type="A">
-                        <?php foreach ($definitions_verticales as $x => $definitions): ?>
+                        <?php foreach ($grille->definitions["verticales"] as $x => $definitions): ?>
                             <li>
+                                <?php if (count($definitions)): ?>
                                     <?php if (count($definitions) == 1): ?>
-                                    <?= $definitions[0] ?>
+                                        <?= formatter_definition($definitions[0]) ?>
                                     <?php else: ?>
                                         <ol>
                                             <?php foreach ($definitions as $definition) : ?>
-                                            <li><?= $definition ?></li>
+                                                <li><?= formatter_definition($definition) ?></li>
                                             <?php endforeach ?>
                                         </ol>
                                     <?php endif ?>
+                                <?php endif ?>
                             </li>
                         <?php endforeach; ?>
                     </ol>
                 </div>
+                <input type="hidden" id="solution_hashee" value="<?= $grille->hash() ?>" />
             <?php else: http_response_code(500); ?>
                 <h3 class="erreur">Erreur de génération de la grille</h3>
             <?php endif ?>
         </div>
         
         <div class="nouvelle-grille">
-            <img src="favicon.svg" width="16" height="16">
+            <img src="favicons/favicon.svg" width="16" height="16">
             <button type="submit">Nouvelle grille</button>
             de
-            <input type="number" id="lignes"<?= isset($_GET["lignes"])? 'name="lignes"': "" ?> value="<?= $hauteur ?>" min="<?=HAUTEUR_MIN?>" max="<?=HAUTEUR_MAX?>"/>
+            <input type="number" id="lignes"<?= isset($_GET["lignes"])? ' name="lignes"': "" ?> value="<?= $hauteur ?>" min="<?=HAUTEUR_MIN?>" max="<?=HAUTEUR_MAX?>"/>
             lignes et
-            <input type="number" id="colonnes"<?= isset($_GET["colonnes"])? 'name="colonnes"': "" ?> value="<?= $largeur ?>" min="<?=LARGEUR_MIN?>" max="<?=LARGEUR_MAX?>"/>
+            <input type="number" id="colonnes"<?= isset($_GET["colonnes"])? ' name="colonnes"': "" ?> value="<?= $largeur ?>" min="<?=LARGEUR_MIN?>" max="<?=LARGEUR_MAX?>"/>
             colonnes
         </div>
     </form>
 
     <script src="script.js"></script>
+    <script>navigator?.serviceWorker.register('service-worker.js')</script>
 </body>
 
 </html>

script.js

@@ -6,7 +6,7 @@ async function sha256(text) {
   return hashArray.map((b) => b.toString(16).padStart(2, "0")).join("");
 }
 
-let inputs = grilleForm.querySelectorAll(".grille input");
+let inputs = Array.from(grilleForm.querySelectorAll(".grille input"));
 let largeur = Number(colonnes.value);
 let nb_cases = inputs.length;
 let index = 0;
@@ -35,26 +35,28 @@ for (let input of inputs) {
   };
 
   input.onkeydown = function (event) {
-    next_input = null;
+    next_input = input;
+    do {
       switch (event.key) {
         case "ArrowUp":
-        next_input = inputs[(input.index - largeur + nb_cases) % nb_cases];
+          next_input = inputs[(next_input.index - largeur + nb_cases) % nb_cases];
           break;
         case "ArrowDown":
-        next_input = inputs[(input.index + largeur) % nb_cases];
+          next_input = inputs[(next_input.index + largeur) % nb_cases];
           break;
         case "ArrowLeft":
-        next_input = inputs[(input.index - 1 + nb_cases) % nb_cases];
+          next_input = inputs[(next_input.index - 1 + nb_cases) % nb_cases];
           break;
         case "ArrowRight":
-        next_input = inputs[(input.index + 1) % nb_cases];
+          next_input = inputs[(next_input.index + 1) % nb_cases];
           break;
+        default:
+          return;
       }
-    if (next_input) {
+    } while (next_input.disabled)
+    event.preventDefault();
     next_input.focus();
     next_input.select();
-      event.preventDefault();
-    }
   };
 
   input.oninput = function (event) {

service-worker.js

@@ -0,0 +1,86 @@
+/*
+Copyright 2015, 2019, 2020 Google LLC. All Rights Reserved.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+// Incrementing OFFLINE_VERSION will kick off the install event and force
+// previously cached resources to be updated from the network.
+const OFFLINE_VERSION = 1;
+const CACHE_NAME = "offline";
+// Customize this with a different URL if needed.
+const OFFLINE_URL = "index.php";
+
+self.addEventListener("install", (event) => {
+  event.waitUntil(
+    (async () => {
+      const cache = await caches.open(CACHE_NAME);
+      // Setting {cache: 'reload'} in the new request will ensure that the
+      // response isn't fulfilled from the HTTP cache; i.e., it will be from
+      // the network.
+      await cache.add(new Request(OFFLINE_URL, { cache: "reload" }));
+    })()
+  );
+  // Force the waiting service worker to become the active service worker.
+  self.skipWaiting();
+});
+
+self.addEventListener("activate", (event) => {
+  event.waitUntil(
+    (async () => {
+      // Enable navigation preload if it's supported.
+      // See https://developers.google.com/web/updates/2017/02/navigation-preload
+      if ("navigationPreload" in self.registration) {
+        await self.registration.navigationPreload.enable();
+      }
+    })()
+  );
+
+  // Tell the active service worker to take control of the page immediately.
+  self.clients.claim();
+});
+
+self.addEventListener("fetch", (event) => {
+  // We only want to call event.respondWith() if this is a navigation request
+  // for an HTML page.
+  if (event.request.mode === "navigate") {
+    event.respondWith(
+      (async () => {
+        try {
+          // First, try to use the navigation preload response if it's supported.
+          const preloadResponse = await event.preloadResponse;
+          if (preloadResponse) {
+            return preloadResponse;
+          }
+
+          // Always try the network first.
+          const networkResponse = await fetch(event.request);
+          return networkResponse;
+        } catch (error) {
+          // catch is only triggered if an exception is thrown, which is likely
+          // due to a network error.
+          // If fetch() returns a valid HTTP response with a response code in
+          // the 4xx or 5xx range, the catch() will NOT be called.
+          console.log("Fetch failed; returning offline page instead.", error);
+
+          const cache = await caches.open(CACHE_NAME);
+          const cachedResponse = await cache.match(OFFLINE_URL);
+          return cachedResponse;
+        }
+      })()
+    );
+  }
+
+  // If our if() condition is false, then this fetch handler won't intercept the
+  // request. If there are any other fetch handlers registered, they will get a
+  // chance to call event.respondWith(). If no fetch handlers call
+  // event.respondWith(), the request will be handled by the browser as if there
+  // were no service worker involvement.
+});

site.webmanifest

@@ -0,0 +1,21 @@
+{
+    "name": "🄼🄾🅃🅂 🄲🅁🄾🄸🅂🄴🅂",
+    "short_name": "🄼🄾🅃🅂 🄲🅁🄾🄸🅂🄴🅂",
+    "icons": [
+      {
+        "src": "favicons/web-app-manifest-192x192.png",
+        "sizes": "192x192",
+        "type": "image/png",
+        "purpose": "maskable"
+      },
+      {
+        "src": "favicons/web-app-manifest-512x512.png",
+        "sizes": "512x512",
+        "type": "image/png",
+        "purpose": "maskable"
+      }
+    ],
+    "theme_color": "#ffffff",
+    "background_color": "#ffffff",
+    "display": "standalone"
+  }

style.css

@@ -18,6 +18,12 @@ h1 {
   letter-spacing: 0.2em;
 }
 
+h1 a {
+  width: 100%;
+  text-decoration: none;
+  color: inherit;
+}
+
 h1.large.width {
   display: inherit;
   padding-top: 1rem;
@@ -95,10 +101,6 @@ h2 {
   background-color: black;
 }
 
-.grille .case.noire {
-  background-color: black;
-}
-
 .grille input {
   width: 100%;
   height: 100%;
@@ -112,6 +114,7 @@ h2 {
 }
 
 .grille input[disabled] {
+  color: black;
   background-color: black;
 }
 
@@ -202,6 +205,7 @@ h2 {
   text-decoration: underline;
 }
 
+h1 a:hover,
 .nouvelle-grille button:hover {
   color: #2a6496;
 }
@@ -292,7 +296,10 @@ h2 {
   }
   
   .definitions li.non-selectionee {
-    display: none;
+    visibility: hidden;
+    height: 0;
+    margin: 0;
+    padding: 0;
   }
 }
 
@@ -315,6 +322,7 @@ h2 {
     background-color: #edeeee;
   }
 
+  h1 a:hover,
   .nouvelle-grille button:hover {
     color: #479fec;
   }