Commit Graph

660 Commits (5507c2b676eab7cba48f7ddc662e4137ce78a8cd)

Author SHA1 Message Date
Björn Lindqvist 6d88ab71b5 FUEL: Load fuel-mode when factor-mode loads. 2014-04-21 08:33:08 -07:00
Björn Lindqvist d62c2ae351 FUEL: some more chars that often are used in word names 2014-04-18 08:43:12 -07:00
Björn Lindqvist 693ca82648 FUEL: factor-find-in returns correct vocab when point is on the IN:-line 2014-04-18 08:43:11 -07:00
Björn Lindqvist bf060849c9 FUEL: improve highlighting of LIBRARY:, HELP: and deprecated 2014-04-18 08:43:11 -07:00
Björn Lindqvist 368abbe777 FUEL: Improved handling of documentation markup errors
The fuel-eval--retort-result-safe function can be used to get the
retort result and throw an error if the retort error is
set. E.g. (fuel-help "prettyprint") will now throw an error because
the markup is invalid instead of showing "No help available.."
2014-04-18 08:43:11 -07:00
Björn Lindqvist a80dc21337 FUEL: Use font-locks data to figure out if the token point is on is a vocab
If point is on "myvocab" in IN: myvocab fuel-help will now understand
that it is on a vocabulary token.
2014-04-18 08:43:11 -07:00
Björn Lindqvist 385a8a0798 FUEL: remove fuel-help-short and supporting code
The feature is not used anywhere (not bound to any key) and the normal
fuel-help display works better than fuel-help-short anyway
2014-04-18 08:43:11 -07:00
Björn Lindqvist c0ff39d129 FUEL: fix factor-find-usings and use it in fuel-help--word-help so that fuel can eval code with the right vocabs imported 2014-04-14 08:38:33 -07:00
Björn Lindqvist 35fd1ad8cb FUEL: correct fuel-helps word lookup algorithm
e.g if you lookup help for pop you should see the help page for
sequences:pop not persistent.deques.private:pop
2014-04-14 08:38:33 -07:00
Björn Lindqvist d05363e1e8 FUEL: need to catch and handle scan-error that forward-sexp can emit if there is no closing bracket 2013-12-12 08:24:02 -08:00
Björn Lindqvist b1b146e709 FUEL: fixed font-locking of SYMBOLS 2013-12-12 08:24:02 -08:00
Björn Lindqvist 084e3e98f1 FUEL: correct font-locking of nested stack effect declarations.
The new matcher function isn't "fooled" by stack effect declarations
like: ( ... seq quot: ( ... elt index -- ... ) i -- ... )
2013-12-01 06:51:48 -08:00
Björn Lindqvist d5568986b2 FUEL: improved font-locking of DESTRUCTOR and FORGET 2013-12-01 06:51:48 -08:00
Björn Lindqvist 0e1d454e66 FUEL: correct highlighting of GENERIC# and MACRO: 2013-12-01 06:51:48 -08:00
Björn Lindqvist d93a444c4c FUEL: improved regexps for setters and getters, now they arent fooled by the parsing words << and >> 2013-12-01 06:51:48 -08:00
Björn Lindqvist 4d56a136a1 FUEL: correct colorizing for FROM and EXCLUDE 2013-12-01 06:51:48 -08:00
Björn Lindqvist 85098e0e49 FUEL: fixed regexp for C-GLOBAL and RENAME 2013-12-01 06:51:48 -08:00
Björn Lindqvist e1bf75cc68 FUEL: colorizing for PROTOCOL and some uncommon parsing words 2013-12-01 06:51:48 -08:00
Björn Lindqvist f21d634a13 FUEL: highlight predicates 2013-12-01 06:51:48 -08:00
Björn Lindqvist a2c7b7c82c FUEL: font-lock ENUMs 2013-12-01 06:51:48 -08:00
Björn Lindqvist 08cf1b3567 FUEL: fix regexp for number literals 2013-09-20 13:42:50 -07:00
Björn Lindqvist 9f8648e1e7 FUEL: highlight alien callbacks identical to functions 2013-09-20 13:42:50 -07:00
Björn Lindqvist 05b18519f6 FUEL: improve handling of whitespace in regexps 2013-09-20 13:42:50 -07:00
Björn Lindqvist 86712433cd FUEL: Improved highlighting of stack effect declarations for alien functions. Types are highlighted bold using the new face factor-font-lock-type-in-stack-effect. 2013-09-20 13:42:50 -07:00
Björn Lindqvist ccda289400 FUEL: better matching for hex numbers, eg. 0xDeadBeefBabe 2013-09-20 13:42:50 -07:00
Björn Lindqvist 85c02e0e0d FUEL: improved highlighting of alien syntax; TYPEDEF, C-TYPE, STRUCT and UNION-STRUCT 2013-09-20 13:42:50 -07:00
Björn Lindqvist 0ac088ccfc FUEL: Correct font-locking of tuples with initial values. 2013-08-19 11:44:41 -07:00
Björn Lindqvist 9ac1522daa FUEL: Tables in help buffers must be plain ascii to be correctly rendered everywhere. 2013-08-14 18:21:58 +02:00
Björn Lindqvist 23e3bcd9ff FUEL: Make fuel-help (C-c C-d d) work for vocabularies too. 2013-08-14 18:04:18 +02:00
Björn Lindqvist f35795f415 FUEL: Correct regexp to work with multiline USING: 2013-08-14 18:02:32 +02:00
Björn Lindqvist 365a790eba FUEL: Put several more characters that can be used in word names in the symbols class 2013-08-14 17:41:36 +02:00
Björn Lindqvist ec74afdd23 FUEL: Error message is now shown if word can't be found. 2013-08-14 13:21:19 +02:00
Björn Lindqvist 13945c4252 FUEL: Exterminating the evil tabs. Also highlight them so they get easier to kill. 2013-08-07 23:53:24 +02:00
Björn Lindqvist 9fae604546 FUEL: One + less... 2013-08-07 18:35:07 +02:00
Björn Lindqvist 3fea81d7cc FUEL: Improve font-locking of constructs that span multiple lines. 2013-08-07 18:27:59 +02:00
Björn Lindqvist 830637c84d FUEL: Improved font-locking. Colors for USING expressions, hexadecimal numbers and tuple slots. 2013-08-05 11:16:23 -07:00
Björn Lindqvist 1358a9eb55 FUEL: Compatibility functions for Emacs 24.2. 2013-07-13 19:13:39 +02:00
Samuel Tardieu 13389a8400 FUEL: unmask `fuel-refresh-all`
`fuel-refresh-all` is documented as mapped onto "\C-c\C-r", but this was
masked by an undocumented mapping for `fuel-eval-region` (which is
already bound to "\C-c\C-e\C-r").
2013-06-07 00:11:21 +02:00
Erik Charlebois 7ab88c8b9d FUEL: Tweak package description 2013-05-12 13:22:41 -04:00
Erik Charlebois 8aa55dff52 FUEL: fuel-pkg.el file for MELPA metadata 2013-05-11 17:02:27 -04:00
Erik Charlebois 9b0989a901 FUEL: Documentation fixes 2013-05-07 22:28:42 -04:00
Erik Charlebois ba02db8485 FUEL: Fix Emacs package metadata for MELPA recipe 2013-05-07 02:03:26 -04:00
Erik Charlebois deb0ceaa9c Large reorg of FUEL codebase
* Modernize the FUEL elisp code for Emacs 24.3. Emacs 24.3 deprecated
the old 'cl lib and standardized a new 'cl-lib lib to put the name
clash issues to rest once and for all. This version of FUEL now requires
24.3.
* Move FUEL code that was needed by factor-mode into factor-mode and
rename appropriately. factor-mode and FUEL are now clearly separated
and FUEL depends on factor-mode.
* Set up FUEL with appropriate autoloads so that it's Emacs 24 package
manager friendly. FUEL can now be uploaded to MELPA or some similar
package manager.
* Changed the Factor faces for font locking to inherit from the default
Emacs faces rather than defaulting to other colors. This means that
Emacs themes will work for Factor code out of the box. Further
tailoring of Factor-specific faces can be done by users themselves.
* Cleaned up a lot of code to use Emacs conventions
(define-defined-mode, define-minor-mode, indent-function, etc) and added
a propery syntax table so that paren matching works, and word/symbol
skipping works.
* Added a new minor mode, fuel-autohelp-mode, that displays the help for
the symbol under point in another window. A fusion of fuel-autodoc-mode
and fuel-help-mode that's quite handy for reading Factor code.
2013-05-07 01:41:12 -04:00
mcandre 946b18fde3 preparing FUEL for MELPA 2013-04-24 06:56:43 -07:00
John Benediktsson dc27c21ab0 editors.textadept: use "-e goto_line(n-1)".
(as suggested by Mitchell@foicica.com on the textadept mailing list)
2013-04-01 14:56:24 -07:00
Michael T. Richter 881aa979b8 Added Lua source files for Textadept editor support for Factor. 2013-04-01 06:30:01 -07:00
John Benediktsson f27bb01ec8 misc/vim: highlight numbers with leading "+" (e.g., "+12"). 2013-03-16 13:50:09 -07:00
John Benediktsson 2d68c470ea misc/fuel: try and fix autodoc bug report. 2013-03-08 14:34:43 -08:00
John Benediktsson 61ae9cab75 misc/icons: renaming to old convention, adding 48x48. 2012-12-01 09:30:33 -08:00
John Benediktsson 9c295e679e New icons for Factor. 2012-11-30 15:26:21 -08:00
John Benediktsson bea4724cc8 vim: update syntax file for new kernel words. 2012-10-22 13:46:17 -07:00
John Benediktsson 28f36a25b0 Revert "core: >array, >byte-vector, >hashtable, >vector should be inline."
This reverts commit cd6026e70e.
2012-10-05 08:30:41 -07:00
John Benediktsson 700cee5afd core: >array, >byte-vector, >hashtable, >vector should be inline. 2012-09-28 19:31:14 -07:00
John Benediktsson 1f0e2c6715 vim: fix ".1" to be float syntax highlighted. 2012-09-26 21:32:34 -07:00
John Benediktsson 474913646f misc: fix syntax highlighting for MATH: generics. 2012-09-14 09:05:20 -07:00
John Benediktsson 719f190e99 misc: highlight TYPED: in vim. 2012-08-28 16:34:17 -07:00
John Benediktsson c26ac5890e misc: support new escapes in vim. 2012-07-26 19:24:52 -07:00
John Benediktsson c894bc098d misc/vim: updating keywords for core vocabs. 2012-07-23 09:08:41 -07:00
John Benediktsson 09ea62edf6 misc: update vim syntax file using ``generate-vim-syntax``. 2012-07-11 14:28:15 -07:00
John Benediktsson 2f4a22d159 misc: update factor.vim generator with changes in last year. 2012-07-11 14:27:48 -07:00
John Benediktsson 34b9b5156a vim: allow sign of exponent to be optional (e.g., "1e10" should be highlighted correctly). 2012-05-29 07:43:09 -07:00
John Benediktsson 78f7a8bc58 vim: fix float syntax highlighting of "1." 2012-05-28 20:48:15 -07:00
Joe Groff 72de75b881 let's pretend BIN: HEX: OCT: never happened 2011-11-23 19:22:37 -08:00
Doug Coleman 2551dd0e4e Handle auto-user in fuel-connection.el. Fix suggested by Eungju Park. 2011-11-02 18:14:10 -07:00
Doug Coleman 6c15e97597 Fix the fuel "No prompt found" bug using eungju's better fix; otherwise would just pull the patch. 2011-11-02 09:28:29 -07:00
John Benediktsson 315896c857 factor.vim: fix syntax highlight for exponentials (i.e. "1.5e10"). 2011-09-21 19:29:56 -07:00
John Benediktsson 6bf9b971f2 factor.vim: fix highlighting of negative ratios. 2011-09-10 21:08:37 -07:00
Joe Groff e8340c5196 misc/vim/syntax: highlight row variables in stack effects 2011-09-03 11:10:08 -07:00
yac 8eea81b0d4 Improved stack effect highlighting in vim.
Delimiters and items in stack effect are highlighted separately, works on
call( -- ) and execute( -- ) too.
2011-06-23 21:01:35 +02:00
Keita Haga 945d5f5c49 misc/vim/syntax/factor.vim: merge two factorComment highlight groups together into one 2011-04-06 15:28:59 +09:00
Keita Haga f2528568bc misc/vim/README.md: update filename 2011-04-05 12:37:10 +09:00
Keita Haga 0f64c5ae58 misc/vim/ftplugin/factor.vim: add copyright header 2011-04-05 10:47:08 +09:00
Keita Haga 9884a73664 misc/vim/syntax/factor.vim: fix factorCallQuotation, factorExecute match patterns 2011-04-05 04:03:17 +09:00
Keita Haga 9f6f498cb6 misc/vim/syntax/factor.vim: update comments 2011-04-05 03:45:34 +09:00
Keita Haga 811cab4f60 misc/vim/syntax/factor.vim: re-fix factorStackEffect, factorLiteralStackEffect match 2011-04-05 03:42:47 +09:00
Keita Haga bb1c6c60c2 misc/vim/syntax/factor.vim: add support for M\ syntax 2011-04-05 02:30:14 +09:00
Keita Haga 91a41aa008 misc/factor.vim.fgen: update 2011-04-04 21:01:20 +09:00
Keita Haga 4059eac351 misc/vim/ftplugin/factor.vim: add b:did_ftplugin at the top 2011-04-04 20:38:30 +09:00
Keita Haga e078094e06 Rename misc/vim/ftplugin/factor_settings.vim to misc/vim/ftplugin/factor.vim 2011-04-04 20:34:43 +09:00
Keita Haga 0e2de48c49 misc/vim/syntax/factor.vim: workaround for factorHook match issue 2011-04-04 19:59:56 +09:00
Keita Haga 900990bec8 misc/vim/README.md: minor tweaks 2011-03-24 09:25:16 +09:00
Keita Haga ef76c7b210 Replace misc/vim/README with misc/vim/README.md 2011-03-24 09:18:46 +09:00
Keita Haga f77bb07525 misc/vim/syntax/factor.vim: add 'display' argument to factorEscape highlight group 2011-03-21 06:54:15 +09:00
Keita Haga d1b126f15b misc/vim/syntax/factor.vim: factorEscape cleanup 2011-03-21 05:37:00 +09:00
Keita Haga 45d9f23104 misc/vim/syntax/factor.vim: add support for escape characters 2011-03-20 19:01:47 +09:00
Keita Haga 45443be1bc misc/vim/syntax/factor.vim: set 'shiftwidth' option in modeline 2011-03-20 16:12:24 +09:00
Keita Haga 07ed91f476 misc/vim/plugin/factor.vim: remove trailing whitespace 2011-03-18 01:40:28 +09:00
Keita Haga 372312948e misc/vim/syntax/factor.vim: add support for 'ERROR: class slots...' syntax 2011-03-18 00:25:12 +09:00
Keita Haga d91d3f2c01 misc/vim/syntax/factor.vim: in factorShebang, add 'display' argument and switch to PreProc highlight group 2011-03-17 10:10:38 +09:00
Keita Haga 34ae717598 misc/vim/syntax/factor.vim: don't set 'shiftwidth', 'softtabstop', etc. 2011-03-17 09:32:49 +09:00
Keita Haga 29e69f5a68 misc/vim/syntax/factor.vim: fix indentation 2011-03-17 08:28:15 +09:00
Keita Haga 579ca7d898 misc/vim/syntax/factor.vim: swapping factorComment definition lines and contain @Spell in factorComment 2011-03-17 06:00:14 +09:00
Keita Haga c9542b5a15 misc/vim/syntax/factor.vim: highlight the shebang 2011-03-17 05:22:15 +09:00
Keita Haga 1ef928b508 misc/vim/syntax/factor.vim: highlight factorCallQuotation, factorExecute, factorStackEffect, and factorLiteralStackEffect definitions correctly 2011-03-17 04:33:02 +09:00
Keita Haga 4122d4aa30 misc/vim/syntax/factor.vim: fix factorRename match 2011-03-16 20:22:32 +09:00
Keita Haga bac4add3a8 misc/vim/syntax/factor.vim: add support for 'execute( stack -- effect )' syntax 2011-03-15 01:27:13 +09:00
Keita Haga eac693ee17 misc/vim/syntax/factor.vim: factorFrySpecifier cleanup 2011-03-15 01:14:33 +09:00
Keita Haga 334b2b57e0 misc/vim/syntax/factor.vim: fix factorStackEffect, factorLiteralStackEffect match patterns 2011-03-15 01:07:29 +09:00
Keita Haga 771577c5a3 misc/vim/syntax/factor.vim: add support for 'call( stack -- effect )' syntax 2011-03-15 00:58:52 +09:00
Keita Haga d79dba57e3 misc/vim/syntax/factor.vim: highlighting of 'call-next-method' 2011-03-15 00:41:22 +09:00
Keita Haga 51d49f03ca misc/vim/syntax/factor.vim: add support for INTERSECTION: syntax 2011-03-13 20:10:07 +09:00
Keita Haga 38eb0bd17e misc/vim/syntax/factor.vim: add support for SLOT: syntax 2011-03-10 22:56:24 +09:00
Keita Haga 55840ae6a1 misc/vim/syntax/factor.vim: highlighting of breakpoint 2011-03-10 20:32:11 +09:00
Keita Haga fdc562c8f3 misc/vim/syntax/factor.vim: add support for UNION: syntax 2011-03-10 20:22:44 +09:00
Keita Haga d76cc21f1f misc/vim/syntax/factor.vim: update "To run" 2011-03-10 19:37:36 +09:00
Keita Haga 9a8c717cba misc/vim/syntax/factor.vim: add support for SYMBOLS: syntax 2011-03-10 19:30:42 +09:00
Keita Haga e4bd8e98fc Update factorSbuf in misc/factor.vim.fgen 2011-03-10 19:21:21 +09:00
Keita Haga a7ed4c8c45 misc/vim/syntax/factor.vim: add support for RENAME: syntax 2011-03-10 02:31:08 +09:00
Keita Haga b25c605563 misc/vim/syntax/factor.vim: add support for EXCLUDE: syntax 2011-03-10 02:26:28 +09:00
Keita Haga 3bf15931fc misc/vim/syntax/factor.vim: rename factorFryDirective to factorFrySpecifier 2011-03-10 00:30:07 +09:00
Keita Haga 4468f1e2e0 misc/vim/syntax/factor.vim: add support for ALIAS: syntax 2011-03-10 00:20:50 +09:00
Keita Haga 4629d7b51b misc/vim/syntax/factor.vim: a few minor changes:
- delete first line
- rename factorCompileDirective to factorDeclaration
- support for more declarations
2011-03-09 23:22:36 +09:00
Keita Haga 5ac122d030 misc/vim/syntax/factor.vim: capitalize the first letter of "Language" header line 2011-03-09 20:34:00 +09:00
Keita Haga fe9661746a Oops, forgot to update misc/factor.vim.fgen 2011-03-05 20:43:48 +09:00
Keita Haga 2e11623708 misc/vim/syntax/factor.vim: improve factorComment match 2011-03-05 19:58:58 +09:00
Jose A. Ortega Ruiz 0c5a0ee058 FUEL: Menus for factor, listener, doc and debug buffers. 2010-08-13 04:25:57 +02:00
Jose A. Ortega Ruiz 5d8495aa5a FUEL: Remove key bindings of the form C-c <alphabetic>
Bindings of the form C-c <alphabetic> (e.g. C-c z) are traditionally
reserved in Emacs for user-defined keymaps, and shouldn't be used by
packages.

This patch removes all bindings of that form, replacing them by C-c
C-<alphabetic> (or simply preserving a previously existing binding).
E.g., C-c z becomes C-c C-z. In most cases, the binding with two C's
was already present.

The only change not following the above rule is C-c h in the listener,
which has become C-c C-w (because the C-h suffix is also 'taken' by
Emacs conventions).
2010-08-12 03:14:44 +02:00
Jose A. Ortega Ruiz 5fd5ed4afe FUEL: fix for listener's misbehaviour in the presence of output. 2010-07-31 23:39:21 +02:00
Jose A. Ortega Ruiz a4c37338fa FUEL: New option to make listener's prompt non-readonly.
By setting fuel-listener-prompt-read-only-p to nil, you'll be able to
delete (portions of) the prompt in the listener. This doesn't have
much value by itself, except that, moreover, a non-read-only prompt
makes some i/o operations work. E.g.:

 "input x:" print flush readln

will work with the new variable set to nil.
2010-07-31 20:11:36 +02:00
Joe Groff f82c6e14ad new ICO for windows 2010-07-05 21:00:12 -07:00
Joe Groff 4608e955bc stacky the raptor was feeling kind of blue. cheer him up a bit 2010-07-05 20:53:24 -07:00
Slava Pestov dc58b75eab Merge remote branch 'origin/new-icons' 2010-06-22 01:08:10 -04:00
Dmitry Shubin 221fb87fae FUEL: improve highlighting and indentation for ERROR: 2010-06-12 06:42:58 +04:00
Joe Groff 63be996042 improve factor icon contrast, and deform smaller icons slightly so they're more visible 2010-06-04 17:09:14 -07:00
Dmitry Shubin d24ffe8346 FUEL: improve syntax highlighting: C-TYPE:, FUNCTION-ALIAS: and more 2010-05-13 22:50:26 +04:00
Dmitry Shubin 9e2fab61ef FUEL: syntax highlighting for DESTRUCTOR: and C-GLOBAL: 2010-05-13 20:20:16 +04:00
Erik Charlebois baab8c060d Remove ENUM: f and replace uses with CONSTANTs.
Fix bootstrap and load-all errors from enum classes.
2010-04-19 20:08:40 -07:00
Erik Charlebois 04d947ef1a Merge branch 'master' of git://factorcode.org/git/factor 2010-04-17 17:48:40 -07:00
Dmitry Shubin a540ffdc36 FUEL: do not fail if there is no file associated with current buffer 2010-04-17 03:27:00 +04:00
Erik Charlebois d387947033 FUEL: Syntax highlight CONSULT: and PROTOCOL: 2010-04-16 13:41:16 -07:00
Erik Charlebois 26a55bbb16 Syntax highlighting for TYPED:: 2010-04-06 12:58:37 -07:00
Erik Charlebois 77e63550a7 Add syntax highlighting for BEFORE: and AFTER: 2010-04-02 00:47:37 -07:00
Erik Charlebois 98da7ac16e FUEL syntax updates 2010-03-02 19:32:07 -08:00
Erik Charlebois 0142d46688 Add scaffolding for platforms.txt, add option to fuel-scaffold-vocab 2010-02-22 20:17:49 -08:00
Erik Charlebois 4f8a6a032c Syntax highlighting for COM-INTERFACE: 2010-02-22 19:34:54 -08:00
Erik Charlebois 52a8c3ebc9 FUEL: Add UNION-STRUCT: to syntax highlighting. 2010-02-21 16:42:31 -08:00
Erik Charlebois 9b8fd8d160 Fix parse error in elisp file 2010-02-21 04:39:44 -08:00
Erik Charlebois a452966af9 FUEL: Add prefix key behavior to fuel-test-vocab so that it is similar to other FUEL interactive functions. 2010-02-21 03:35:15 -08:00
Erik Charlebois ffddca36b7 Add scaffolding words for tags, summary and authors and hook these up to FUEL. Modified fuel-scaffold-vocab to prompt the user for tags, summary and whether to create help and test files immediately. 2010-02-21 03:34:08 -08:00
Erik Charlebois bb3665f37e FUEL: Flip the default behavior of visit-other-file so that it does not try to create -docs or -tests files if they do not exist by default. This is the more common case when spelunking in code and in general you want to scaffold those files anyway. 2010-02-21 03:27:16 -08:00
Erik Charlebois a19c5f5663 Update FUEL font coloring for new syntactic keywords 2010-02-10 22:03:39 -08:00
erikc c4bd780bff Add fuel-test-vocab to FUEL (C-ct default) to run unit tests on a vocab 2010-02-08 15:58:40 -08:00
erikc e3c3739624 Add brace matching for parse time quotes $\[ 2010-02-05 15:52:55 -08:00
erikc 3e2f848101 Make TUPLE: indent, which seems to be the common indentation. 2010-01-27 15:31:08 -08:00
erikc b2db8c4492 Add struct, struct-union and tag indent words. 2010-01-26 22:00:25 -08:00
Joe Groff 230630c78a Merge branch 'master' of git://factorcode.org/git/factor 2010-01-24 12:48:17 -08:00
Doug Coleman 8c1d202b4c Rename accumulator to collector, pusher to selector 2010-01-22 15:00:53 -06:00
Joe Groff 77385e8715 generalize vim syntax highlighting for SBUF" " to any syntax word ending in " 2010-01-21 11:13:34 -08:00
Philipp Brüschweiler ed16e89999 misc: update factor.vim and it's template 2010-01-20 16:57:24 +01:00
Doug Coleman 1d12a6707d sigma -> map-sum 2009-10-29 14:34:04 -05:00