Mercurial > emacs
changeset 111633:4e76c4e4f20f
calc.texi (TeX and LaTeX Language Modes, Predefined Units):
calc-units.el (math-build-units-table-buffer):
README: Mention that the TeX specific units won't use the `tex' prefix
in TeX mode.
calc-lang.el (math-variable-table): Don't use the `tex' prefix for
units in TeX mode.
| author | Jay Belanger <jay.p.belanger@gmail.com> |
|---|---|
| date | Thu, 18 Nov 2010 19:14:36 -0600 |
| parents | e06fc3baed8c |
| children | 3334777d733d |
| files | doc/misc/ChangeLog doc/misc/calc.texi lisp/ChangeLog lisp/calc/README lisp/calc/calc-lang.el lisp/calc/calc-units.el |
| diffstat | 6 files changed, 54 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/misc/ChangeLog Thu Nov 18 13:45:03 2010 -0800 +++ b/doc/misc/ChangeLog Thu Nov 18 19:14:36 2010 -0600 @@ -1,3 +1,9 @@ +2010-11-19 Jay Belanger <jay.p.belanger@gmail.com> + + * calc.texi (TeX and LaTeX Language Modes, Predefined Units): + Mention that the TeX specific units won't use the `tex' prefix + in TeX mode. + 2010-11-18 Katsumi Yamaoka <yamaoka@jpl.org> * gnus.texi (Misc Article): Document gnus-inhibit-images.
--- a/doc/misc/calc.texi Thu Nov 18 13:45:03 2010 -0800 +++ b/doc/misc/calc.texi Thu Nov 18 19:14:36 2010 -0600 @@ -14122,6 +14122,10 @@ @texline @math{\sin(2 + x)}. @infoline @expr{sin(2 + x)}. +The @TeX{} specific unit names (@pxref{Predefined Units}) will not use +the @samp{tex} prefix; the unit name for a @TeX{} point will be +@samp{pt} instead of @samp{texpt}, for example. + Function and variable names not treated specially by @TeX{} and La@TeX{} are simply written out as-is, which will cause them to come out in italic letters in the printed document. If you invoke @kbd{d T} or @@ -27990,6 +27994,14 @@ @code{texcc} (a Cicero) and @code{texsp} (a scaled @TeX{} point, all dimensions representable in @TeX{} are multiples of this value). +When Calc is using the @TeX{} or La@TeX{} language mode (@pxref{TeX +and LaTeX Language Modes}), the @TeX{} specific unit names will not +use the @samp{tex} prefix; the unit name for a @TeX{} point will be +@samp{pt} instead of @samp{texpt}, for example. To avoid conflicts, +the unit names for pint and parsec will simply be @samp{pint} and +@samp{parsec} instead of @samp{pt} and @samp{pc}. + + The unit @code{e} stands for the elementary (electron) unit of charge; because algebra command could mistake this for the special constant @expr{e}, Calc provides the alternate unit name @code{ech} which is
--- a/lisp/ChangeLog Thu Nov 18 13:45:03 2010 -0800 +++ b/lisp/ChangeLog Thu Nov 18 19:14:36 2010 -0600 @@ -1,3 +1,11 @@ +2010-11-19 Jay Belanger <jay.p.belanger@gmail.com> + + * calc/calc-units.el (math-build-units-table-buffer): + calc/README: Mention that the TeX specific units won't use the + `tex' prefix in TeX mode. + calc/calc-lang.el (math-variable-table): Don't use the `tex' + prefix for units in TeX mode. + 2010-11-18 Stefan Monnier <monnier@iro.umontreal.ca> * simple.el (kill-new, kill-append, kill-region):
--- a/lisp/calc/README Thu Nov 18 13:45:03 2010 -0800 +++ b/lisp/calc/README Thu Nov 18 19:14:36 2010 -0600 @@ -74,6 +74,9 @@ Emacs 24.1 +* Calc no longer uses the tex prefix for TeX specific unit +names when using TeX or LaTeX mode. + * Added option to highlight selections using faces. * Gave `calc-histogram' the option of using a vector to determine the bins.
--- a/lisp/calc/calc-lang.el Thu Nov 18 13:45:03 2010 -0800 +++ b/lisp/calc/calc-lang.el Thu Nov 18 19:14:36 2010 -0600 @@ -540,6 +540,16 @@ ( \\Psi . var-Psi ) ( \\omega . var-omega ) ( \\Omega . var-Omega ) + ;; Units + ( pt . var-texpt ) + ( pc . var-texpc ) + ( bp . var-texbp ) + ( dd . var-texdd ) + ( cc . var-texcc ) + ( sp . var-texsp ) + ( pint . var-pt ) + ( parsec . var-pc) + ;; Others ( \\ell . var-ell ) ( \\infty . var-inf )
--- a/lisp/calc/calc-units.el Thu Nov 18 13:45:03 2010 -0800 +++ b/lisp/calc/calc-units.el Thu Nov 18 19:14:36 2010 -0600 @@ -57,23 +57,23 @@ "149597870691 m (*)") ;; (approx) NASA JPL (http://neo.jpl.nasa.gov/glossary/au.html) ( lyr "c yr" "Light Year" ) - ( pc "3.0856775854*10^16 m" "Parsec" nil + ( pc "3.0856775854*10^16 m" "Parsec (**)" nil "3.0856775854 10^16 m (*)") ;; (approx) ESUWM ( nmi "1852 m" "Nautical Mile" ) ( fath "6 ft" "Fathom" ) ( fur "660 ft" "Furlong") ( mu "1 um" "Micron" ) ( mil "(1/1000) in" "Mil" ) - ( point "(1/72) in" "Point (1/72 inch)" ) + ( point "(1/72) in" "Point (PostScript convention)" ) ( Ang "10^(-10) m" "Angstrom" ) ( mfi "mi+ft+in" "Miles + feet + inches" ) ;; TeX lengths - ( texpt "(100/7227) in" "Point (TeX conventions)" ) - ( texpc "12 texpt" "Pica" ) - ( texbp "point" "Big point (TeX conventions)" ) - ( texdd "(1238/1157) texpt" "Didot point" ) - ( texcc "12 texdd" "Cicero" ) - ( texsp "(1/65536) texpt" "Scaled TeX point" ) + ( texpt "(100/7227) in" "Point (TeX convention) (**)" ) + ( texpc "12 texpt" "Pica (TeX convention) (**)" ) + ( texbp "point" "Big point (TeX convention) (**)" ) + ( texdd "(1238/1157) texpt" "Didot point (TeX convention) (**)" ) + ( texcc "12 texdd" "Cicero (TeX convention) (**)" ) + ( texsp "(1/65536) texpt" "Scaled TeX point (TeX convention) (**)" ) ;; Area ( hect "10000 m^2" "*Hectare" ) @@ -86,7 +86,7 @@ ( l "L" "Liter" ) ( gal "4 qt" "US Gallon" ) ( qt "2 pt" "Quart" ) - ( pt "2 cup" "Pint" ) + ( pt "2 cup" "Pint (**)" ) ( cup "8 ozfl" "Cup" ) ( ozfl "2 tbsp" "Fluid Ounce" ) ( floz "2 tbsp" "Fluid Ounce" ) @@ -1531,7 +1531,12 @@ (indent-to 15) (insert " " (nth 2 u) "\n") (while (eq (car (car (setq uptr (cdr uptr)))) 0))) - (insert "\n")) + (insert "\n\n") + (insert "(**) When in TeX or LaTeX display mode, the TeX specific unit\n" + "names will not use the `tex' prefix; the unit name for a\n" + "TeX point will be `pt' instead of `texpt', for example.\n" + "To avoid conflicts, the unit names for pint and parsec will\n" + "be `pint' and `parsec' instead of `pt' and `pc'.")) (view-mode) (message "Formatting units table...done")) (setq math-units-table-buffer-valid t)