/[emacs]/emacs/lisp/calc/calc.el
ViewVC logotype

Diff of /emacs/lisp/calc/calc.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.62 by lektu, Mon Jul 4 02:39:37 2005 UTC revision 1.63 by jpb, Sat Jul 9 03:41:40 2005 UTC
# Line 241  Line 241 
241    :group 'calc    :group 'calc
242    :type '(regexp))    :type '(regexp))
243    
244    (defcustom calc-embedded-announce-formula-alist
245      '((texinfo-mode . "@c Embed\n\\(@c .*\n\\)*")
246        (nroff-mode   . "\\\\\"Embed\n\\(\\\\\" .*\n\\)*")
247        (pascal-mode  . "{Embed}\n\\({.*}\n\\)*")
248        (c-mode       . "/\\*Embed\\*/\n\\(/\\* .*\\*/\n\\)*")
249        (c++-mode     . "//Embed\n\\(// .*\n\\)*")
250        (fortran-mode . "C Embed\n\\(C .*\n\\)*")
251        (f90-mode     . "!Embed\n\\(! .*\n\\)*"))
252      "*Alist of major modes with appropriate values for `calc-embedded-announce-formula'."
253      :group 'calc
254      :type '(alist :key-type (symbol :tag "Major mode")
255                    :value-type (regexp :tag "Regexp to announce formula")))
256    
257  (defcustom calc-embedded-open-formula  (defcustom calc-embedded-open-formula
258    "\\`\\|^\n\\|\\$\\$?\\|\\\\\\[\\|^\\\\begin[^{].*\n\\|^\\\\begin{.*[^x]}.*\n\\|^@.*\n\\|^\\.EQ.*\n\\|\\\\(\\|^%\n\\|^\\.\\\\\"\n"    "\\`\\|^\n\\|\\$\\$?\\|\\\\\\[\\|^\\\\begin[^{].*\n\\|^\\\\begin{.*[^x]}.*\n\\|^@.*\n\\|^\\.EQ.*\n\\|\\\\(\\|^%\n\\|^\\.\\\\\"\n"
259    "*A regular expression for the opening delimiter of a formula used by calc-embedded."    "*A regular expression for the opening delimiter of a formula used by calc-embedded."
# Line 253  Line 266 
266    :group 'calc    :group 'calc
267    :type '(regexp))    :type '(regexp))
268    
269    (defcustom calc-embedded-open-close-formula-alist
270      nil
271      "*Alist of major modes with pairs of formula delimiters used by calc-embedded."
272      :group 'calc
273      :type '(alist :key-type (symbol :tag "Major mode")
274                    :value-type (list (regexp :tag "Opening formula delimiter")
275                                      (regexp :tag "Closing formula delimiter"))))
276    
277  (defcustom calc-embedded-open-word  (defcustom calc-embedded-open-word
278    "^\\|[^-+0-9.eE]"    "^\\|[^-+0-9.eE]"
279    "*A regular expression for the opening delimiter of a formula used by calc-embedded-word."    "*A regular expression for the opening delimiter of a formula used by calc-embedded-word."
# Line 265  Line 286 
286    :group 'calc    :group 'calc
287    :type '(regexp))    :type '(regexp))
288    
289    (defcustom calc-embedded-open-close-word-alist
290      nil
291      "*Alist of major modes with pairs of word delimiters used by calc-embedded."
292      :group 'calc
293      :type '(alist :key-type (symbol :tag "Major mode")
294                    :value-type (list (regexp :tag "Opening word delimiter")
295                                      (regexp :tag "Closing word delimiter"))))
296    
297  (defcustom calc-embedded-open-plain  (defcustom calc-embedded-open-plain
298    "%%% "    "%%% "
299    "*A string which is the opening delimiter for a \"plain\" formula.    "*A string which is the opening delimiter for a \"plain\" formula.
# Line 280  See calc-embedded-open-plain." Line 309  See calc-embedded-open-plain."
309    :group 'calc    :group 'calc
310    :type '(string))    :type '(string))
311    
312    (defcustom calc-embedded-open-close-plain-alist
313      '((texinfo-mode "@c %% "   " %%\n")
314        (nroff-mode   "\\\" %% " " %%\n")
315        (pascal-mode  "{%% "    " %%}\n")
316        (c-mode       "/* %% "   " %% */\n")
317        (c++-mode     "// %% "   " %%\n")
318        (fortran-mode "C %% "    " %%\n")
319        (f90-mode     "! %% "    " %%\n"))
320      "*Alist of major modes with pairs of delimiters for \"plain\" formulas."
321      :group 'calc
322      :type '(alist :key-type (symbol :tag "Major mode")
323                    :value-type (list (string :tag "Opening \"plain\" delimiter")
324                                      (string :tag "Closing \"plain\" delimiter"))))
325    
326  (defcustom calc-embedded-open-new-formula  (defcustom calc-embedded-open-new-formula
327    "\n\n"    "\n\n"
328    "*A string which is inserted at front of formula by calc-embedded-new-formula."    "*A string which is inserted at front of formula by calc-embedded-new-formula."
# Line 292  See calc-embedded-open-plain." Line 335  See calc-embedded-open-plain."
335    :group 'calc    :group 'calc
336    :type '(string))    :type '(string))
337    
338    (defcustom calc-embedded-open-close-new-formula-alist
339      nil
340      "*Alist of major modes with pairs of new formula delimiters used by calc-embedded."
341      :group 'calc
342      :type '(alist :key-type (symbol :tag "Major mode")
343                    :value-type (list (string :tag "Opening new formula delimiter")
344                                      (string :tag "Closing new formula delimiter"))))
345    
346  (defcustom calc-embedded-open-mode  (defcustom calc-embedded-open-mode
347    "% "    "% "
348    "*A string which should precede calc-embedded mode annotations.    "*A string which should precede calc-embedded mode annotations.
# Line 306  This is not required to be present for u Line 357  This is not required to be present for u
357    :group 'calc    :group 'calc
358    :type '(string))    :type '(string))
359    
360    (defcustom calc-embedded-open-close-mode-alist
361      '((texinfo-mode "@c "   "\n")
362        (nroff-mode   "\\\" " "\n")
363        (pascal-mode  "{ "    " }\n")
364        (c-mode       "/* "   " */\n")
365        (c++-mode     "// "   "\n")
366        (fortran-mode "C "    "\n")
367        (f90-mode     "! "    "\n"))
368      "*Alist of major modes with pairs of strings to delimit annotations."
369      :group 'calc
370      :type '(alist :key-type (symbol :tag "Major mode")
371                    :value-type (list (string :tag "Opening annotation delimiter")
372                                      (string :tag "Closing annotation delimiter"))))
373    
374  (defcustom calc-gnuplot-name  (defcustom calc-gnuplot-name
375    "gnuplot"    "gnuplot"
376    "*Name of GNUPLOT program, for calc-graph features."    "*Name of GNUPLOT program, for calc-graph features."
# Line 726  If nil, selections displayed but ignored Line 791  If nil, selections displayed but ignored
791  (defvar calc-trail-window-hook nil  (defvar calc-trail-window-hook nil
792    "Hook called to create the Calc trail window.")    "Hook called to create the Calc trail window.")
793    
794    (defvar calc-embedded-new-buffer-hook nil
795      "Hook run when starting embedded mode in a new buffer.")
796    
797    (defvar calc-embedded-new-formula-hook nil
798      "Hook run when starting embedded mode in a new formula.")
799    
800    (defvar calc-embedded-mode-hook nil
801      "Hook run when starting embedded mode.")
802    
803  ;; Verify that Calc is running on the right kind of system.  ;; Verify that Calc is running on the right kind of system.
804  (defvar calc-emacs-type-lucid (not (not (string-match "Lucid" emacs-version))))  (defvar calc-emacs-type-lucid (not (not (string-match "Lucid" emacs-version))))
805    

Legend:
Removed from v.1.62  
changed lines
  Added in v.1.63

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26