# HG changeset patch
# User Dan Drake
# Date 1231496172 -32400
# Node ID 8ab6766189979bacc45182c487e1755632f37f89
# Parent 17336e98f6ef01d3cce11ea6394344ff0a4e72d7
un-spkg-ification complete, let's call this 2.0
diff --git a/MANIFEST.in b/MANIFEST.in
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -9,5 +9,3 @@
include sagetexpackage.sage
include sagetexparse.py
include sagetex.sty
-include README.spkg
-include spkg-install
\ No newline at end of file
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,8 @@
makeindex -s gglo.ist -o $(pkg).gls $(pkg).glo
makeindex -s gind.ist -o $(pkg).ind $(pkg).idx
latex $(pkg).dtx
+ sage $(pkg).sage
+ latex $(pkg).dtx
pdflatex $(pkg).dtx
latex example.tex
sage example.sage
@@ -41,10 +43,6 @@
clear
./test
-# make a spkg for Sage
-spkg:
- python setup.py sdist --formats=bztar
- cd dist
- gunzip dist/sagetex-$(ver).tar.gz
- bzip2 dist/sagetex-$(ver).tar
- cp dist/sagetex-$(ver).tar.bz2 dist/sagetex-$(ver).spkg
+# make a source distribution, used for building the spkg
+dist: all
+ python setup.py sdist --formats=tar
diff --git a/sagetexpackage.dtx b/sagetexpackage.dtx
--- a/sagetexpackage.dtx
+++ b/sagetexpackage.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2008 by Dan Drake
+% Copyright (C) 2009 by Dan Drake
% -------------------------------------------------------
%
% See the "Copying and licenses" section at the end of this file for the
@@ -27,7 +27,7 @@
%\NeedsTeXFormat{LaTeX2e}
%\ProvidesPackage{sagetex}
%<*latex>
- [2008/12/18 v2.0 embedding Sage into LaTeX documents]
+ [2008/01/09 v2.0 embedding Sage into LaTeX documents]
%
%<*driver>
\documentclass{ltxdoc}
@@ -75,6 +75,7 @@
% \changes{v2.0}{2008/12/16}{External Python scripts for parsing
% SageTeX-ified documents, tons of documentation improvements,
% sagetex.py refactored, include in Sage as spkg}
+% \changes{v2.0}{2009/01/09}{Miscellaneous fixes, final 2.0 version.}
%
% \GetFileInfo{sagetexpackage.dtx}
%
@@ -304,14 +305,25 @@
% you have defined the Sage variable |foo| to be $12$ (using, say, the
% |sageblock| environment), then you can do something like this:
% \begin{quote}
-% |The prime factorization of the current page plus foo is|\\
-% |$\sage{factor(foo + \thepage)}$|.
+% |The prime factorization of the current page number plus foo|\\
+% |is $\sage{factor(foo + \thepage)}$|.
% \end{quote}
% Here, I'll do just that right now: the prime factorization of the
-% current page plus $12$ is $\sage{factor(\thepage + 12)}$.
-%
-% The |\sage| command doesn't automatically use math mode for its
-% output, so be sure to use dollar signs or a displayed math environment
+% current page number plus $12$ is $\sage{factor(\thepage + 12)}$.
+% (Wrong answer? See footnote.\footnote{Is the above factorization
+% wrong? If the current page number plus $12$ is one larger than the
+% claimed factorization, you need to do another Sage/\LTX cycle on
+% this source file. Why? The first time you run \LTX on this file, the
+% sine graph isn't available, so the text where I've talked about the
+% prime factorization is back one page. Then you run Sage, and it
+% creates the sine graph and does the factorization. When you run \LTX
+% again, the sine graph pushes the text onto the next page, but it
+% uses the Sage-computed value from the previous page. Meanwhile, the
+% |.sage| file has been rewritten with the correct page number, so if
+% you do another Sage/\LTX cycle, you'll get the correct value
+% above.}) The |\sage| command doesn't automatically use math mode for
+% its output, so be sure to use dollar signs or a displayed math
+% environment
% as appropriate.\\
%
% \DescribeMacro{\percent} If you are doing modular arithmetic or string
@@ -1923,14 +1935,16 @@
% \url{http://creativecommons.org/licenses/by-nc-sa/3.0/} or send a
% letter to Creative Commons, 171 Second Street, Suite 300, San
% Francisco, California, 94105, USA.
+%
% \iffalse
-% I've run into a situation where the index wants to start on the very
-% last line of the page, and I actually get errors: ``Package multicol
-% Error: Error saving partial page.'' The problem goes away if I
-% fiddle with some lines so that the index starts elsewhere. Putting
-% in a clearpage below makes the index start nicely in the middle of a
-% page (until my change history gets too long!) and solves all those
-% problems. It can be removed if you're confident the pagebreak
-% problems won't occur.
+% I've run into a situation where the index wants to start on the very
+% last line of the page, and I actually get errors: ``Package multicol
+% Error: Error saving partial page.'' The problem goes away if I fiddle
+% with some lines so that the index starts elsewhere. Putting in a
+% clearpage below makes the index start nicely in the middle of a page
+% (until my change history gets too long!) and solves all those
+% problems. It can be removed/pulled into this comment if you're
+% confident the pagebreak problems won't occur.
+% \clearpage
% \fi
-% \clearpage
+
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,6 @@
'sagetexpackage.ins',
'sagetexpackage.pdf',
'sagetexparse.py',
- 'sagetex.sty',
- 'README.spkg'])])
+ 'sagetex.sty'])])