done with Handbook and building pdf directly does not seem to work
correctly anyway. This change will help simplifying the build process
and spare some image conversions.
This is useful when running lint from upper directories. Otherwise,
a validation error would not cause make to halt and an error could
remain unspotted.
this was that 'SGMLFLAGS' had to be changed to 'XMLFLAGS' in
share/mk/doc.docbook.mk so that everything continued to build OK.
Approved by: gabor (mentor)
www.freebsd.org/security/{advisories,patches}/...
from the en_US.ISO8859-1 directory as we do for logos, etc.
The magic is a bit special to avoid having to add each advisory
or errata notice, and their patches and signatures individually.
Factor out the slightly different to bsd.links.mk SYMLINKS
support as well as the "bulk data install" that cannot be
handled by just DATA as (i) the input dir differs, (ii) input
uses a 1 or more level of sub-directories.
This is the second of three steps. The last one will be to link
to these files locally rather than to security.freebsd.org.
Approved by: gabor
The web build uses WEBGRP and CGIGRP to determine group ownership
during the build phase. When left unset, the default group is 'www'.
The problem is that if $USER is not in group 'www', the build will
fail due to lack of permissions via chgrp(1).
This change sets default values for WEBGRP and CGIGRP to $USER, unless
explicitly set during build time to prevent chgrp(1)-invoked build
failure.
Note: This change has no effect for users currently setting WEBGRP
and CGIGRP, either via command-line or within scripts.
Reviewed by: -www@ (silence)
time on the bottom of each page:
Last modified: 2010/05/09 21:07:40
Since the move to Subversion, the $FreeBSD$ string is slightly different
and so the code that does this no longer works correctly, causing the
output appears as:
Last modified: 38826 2012-05-17
Arguably, having the SVN revision number in the output is useful,
however this wasn't intentional - and instead appears to be an
oversight.
This change both fixes the missing date and adds extra information,
producing the following output:
Last modified: 2012-05-17 19:12:14Z
(head/en_US.ISO8859-1/htdocs/internet.sgml r38826)
Adding the path to the source file will hopefully make it much easier
for people wishing to contribute to the page to find the source
Approved by: bcr (mentor)
M mk/web.site.mk
- Move files under <lang>/htdocs/share to <lang>/share.
- s/WEB_PREFIX/DOC_PREFIX/
- Update the webupdate script to use the SVN repository.
Approved by: doceng (implicit)
result of <script> end tag by the DSSSL stylesheet was </script\n> to avoid
unnecessary spaces after the tag, most of the www browsers and HTML
processors cannot recognize it as the end of <script>. To workaround this,
($user-html-headers$) now outputs the start and the end tag independently
in each single line.
- Add %html-header-script% to control if <script> is included in <head>.
- Add html.header.script.google knob for SGML and XML documents in non-DocBook
DTD. %html.header.script.google; and $html.header.script.google.
- Add WWWFREEBSDORG make(1) knob to control the <script> inclusion. Note that
<script> is disabled temporarily.
Discussed with: gjb and core
Tested by: gjb
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)
This change eliminates O(2^N)-1 passes through the individual documents,
where N is the number of levels of directory hierarchy. For a
"make install" from the top level of the doc/ tree, files corresponding
to individual documents were being installed eight (!!!) times.
Reviewed by: trhodes, Szilveszter Adam
activate it instead of using a static &base;. Since an .xml database file
(or an .xslt stylesheet file) is used from various directories, the static
&base; no longer works.
PR: www/102331
- Add NO_{TEX,PLAINTEXT,RTF} and NO_{TEX,PLAINTEXT,RTF}_LANG knobs not to
build or install broken files[*].
Suggested by: alex.istra at rambler dot ru[*]
- 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.
