Version: marque le passage en 1.9

.gitignore

@@ -3,6 +3,7 @@ guide_libre_asso.*
 teaser.pdf
 version_html/
 version_epub/
+includes/*/vignettes/*
 
 *.aux
 *.ilg

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,12 @@ 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
+
+rebuild:
+	rm -fv guide_libre_asso.wiki guide_libre_asso.tex
+	make all
+
+.PHONY: all clean mrproper distclean rebuild

guide.tex

@@ -3,7 +3,7 @@
 \title{Guide Libre Association}
 \subject{Guide d'usage des logiciels libres en milieu associatif}
 \keywords{Logiciels libres, association, Internet, travail collaboratif}
-\version{1.1}
+\version{1.9}
 \date{\today}
 \organisation{April}
 \orgwebsite{www.april.org}

includes/screenshots/stevejob.pdf

@@ -0,0 +1 @@
+../../includes/images/stevejob.pdf

lolipop.cls

@@ -164,18 +164,10 @@
 \renewcommand{\emph}[1]{{\it#1}}
 \newcommand{\strong}[1]{{\bf\magenta#1}}
 % Ainsi que pour les exergues, que nous définirons comme un paragraphe centré
-% dans la marge.
-\NewEnviron{exergue}{
-  \let\href\fnhref
-  \marginpar{
-   \checkoddpage\ifoddpage\raggedright\else\raggedleft\fi
-   \begin{minipage}{4.0cm}
-     \centering
-     \bf\large\magenta
-     \BODY
-   \end{minipage}
-  }
-  \let\href\mphref
+\newcommand{\exergue}[1]{
+  \vskip 20\p@
+  {\centering\bf\large\magenta #1}
+  \vskip 20\p@
 }
 
 %%% Hyperliens %%%
@@ -188,8 +180,8 @@
 % redéfinissons les notres.
 \let\hhref\href
 \let\hurl\url
-\let\href\mphref
 \newcommand{\mphref}[2]{\hhref{#1}{#2\footnote{\url{#1}}}}
+\let\href\mphref
 \renewcommand{\url}[1]{\hurl{#1}}
 \newcommand{\email}[1]{\hhref{mailto:#1}{\tech{#1}}}
 % Cependant, cela ne permet plus d'afficher un lien dans une footnote. Pour

tools/wiki2tex.sed

@@ -7,8 +7,11 @@ s/ / /g
 # acceptons de mettre du code LaTeX dans la page wiki
 s/\ /\\nbspace /g
 s/\(\$\|~\|%\|\&\|_\|#\)/\\\1/g
+# en début de ligne on suppose que c'est du commentaire
+s/^\\%/%/
 s/« /«\~/g
 s/ »/\~»/g
+s/\([0-9]\) \([0-9]\{3,3\}\)/\1~\2/g
 s/’/'/g
 s/n°/\\no /g
 s/\\nbspace /~/g
@@ -20,9 +23,11 @@ s/{{[ ]*[Tt]ravail [Ee]n [Cc]ours.*}}//g
 s/<references *\/>//g
 
 # Mise en forme
-s/'''\([^\('''\)]*\)'''/\\strong{\1}/g
+s/'''\([^\('''\)]\+\)'''/\\strong{\1}/g
+s/<strong>\([^<]*\)<\/strong>/\\strong{\1}/g
 s/''\([^\(''\)]*\)''/\\emph{\1}/g
 s/<em>\([^<]*\)<\/em>/\\emph{\1}/g
+s/{{Exergue|\(.*\)}}/\\exergue{\1}/g
 
 # buggy ...
 s/<ref>\([^\(<\/ref>\)]*\)<\/ref>/\\emph{\1}/g