# HG changeset patch
# User Scott Morrison <scott@tqft.net>
# Date 1276804106 25200
# Node ID 7c7b06239444812c8b279bf2ec6bbb3137151c7d
# Parent  2eb73a43726a3172ff95cb44b249d215cf29baf5# Parent  7d15bb9afe0109d8220f25390bb6f50b38165750
Automated merge with https://tqft.net/hg/blob/

diff -r 2eb73a43726a -r 7c7b06239444 .hgignore
--- a/.hgignore	Wed Jun 16 15:52:59 2010 -0700
+++ b/.hgignore	Thu Jun 17 12:48:26 2010 -0700
@@ -8,8 +8,11 @@
 *.toc
 *.synctex.gz
 
-# the article PDF
+# artifacts
 blob1.pdf
+sandbox.pdf
+blob1.dvi
+blob.tar.gz
 
 # bibliograph stuff
 *.bbl
diff -r 2eb73a43726a -r 7c7b06239444 build.xml
--- a/build.xml	Wed Jun 16 15:52:59 2010 -0700
+++ b/build.xml	Thu Jun 17 12:48:26 2010 -0700
@@ -48,7 +48,7 @@
     </target>
 
     <target name="bbl" depends="init">
-        <exec executable="latex">
+        <exec executable="pdflatex">
             <arg value="blob1"/>
         </exec>
         <exec executable="bibtex">
@@ -56,43 +56,13 @@
         </exec>
     </target>
      
-    <target name="dvi" depends="bbl">
-        <exec executable="latex">
-            <arg value="blob1"/>
-        </exec>
-        <exec executable="latex">
-            <arg value="blob1"/>
-        </exec>
-    </target>
-
-    <target name="ps" depends="dvi">
-        <exec executable="dvips">
-            <arg value="blob1"/>
-        </exec>
-    </target>
-
-    <target name="pdf" depends="ps">
-        <exec executable="ps2pdf">
-            <arg value="blob1.ps"/>
-        </exec>
-    </target>
-    
-    <target name="eps-diagrams">
-        <exec executable="bash" dir="diagrams/scripts/">
-            <arg value="find_all_diagrams.sh"/>
-        </exec>
-        <exec executable="bash" dir="diagrams/scripts/">
-            <arg value="stripall.sh"/>
-        </exec>
-    </target>
-
-    <target name="direct-pdf" depends="bbl">
+    <target name="pdf" depends="bbl">
         <exec executable="pdflatex">
             <arg value="blob1"/>
         </exec>
     </target>
     
-    <target name="copy-pdf" depends="direct-pdf">
+    <target name="copy-pdf" depends="pdf">
         <copy file="blob1.pdf" tofile="../../Sites/tqft.net/papers/blobs.pdf"/>
         <exec executable="svn" dir="../../Sites/tqft.net/papers/">
             <arg value="commit"/>
diff -r 2eb73a43726a -r 7c7b06239444 diagrams/latex2pdf/defontify.tex
--- a/diagrams/latex2pdf/defontify.tex	Wed Jun 16 15:52:59 2010 -0700
+++ b/diagrams/latex2pdf/defontify.tex	Thu Jun 17 12:48:26 2010 -0700
@@ -28,4 +28,6 @@
 abmab & \\
 v_1 v_2 v_3 v_4 A
 \end{align*}
+
+$E_0 M_0 N_0 M_1 N_1 M_2 N_2 R_1 R_2 C(f_0) C(f_1) C(f_2)$
 \end{document}
diff -r 2eb73a43726a -r 7c7b06239444 diagrams/pdf/deligne/mapping-cylinders.pdf
Binary file diagrams/pdf/deligne/mapping-cylinders.pdf has changed
diff -r 2eb73a43726a -r 7c7b06239444 diagrams/pdf/tempkw/dfig2.pdf
Binary file diagrams/pdf/tempkw/dfig2.pdf has changed
diff -r 2eb73a43726a -r 7c7b06239444 text/deligne.tex
--- a/text/deligne.tex	Wed Jun 16 15:52:59 2010 -0700
+++ b/text/deligne.tex	Thu Jun 17 12:48:26 2010 -0700
@@ -91,8 +91,8 @@
 with $C(f_i)$ glued to $C(f_{i+1})$ along $R_{i+1}$
 (see Figure \ref{xdfig2}).
 \begin{figure}[t]
-$$\mathfig{.9}{tempkw/dfig2}$$
-\caption{$n$-dimensional fat graph from mapping cylinders}\label{xdfig2}
+$$\mathfig{.9}{deligne/mapping-cylinders}$$
+\caption{An $n$-dimensional fat graph constructed from mapping cylinders}\label{xdfig2}
 \end{figure}
 The $n$-manifolds are the ``$n$-dimensional graph" and the $I$ direction of the mapping cylinders is the ``fat" part.
 We regard two such fat graphs as the same if there is a homeomorphism between them which is the