aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2009-01-10 13:20:18 +0000
committerChong Yidong2009-01-10 13:20:18 +0000
commit2833b3fffd6e3cef1cb472ef11eb611772521caa (patch)
tree8dfbdc1ea1b26bee093fa0bba21572e756a397c9
parent9cf04f512b13d5b426b6dbd2b21c0a18df280079 (diff)
downloademacs-2833b3fffd6e3cef1cb472ef11eb611772521caa.tar.gz
emacs-2833b3fffd6e3cef1cb472ef11eb611772521caa.zip
Undo last change.
-rw-r--r--doc/lispref/display.texi28
-rw-r--r--doc/lispref/elisp.texi1
-rw-r--r--lisp/Makefile.in1
3 files changed, 30 insertions, 0 deletions
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 2a076c3f22c..ca7785f1239 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -3949,6 +3949,7 @@ displayed (@pxref{Display Feature Testing}).
3949* XPM Images:: Special features for XPM format. 3949* XPM Images:: Special features for XPM format.
3950* GIF Images:: Special features for GIF format. 3950* GIF Images:: Special features for GIF format.
3951* TIFF Images:: Special features for TIFF format. 3951* TIFF Images:: Special features for TIFF format.
3952* PostScript Images:: Special features for PostScript format.
3952* Other Image Types:: Various other formats are supported. 3953* Other Image Types:: Various other formats are supported.
3953* Defining Images:: Convenient ways to define an image for later use. 3954* Defining Images:: Convenient ways to define an image for later use.
3954* Showing Images:: Convenient ways to display an image once it is defined. 3955* Showing Images:: Convenient ways to display an image once it is defined.
@@ -4347,6 +4348,33 @@ number @var{index} from the file. If the TIFF file doesn't contain an
4347image with index @var{index}, the image displays as a hollow box. 4348image with index @var{index}, the image displays as a hollow box.
4348@end table 4349@end table
4349 4350
4351@node PostScript Images
4352@subsection PostScript Images
4353@cindex postscript images
4354
4355 To use PostScript for an image, specify image type @code{postscript}.
4356This works only if you have Ghostscript installed. You must always use
4357these three properties:
4358
4359@table @code
4360@item :pt-width @var{width}
4361The value, @var{width}, specifies the width of the image measured in
4362points (1/72 inch). @var{width} must be an integer.
4363
4364@item :pt-height @var{height}
4365The value, @var{height}, specifies the height of the image in points
4366(1/72 inch). @var{height} must be an integer.
4367
4368@item :bounding-box @var{box}
4369The value, @var{box}, must be a list or vector of four integers, which
4370specifying the bounding box of the PostScript image, analogous to the
4371@samp{BoundingBox} comment found in PostScript files.
4372
4373@example
4374%%BoundingBox: 22 171 567 738
4375@end example
4376@end table
4377
4350@node Other Image Types 4378@node Other Image Types
4351@subsection Other Image Types 4379@subsection Other Image Types
4352@cindex PBM 4380@cindex PBM
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index aa1f7eeb1e1..d98b1f488e4 100644
--- a/doc/lispref/elisp.texi
+++ b/doc/lispref/elisp.texi
@@ -1323,6 +1323,7 @@ Images
1323* XBM Images:: Special features for XBM format. 1323* XBM Images:: Special features for XBM format.
1324* XPM Images:: Special features for XPM format. 1324* XPM Images:: Special features for XPM format.
1325* GIF Images:: Special features for GIF format. 1325* GIF Images:: Special features for GIF format.
1326* PostScript Images:: Special features for PostScript format.
1326* Other Image Types:: Various other formats are supported. 1327* Other Image Types:: Various other formats are supported.
1327* Defining Images:: Convenient ways to define an image for later use. 1328* Defining Images:: Convenient ways to define an image for later use.
1328* Showing Images:: Convenient ways to display an image once 1329* Showing Images:: Convenient ways to display an image once
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index f109eada9cd..5c4595ffca2 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -649,6 +649,7 @@ ELCFILES = \
649 $(lisp)/gnus/utf7.elc \ 649 $(lisp)/gnus/utf7.elc \
650 $(lisp)/gnus/webmail.elc \ 650 $(lisp)/gnus/webmail.elc \
651 $(lisp)/gnus/yenc.elc \ 651 $(lisp)/gnus/yenc.elc \
652 $(lisp)/gs.elc \
652 $(lisp)/help-at-pt.elc \ 653 $(lisp)/help-at-pt.elc \
653 $(lisp)/help-fns.elc \ 654 $(lisp)/help-fns.elc \
654 $(lisp)/help-macro.elc \ 655 $(lisp)/help-macro.elc \