Réorganisation des dossiers « anamorphoses »

diff --git a/img/serie01/DScitroen.png b/img/serie01/DScitroen.png
index e48b99d..c5deaeb 100644 (file)
Binary files a/img/serie01/DScitroen.png and b/img/serie01/DScitroen.png differ

diff --git a/img/serie01/LISTE.txt b/img/serie01/LISTE.txt
new file mode 100644 (file)
index 0000000..66e2d81
--- /dev/null
+++ b/img/serie01/LISTE.txt
@@ -0,0 +1,14 @@
+eiffel.png::Tour Eiffel
+eiffel.eps::Tour Eiffel (eps)
+asterix.png::Asterix
+asterix.eps::Asterix (eps)
+asterixobelix.png::Asterix et Obelix
+asterixobelix.eps::Asterix et Obelix (eps)
+gaston1.png::Gaston et la mouette rieuse 1
+gaston_mouette.eps::Gaston et la mouette rieuse (eps)
+gaston2.png::Gaston et la mouette rieuse 2
+-  Cette case vide permettra l'affichage de la figure suivante, à gauche :)
+donald.png::Donald
+donald.eps::Donald (eps)
+DScitroen.png::Citroën DS
+DScitroen.eps::Citroën DS (eps)

diff --git a/img/serie01/anamorphose_conique_cercles.png b/img/serie01/anamorphose_conique_cercles.png
deleted file mode 100644 (file)
index 2be8a42..0000000
Binary files a/img/serie01/anamorphose_conique_cercles.png and /dev/null differ

diff --git a/img/serie01/anamorphose_conique_quadrillage.png b/img/serie01/anamorphose_conique_quadrillage.png
deleted file mode 100644 (file)
index d98b8ee..0000000
Binary files a/img/serie01/anamorphose_conique_quadrillage.png and /dev/null differ

diff --git a/img/serie01/asterix.png b/img/serie01/asterix.png
index e3569bf..26755ff 100644 (file)
Binary files a/img/serie01/asterix.png and b/img/serie01/asterix.png differ

diff --git a/img/serie01/asterixobelix.png b/img/serie01/asterixobelix.png
index 6854265..f50d30b 100644 (file)
Binary files a/img/serie01/asterixobelix.png and b/img/serie01/asterixobelix.png differ

diff --git a/img/serie01/donald.png b/img/serie01/donald.png
index 99ce2b2..26fd506 100644 (file)
Binary files a/img/serie01/donald.png and b/img/serie01/donald.png differ

diff --git a/img/serie01/eiffel.pdf b/img/serie01/eiffel.pdf
new file mode 100644 (file)
index 0000000..3c3fda0
Binary files /dev/null and b/img/serie01/eiffel.pdf differ

diff --git a/img/serie01/eiffel.png b/img/serie01/eiffel.png
new file mode 100644 (file)
index 0000000..c23f4cb
Binary files /dev/null and b/img/serie01/eiffel.png differ

diff --git a/img/serie01/exemple_eiffel.tex b/img/serie01/eiffel.tex
similarity index 70%
rename from img/serie01/exemple_eiffel.tex
rename to img/serie01/eiffel.tex
index 3101205..dd08348 100644 (file)
--- a/img/serie01/exemple_eiffel.tex
+++ b/img/serie01/eiffel.tex
@@ -44,18 +44,4 @@
 \end{pspicture}
 }
 \end{center}
-\newpage
-\begin{verbatim}
-\begin{pspicture}[showgrid](-9,-14)(9,8)
-\pscircle[doubleline=true,linestyle=dashed]{3}
-\psset{Yv=-100,Xv=0}
-%\Cadre
-\psanamorphosis[scale=3 3,drawanamorphosis=true](0,2.5){eiffel.eps}
-\pstextA[fontsize=15,fillcolor=black](0,7){La tour Eiffel}
-\pstextA[fontsize=15,fillcolor=black](-1.25,5.5){2}
-\pstextA[fontsize=15,fillcolor=black](-1.25,5){0}
-\pstextA[fontsize=15,fillcolor=black](-1.25,4.5){1}
-\pstextA[fontsize=15,fillcolor=black](-1.25,4){1}
-\end{pspicture}
-\end{verbatim}
 \end{document} 
\ No newline at end of file

diff --git a/img/serie01/exemple_eiffel.pdf b/img/serie01/exemple_eiffel.pdf
deleted file mode 100644 (file)
index de29e79..0000000
Binary files a/img/serie01/exemple_eiffel.pdf and /dev/null differ

diff --git a/img/serie01/exemple_eiffel.png b/img/serie01/exemple_eiffel.png
deleted file mode 100644 (file)
index f2cf18a..0000000
Binary files a/img/serie01/exemple_eiffel.png and /dev/null differ

diff --git a/img/serie01/exemple_parapluie.pdf b/img/serie01/exemple_parapluie.pdf
deleted file mode 100644 (file)
index 3f8aae3..0000000
Binary files a/img/serie01/exemple_parapluie.pdf and /dev/null differ

diff --git a/img/serie01/exemples_pavages_conique.pdf b/img/serie01/exemples_pavages_conique.pdf
deleted file mode 100644 (file)
index e4a057a..0000000
Binary files a/img/serie01/exemples_pavages_conique.pdf and /dev/null differ

diff --git a/img/serie01/gaston1.png b/img/serie01/gaston1.png
index 516b829..9a542b2 100644 (file)
Binary files a/img/serie01/gaston1.png and b/img/serie01/gaston1.png differ

diff --git a/img/serie01/gaston2.png b/img/serie01/gaston2.png
index fa855df..eef1a62 100644 (file)
Binary files a/img/serie01/gaston2.png and b/img/serie01/gaston2.png differ

diff --git a/img/serie01/parapluie.png b/img/serie01/parapluie.png
deleted file mode 100644 (file)
index 52baa94..0000000
Binary files a/img/serie01/parapluie.png and /dev/null differ

diff --git a/img/serie02/LISTE.txt b/img/serie02/LISTE.txt
new file mode 100644 (file)
index 0000000..ae20e38
--- /dev/null
+++ b/img/serie02/LISTE.txt
@@ -0,0 +1,4 @@
+pavage1.png
+pavage2.png
+parapluie.png
+parapluie.eps
\ No newline at end of file

diff --git a/img/serie02/index.xml b/img/serie02/index.xml
new file mode 100644 (file)
index 0000000..106d611
--- /dev/null
+++ b/img/serie02/index.xml
@@ -0,0 +1,3 @@
+<simple association="png:pdf:tex">
+    <titre>Série 2</titre>
+</simple>

diff --git a/img/serie01/parapluie.eps b/img/serie02/parapluie.eps
similarity index 100%
rename from img/serie01/parapluie.eps
rename to img/serie02/parapluie.eps

diff --git a/img/serie02/parapluie.pdf b/img/serie02/parapluie.pdf
new file mode 100644 (file)
index 0000000..25629e4
Binary files /dev/null and b/img/serie02/parapluie.pdf differ

diff --git a/img/serie02/parapluie.png b/img/serie02/parapluie.png
new file mode 100644 (file)
index 0000000..d9f49e3
Binary files /dev/null and b/img/serie02/parapluie.png differ

diff --git a/img/serie01/exemple_parapluie.tex b/img/serie02/parapluie.tex
similarity index 100%
rename from img/serie01/exemple_parapluie.tex
rename to img/serie02/parapluie.tex

diff --git a/img/serie02/pavage1.pdf b/img/serie02/pavage1.pdf
new file mode 100644 (file)
index 0000000..8b5c928
Binary files /dev/null and b/img/serie02/pavage1.pdf differ

diff --git a/img/serie02/pavage1.png b/img/serie02/pavage1.png
new file mode 100644 (file)
index 0000000..250cd82
Binary files /dev/null and b/img/serie02/pavage1.png differ

diff --git a/img/serie02/pavage1.tex b/img/serie02/pavage1.tex
new file mode 100644 (file)
index 0000000..ff8337f
--- /dev/null
+++ b/img/serie02/pavage1.tex
@@ -0,0 +1,66 @@
+\documentclass[a4paper]{article}
+\usepackage[T1]{fontenc}
+\usepackage{pst-anamorphosis-add}
+\definecolor{sepia}{rgb}{1,0.8,0.8}
+\pagestyle{empty}
+\begin{document}
+\section*{Image d'un pavage avec des cercles}
+\begin{center}
+\psset{type=conical}
+%\psset{unit=0.7}
+\begin{pspicture}[showgrid](-7,-7)(7,7)
+\pscircle[doubleline=true]{3}
+{\psset{linecolor=red}
+\pnodeA(-0.5,-1){I}
+\pnodeA(-0.5,1){J}
+\pnodeA(1,1){K}
+\pnodeA(1,-1){L}
+\pnode(-0.5,-1){I'}
+\pnode(-0.5,1){J'}
+\pnode(1,1){K'}
+\pnode(1,-1){L'}
+\pslineA(-0.5,-1)(-0.5,1)(1,1)(1,-1)(-0.5,-1)
+%\psdots[dotsize=2mm](I)(J)(K)(L)(I')(J')(K')(L')
+\psframe(-0.5,-1)(1,1)}
+\multido{\N=-1.5+1.0}{4}{
+\multido{\n=-1.5+1.0}{4}{%
+    \pscircle[fillstyle=solid,fillcolor=sepia](\n,\N){0.5}
+    }}
+\multido{\N=-1.5+1.0}{4}{
+\multido{\n=-1.5+1.0}{4}{%
+    \pscircleA[fillstyle=solid,fillcolor=sepia](\n,\N){0.5}
+    }}
+\multido{\n=0.5+0.5,\N=0.5+0.5}{4}{%
+    \pnode(! \n\space -2){A}
+    \pnode(! \n\space 2){B}
+    \psline(A)(B)
+    \pslineA(A)(B)
+    \pnode(!-2 \N){A}
+    \pnode(!2 \N){B}
+    \pslineA(A)(B)
+    \psline(A)(B)
+    }
+\multido{\n=-2.0+0.5,\N=-2.0+0.5}{4}{%
+    \pnode(! \n\space -2){A}
+    \pnode(! \n\space 2){B}
+    \psline(A)(B)
+    \pslineA(A)(B)
+    \pnode(!-2 \N){A}
+    \pnode(!2 \N){B}
+    \pslineA(A)(B)
+    \psline(A)(B)
+    }
+\pnodeA(-0.5,-1){I}
+\pnodeA(-0.5,1){J}
+\pnodeA(1,1){K}
+\pnodeA(1,-1){L}
+\pnode(-0.5,-1){I'}
+\pnode(-0.5,1){J'}
+\pnode(1,1){K'}
+\pnode(1,-1){L'}
+\pslineA[linecolor=blue](-0.5,-1)(-0.5,1)(1,1)(1,-1)(-0.5,-1)
+\psframe[linecolor=blue](I')(K')
+\psdots[dotsize=2mm,linecolor=red](I)(J)(K)(L)(I')(J')(K')(L')
+\end{pspicture}
+\end{center}
+\end{document}
\ No newline at end of file

diff --git a/img/serie02/pavage2.pdf b/img/serie02/pavage2.pdf
new file mode 100644 (file)
index 0000000..1dc203d
Binary files /dev/null and b/img/serie02/pavage2.pdf differ

diff --git a/img/serie02/pavage2.png b/img/serie02/pavage2.png
new file mode 100644 (file)
index 0000000..838db06
Binary files /dev/null and b/img/serie02/pavage2.png differ

diff --git a/img/serie01/exemples_pavages_conique.tex b/img/serie02/pavage2.tex
similarity index 59%
rename from img/serie01/exemples_pavages_conique.tex
rename to img/serie02/pavage2.tex
index 4940f20..a3dac8a 100644 (file)
--- a/img/serie01/exemples_pavages_conique.tex
+++ b/img/serie02/pavage2.tex
@@ -2,67 +2,9 @@
 \usepackage[T1]{fontenc}
 \usepackage{pst-anamorphosis-add}
 \definecolor{sepia}{rgb}{1,0.8,0.8}
+\pagestyle{empty}
 \begin{document}
-\section{Image d'un pavage avec des cercles}
-\begin{center}
-\psset{type=conical}
-%\psset{unit=0.7}
-\begin{pspicture}[showgrid](-7,-7)(7,7)
-\pscircle[doubleline=true]{3}
-{\psset{linecolor=red}
-\pnodeA(-0.5,-1){I}
-\pnodeA(-0.5,1){J}
-\pnodeA(1,1){K}
-\pnodeA(1,-1){L}
-\pnode(-0.5,-1){I'}
-\pnode(-0.5,1){J'}
-\pnode(1,1){K'}
-\pnode(1,-1){L'}
-\pslineA(-0.5,-1)(-0.5,1)(1,1)(1,-1)(-0.5,-1)
-%\psdots[dotsize=2mm](I)(J)(K)(L)(I')(J')(K')(L')
-\psframe(-0.5,-1)(1,1)}
-\multido{\N=-1.5+1.0}{4}{
-\multido{\n=-1.5+1.0}{4}{%
-    \pscircle[fillstyle=solid,fillcolor=sepia](\n,\N){0.5}
-    }}
-\multido{\N=-1.5+1.0}{4}{
-\multido{\n=-1.5+1.0}{4}{%
-    \pscircleA[fillstyle=solid,fillcolor=sepia](\n,\N){0.5}
-    }}
-\multido{\n=0.5+0.5,\N=0.5+0.5}{4}{%
-    \pnode(! \n\space -2){A}
-    \pnode(! \n\space 2){B}
-    \psline(A)(B)
-    \pslineA(A)(B)
-    \pnode(!-2 \N){A}
-    \pnode(!2 \N){B}
-    \pslineA(A)(B)
-    \psline(A)(B)
-    }
-\multido{\n=-2.0+0.5,\N=-2.0+0.5}{4}{%
-    \pnode(! \n\space -2){A}
-    \pnode(! \n\space 2){B}
-    \psline(A)(B)
-    \pslineA(A)(B)
-    \pnode(!-2 \N){A}
-    \pnode(!2 \N){B}
-    \pslineA(A)(B)
-    \psline(A)(B)
-    }
-\pnodeA(-0.5,-1){I}
-\pnodeA(-0.5,1){J}
-\pnodeA(1,1){K}
-\pnodeA(1,-1){L}
-\pnode(-0.5,-1){I'}
-\pnode(-0.5,1){J'}
-\pnode(1,1){K'}
-\pnode(1,-1){L'}
-\pslineA[linecolor=blue](-0.5,-1)(-0.5,1)(1,1)(1,-1)(-0.5,-1)
-\psframe[linecolor=blue](I')(K')
-\psdots[dotsize=2mm,linecolor=red](I)(J)(K)(L)(I')(J')(K')(L')
-\end{pspicture}
-\end{center}
-\section{Esquisse de l'image d'un pavage classique}
+\section*{Esquisse de l'image d'un pavage classique}
 \begin{center}
 %\psset{unit=0.75}
 \begin{pspicture}(-6,-6)(6,6)