From: Jay Belanger Date: Fri, 19 Nov 2010 01:14:36 +0000 (-0600) Subject: calc.texi (TeX and LaTeX Language Modes, Predefined Units): X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~196 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1265829ec33f6d23787733a3f312984f4f268a33;p=emacs.git 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. --- diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index f9e55ffb5ee..d57df81befc 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,9 @@ +2010-11-19 Jay Belanger + + * 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 * gnus.texi (Misc Article): Document gnus-inhibit-images. diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi index 9c30556ab78..58de84b8194 100644 --- a/doc/misc/calc.texi +++ b/doc/misc/calc.texi @@ -14122,6 +14122,10 @@ but @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 @@ than the point used by @TeX{}), @code{texdd} (a Didot point), @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 diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9fa66ca8022..166f30c0574 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2010-11-19 Jay Belanger + + * 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 * simple.el (kill-new, kill-append, kill-region): diff --git a/lisp/calc/README b/lisp/calc/README index cf3a697c5d7..b23666018e5 100644 --- a/lisp/calc/README +++ b/lisp/calc/README @@ -74,6 +74,9 @@ Summary of changes to "Calc" 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. diff --git a/lisp/calc/calc-lang.el b/lisp/calc/calc-lang.el index f461c47aafd..6c0a65f5567 100644 --- a/lisp/calc/calc-lang.el +++ b/lisp/calc/calc-lang.el @@ -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 ) diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el index a88e87dffbc..8fd1983ac6d 100644 --- a/lisp/calc/calc-units.el +++ b/lisp/calc/calc-units.el @@ -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 @@ If EXPR is nil, return nil." (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)