diff --git a/.gitignore b/.gitignore index 27f701e..fd4098c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ guide_libre_asso.* teaser.pdf version_html/ version_epub/ +includes/*/vignettes/* *.aux *.ilg diff --git a/Makefile b/Makefile index 6b5dac3..6a09b56 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,24 @@ TEMP=$(foreach ext,$(EXT), guide.$(ext)) PDFTEX = pdflatex -interaction nonstopmode NEED_RERUN = '(There were undefined references|Rerun (me )?to get (cross-references|the bars) right)|((Reference|Citation).*undefined)|(Label.*multiply defined)' +IMG_PNG = $(wildcard includes/screenshots/*.png) $(wildcard includes/images/*.png) +IMG_PNG_SMALL = $(subst screenshots,screenshots/vignettes, $(subst images,images/vignettes, ${IMG_PNG})) + +includes/screenshots/vignettes/%.png: includes/screenshots/%.png + convert $< -resize 200 $@ + +includes/images/vignettes/%.png: includes/images/%.png + convert $< -resize 200 $@ + +IMG_JPG = $(wildcard includes/screenshots/*.jpg) $(wildcard includes/images/*.jpg) +IMG_JPG_SMALL = $(subst screenshots,screenshots/vignettes, $(subst images,images/vignettes, ${IMG_JPG})) + +includes/screenshots/vignettes/%.jpg: includes/screenshots/%.jpg + convert $< -resize 200 $@ + +includes/images/vignettes/%.jpg: includes/images/%.jpg + convert $< -resize 200 $@ + all : ${PDF} guide_libre_asso.wiki: wget "http://wiki.april.org/index.php?title=Guide_Libre_Association_complet&action=raw" -O $@ @@ -16,11 +34,11 @@ guide_libre_asso.tex: guide_libre_asso.wiki sed -i $@ -e 's/\\description/\\descriptif/g' vim -c '%s/^\(\s*\*.*\)\n\(\s*[^*]\|\n\)/\1\r\\end{itemize}\r\2/g' -c '%s/^\(\s*[^*].*\|\)\n\s*\*/\1\r\\begin{itemize}\r*/g' -c '%s/^\s*\*/\\item/' -c ':x' $@ -guide.pdf: guide.tex guide_libre_asso.tex lolipop.cls +guide.pdf: guide.tex guide_libre_asso.tex lolipop.cls ${IMG_PNG} ${IMG_JPG} ${PDFTEX} $< if egrep -q $(NEED_RERUN) $(subst tex,log,$<) ; then ${PDFTEX} $< ; fi -version_html/tmp/guide.html: guide.tex guide_libre_asso.tex lolipop.hva +version_html/tmp/guide.html: guide.tex guide_libre_asso.tex lolipop.hva ${IMG_PNG_SMALL} ${IMG_JPG_SMALL} cd version_html/tmp &&\ hevea -I ../../ $< 2> guide.log &&\ if egrep -q $(NEED_RERUN) guide.log ; then hevea -I ../../ $< 2> guide.log; fi @@ -42,6 +60,6 @@ clean: rm -fv $(TEMP) version_html/tmp/* mrproper: clean - rm -fv guide.pdf guide_libre_asso.* version_html/guide.html + rm -fv guide.pdf guide_libre_asso.* version_html/guide.html ${IMG_PNG_SMALL} ${IMG_JPG_SMALL} distclean: mrproper diff --git a/includes/images/stevejob.pdf b/includes/images/stevejob.pdf new file mode 100644 index 0000000..61c6d3c Binary files /dev/null and b/includes/images/stevejob.pdf differ diff --git a/includes/images/stevejob.svg b/includes/images/stevejob.svg new file mode 100644 index 0000000..3129bd7 --- /dev/null +++ b/includes/images/stevejob.svg @@ -0,0 +1,2972 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + JE SUIS VENU,J'AI VU, J'AIVERROUILLÉ ! + + CECI EST UNERÉVOLUTION ! + CC By Sa - Simon Giraudot + + diff --git a/includes/images/vignettes/.gitkeep b/includes/images/vignettes/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/includes/images/vignettes/catalogue-libre.png b/includes/images/vignettes/catalogue-libre.png deleted file mode 100644 index 7930d8b..0000000 Binary files a/includes/images/vignettes/catalogue-libre.png and /dev/null differ diff --git a/includes/images/vignettes/comment-ca-marche.png b/includes/images/vignettes/comment-ca-marche.png deleted file mode 100644 index 2f8f0dc..0000000 Binary files a/includes/images/vignettes/comment-ca-marche.png and /dev/null differ diff --git a/includes/images/vignettes/documents-sous-licence-libre.png b/includes/images/vignettes/documents-sous-licence-libre.png deleted file mode 100644 index 479d6a5..0000000 Binary files a/includes/images/vignettes/documents-sous-licence-libre.png and /dev/null differ diff --git a/includes/images/vignettes/essayez-la-liberte.png b/includes/images/vignettes/essayez-la-liberte.png deleted file mode 100644 index 49d11cd..0000000 Binary files a/includes/images/vignettes/essayez-la-liberte.png and /dev/null differ diff --git a/includes/images/vignettes/expolibre.png b/includes/images/vignettes/expolibre.png deleted file mode 100644 index 61680ba..0000000 Binary files a/includes/images/vignettes/expolibre.png and /dev/null differ diff --git a/includes/images/vignettes/faites-passer.jpg b/includes/images/vignettes/faites-passer.jpg deleted file mode 100644 index aaac41f..0000000 Binary files a/includes/images/vignettes/faites-passer.jpg and /dev/null differ diff --git a/includes/images/vignettes/formats-ouverts.png b/includes/images/vignettes/formats-ouverts.png deleted file mode 100644 index 7f76334..0000000 Binary files a/includes/images/vignettes/formats-ouverts.png and /dev/null differ diff --git a/includes/images/vignettes/logiciel-libre-a-partager.jpg b/includes/images/vignettes/logiciel-libre-a-partager.jpg deleted file mode 100644 index 36aad88..0000000 Binary files a/includes/images/vignettes/logiciel-libre-a-partager.jpg and /dev/null differ diff --git a/includes/images/vignettes/revolution-logiciel-libre.png b/includes/images/vignettes/revolution-logiciel-libre.png deleted file mode 100644 index eb5b6c1..0000000 Binary files a/includes/images/vignettes/revolution-logiciel-libre.png and /dev/null differ diff --git a/includes/images/vignettes/vente-liee.png b/includes/images/vignettes/vente-liee.png deleted file mode 100644 index 5888979..0000000 Binary files a/includes/images/vignettes/vente-liee.png and /dev/null differ diff --git a/includes/screenshots/framapad.png b/includes/screenshots/framapad.png new file mode 100644 index 0000000..f20d317 Binary files /dev/null and b/includes/screenshots/framapad.png differ diff --git a/includes/screenshots/owncloud.png b/includes/screenshots/owncloud.png new file mode 100644 index 0000000..ba1e17c Binary files /dev/null and b/includes/screenshots/owncloud.png differ diff --git a/includes/screenshots/sigmah.png b/includes/screenshots/sigmah.png new file mode 100644 index 0000000..e511dd8 Binary files /dev/null and b/includes/screenshots/sigmah.png differ diff --git a/includes/screenshots/stevejob.pdf b/includes/screenshots/stevejob.pdf new file mode 120000 index 0000000..e49f22e --- /dev/null +++ b/includes/screenshots/stevejob.pdf @@ -0,0 +1 @@ +../../includes/images/stevejob.pdf \ No newline at end of file diff --git a/includes/screenshots/stevejob.pdf.png b/includes/screenshots/stevejob.pdf.png new file mode 100644 index 0000000..c2ff1d3 Binary files /dev/null and b/includes/screenshots/stevejob.pdf.png differ diff --git a/includes/screenshots/vignettes/.gitkeep b/includes/screenshots/vignettes/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/includes/screenshots/vignettes/dolibarr.png b/includes/screenshots/vignettes/dolibarr.png deleted file mode 100644 index d506959..0000000 Binary files a/includes/screenshots/vignettes/dolibarr.png and /dev/null differ diff --git a/includes/screenshots/vignettes/firefox.png b/includes/screenshots/vignettes/firefox.png deleted file mode 100644 index 8764ac8..0000000 Binary files a/includes/screenshots/vignettes/firefox.png and /dev/null differ diff --git a/includes/screenshots/vignettes/framadate.png b/includes/screenshots/vignettes/framadate.png deleted file mode 100644 index 7192b17..0000000 Binary files a/includes/screenshots/vignettes/framadate.png and /dev/null differ diff --git a/includes/screenshots/vignettes/freeplane.png b/includes/screenshots/vignettes/freeplane.png deleted file mode 100644 index b144fb4..0000000 Binary files a/includes/screenshots/vignettes/freeplane.png and /dev/null differ diff --git a/includes/screenshots/vignettes/galette.png b/includes/screenshots/vignettes/galette.png deleted file mode 100644 index dee70b3..0000000 Binary files a/includes/screenshots/vignettes/galette.png and /dev/null differ diff --git a/includes/screenshots/vignettes/gcompris.png b/includes/screenshots/vignettes/gcompris.png deleted file mode 100644 index dc25830..0000000 Binary files a/includes/screenshots/vignettes/gcompris.png and /dev/null differ diff --git a/includes/screenshots/vignettes/gimp.png b/includes/screenshots/vignettes/gimp.png deleted file mode 100644 index 5eeedba..0000000 Binary files a/includes/screenshots/vignettes/gimp.png and /dev/null differ diff --git a/includes/screenshots/vignettes/gnu-and-penguin.png b/includes/screenshots/vignettes/gnu-and-penguin.png deleted file mode 100644 index de60670..0000000 Binary files a/includes/screenshots/vignettes/gnu-and-penguin.png and /dev/null differ diff --git a/includes/screenshots/vignettes/gnucash.png b/includes/screenshots/vignettes/gnucash.png deleted file mode 100644 index 2c4b362..0000000 Binary files a/includes/screenshots/vignettes/gnucash.png and /dev/null differ diff --git a/includes/screenshots/vignettes/grisbi.png b/includes/screenshots/vignettes/grisbi.png deleted file mode 100644 index c408942..0000000 Binary files a/includes/screenshots/vignettes/grisbi.png and /dev/null differ diff --git a/includes/screenshots/vignettes/inkscape.png b/includes/screenshots/vignettes/inkscape.png deleted file mode 100644 index 28b781b..0000000 Binary files a/includes/screenshots/vignettes/inkscape.png and /dev/null differ diff --git a/includes/screenshots/vignettes/libreoffice.png b/includes/screenshots/vignettes/libreoffice.png deleted file mode 100644 index f5e27a4..0000000 Binary files a/includes/screenshots/vignettes/libreoffice.png and /dev/null differ diff --git a/includes/screenshots/vignettes/phpcompta.png b/includes/screenshots/vignettes/phpcompta.png deleted file mode 100644 index 9c0446c..0000000 Binary files a/includes/screenshots/vignettes/phpcompta.png and /dev/null differ diff --git a/includes/screenshots/vignettes/pidgin.png b/includes/screenshots/vignettes/pidgin.png deleted file mode 100644 index 6ca6227..0000000 Binary files a/includes/screenshots/vignettes/pidgin.png and /dev/null differ diff --git a/includes/screenshots/vignettes/scenari.png b/includes/screenshots/vignettes/scenari.png deleted file mode 100644 index 92d52fc..0000000 Binary files a/includes/screenshots/vignettes/scenari.png and /dev/null differ diff --git a/includes/screenshots/vignettes/scratch.png b/includes/screenshots/vignettes/scratch.png deleted file mode 100644 index 767d5e4..0000000 Binary files a/includes/screenshots/vignettes/scratch.png and /dev/null differ diff --git a/includes/screenshots/vignettes/spip.png b/includes/screenshots/vignettes/spip.png deleted file mode 100644 index fc5f4bc..0000000 Binary files a/includes/screenshots/vignettes/spip.png and /dev/null differ diff --git a/includes/screenshots/vignettes/stellarium.png b/includes/screenshots/vignettes/stellarium.png deleted file mode 100644 index eb3e2af..0000000 Binary files a/includes/screenshots/vignettes/stellarium.png and /dev/null differ diff --git a/includes/screenshots/vignettes/thunderbird.png b/includes/screenshots/vignettes/thunderbird.png deleted file mode 100644 index c2b49a6..0000000 Binary files a/includes/screenshots/vignettes/thunderbird.png and /dev/null differ diff --git a/includes/screenshots/vignettes/wiki-april.png b/includes/screenshots/vignettes/wiki-april.png deleted file mode 100644 index e9ceec8..0000000 Binary files a/includes/screenshots/vignettes/wiki-april.png and /dev/null differ