- Tell the location where Jade/OpenJade will look for the PNG
images.
- Use rtf-nopng as extension name for Jade/OpenJade generated
RTF files.
- Use fixrtf(1) from textproc/fixrtf to make necessary fixups
on generated RTFs, embedding PNGs into the intermediate RTF
and save them into the new *.rtf files.
- Retire rtf.tar target which is no longer necessary.
Please note that you have to upgrade the docproj toolset or
this commit would break the build.
PR: docs/93965
Submitted by: intron <intron intron ac>
Approved by: doceng
- Consider index.sgml as intermediate file, not dependency that ${DOC}.*
require. Instead, generate it on-the-fly when building ${DOC}.*.
This solves the problem that index.sgml is generated for the first
built target, but needs to be different from target to target.
The affected targets are:
index.html HTML.manifest
${DOC}.html
${DOC}.html-text
${DOC}.rtf
${DOC}.tex
${DOC}.tex-pdf
${INDEX_SGML} target removed in favor of the on-the-fly build.
- When building ${DOC}.rtf, add ${PRINT_INDEX} and ${LOCAL_IMAGES_PNG}
as dependencies, eliminating the need of building ${DOC}.rtf without
having to build ${DOC}.html beforehand.
- Modifications against ${HTML_INDEX} and ${HTML_SPLIT_INDEX}:
+ Add dependency to ${SRCS} and ${LOCAL_IMAGES_TXT} to force
index updates when necessary.
+ Every build now causes index.sgml to be reinitialized.
+ Depend on ${DOC}.* to generate index.sgml.
Submitted by: "intron" <intron at intron ac>
PR: docs/90255 (slightly changed version)
project:
- For "dvi" and "ps", add "${DOC}.out" to CLEANFILES
- Allow overriding of the following targets:
${DOC}.txt, ${DOC}.dvi, ${DOC}.pdf, ${PRINT_INDEX}
Submitted by: "intron" <intron intron ac>
PR: docs/90171
ru_RU.KOI8-R, and zh_TW.Big5---because they are broken.
This behavior can be controlled by using $NO_TEX_LANG.
This is a temporary measure, and we need to use localized
TeX variants to build the printable formats.
Tested by: simon
Before: use jade on i386, openjade on !386, provide OPENJADE var for override
Now: detect what's available, when both systems are present, use jade,
provide OPENJADE var for override
This change follows same logic as recent similar change in web.mk
Approved by: keramida (mentor)
First, zip up the template directory from /usr/doc/share/openoffice,
then use 'zip -g slides.sxi content.xml' to append a single file to
the zip archive after content.xml has been created.
Also make this target .OBJDIR clean.
USE_SAXON is set. This doesn't quite work yet.
Also fix a bug in the .fo target that was uncovered when slides for a
presentation are split across multiple XML files.
Norman Walsh's DocBook Slides DTD.
This DTD offers the vocabulary of simplified DocBook for
presentations. Initially, the supported output formats are PDF and
HTML.
XSL stylesheets are used so libxslt is required.
PassiveTeX is used for the PDF generation to convert the XSL-FO
directly to PDF.
This commit moves various TeX definitions out of doc.docbook.mk and
into doc.project.mk, since docbook is no longer the only back-end to
utilize TeX.
An example Makefile would look like :
----
DOCFORMAT= slides
DOC= slides
SRCS= slides.xml
DOC_PREFIX?= ${.CURDIR}/../../..
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
---
And an example slides file (slides.xml) looks like :
---
<!DOCTYPE slides PUBLIC "-//Norman Walsh//DTD Slides XML V3.3.1//EN"
"http://docbook.sourceforge.net/releases/slides/3.3.1/slides.dtd">
<slides>
<slidesinfo>
<title>What's new in FreeBSD 5.3</title>
<titleabbrev>FreeBSD 5.3</titleabbrev>
</slidesinfo>
<foil><title>Introduction Slide</title>
<para>Content</para>
</foil>
</slides>
---
You could then build the HTML and PDF versions of the slides by typing
"make FORMATS='pdf html'". Enjoy.
Please coordinate with doceng@ before importing any presentations to
doc/.
Jade is not able to embed images but links them instead, so images have
to be installed with the .rtf document (it's similar to the HTML case).
I added a new format: rtf.tar which is a better solution than using rtf
since the images are not embedded.
make FORMATS=rtf.tar is your friend :)
just after doc.common.mk included. This can be used for various
language specific customizations.
- Remove SP_ENCODING_LIST. Translators should define the SP_ENCODING
variable directly in their doc.local.mk when it is needed.
Discussed with: den
Add KOI8-R to this list
Other encodings can be added after some testing
Note: KOI8-R supported by jade-1.2.1_8 and above
Reviewed by: Dmitry Morozovsky <marck@rinet.ru>, ru
With cleanups from: ru
No objections from: freebsd-doc
stylesheet omits the contents of <filename>, <devicename>,
<programlisting>, and other tags that are likely to not contain real
English words. The output of this stylesheet can then be checked with
'make spellcheck' with far fewer false positives.
is not defined.
- URL_RELPREFIX must always point the top page's URL
(http://www.FreeBSD.org) in relative form, defined in Makefile.
- &url.base; can be used in doc/<langcode>/*. It will be
replaced with the real URL which points the top page.
For translators: Please make sure to define URL_RELPREFIX to
point the top page. The localized docs have different directory
hierarchy in its URL from the English version.
Tested by: den
Replace &url.main; -> http://www.FreeBSD.org
when URLS_ABSOLUTE is set (for release building),
and -> ../../../.. by default (for mirror sites).
Patch was slightly modified by: hrs
Discussed with: des, ceri, hrs, trhodes, simon
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
After introduction of shared images concept it was not possible to realize
how images should be put into packages, so built images references were
used. It result up tgz file with lots filename which contained of '..'.
In order to workaround this issue I used temporary directory to install
complete packaging document, then generate PLIST based on content of
temporary directory and create actual package then.
Prodded by: The FreeBSD Russian Documentation Project
doc.docbook.mk includes bsd.subdir.mk via bsd.obj.mk which is responsible
for processing of 'SUBDIR' make variable. But since we are handling
'SUBDIR' here explicitly, doing same thing (second time!) via
bsd.subdir.mk's rules makes no sense and only adds disk IO overhead.
It reduces install recursive calls by factor 4.
in the docproj port. TEX, LATEX, PDFTEX, JADETEX, and PDFJADETEX
has been renamed to TEX_CMD, LATEX_CMD, PDFTEX_CMD, JADETEX_CMD, and
PDFJADETEX_CMD for consistency. And TEXCMDS has been renamed
TEX_CMDSEQ because TEXCMDS and TEX_CMD are misleading names.
Discussed on: -doc
- The structure of transtable.xml is revised. <word> should be
bracketed with <group>.
- A sorting order of the FreeBSD mirror sites rendered using
mirrors.xml has been determined by sort(1).
- A template "transtable-lookup" has been added for localization on
word-by-word basis.
- Replace English month names in news.xml, press.xml, and
advisories.xml with numbers that correspond to the names.
The number->name translation is performed on the fly.
- Since information in mirrors.xml is used in www/ tree, it depends on
doc/ tree now. When WITHOUT_DOC is defined it can be built without
doc/ tree, but some information becomes unavailable. For example,
a list of the mirror sites generated in index.html becomes a dummy
one, and calling "transtable-lookup" with a word returns the word
itself.
Neither www/ nor doc/ build should be broken due to this commit, but
until the necessary changes are applied in the localized directories,
the transtable does not work; it simply generates non-localized contents
even if transtable.xsl is used.
- add doc.common.mk, which defines variables, targets, and
dependencies commonly used in www/ and doc/.
- move www/<lang>/includes.xsl to the language independent
directory and split into several files.
- add transtable*.xsl and transtable.xml to support localized
mirror names.
- make doc/{en_US.ISO8859-1,ja_JP.eucJP}/books/handbook/ use
mirrors.xml (mirrors and eresources).
- make www/{en,ja}/index.xsl use mirrors.xml.
For details, please see doc/share/sgml/README.mirrors for the moment.
Reviewed by: simon and Alex Dupre <sysadmin@alexdupre.com>
the lines at column 90, instead of the default 68. This makes the
resulting HTML considerably smaller.
The change also band-aid a problem where Tidy wrap lines which shouldn't
have been wrapped. This can cause extra spaces in the resulting HTML,
e.g. resulting in "( audio/lame)" instead of "(audio/lame)".
Discussed on: -doc
required symbols, by setting the make variable
WITH_ALL_TRADEMARK_SYMBOLS, to any non empty value.
This feature is mainly useful for document writers, to make sure all
trademarks are marked up correctly.
empty and unclosed tags. I used the word "should" because sometimes it
does not work, however most of malformed tags are found now.
That idea came after a talk with Denis Peplin.
bsd.obj.mk already includes bsd.subdir.mk so there is no need
to include it twice.
PR: 52540
Submitted by: "Simon L.Nielsen" <simon@nitro.dk>
Tested with: cd doc/ && make
<indexterms> are sparse. Also add makefile glue so that this may be
invoked on the Handbook or any other document in the FDP tree by
typing "make indexcheck".
Sponsored by: FreeBSD Mall, Inc.
enable it in en_US.ISO8859-1/ and ja_JP.eucJP/.
- Add PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
and l10n.ent for entity localization.
- Use share/misc/docbook.css for indentiation of <programlisting>
and <screen>.
- Add some missing $FreeBSD$.
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
- WITH_INLINE_LEGALNOTICE (for HTML only):
do not render <legalnotice> as a separate file if defined.
- WITH_ARTICLE_TOC:
generate TOC for documents whose root element is <article> if defined.
- WITH_BIBLIOXREF_TITLE:
for cross references to bibliography entries, use the title of
the entry as the cross reference text, if defined.
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.
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
Add support for using the XSL stylesheets to generate HTML output using
XSLT transforms, rather than using JadeTeX. So (assuming you have
installed xsltproc from ports/textproc/libxslt, and the docbook-xsl
stylesheets), you can now do
make STYLESHEET_TYPE=xsl FORMATS=html
and get HTML output that way.
