[asymptote/f14/master] update to 2.08 and fix outstanding bugs
Tom Callaway
spot at fedoraproject.org
Tue Mar 8 21:31:21 UTC 2011
commit 8964f3345e41a7ffd3099a55be2dab677911c052
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date: Tue Mar 8 16:32:41 2011 -0500
update to 2.08 and fix outstanding bugs
asymptote-2.08-info-path-fix.patch | 12 ++
asymptote.spec | 137 +++++++++++++---
asymptote.sty.204 | 313 ++++++++++++++++++++++++++++++++++++
sources | 2 +-
4 files changed, 441 insertions(+), 23 deletions(-)
---
diff --git a/asymptote-2.08-info-path-fix.patch b/asymptote-2.08-info-path-fix.patch
new file mode 100644
index 0000000..934b431
--- /dev/null
+++ b/asymptote-2.08-info-path-fix.patch
@@ -0,0 +1,12 @@
+diff -up asymptote-2.08/doc/asymptote.texi.BAD asymptote-2.08/doc/asymptote.texi
+--- asymptote-2.08/doc/asymptote.texi.BAD 2011-03-08 11:42:17.349734001 -0500
++++ asymptote-2.08/doc/asymptote.texi 2011-03-08 11:42:21.462734066 -0500
+@@ -21,7 +21,7 @@ file LICENSE in the top-level source dir
+
+ @dircategory Languages
+ @direntry
+-* asymptote: (asymptote/asymptote). Vector graphics language.
++* asymptote: (asymptote). Vector graphics language.
+ @end direntry
+
+ @titlepage
diff --git a/asymptote.spec b/asymptote.spec
index 0d52a86..5d96038 100644
--- a/asymptote.spec
+++ b/asymptote.spec
@@ -1,11 +1,8 @@
%{!?_texmf: %define _texmf %(eval "echo `kpsewhich -expand-var '$TEXMFMAIN'`")}
-%define emacs_sitelisp %{_datadir}/emacs/site-lisp
-%define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
-
Name: asymptote
-Version: 2.04
-Release: 1%{?dist}
+Version: 2.08
+Release: 4%{?dist}
Summary: Descriptive vector graphics language
Group: Applications/Publishing
@@ -14,9 +11,12 @@ URL: http://asymptote.sourceforge.net/
Source0: http://download.sourceforge.net/sourceforge/asymptote/asymptote-%{version}.src.tgz
Source1: asy.gif
Source2: xasy.desktop
+Source3: asymptote.sty.204
Patch0: asymptote-2.00-settings.patch
Patch1: asymptote-1.63-gcc44.patch
Patch2: asymptote-1.91-fix-implicit-DSO-linking-libGL.patch
+# This doesn't need to go upstream. We put the info file in the topdir, not a subdir, so we need this fix.
+Patch3: asymptote-2.08-info-path-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ncurses-devel
@@ -32,6 +32,10 @@ BuildRequires: desktop-file-utils
BuildRequires: freeglut-devel
BuildRequires: zlib-devel
BuildRequires: libtool
+BuildRequires: emacs
+BuildRequires: xemacs
+# For cc-mode
+BuildRequires: xemacs-packages-extra
Requires: tetex-latex
Requires: tkinter
@@ -48,12 +52,52 @@ drawings, inspired by MetaPost but with an improved C++-like syntax.
Asymptote provides for figures the same high-quality level of typesetting
that LaTeX does for scientific text.
+%package -n emacs-%{name}
+Summary: Compiled elisp files to run %{name} under GNU Emacs
+Group: Applications/Publishing
+Requires: emacs(bin) >= %{_emacs_version}
+Requires: %{name} = %{version}-%{release}
+
+%description -n emacs-%{name}
+This package contains the byte compiled elisp packages to run %{name} with GNU
+Emacs.
+
+%package -n emacs-%{name}-el
+Summary: Elisp source files for %{name} under GNU Emacs
+Group: Applications/Publishing
+Requires: emacs-%{name} = %{version}-%{release}
+
+%description -n emacs-%{name}-el
+This package contains the elisp source files for %{name} under GNU Emacs. You
+do not need to install this package to run %{name}. Install the emacs-%{name}
+package to use %{name} with GNU Emacs.
+
+%package -n xemacs-%{name}
+Summary: Compiled elisp files to run %{name} under XEmacs
+Group: Applications/Publishing
+Requires: xemacs(bin) >= %{_xemacs_version}
+Requires: %{name} = %{version}-%{release}
+
+%description -n xemacs-%{name}
+This package contains the byte compiled elisp packages to use %{name} with
+XEmacs.
+
+%package -n xemacs-%{name}-el
+Summary: Elisp source files for %{name} under XEmacs
+Group: Applications/Publishing
+Requires: xemacs-%{name} = %{version}-%{release}
+
+%description -n xemacs-%{name}-el
+This package contains the elisp source files for %{name} under XEmacs. You do
+not need to install this package to run %{name}. Install the xemacs-%{name}
+package to use %{name} with XEmacs.
%prep
%setup -q
%patch0 -p1 -b .settings
%patch1 -p1 -b .gcc44
%patch2 -p1 -b .DSO
+%patch3 -p1 -b .path-fix
%{__sed} -i 's/\r//' doc/CAD1.asy
# convert to UTF-8
@@ -65,35 +109,43 @@ autoreconf -i
%configure --enable-gc=system --with-docdir=%{_defaultdocdir}/%{name}-%{version}/ --with-latex=%{_texmf}/tex/latex --with-context=%{_texmf}/tex/context/
make %{?_smp_mflags}
cd doc/
+# We're hacking around the fact that the asymptote.sty generated doesn't work with Fedora's old latex
+make asy-latex.pdf
+cp %{SOURCE3} asymptote.sty
make all
%install
rm -rf $RPM_BUILD_ROOT
-make install-asy DESTDIR=$RPM_BUILD_ROOT
-
-pushd doc
make install DESTDIR=$RPM_BUILD_ROOT mandir=$RPM_BUILD_ROOT%{_mandir}
-popd
+
+# pushd doc
+# make install DESTDIR=$RPM_BUILD_ROOT mandir=$RPM_BUILD_ROOT%{_mandir}
+# popd
install -p -m 644 BUGS ChangeLog LICENSE README ReleaseNotes TODO \
$RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-%{version}/
-# Emacs mode and init files
-install -dm 755 $RPM_BUILD_ROOT%{emacs_sitelisp}/site-start.d
-cd $RPM_BUILD_ROOT%{emacs_sitelisp}
-ln -s ../../%{name}/asy-{mode,keywords}.el .
-cd $RPM_BUILD_ROOT%{emacs_sitelisp}/site-start.d
-ln -s ../../../%{name}/asy-init.el .
+# Emacs files
+mkdir -p $RPM_BUILD_ROOT%{_emacs_sitestartdir}
+mkdir -p $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name}
+cp -a $RPM_BUILD_ROOT%{_datadir}/%{name}/*.el $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name}
+mv $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name}/asy-init.el $RPM_BUILD_ROOT%{_emacs_sitestartdir}
+for i in $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name}/*.el; do
+ %{_emacs_bytecompile} $i
+done
+
+# XEmacs files
+mkdir -p $RPM_BUILD_ROOT%{_xemacs_sitestartdir}
+mkdir -p $RPM_BUILD_ROOT%{_xemacs_sitelispdir}/%{name}
+cp -a $RPM_BUILD_ROOT%{_datadir}/%{name}/*.el $RPM_BUILD_ROOT%{_xemacs_sitelispdir}/%{name}
+mv $RPM_BUILD_ROOT%{_xemacs_sitelispdir}/%{name}/asy-init.el $RPM_BUILD_ROOT%{_xemacs_sitestartdir}
+for i in $RPM_BUILD_ROOT%{_xemacs_sitelispdir}/%{name}/*.el; do
+ %{_xemacs_bytecompile} $i
+done
-# Xemacs mode and init files
-install -dm 755 $RPM_BUILD_ROOT%{xemacs_sitelisp}/site-start.d
-cd $RPM_BUILD_ROOT%{xemacs_sitelisp}
-ln -s ../../../%{name}/asy-{mode,keywords}.el .
-cd $RPM_BUILD_ROOT%{xemacs_sitelisp}/site-start.d
-ln -s ../../../../%{name}/asy-init.el .
# Vim syntax file
-for vimver in 63 64 70 71 ; do
+for vimver in 63 64 70 71 72 73 ; do
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/vim/vim$vimver/syntax
cd $RPM_BUILD_ROOT%{_datadir}/vim/vim$vimver/syntax
ln -s ../../../%{name}/asy.vim .
@@ -152,8 +204,49 @@ fi
%{_datadir}/pixmaps/asy.gif
%{_datadir}/applications/*.desktop
+%files -n emacs-%{name}
+%defattr(-,root,root,-)
+%{_emacs_sitestartdir}/*.el
+%{_emacs_sitelispdir}/%{name}/*.elc
+%dir %{_emacs_sitelispdir}/%{name}
+
+%files -n emacs-%{name}-el
+%defattr(-,root,root,-)
+%{_emacs_sitelispdir}/%{name}/*.el
+
+%files -n xemacs-%{name}
+%defattr(-,root,root,-)
+%{_xemacs_sitelispdir}/%{name}/*.elc
+%{_xemacs_sitestartdir}/*.el
+%dir %{_xemacs_sitelispdir}/%{name}
+
+%files -n xemacs-%{name}-el
+%defattr(-,root,root,-)
+%{_xemacs_sitelispdir}/%{name}/*.el
%changelog
+* Thu Mar 3 2011 Tom Callaway <spot at fedoraproject.org> - 2.08-4
+- no, really, fix info parsing
+- breakout emacs subpackages
+
+* Fri Feb 18 2011 Tom Callaway <spot at fedoraproject.org> - 2.08-3
+- fix info parsing
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.08-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Nov 4 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 2.08-1
+- update to 2.08
+
+* Mon Nov 1 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 2.07-1
+- update to 2.07
+
+* Mon Oct 25 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 2.06-1
+- update to 2.06
+
+* Wed Oct 20 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 2.05-1
+- update to 2.05
+
* Mon Aug 23 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 2.04-1
- update to 2.04
diff --git a/asymptote.sty.204 b/asymptote.sty.204
new file mode 100644
index 0000000..3bc7bd6
--- /dev/null
+++ b/asymptote.sty.204
@@ -0,0 +1,313 @@
+%%% Asymptote style file for LaTeX
+%%% Contributed by Tom Prince 14 May 2003
+%%% Modified by John Bowman
+%%% Adapted from comment.sty (Under GPL v2+)
+
+\ProvidesPackage{asymptote}[2010/08/19 v1.19 Asymptote style file for LaTeX]
+\RequirePackage{keyval}
+\RequirePackage{ifthen}
+\newif\ifASYdefaultinline
+\newif\ifASYdefaultattach
+\DeclareOption{inline}{\ASYdefaultinlinetrue}
+\DeclareOption{attach}{\ASYdefaultattachtrue}
+\ProcessOptions*
+
+\def\asydir{}
+\def\ASYprefix{}
+
+\def\unquoteJobname#1"#2"#3\relax{\def\rawJobname{#1}%
+ \ifx\rawJobname\empty\def\rawJobname{#2}\fi}
+\expandafter\unquoteJobname\jobname""\relax
+% Work around jobname bug in MiKTeX 2.5 and 2.6:
+% Turn stars in file names (resulting from spaces, etc.) into minus signs
+\def\fixstar#1*#2\relax{\def\argtwo{#2}\ifx\argtwo\empty\gdef\Jobname{#1}\else
+\fixstar#1-#2\relax\fi}
+\expandafter\fixstar\rawJobname*\relax
+
+\RequirePackage{color,graphicx}
+
+\def\makeinnocent#1{\catcode`#1=12 }
+\def\csarg#1#2{\expandafter#1\csname#2\endcsname}
+\newwrite\AsyStream
+\newwrite\AsyPreStream
+\newread\AsyTestStream
+
+\def\AsyInput#1{\openin\AsyTestStream=#1
+\ifeof\AsyTestStream
+\else
+ \input #1
+\fi
+\closein\AsyTestStream%
+}
+
+\AsyInput{\jobname.pre}
+
+\immediate\openout\AsyPreStream=\jobname.pre
+
+\newif\ifASYinline
+\newif\ifASYattach
+\newif\ifASYPDF
+
+\ifx\pdfoutput\undefined
+\else
+\ifcase\pdfoutput
+\else
+\ASYPDFtrue
+\fi
+\fi
+\ifx\XeTeXversion\undefined
+\else
+\ASYPDFtrue
+\fi
+
+\newbox\ASYbox
+\newcounter{asy}
+
+\def\ProcessAsymptote#1% start it all off
+{\begingroup
+ \def\CurrentAsymptote{#1}%
+ \let\do\makeinnocent \dospecials
+ \makeinnocent\^^L% and whatever other special cases
+ \endlinechar`\^^M \catcode`\^^M=12 \xAsymptote}
+{\catcode`\^^M=12 \endlinechar=-1 %
+ \gdef\xAsymptote{%
+ \expandafter\ProcessAsymptoteLine}
+ \gdef\ProcessAsymptoteLine#1^^M{\def\test{#1}
+ \csarg\ifx{End\CurrentAsymptote Test}\test
+ \edef\next{\noexpand\EndOfAsymptote{\CurrentAsymptote}}%
+ \else \ThisAsymptote{#1}\let\next\ProcessAsymptoteLine
+ \fi \next}
+}
+
+\def\ASYstringmeaning#1{\expandafter\ASYgobblearrow\meaning#1}
+\def\ASYstringcsnoescape#1{\expandafter\ASYgobbleescape\string#1}
+{\escapechar-1
+ \expandafter\expandafter\expandafter\gdef
+ \expandafter\expandafter\expandafter\ASYgobblearrow
+ \expandafter\string\csname macro:->\endcsname{}
+}
+\def\ASYgobbleescape#1{\ifnum`\\=`#1 \else #1\fi}
+
+\def\WriteAsyLine#1{\def\ASYtmp{#1}%
+ \immediate\write\AsyStream{\ASYstringmeaning\ASYtmp}}
+
+\def\gedefappend#1#2{%
+ \toks@ = \expandafter{#1}%
+ \global\edef#1{\the\toks@ #2}%
+}%
+\def\globalASYdefs{}
+\def\WriteGlobalAsyLine#1{\def\ASYtmp{#1^^J}%
+\gedefappend\globalASYdefs{\ASYstringmeaning\ASYtmp}}
+
+\def\EndOfAsymptote#1{\endgroup\end{#1}%
+ \csname After#1Asymptote\endcsname}
+\def\AsymptoteEndDef#1{{\escapechar=-1\relax
+ \csarg\xdef{End#1Test}{\string\\end\string\{#1\string\}}%
+ }}
+
+\def\AfterasyAsymptote{%
+ \ifx\ASYwidth\empty
+ \ifx\ASYheight\empty
+ \else
+ \immediate\write\AsyStream{size(0,\ASYheight);}%
+ \fi
+ \else
+ \ifx\ASYheight\empty
+ \immediate\write\AsyStream{size(\ASYwidth,0);}%
+ \else
+ \immediate\write\AsyStream{size(\ASYwidth,\ASYheight);}%
+ \fi
+ \fi
+ \ifASYattach
+ \def\ASYdefaultviewportwidth{0}%
+ \else
+ \def\ASYdefaultviewportwidth{\the\linewidth}%
+ \fi
+ \ifx\ASYviewportwidth\empty
+ \ifx\ASYviewportheight\empty
+ \else
+ \immediate\write\AsyStream{viewportsize=(0,\ASYviewportheight);}%
+ \fi
+ \else
+ \ifx\ASYviewportheight\empty
+ \immediate\write\AsyStream{viewportsize=(\ASYviewportwidth,0);}%
+ \else
+ \immediate\write%
+ \AsyStream{viewportsize=(\ASYviewportwidth,\ASYviewportheight);}%
+ \fi
+ \fi
+ \gdef\ASYwidth{}%
+ \gdef\ASYheight{}%
+ \gdef\ASYviewportwidth{\ASYdefaultviewportwidth}%
+ \gdef\ASYviewportheight{}%
+ \immediate\closeout\AsyStream
+ \ifASYinline
+ \openin\AsyTestStream=\AsyFile.tex
+ \else
+ \ifASYPDF
+ \openin\AsyTestStream=\AsyFile.pdf
+ \else
+ \openin\AsyTestStream=\AsyFile.eps
+ \fi
+ \fi
+ \ifeof\AsyTestStream
+ \ifASYinline
+ \PackageWarning{asymptote}{file `\AsyFile.tex' not found}%
+ \closein\AsyTestStream%
+ \else
+ \closein\AsyTestStream%
+ \openin\AsyTestStream=\AsyFile.tex
+ \ifeof\AsyTestStream
+ \ifASYPDF
+ \PackageWarning{asymptote}{file `\AsyFile.pdf' not found}%
+ \else
+ \PackageWarning{asymptote}{file `\AsyFile.eps' not found}%
+ \fi
+ \else
+ \catcode`:=12
+ \input \AsyFile.tex%
+ \fi
+ \closein\AsyTestStream%
+ \fi
+ \else
+ \closein\AsyTestStream%
+ \ifASYinline
+ \catcode`:=12
+ \input \AsyFile.tex%
+ \else
+ \ifASYattach
+ \ifASYPDF
+ \openin\AsyTestStream=\AsyFile+0.pdf
+ \fi
+ \ifeof\AsyTestStream
+ \setbox\ASYbox=\hbox{\includegraphics[hiresbb]{\AsyFile}}%
+ \else
+ \setbox\ASYbox=\hbox{\includegraphics[hiresbb]{\AsyFile+0}}%
+ \fi
+ \textattachfile{\AsyFile.pdf}{\phantom{\copy\ASYbox}}%
+ \vskip-\ht\ASYbox%
+ \indent%
+ \box\ASYbox%
+ \closein\AsyTestStream%
+ \else
+ \includegraphics[hiresbb]{\AsyFile}%
+ \fi
+ \fi
+ \fi
+ \relax%
+ \endgroup}
+\gdef\ASYwidth{}%
+\define at key{ASYkeys}{width}{%
+ \gdef\ASYwidth{#1}%
+}
+\gdef\ASYheight{}%
+\define at key{ASYkeys}{height}{%
+ \gdef\ASYheight{#1}%
+}
+\gdef\ASYviewportwidth{\ASYdefaultviewportwidth}%
+\define at key{ASYkeys}{viewportwidth}{%
+ \gdef\ASYviewportwidth{#1}%
+}
+\gdef\ASYviewportheight{}%
+\define at key{ASYkeys}{viewportheight}{%
+ \gdef\ASYviewportheight{#1}%
+}
+\define at key{ASYkeys}{attach}[true]{%
+ \ifthenelse{\equal{#1}{true}}{\global\ASYattachtrue}{\global\ASYattachfalse}%
+}
+\define at key{ASYkeys}{inline}[true]{%
+ \ifthenelse{\equal{#1}{true}}{\global\ASYinlinetrue}{\global\ASYinlinefalse}%
+}
+\newcommand\asy[1][]{%
+ \begingroup
+ \let\par\empty
+ \stepcounter{asy}%
+ \global\let\ifASYinline\ifASYdefaultinline
+ \global\let\ifASYattach\ifASYdefaultattach
+ \setkeys{ASYkeys}{#1}%
+ \ifASYattach
+ \global\ASYinlinefalse
+ \fi
+ \ifx\asydir\empty
+ \else
+ \gdef\ASYprefix{\asydir/}
+ \fi
+ \immediate\write\AsyPreStream{\@backslashchar%
+ AsyInput{\ASYprefix\@backslashchar jobname-\the\c at asy.pre}}
+ \immediate\openout\AsyStream=\ASYprefix\jobname-\the\c at asy.asy
+ \gdef\AsyFile{\ASYprefix\Jobname-\the\c at asy}%
+ \immediate\write\AsyStream{if(!settings.multipleView)}%
+ \immediate\write\AsyStream{ settings.batchView=false;}%
+ \ifx\XeTeXversion\undefined
+ \ifASYPDF
+ \immediate\write\AsyStream{settings.tex="pdflatex";}%
+ \fi
+ \else
+ \immediate\write\AsyStream{settings.tex="xelatex";}%
+ \ASYPDFtrue
+ \fi
+ \ifASYinline
+ \immediate\write\AsyStream{settings.inlinetex=true;}%
+ \immediate\write\AsyStream{deletepreamble();}%
+ \fi
+ \immediate\write\AsyStream{defaultfilename="\Jobname-\the\c at asy";}%
+ \immediate\write\AsyStream{if(settings.render < 0) settings.render=4;}%
+ \ifASYattach
+ \immediate\write\AsyStream{settings.inlineimage=false;}%
+ \immediate\write\AsyStream{settings.embed=false;}%
+ \immediate\write\AsyStream{settings.outformat="pdf";}%
+ \immediate\write\AsyStream{settings.toolbar=true;}%
+ \else
+ \immediate\write\AsyStream{settings.inlineimage=true;}%
+ \immediate\write\AsyStream{settings.embed=true;}%
+ \immediate\write\AsyStream{settings.outformat="";}%
+ \immediate\write\AsyStream{settings.toolbar=false;}%
+ \immediate\write\AsyStream{viewportmargin=(2,2);}%
+ \fi
+ \immediate\write\AsyStream{\globalASYdefs}%
+ \let\ThisAsymptote\WriteAsyLine%
+ \ProcessAsymptote{asy}%
+}
+\AsymptoteEndDef{asy}
+\def\asydef{%
+ \let\ThisAsymptote\WriteGlobalAsyLine%
+ \ProcessAsymptote{asydef}}
+\AsymptoteEndDef{asydef}
+\def\AfterasydefAsymptote{}
+
+\AtEndDocument{\immediate\closeout\AsyPreStream}
+
+\newcommand{\ASYanimategraphics}[5][]{%
+\openin\AsyTestStream=_#3.pdf
+\ifeof\AsyTestStream%
+\else%
+\animategraphics[{#1}]{#2}{_#3}{#4}{#5}%
+\fi%
+}
+
+% Work around bug in dvips.def: allow spaces in file names.
+\def\Ginclude at eps#1{%
+ \message{<#1>}%
+ \bgroup
+ \def\@tempa{!}%
+ \dimen@\Gin at req@width
+ \dimen at ii.1bp%
+ \divide\dimen@\dimen at ii
+ \@tempdima\Gin at req@height
+ \divide\@tempdima\dimen at ii
+ \special{PSfile=#1\space
+ llx=\Gin at llx\space
+ lly=\Gin at lly\space
+ urx=\Gin at urx\space
+ ury=\Gin at ury\space
+ \ifx\Gin at scalex\@tempa\else rwi=\number\dimen@\space\fi
+ \ifx\Gin at scaley\@tempa\else rhi=\number\@tempdima\space\fi
+ \ifGin at clip clip\fi}%
+ \egroup}
+
+\def\Asymptote{{\tt Asymptote}}
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: "shared"
+%%% End:
diff --git a/sources b/sources
index 8d62966..8ffbcb2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6adb5d7714b662152b6f6f16c24f5751 asymptote-2.04.src.tgz
+ab7bc11c8110b6eb459285b9c206cfe6 asymptote-2.08.src.tgz
More information about the scm-commits
mailing list