# HG changeset patch
# User Dan Drake
# Date 1262141351 32400
# Node ID 31f6710bb6fce883d1a3d6cab8b64ea309152650
# Parent 91feb804ae7d03d7081926d690a1d4f7cb1203f6
final changes for new installation as default spkg
diff git a/Makefile b/Makefile
 a/Makefile
+++ b/Makefile
@@ 1,10 +1,8 @@
SHELL=/bin/bash
pkg=sagetexpackage
dest=/home/drake/texmf/tex/latex/sagetex/
dtxs=$(wildcard *.dtx)
# the subdir stuff makes the tarball have the directory correct
srcs=example.tex README sagetexpackage.ins
ver=2.2.1
.SUFFIXES:
@@ 46,10 +44,7 @@
# the following bit requires SHELL=bash
auxclean:
 rm f {$(pkg),example}.{glo,gls,aux,sout,out,toc,dvi,pdf,ps,log,ilg,ind,idx,sage,fdb_latexmk}

install: sagetex.sty sagetex.py
 cp sagetex.sty $(dest)
+ /bin/bash c "rm f {$(pkg),example}.{glo,gls,aux,sout,out,toc,dvi,pdf,ps,log,ilg,ind,idx,sage,fdb_latexmk}"
# make a tarball suitable for CTAN uploads, or for someone who knows how
# to handle .dtx files
diff git a/README b/README
 a/README
+++ b/README
@@ 3,15 +3,14 @@
(http://sagemath.org) into LaTeX documents.
====================================================================
The recommended way to acquire and install SageTeX is by installing the
Sage spkg; visit http://sagemath.org/packages/optional/, find the
current version number, and run "sage i sagetex[version]" in a
terminal. Then you'll need to make the file sagetex.sty known to TeX;
that file will be in SAGE_ROOT/local/share/texmf/tex/generic/sagetex,
along with documentation and examples.
+SageTeX is included with Sage, so to use it, you only need to make the
+file sagetex.sty known to TeX; that file will be in
+SAGE_ROOT/local/share/texmf/tex/generic/sagetex, along with
+documentation and examples. See the Sage installation guide at
+http://sagemath.org/doc/installation/ for complete instructions.
If you can't or don't want to install SageTeX by using Sage, you can use
this CTAN package. If sagetex.py and sagetex.sty haven't been extracted
+the CTAN package. If sagetex.py and sagetex.sty haven't been extracted
from the .dtx file, you'll need to do:
0. Run `latex sagetexpackage.ins'
diff git a/sagetexpackage.dtx b/sagetexpackage.dtx
 a/sagetexpackage.dtx
+++ b/sagetexpackage.dtx
@@ 29,7 +29,7 @@
%\ProvidesPackage{sagetex}
%__version__ = """
%<*latexpython>
 [2009/07/27 v2.2.3 embedding Sage into LaTeX documents]
+ [2009/12/30 v2.2.3 embedding Sage into LaTeX documents]
%
%"""
%<*driver>
@@ 288,7 +288,6 @@
% filename, including it into your document, and so on. In
% \autoref{sec:usage}, we will see what what we can do with \ST.
%
%
% \section{Installation}
% \label{sec:installation}
% \changes{v2.0}{2009/01/14}{Fixed up installation section, final
@@ 298,33 +297,45 @@
%
% \newcommand{\sageroot}{\$SAGE\_ROOT}
%
% new installation section FIXME FIXME FIXME
%
% \ST needs two parts to work: a Python module known to Sage, and a
% \LTX package known to \TeX. As of Sage version 4.3.1, \ST comes
% included with Sage, so you only need to make sagetex.sty, the \LTX
% package, known to \TeX. Full details of this are in the Sage
% Installation guide at http://sagemath.org/doc/installation/ in the
% obviouslynamed section ``Make \ST known to \TeX''. Here's a brief
% summary of how to do that:
+% \ST needs two parts to work: a Python module known to Sage, and a \LTX
+% package known to \TeX. These two parts need to come from the same
+% version of \ST to guarantee that everything works properly. As of Sage
+% version 4.3.1, \ST comes included with Sage, so you only need to make
+% \texttt{sagetex.sty}, the \LTX package, known to \TeX. Full details of
+% this are in the Sage Installation guide at
+% \href{http://sagemath.org/doc/installation/}{\texttt{sagemath.org/doc/installation/}}
+% in the obviouslynamed section ``Make \ST known to \TeX''. Here's a
+% brief summary of how to do that:
%
% \begin{itemize}
+% \item Copy \texttt{sagetex.sty} to the same directory as your
+% document. This always works, but requires lots of copies of
+% \texttt{sagetex.sty} and is prone to version skew.
%
% \item Copy sagetex.sty to the same directory as your document. This
% always works, but requires lots of copies off sagetex.sty and is prone
% to version skew.
+% \item Use the environment variable \texttt{TEXINPUTS} to tell \TeX{}
+% to search the directory containing \texttt{sagetex.sty}; in the bash
+% shell, you can do
+% \begin{quotation}
+% \texttt{export TEXINPUTS=\sageroot/local/share/texmf//:}
+% \end{quotation}
+% You should replace \texttt{\sageroot} with the location of your Sage
+% installation.
%
% \item Set the environment variable TEXINPUTS to
% ``\sageroot/local/share/texmf//:'', where \sageroot refers to the
% location of your Sage install.
%
% \item Copy the above directory to your home directory with a command
% like ``cp R \sageroot/local/share/texmf ~/''.
%
+% \item Copy the directory containing \texttt{sagetex.sty} to your home
+% directory with a command like
+% \begin{quotation}
+% \texttt{cp R \sageroot/local/share/texmf \textasciitilde/}
+% \end{quotation}
+% where again you replace \texttt{\sageroot} with the location of your
+% Sage installation.
% \end{itemize}
%
% I prefer using TEXINPUTS, as it guarantees that both Sage and \TeX are
% using synchronized code.
+% I prefer using \texttt{TEXINPUTS}, as it guarantees that both Sage and
+% \TeX{} are synchronized and doesn't require you to copy any files.
+%
+% Note that along with \texttt{sagetex.sty}, this documentation, an
+% example file, and other useful scripts are all located in the
+% directory \texttt{\sageroot/local/share/texmf}.
%
% \subsection{\ST and \TeX Live}
%
@@ 333,7 +344,7 @@
% the \LTX package from \TeX Live and the Python module from Sage, they
% may not work together if they are from different versions of \ST.
% Because of this, I strongly recommend using \ST only from what is
% included with Sage and ignoring what's included with \TeX Live.
+% included with Sage and ignoring what's included with \TeX Live.
%
% \subsection{Using \TeX Shop}
% \label{sec:usingtexshop}
@@ 350,11 +361,10 @@
% at the top of your document, then \TeX Shop will automatically run Sage
% for you when compiling your document.
%
% Note that you will need to make sagetex.sty and sagetex.py known
% to \LTX and Sage using any of the methods described above (although
% note that \TeX Shop includes copies of these files for you). You also
% might need to edit the sage.engine script to reflect the location of
% your Sage installation.
+% Note that you will need to make sure that \LTX can find sagetex.sty
+% using any of the methods above. You also might need to edit the
+% sage.engine script to reflect the location of your Sage
+% installation.
%
% \subsection{Other scripts included with \ST}
% \label{sec:instotherscripts}
diff git a/test b/test
 a/test
+++ b/test
@@ 15,10 +15,10 @@
fi
}
latex example.tex > /dev/null
+pdflatex example.tex > /dev/null
checkdotsage example
latex sagetexpackage.dtx > /dev/null
+pdflatex sagetexpackage.dtx > /dev/null
checkdotsage sagetexpackage
# if we get here, we assume the .sage files are good, and exit successfully