# HG changeset patch
# User Scott Morrison <scott@tqft.net>
# Date 1290018217 28800
# Node ID 14e85db55dce259935fe37d702a71190182e55c3
# Parent  77154439205822e5f0efd05b5072a709d9ce6ef8# Parent  bf613e5af5a340a6e5d2441bcd5e54c7680185dc
Automated merge with https://tqft.net/hg/blob/

diff -r 771544392058 -r 14e85db55dce pnas/build.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pnas/build.xml	Wed Nov 17 10:23:37 2010 -0800
@@ -0,0 +1,82 @@
+<!-- This is an Ant build file; you'll need to install Ant before using it. -->
+<project name="pnas" default="usage">
+    <target name="init">
+      <property name="arxivTarFile" value="pnas.tar"/>
+    </target>
+
+    <!-- USAGE -->
+    <!-- Instructions for using the build file -->
+    <!-- =================================================================== -->
+    <target name = "usage" depends = "init">    
+        <echo message = ""/>
+        <echo message = "blob build instructions"/>
+        <echo message = "-------------------------------------------------------------"/>
+        <echo message = ""/>
+        <echo message = " available targets are:"/>
+        <echo message = ""/>
+        <echo message = "   arxiv --> builds blob.tar.gz, for submission to the arxiv"/>
+        <echo message = "   pdf   --> builds blob.pdf"/>
+        <echo message = ""/>
+        <echo message = "-------------------------------------------------------------"/>
+        <echo message = ""/>  
+    </target>
+    <!-- =================================================================== -->    
+
+    <target name="clean" depends="init">
+        <delete>
+            <fileset dir=".">
+                <include name="*.toc"/>
+                <include name="*.log"/>
+                <include name="*.aux"/>
+                <include name="*.blg"/>
+                <include name="*.xyc"/>
+                <include name="*.out"/>
+            </fileset>
+        </delete>
+    </target>
+
+    <target name="arxiv" depends="clean">
+        <delete file="${arxivTarFile}"/>
+        <delete file="${arxivTarFile}.gz"/>
+        <tar destfile="${arxivTarFile}" basedir="." includes="**"
+            excludes="*.synctex*,*.dvi,*.ps,pnas.pdf,*.png,${arxivTarFile},${arxivTarFile}.gz,sandbox.*,bibliography/**,papers/**,talks/**,diagrams/obsolete/**,diagrams/latex2pdf/**,text/obsolete/**,.hg/**"
+        />
+        <gzip src="${arxivTarFile}" destfile="${arxivTarFile}.gz"/>
+        <delete file="${arxivTarFile}"/>
+    </target>
+
+    <target name="bbl" depends="init">
+        <exec executable="pdflatex">
+            <arg value="pnas"/>
+        </exec>
+        <exec executable="bibtex">
+            <arg value="pnas"/>
+        </exec>
+    </target>
+     
+    <target name="pdf" depends="bbl">
+        <exec executable="pdflatex">
+            <arg value="pnas"/>
+        </exec>
+    </target>
+    
+    <target name="copy-pdf" depends="pdf">
+        <exec executable="svn" dir="../../../Sites/tqft.net/papers/">
+            <arg value="up"/>
+	    <arg value="--accept"/>
+	    <arg value="theirs-full"/>
+        </exec>
+        <copy file="pnas.pdf" tofile="../../../Sites/tqft.net/papers/blobs-pnas.pdf"/>
+        <exec executable="svn" dir="../../../Sites/tqft.net/papers/">
+            <arg value="commit"/>
+            <arg value="-m"/>
+            <arg value="pnas"/>
+        </exec>
+        <exec executable="ssh">
+            <arg value="scottmorrison@tqft.net"/>
+            <arg value="svn"/>
+            <arg value="up"/>      
+            <arg value="tqft.net"/>                  
+        </exec>
+    </target>
+</project>
diff -r 771544392058 -r 14e85db55dce pnas/pnas.tex
--- a/pnas/pnas.tex	Wed Nov 17 09:17:07 2010 -0800
+++ b/pnas/pnas.tex	Wed Nov 17 10:23:37 2010 -0800
@@ -96,7 +96,7 @@
 %% For titles, only capitalize the first letter
 %% \title{Almost sharp fronts for the surface quasi-geostrophic equation}
 
-\title{$n$-categories, colimits and the blob complex}
+\title{Higher categories, colimits and the blob complex}
 
 
 %% Enter authors via the \author command.