From f5370aa2a2fe42bbb65d51ceb3b2697134e07d13 Mon Sep 17 00:00:00 2001
From: Thomas Schwery <thomas@schwery.me>
Date: Wed, 23 Feb 2011 21:41:48 +0100
Subject: [PATCH] Uniformisation syntaxe temps et portions script de validation
 de syntaxe

---
 .../accompagnements/courgettes_olives.tex     |  3 +-
 .../ratatouille_provencale.tex                |  2 +-
 chapters/boissons/sangria.tex                 |  2 +-
 chapters/desserts/Salade_banane.tex           |  3 +-
 chapters/desserts/biscuit_roule.tex           |  2 +-
 chapters/desserts/biscuit_roule_pommes.tex    |  2 +-
 chapters/desserts/brownies.tex                |  2 +-
 chapters/desserts/cake_citron.tex             |  2 +-
 chapters/desserts/croquets.tex                |  3 +-
 chapters/desserts/gateau_creme.tex            |  2 +-
 chapters/desserts/gateau_rapidos.tex          |  2 +-
 chapters/desserts/pain_anis.tex               |  3 +-
 chapters/desserts/tarte_poires.tex            |  3 +-
 chapters/desserts/tarte_vin_cuit.tex          |  2 +-
 chapters/desserts/tarte_vin_cuit_aline.tex    |  3 +-
 chapters/entrees/terrine_tomates.tex          |  3 +-
 chapters/pains/panettone.tex                  |  2 +-
 chapters/pains/pate_pain.tex                  |  2 +-
 chapters/patates/provencale.tex               |  3 +-
 chapters/pates/legumes.tex                    |  3 +-
 chapters/pates/poulet.tex                     |  3 +-
 chapters/quiches/flammenkueche.tex            |  2 +-
 chapters/salades/couscous.tex                 |  2 +-
 chapters/salades/salade_grecque.tex           |  2 +-
 chapters/salades/salade_nicoise.tex           |  3 +-
 chapters/viandes/almondigas.tex               |  2 +-
 syntax_check.sh                               | 62 +++++++++++++++++++
 27 files changed, 88 insertions(+), 37 deletions(-)
 create mode 100755 syntax_check.sh

diff --git a/chapters/accompagnements/courgettes_olives.tex b/chapters/accompagnements/courgettes_olives.tex
index 4ddf531..8cb3c8a 100644
--- a/chapters/accompagnements/courgettes_olives.tex
+++ b/chapters/accompagnements/courgettes_olives.tex
@@ -1,5 +1,4 @@
-\begin{recipe}{Courgettes aux olives}{Pour 4 portions}{10 minutes + 15 
-minutes cuisson}
+\begin{recipe}{Courgettes aux olives}{4 portions}{10 minutes + 15 minutes cuisson}
 \index{Courgettes aux olives}
 
 \ing[1]{kg}{Courgettes}
diff --git a/chapters/accompagnements/ratatouille_provencale.tex b/chapters/accompagnements/ratatouille_provencale.tex
index 6c65a10..b93a241 100644
--- a/chapters/accompagnements/ratatouille_provencale.tex
+++ b/chapters/accompagnements/ratatouille_provencale.tex
@@ -1,4 +1,4 @@
-\begin{recipe}{Ratatouille provençale}{4 portions}{25minutes + 1heure de cuisson}
+\begin{recipe}{Ratatouille provençale}{4 portions}{25 minutes + 1 heure de cuisson}
 \index{Ratatouille provençale}
 
 \ing[500]{g}{Aubergine}
diff --git a/chapters/boissons/sangria.tex b/chapters/boissons/sangria.tex
index 078f861..acaa392 100644
--- a/chapters/boissons/sangria.tex
+++ b/chapters/boissons/sangria.tex
@@ -1,4 +1,4 @@
-\begin{recipe}{Sangria}{4 portions}{10 minutes + refroidir 2-3 heures}
+\begin{recipe}{Sangria}{4 portions}{10 minutes + 2-3 heures refroidir}
 \index{Sangria}
 \ing[7,5]{dl}{Vin rouge}
 \ing[2,5]{dl}{D'eau gazeuse} 
diff --git a/chapters/desserts/Salade_banane.tex b/chapters/desserts/Salade_banane.tex
index b23f860..b224256 100644
--- a/chapters/desserts/Salade_banane.tex
+++ b/chapters/desserts/Salade_banane.tex
@@ -1,5 +1,4 @@
-\begin{recipe}{Salade de bananes au citron vert}{4 portions}{10 minutes 
-+ 3 heures de repos}
+\begin{recipe}{Salade de bananes au citron vert}{4 portions}{10 minutes + 3 heures de repos}
 \index{Salade!Bananes au citron vert}
 
 \ing[2]{dl}{Eau}
diff --git a/chapters/desserts/biscuit_roule.tex b/chapters/desserts/biscuit_roule.tex
index e2abfb1..9872046 100644
--- a/chapters/desserts/biscuit_roule.tex
+++ b/chapters/desserts/biscuit_roule.tex
@@ -1,4 +1,4 @@
-\begin{recipe}{Biscuit roulé}{Plaque 40x50 cm}{20 minutes}
+\begin{recipe}{Biscuit roulé}{1 plaque 40x50 cm}{20 minutes}
 \index{Biscuit roulé}
 
 \ing[3]{}{Jaunes d'oeufs}
diff --git a/chapters/desserts/biscuit_roule_pommes.tex b/chapters/desserts/biscuit_roule_pommes.tex
index e4ce527..a50643d 100644
--- a/chapters/desserts/biscuit_roule_pommes.tex
+++ b/chapters/desserts/biscuit_roule_pommes.tex
@@ -1,4 +1,4 @@
-\begin{recipe}{Biscuit roulé aux pommes}{Plaque 40x50 cm}{20 minutes}
+\begin{recipe}{Biscuit roulé aux pommes}{1 plaque 40x50 cm}{20 minutes}
 \index{Biscuit roulé!aux pommes}
 \newstep 
 Suivre la recette du biscuit roulé pour la pâte
diff --git a/chapters/desserts/brownies.tex b/chapters/desserts/brownies.tex
index 821273c..3839112 100644
--- a/chapters/desserts/brownies.tex
+++ b/chapters/desserts/brownies.tex
@@ -1,4 +1,4 @@
-\begin{recipe}{Brownies}{Plaques de 30x33 cm}{10 minutes + 20 minutes cuisson}
+\begin{recipe}{Brownies}{1 plaque de 30x33 cm}{10 minutes + 20 minutes cuisson}
 \index{Brownies}
 
 \newstep
diff --git a/chapters/desserts/cake_citron.tex b/chapters/desserts/cake_citron.tex
index cb1bd04..1ffd54e 100644
--- a/chapters/desserts/cake_citron.tex
+++ b/chapters/desserts/cake_citron.tex
@@ -1,4 +1,4 @@
-\begin{recipe}{Cake au citron}{4 portion}{}
+\begin{recipe}{Cake au citron}{1 moule à cake 25cm}{15 minutes + 45 minutes}
 \index{Cake!au citron}
 
 \ing[1]{}{Citron}
diff --git a/chapters/desserts/croquets.tex b/chapters/desserts/croquets.tex
index e9f2168..18c517e 100644
--- a/chapters/desserts/croquets.tex
+++ b/chapters/desserts/croquets.tex
@@ -1,5 +1,4 @@
-\begin{recipe}{Croquets}{40 pièces}{10 minutes + 1 nuit repos + 12 
-minutes cuisson}
+\begin{recipe}{Croquets}{40 pièces}{10 minutes + 1 nuit repos + 12 minutes cuisson}
 \index{Croquets}
 
 \ing[2]{}{Œufs}
diff --git a/chapters/desserts/gateau_creme.tex b/chapters/desserts/gateau_creme.tex
index a2d91ca..baf79d1 100644
--- a/chapters/desserts/gateau_creme.tex
+++ b/chapters/desserts/gateau_creme.tex
@@ -1,4 +1,4 @@
-\begin{recipe}{Gâteau à la crème}{1 plaque 30 cm diamètre}{1heure + 15 minutes cuisson}
+\begin{recipe}{Gâteau à la crème}{1 plaque 30 cm diamètre}{1 heure + 15 minutes cuisson}
 \index{Gâteau!À la crème}
 \index{Gâteau!Du Vully}
 \index{Gâteau!De Goumoens}
diff --git a/chapters/desserts/gateau_rapidos.tex b/chapters/desserts/gateau_rapidos.tex
index bf8671f..e88aace 100644
--- a/chapters/desserts/gateau_rapidos.tex
+++ b/chapters/desserts/gateau_rapidos.tex
@@ -1,4 +1,4 @@
-\begin{recipe}{Gâteau Rapidos}{Plaque 30 cm de diamètre}{25 minutes}
+\begin{recipe}{Gâteau Rapidos}{1 plaque à gâteau 30 cm}{25 minutes}
 \index{Gâteau!Rapidos}
 
 \ing[100]{g}{Beurre}
diff --git a/chapters/desserts/pain_anis.tex b/chapters/desserts/pain_anis.tex
index 41cf154..74b78ee 100644
--- a/chapters/desserts/pain_anis.tex
+++ b/chapters/desserts/pain_anis.tex
@@ -1,5 +1,4 @@
-\begin{recipe}{Pains d'anis}{40 pièces}{15 minutes + 1 nuit + 10 minutes
-cuisson}
+\begin{recipe}{Pains d'anis}{40 pièces}{15 minutes + 1 nuit + 10 minutes cuisson}
 \index{Pains d'anis}
 
 \newstep
diff --git a/chapters/desserts/tarte_poires.tex b/chapters/desserts/tarte_poires.tex
index deae914..853467a 100644
--- a/chapters/desserts/tarte_poires.tex
+++ b/chapters/desserts/tarte_poires.tex
@@ -1,5 +1,4 @@
-\begin{recipe}{Tarte aux poires}{Moule 30 cm de diamètre}{10minutes + 35
-minutes}
+\begin{recipe}{Tarte aux poires}{1 plaque à gâteau 30 cm}{10 minutes + 35 minutes}
 \index{Tarte!aux poires}
 
 \ing[1]{}{Pâte brisée abaissée}
diff --git a/chapters/desserts/tarte_vin_cuit.tex b/chapters/desserts/tarte_vin_cuit.tex
index 7457dc5..5e53807 100644
--- a/chapters/desserts/tarte_vin_cuit.tex
+++ b/chapters/desserts/tarte_vin_cuit.tex
@@ -1,4 +1,4 @@
-\begin{recipe}{Tarte au vin cuit}{Moule de 30 cm de diamètre}{10 minutes + 20 minutes cuisson}
+\begin{recipe}{Tarte au vin cuit}{1 plaque à gâteau 30 cm}{10 minutes + 20 minutes cuisson}
 \index{Tarte!au vin cuit}
 
 \ing[2]{dl}{Lait}
diff --git a/chapters/desserts/tarte_vin_cuit_aline.tex b/chapters/desserts/tarte_vin_cuit_aline.tex
index 517a51f..58babb1 100644
--- a/chapters/desserts/tarte_vin_cuit_aline.tex
+++ b/chapters/desserts/tarte_vin_cuit_aline.tex
@@ -1,5 +1,4 @@
-\begin{recipe}{Tarte au vin cuit (Aline)}{Moule de 30 cm de diamètre}
-{5 minutes + 15 minutes cuisson}
+\begin{recipe}{Tarte au vin cuit (Aline)}{1 plaque à gâteau 30 cm}{5 minutes + 15 minutes cuisson}
 \index{Tarte!au vin cuit (Aline)}
 
 \ing[2\fr12]{dl}{Crème entière}
diff --git a/chapters/entrees/terrine_tomates.tex b/chapters/entrees/terrine_tomates.tex
index 35e0983..acbe2d6 100644
--- a/chapters/entrees/terrine_tomates.tex
+++ b/chapters/entrees/terrine_tomates.tex
@@ -1,5 +1,4 @@
-\begin{recipe}{Terrine de tomates au fromage de chèvre}{1 grande terrine: 8 portions}
-{20 minutes + 12heures au frais}
+\begin{recipe}{Terrine de tomates au fromage de chèvre}{1 grande terrine: 8 portions}{20 minutes + 12 heures au frais}
 \index{Terrine!De tomates au fromage de chèvre}
 
 \ing[4]{feuilles}{Gélatine}
diff --git a/chapters/pains/panettone.tex b/chapters/pains/panettone.tex
index 95f4aef..ed34e5d 100644
--- a/chapters/pains/panettone.tex
+++ b/chapters/pains/panettone.tex
@@ -1,4 +1,4 @@
-\begin{recipe}{Panettone}{1 miche}{15 minutes de préparation + 1heure d'attente + 25minutes de cuisson}
+\begin{recipe}{Panettone}{1 pain de 400g}{15 minutes préparation + 1 heure attente + 25 minutes cuisson}
 \index{Panettone}
 
 \ing[1.1]{dl}{Lait}
diff --git a/chapters/pains/pate_pain.tex b/chapters/pains/pate_pain.tex
index 07a24ba..3e09fe6 100644
--- a/chapters/pains/pate_pain.tex
+++ b/chapters/pains/pate_pain.tex
@@ -1,4 +1,4 @@
-\begin{recipe}{Pâte à pain} {pain d'environ 400g} {15 minutes de préparation + 1 heure d'attente + 25 minutes de cuisson}
+\begin{recipe}{Pâte à pain}{1 pain de 400g}{15 minutes préparation + 1 heure attente + 25 minutes cuisson}
 \index{Pâte!à pain}
 
 \ing[1]{sachet}{Levure de boulanger spéciale pain}
diff --git a/chapters/patates/provencale.tex b/chapters/patates/provencale.tex
index 96004fa..dc7daea 100644
--- a/chapters/patates/provencale.tex
+++ b/chapters/patates/provencale.tex
@@ -1,5 +1,4 @@
-\begin{recipe}{Pommes de terre provençale}{4 portions}{25 minutes 
-+30 minutes cuisson}
+\begin{recipe}{Pommes de terre provençale}{4 portions}{25 minutes + 30 minutes cuisson}
 \index{Pommes de terre!Provençale}
 
 \ing[800]{g}{Pommes de terre}
diff --git a/chapters/pates/legumes.tex b/chapters/pates/legumes.tex
index 0b9ac17..959a2a0 100644
--- a/chapters/pates/legumes.tex
+++ b/chapters/pates/legumes.tex
@@ -1,5 +1,4 @@
-\begin{recipe}{Pâtes aux petits légumes}{4 personnes}{15minutes + 20 
-minutes de cuisson}
+\begin{recipe}{Pâtes aux petits légumes}{4 portions}{15 minutes + 20 minutes de cuisson}
 \index{Pâtes!aux petits légumes}
 
 \ing[400]{g}{Pâtes fraîches}
diff --git a/chapters/pates/poulet.tex b/chapters/pates/poulet.tex
index 7269a0a..bf453fa 100644
--- a/chapters/pates/poulet.tex
+++ b/chapters/pates/poulet.tex
@@ -1,5 +1,4 @@
-\begin{recipe}{Nouilles sautées au poulet}{4 portions}{10 minutes + 2h 
-repos + 10 minutes cuisson}
+\begin{recipe}{Nouilles sautées au poulet}{4 portions}{10 minutes + 2h repos + 10 minutes cuisson}
 \index{Nouilles!sautées au poulet}
 
 \ing[4]{filets}{Poulet coupé en dés}
diff --git a/chapters/quiches/flammenkueche.tex b/chapters/quiches/flammenkueche.tex
index ded9e16..50fe3fc 100644
--- a/chapters/quiches/flammenkueche.tex
+++ b/chapters/quiches/flammenkueche.tex
@@ -1,4 +1,4 @@
-\begin{recipe}{Flammenküche}{4 portions} {30 minutes + 10 minutes}
+\begin{recipe}{Flammenküche}{4 portions}{30 minutes + 10 minutes}
 \index{Tarte!flambée}
 \index{Flammenküche}
 
diff --git a/chapters/salades/couscous.tex b/chapters/salades/couscous.tex
index 061ee40..bae93af 100644
--- a/chapters/salades/couscous.tex
+++ b/chapters/salades/couscous.tex
@@ -1,4 +1,4 @@
-\begin{recipe}{Couscous}{4 personnes}{15 minutes}
+\begin{recipe}{Couscous}{4 portions}{15 minutes}
 \index{Couscous}
 
 \ing[1]{dl}{Eau}
diff --git a/chapters/salades/salade_grecque.tex b/chapters/salades/salade_grecque.tex
index 841156f..68a5896 100644
--- a/chapters/salades/salade_grecque.tex
+++ b/chapters/salades/salade_grecque.tex
@@ -1,4 +1,4 @@
-\begin{recipe}{Salade paysanne grecque}{Pour 4 personnes}{20 minutes}
+\begin{recipe}{Salade paysanne grecque}{4 portions}{20 minutes}
 \index{Salade!Paysanne grecque}
 
 \ing[1]{}{Concombre}
diff --git a/chapters/salades/salade_nicoise.tex b/chapters/salades/salade_nicoise.tex
index 1963131..db5a5d0 100644
--- a/chapters/salades/salade_nicoise.tex
+++ b/chapters/salades/salade_nicoise.tex
@@ -1,5 +1,4 @@
-\begin{recipe}{Salade Niçoise}{4 personnes}{30 minutes + 10 minutes 
-cuisson}
+\begin{recipe}{Salade Niçoise}{4 personnes}{30 minutes + 10 minutes cuisson}
 \index{Salade!Niçoise}
 
 \ing[4]{}{Œufs}
diff --git a/chapters/viandes/almondigas.tex b/chapters/viandes/almondigas.tex
index 7ef4803..7dafb51 100644
--- a/chapters/viandes/almondigas.tex
+++ b/chapters/viandes/almondigas.tex
@@ -1,4 +1,4 @@
-\begin{recipe}{Almondigas}{4 portions}{15minutes+ 2 heures repos + 30 minutes cuisson}
+\begin{recipe}{Almondigas}{4 portions}{15 minutes + 2 heures repos + 30 minutes cuisson}
 \index{Boulettes de viande}
 \index{Almondigas}
 
diff --git a/syntax_check.sh b/syntax_check.sh
new file mode 100755
index 0000000..c260a37
--- /dev/null
+++ b/syntax_check.sh
@@ -0,0 +1,62 @@
+#!/bin/sh
+
+printsuccess=0
+printfail=1
+folder="chapters"
+
+while [ $# -gt 0 ]
+do
+    case "$1" in
+    --success) printsuccess=1;;
+    --fail) printfail=1;;
+    --nosuccess) printsuccess=0;;
+    --nofail) printfail=0;;
+    --folder) folder="$2"; shift;;
+    *)   echo >&2 \
+            "usage: $0 [--success] [--fail] [--nosuccess] [--nofail] [--folder path]"
+        error
+        exit 1;;
+    esac
+shift
+done
+
+result() {
+    if [ $1 -eq 0 ]; then
+        if [ $printfail -eq 1 ]; then
+            printf "\033[01;31m[FAIL-%s]\t%s\033[00m\n" $2 $i
+        fi
+    else
+        if [ $printsuccess -eq 1 ]; then
+            printf "\033[01;32m[PASS-%s]\t%s\033[00m\n" $2 $i
+        fi
+    fi;
+}
+
+failligne=0
+failtemps=0
+failportions=0
+
+for i in `ls ${folder}/*/*.tex`; do
+    cat $i | sed 1q | perl -ne 'if (m/^\\begin{recipe}{.*?}{.*?}{.*?}$/) { exit 1; } else { exit 0; }';
+    ret=$?
+    if [ $ret -eq 0 ]; then failligne=$(echo ${failligne}+1 | bc); fi;
+    result $ret "LIGNE"
+
+    cat $i | sed 1q | perl -ne 'if (m/{(\d+(\d+)?\s((\w|[éèà])+\s?)+(\s\+\s)?)+}$/) { exit 1; } else { exit 0; }';
+    ret=$?
+    if [ $ret -eq 0 ]; then failtemps=$(echo ${failtemps}+1 | bc); fi;
+    result $ret "TEMPS"
+
+    regexpains='(\d+\smiches?)|(\d+\spains?\s(\w+\s)?\d+g)'
+    regexportions='(\d+\sportions?)'
+    regexgateaux='(1\s(plaque)|(moule).*cm)'
+    regexmisc='(\d+(-\d+)?\s(\w+\s)*((pièces?)|(bacs?)|(pots?)))'
+    cat $i | sed 1q | perl -ne "if (m/{$regexpains|$regexportions|$regexgateaux|$regexmisc}/) { exit 1; } else { exit 0; }";
+    ret=$?
+    result $ret "PORTIONS"
+    if [ $ret -eq 0 ]; then failportions=$(echo ${failportions}+1 | bc); fi;
+done
+
+echo "Test LIGNE (ligne 'recipe' sur une ligne avec bon nombre d'arguments) : " $failligne "erreurs"
+echo "Test TEMPS (le paramètre de temps pour la recette est présent et bien formaté) :" $failtemps "erreurs"
+echo "Test PORTIONS (les portions sont sous un format listé)" $failportions "erreurs"