Commit graph

38 commits

Author SHA1 Message Date
Wolfram Schneider
0b4df7438b fix race conditions in doc image builds
PR: 222327
2017-09-19 09:57:15 +00:00
Wolfram Schneider
e041adf9e7 cleanup *.ps files
PR: 222252
2017-09-19 09:54:21 +00:00
Gabor Kovesdan
c94df498ed - Drop SGML catalogs
- Drop DSSSL stylesheets
- Drop some DSSSL-related comments and Makefile code
2013-05-29 19:21:25 +00:00
Gabor Kovesdan
d5c6e245d4 - Remove some further unused leftovers
- Make sure printed docs generated with DSSSL always use .eps images
- And XSLT-based output always uses .png
- Fix image conversion
2013-04-01 08:16:09 +00:00
Gabor Kovesdan
68eb6e1a6c - Remove more leftovers
- Simplify image processing so that html always uses .png and printed
  formats always use .eps
2013-03-31 21:35:32 +00:00
Gabor Kovesdan
4cb9e266b6 - Remove doc.html.mk, which is not used any more
- Factor out command macros for better readability and consistency
  and less duplication
- Make some macros more consistent with the rest
2013-02-02 14:52:15 +00:00
Ulrich Spörlein
2ec9223e66 Unbreak build when .OBJDIR is being used (i.e. after running make obj).
_IMAGES_FOO already contains fully qualified paths, so prepending
${.OBJDIR} is breaking the build.

Approved by:	hrs
2012-01-17 08:36:59 +00:00
Hiroki Sato
39d6423ca4 Fix doc tree build when Ghostscript 8.70 is used.
The ps2epsi.ps file in Ghostscript 8.70 requires %%BoundingBox line
exists in the output EPS file *before* the conversion while the older
versions calculated it from the PS file and output the line during the
conversion.

Approved by:	doceng (implicit)
2009-12-25 18:12:00 +00:00
Marc Fonvieille
dc2a444aae GS 8.70 needs that target files exist before being created. This
unbreakis doc builds with that GS version.

Submitted by:	hrs@
2009-12-23 13:17:35 +00:00
Hiroki Sato
ca944c36ab Remove trailing whitespaces. 2004-07-23 18:58:56 +00:00
Hiroki Sato
c8277d756c Fix a build problem when print/ghostscript-afpl is used:
- epsgeom+gs now converts EPS files.  graphics/peps is no longer used.
 - Add $PERL, $REALPATH, and $SETENV into doc.project.mk.

Tested by:	simon
2004-07-23 18:53:34 +00:00
Simon L. B. Nielsen
c0dc63ac06 Really unbreak creation of PDF documents which use "shared" PNG images:
The previous fix only worked in some cases, so back it out and add a
more clean fix.  This fix also makes "make clean" work as expected again
for the shared PNG images.

The real problem is the assumption in doc.images.mk that the
${IMAGES_PDF} variable only need to contain images converted to PDF
format and not images which are already in PNG format.  We need to list
the PNG images in ${IMAGES_PDF} since they might be in a shared image
directory, and if we don't list them in ${IMAGES_PDF} they will not be
copied to the working directory and will therefor not be found during
build.

Prompted by:	phantom
2004-04-05 22:53:43 +00:00
Hiroki Sato
354d1cc7e5 Fix problems when ghostscript with A4=yes is used. 2003-12-30 21:41:17 +00:00
Murray Stokely
1d5eac4d80 Add a 'GREYSCALE_IMAGES' option to the print infrastructure to convert
screenshots to greyscale before embedding them in the PostScript
output.

Sponsored by:	FreeBSD Mall, Inc.
2003-12-08 02:37:02 +00:00
Hiroki Sato
252ac09ed2 Add a workaround to unbreak the build when ghostscript built
with A4=yes is used.

Discussed on:	-doc
2003-11-24 18:34:01 +00:00
Marc Fonvieille
f8cfbd21b0 Remove -p option from ${MKDIR} definition to avoid redundancy (options
should be specified out from the variable definition).

PR:		docs/54422
Submitted by:	Lukas Ertl <l.ertl@univie.ac.at>
2003-08-01 20:28:55 +00:00
Marc Fonvieille
47f6d4e260 Commit images separation from en_US.ISO8859-1/ directory to
share/images.  To link "generic" images (share/images ones) from
Makefiles use IMAGES_EN and to link localized images use IMAGES.
For an example look at en_US.ISO8859-1/books/handbook/Makefile
2003-04-11 09:21:15 +00:00
Ceri Davies
5cf784715b Add $LOCAL_IMAGES_LIB_DIR to $CLEANDIRS.
Not objected to by:	doc
2003-01-31 17:26:53 +00:00
Marc Fonvieille
6c9a428eee Remove my dirty hack, it's useless with doc.docbook.mk changes. 2002-11-02 21:45:53 +00:00
Marc Fonvieille
88477ef95f Quick hack to allow build of the Handbook with .txt files.
textproc/scr2txt must also be on the system.

The .txt files are created on the fly with .png ones.  This is not
perfect, but it allows mirrors to build docs.
2002-10-30 10:06:03 +00:00
Nik Clayton
eece7f02d3 Add in the necessary framework so that in the "FORMATS=txt" case, any
.scr files in the ${IMAGES} list are automatically converted to their
plain text equivalents.
2002-10-28 19:41:55 +00:00
Marc Fonvieille
a89acfe274 Allow the use of graphic files from en_US.ISO8859-1/ directory for
localized docs.

For example in the Handbook Makefile, an image entry will be similar to:

IMAGES = ../../../en_US.ISO8859-1/books/handbook/install/userconfig.scr

the image will be built in that directory and then installed in the right
localized place at installation time.

Some versions of ghostscript (7.04) have problems with the use of
relative path when the arguments are passed by peps; a fix was
added.

Reviewed and discussed with:	murray
2002-10-12 10:53:52 +00:00
Bruce A. Mah
dde19dfed1 Teach the doc tree how to convert PIC diagrams to PDF files
in a OBJDIR-friendly way.
2002-02-06 16:26:41 +00:00
Murray Stokely
d5a4400b57 Teach the doc tree how to convert PIC diagrams to PNG and EPS files
in a OBJDIR-friendly way.
2002-02-02 20:30:55 +00:00
Murray Stokely
0e36f3ddca Add command variables for PS2EPS, PIC2PS, and groff so that we can use
PIC diagrams in the doc tree.
2002-01-02 01:10:37 +00:00
Murray Stokely
4ffcb3417b Make the TIDYFLAGS/TIDYOPTS usage homologous to the rest of the make
variables in the doc infrastructure.  Fixes several small bugs.

PR:		docs/31703
Submitted by:	Akio Morita <amorita@FreeBSD.org>
2001-11-05 10:33:38 +00:00
Murray Stokely
f92319a1b1 Make build/install /usr/obj prefix clean.
Also fix several minor bugs here, such as leftover files not being
deleted after 'make clean'.

PR:		docs/31131
Submitted by:	Cyrille Lefevre <clefevre@citeweb.net>
2001-10-29 09:21:53 +00:00
Murray Stokely
388ddee70e Add scr -> png -> eps support, so that we can build Randy's new
Installation chapter with spiffy color screenshots of sysinstall.
2001-08-14 21:51:25 +00:00
Nik Clayton
9e7e408f55 Use peps instead of eps2png. 2001-07-13 12:09:59 +00:00
Nik Clayton
6887d21569 Add a new variable, EPS2PNG_RES, to set the resolution eps2png uses to
convert graphics.  Change the default from 82 to 100, for clearer images.

PR:		docs/28237
Submitted by:	G. Adam Stanislav <adam@whizkidtech.net>

While I'm here, include some suffix rules to convert .scr files to .png
files.  Nothing uses these, yet, but should do shortly.
2001-06-22 10:12:23 +00:00
Nik Clayton
f3866f36b1 Make the eps2png and epstopdf commands OBJDIR safe.
Submitted by:	Christian Weisgerber <naddy@mips.inka.de>
2001-05-09 19:31:47 +00:00
Nik Clayton
88abf1e8bb Better image support. Use Ghostscript and NetPBM, rather than simply
relying on ImageMagick.
2001-02-20 19:08:58 +00:00
Nik Clayton
378340c7fe Use epstopdf (from teTeX) rather than ImageMagick to convert EPS to PDF
files.  The results seem to be nicer.
2001-02-12 17:03:54 +00:00
Nik Clayton
324f84d204 LIB_IMAGES -> IMAGES_LIB, to be consistent with IMAGES_PNG and IMAGES_EPS
Extend the image support.  Now handles the "install" part for HTML, PS, and
PDF, as well as packaging.

Better support for images in the PDF output.  I'm still trying to figure out
how to get good quality PDF from EPS source though.
2000-10-29 02:39:10 +00:00
Nik Clayton
107896244a Initial support for images within the documentation. Support EPS and PNG
format images.  Assume that ImageMagick has been installed -- this is a
big requirement, and will be refined before this gets much further.
2000-10-08 19:17:42 +00:00
Neil Blakey-Milner
1c78f1c07d a) "Fix" out-of-tree builds by not hard-coding locations of dsl files
with SYSTEM, and using instead PUBLIC entities gained from the catalog
in the directory of the language the document belongs to, or the
language-neutral entity.  Now we always use default.dsl as our dsl
master, and it grabs the necessary magic from the catalogs.

b) Fix the always-out-of-date imagelib problem with some make(1)-fu.

Approved by:	nik (ages ago)
2000-09-28 23:29:48 +00:00
Nik Clayton
f631452350 doc.images.mk
LOCAL_LIB_IMAGES_DIR should be a path component, not a complete path, so
remove ${.CURDIR}.

doc.docbook.mk

Set the directory for image installation correctly, and ensure that the
directory exists before we try and do anything with it.

These should fix the installation problems people are having with the
primer.  There's still an outstanding bug -- make(1) thinks that the
local library images are out-of-date with respect to the ones in
share/images for some reason.  This forces a rebuild each time.  I'm
still looking at that.
2000-07-18 16:30:45 +00:00
Nik Clayton
f24bb0a201 Image support in the documentation. For the time being, just support
library images (and in particular the callout bugs).
2000-07-16 16:27:30 +00:00