Commit graph

337 commits

Author SHA1 Message Date
Gabor Kovesdan
d55a546a05 - Work around a DocBook XSL bug which lists unexisting files in the
manifest
2013-02-25 20:19:29 +00:00
Gabor Kovesdan
0701bf45bd - Add infrastructure for language-specific XSLT customizations 2013-02-25 20:17:26 +00:00
Gabor Kovesdan
59d4db9584 - Add back SGML catalogs (trimmed to minimally necessary content) since
they are still needed for language-specific DSSSL customizations
2013-02-19 16:14:00 +00:00
Gabor Kovesdan
28d065247c - Fix rendering of Handbook with (Open)Jade 2013-02-18 13:03:19 +00:00
Gabor Kovesdan
f1a9c7762c - Revert r40891 since the created archive has compatibility problems 2013-02-05 10:11:29 +00:00
Gabor Kovesdan
5ab0b5a928 - Also add images to the epub archive 2013-02-05 10:02:36 +00:00
Gabor Kovesdan
f91ca3af36 - Use bsdtar to create zip archives
Submitted by:	hrs
2013-02-05 09:39:04 +00:00
Gabor Kovesdan
a06603e1e8 - MFH 2013-02-05 09:14:34 +00:00
Gabor Kovesdan
5be9852003 - Better categorize and sort 2013-02-04 09:41:53 +00:00
Gabor Kovesdan
49010f9fab - Do not pass unused XSLT params
- Remove some conditionals since we always use XML catalogs
2013-02-04 09:05:59 +00:00
Gabor Kovesdan
f8e80d75f9 - Include command macros
- Drop some obsolete SGML constructs
2013-02-03 21:28:23 +00:00
Gabor Kovesdan
2f0c94a684 - Do not pass the --catalogs option to xmllint/xsltproc since we don't
have SGML catalogs any more
2013-02-03 21:11:22 +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
Gabor Kovesdan
7919bb16d6 - Remove some rarely used and badly supported features 2013-02-01 19:51:58 +00:00
Gabor Kovesdan
3a1f4b3005 - Build index in the DocBook XSL way 2013-02-01 19:50:33 +00:00
Gabor Kovesdan
3327cf64d4 - Remove HTML Tidy leftovers 2013-02-01 18:51:52 +00:00
Gabor Kovesdan
90daffe2e7 - Remove some SGML leftovers 2013-02-01 18:45:41 +00:00
Gabor Kovesdan
3a2d8092b9 - Clean up leftovers after make lint 2013-02-01 17:37:53 +00:00
Gabor Kovesdan
e1fa809a80 - There is no need for XInclude processing at the point when xsltproc is
called
2013-02-01 13:21:13 +00:00
Gabor Kovesdan
5a8e3a368d - Properly validate and process XInclude 2013-02-01 13:03:24 +00:00
Gabor Kovesdan
33e89a267c - Always parse the documentation first and use the parsed XML
- s/PDFENGINE/RENDERENGINE/ and add support for generating .rtf with FOP
2013-02-01 11:04:50 +00:00
Gabor Kovesdan
a3c89a1805 - Use exclusively the XML catalogs and drop the old SGML format 2013-02-01 09:48:25 +00:00
Gabor Kovesdan
9162098876 - Parse the documents with XML tools before passing them to Jade and turn off
Jade validation.  This will let us keep using Jade for printed output
  rendering and dropping old SGML constructs at the same time.
2013-02-01 09:18:30 +00:00
Gabor Kovesdan
249ab2480a - Add experimental support for FOP-based PDF and PS rendering 2013-01-31 10:27:59 +00:00
Gabor Kovesdan
2a1cbc680d - Add epub to KNOWN_FORMATS 2013-01-31 10:15:46 +00:00
Gabor Kovesdan
d891a25dc5 - Make sure all source files are ready before validation
- Make sure all source files are ready before building
- Clean up the workarounds from handbook Makefiles
2013-01-31 09:55:07 +00:00
Gabor Kovesdan
3a9b83582b - Use XInclude to include text files instead of <inlinegraphic> since such
inclusion is not supported in standard XSLT and xsltproc provides no
  extensions for that
2013-01-30 20:11:31 +00:00
Gabor Kovesdan
ebeaccc19d - Add support for epub generation 2013-01-30 16:36:59 +00:00
Gabor Kovesdan
651943c7e4 - Generate html and html-split with XSLT rather than DSSSL
- Good bye HTML Tidy
2013-01-30 16:19:08 +00:00
Gabor Kovesdan
a1c12382a0 - Restore support for make lint
- Validation is now actually XML validation
2013-01-21 17:31:17 +00:00
Hiroki Sato
4654052202 Fix a typo in the dependency detection. It ignored all of *.ent files
accidentally.
2012-11-03 21:16:08 +00:00
Isabell Long
2be1e25fc2 Replace 'SGML' with 'XML' in Makefile code and comments. A consequence of
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)
2012-10-06 17:52:37 +00:00
Gabor Kovesdan
77d737ee88 - Rename the share/sgml directories to share/xml
- Fix build errors from the next change

Approved by:	doceng (implicit)
2012-10-01 11:56:00 +00:00
Gabor Kovesdan
b4346b9b2d - Rename .sgml files to .xml
- Reflect the rename in referencing files

Approved by:	doceng (implicit)
2012-10-01 09:53:01 +00:00
Bjoern A. Zeeb
8a1a59e2f5 Hook-up advistories and patches to be installed to
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
2012-09-17 08:42:56 +00:00
Gabor Kovesdan
3d401ef124 - The trademarks.html file is now generated with a lower-case filename,
reflact that

Submitted by:	ebrandi (via private mail)
2012-09-16 18:26:39 +00:00
Hiroki Sato
82e24f3e86 Suppress HTML Tidy's version string output. 2012-09-14 15:35:18 +00:00
Gabor Kovesdan
bfb29d953f MFH
Approved by:	doceng (implicit)
2012-09-14 09:21:39 +00:00
Glen Barber
1456891f7e Change WEBGRP and CGIGRP defaults.
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)
2012-09-10 10:47:53 +00:00
Gabor Kovesdan
6b67dd8ee6 - The latest version of tidy broke compatibility and expects different
command-line options. It seems that this is the correct fix for the
  earlier problems.

Approved by:	doceng (implicit)
2012-09-03 19:47:51 +00:00
Gabor Kovesdan
1e95d140ac - Add missing closing }
Approved by:	doceng (implicit)
2012-08-30 19:48:29 +00:00
Gabor Kovesdan
38f7e27108 - Fix generation of enbase
Approved by:	doceng (implicit)
2012-08-30 16:51:53 +00:00
Gabor Kovesdan
54596e2fcd - Only drop -raw -preserve tidy flags when the encoding is ISO8859-1.
For other encodings, it caused rendering problems.

Approved by:	doceng (implicit)
2012-08-27 10:15:10 +00:00
Gabor Kovesdan
2e51ec7022 - Strip unnecessary trailing spaces
Approved by:	doceng (implicit)
2012-08-21 19:16:02 +00:00
Gabor Kovesdan
63b92e005c - Remove -preserve -raw from tidy options; it seems it does not
mess up charsets any more with these switches

Approved by:	doceng (implicit)
2012-08-21 09:17:40 +00:00
Gabor Kovesdan
6f0813b25d - For non-English pages generate the enbase entity, as well, not just base
- Remove inline declarations of base and enbase entities since they
  are generated automatically in autogen.ent

Approved by:	doceng (implicit)
2012-08-13 14:22:30 +00:00
Gabor Kovesdan
d7f1fde5eb - Add a cvs:keyword element to store the $FreeBSD$ keyword for later
processing
- Date is now obtained from cvs:keyword, so no need for the sed magic

Approved by:	doceng (implicit)
2012-08-04 22:42:35 +00:00
Gabor Kovesdan
9977e32c49 - Drop HTML Tidy support on webpages; on articles/books it is still used
since the default HTML output is not that clean

Approved by:	doceng (implicit)
2012-08-04 17:56:04 +00:00
Gabor Kovesdan
5b3709a67c - Render pages with the newly added XSLT
- Disable HTML tidy
- Remove old comment

Approved by:	doceng (implicit)
2012-07-15 10:42:40 +00:00
Gabor Kovesdan
26807ec6ea - Add XML declaration to Jade
- Use xmllint for validation

Approved by:	doceng (implicit)
2012-06-21 15:48:59 +00:00
Gavin Atkinson
42398b4fce In the old CVS world, web pages would end up with the modified date and
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
2012-05-26 00:08:00 +00:00
Hiroki Sato
372160a46e s/WWW_LANGCODE/LANGCODE/ for localized news.xml.
Spotted by:	ryusuke
2012-05-23 01:41:08 +00:00
Hiroki Sato
04627121fa Simplifiy DOC_PREFIX_REL.
Approved by:	doceng (implicit)
2012-05-17 21:57:53 +00:00
Hiroki Sato
a11323de18 Fix DOC_PREFIX_REL for English version.
Approved by:	doceng (implicit)
2012-05-17 20:49:11 +00:00
Hiroki Sato
89a02c01d7 Fix &base; definition and add DOC_PREFIX_REL for autogen.ent.
Approved by:	doceng (implicit)
2012-05-17 20:21:00 +00:00
Hiroki Sato
35babe0ae5 - Set svn:ketwords and svn:mime-type. Note that application/octet-stream is
set on some files as a workaround for binary check.
- Fix pathname for svn co in the webupdate script.

Approved by:	doceng (implicit)
2012-05-17 19:12:14 +00:00
Hiroki Sato
4fe414e55f - Move developers.sgml to the language-independent directory.
- 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)
2012-05-17 03:23:15 +00:00
Hiroki Sato
290385d7cd Prevent generation of foo.html-e files. 2012-02-11 17:59:46 +00:00
Hiroki Sato
a3e34ae400 - Fix ($user-html-header$) to support <script src="foo">. While the rendered
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
2012-01-31 02:01:32 +00:00
Warren Block
747f2d46e6 Add a workaround to prevent Tidy from converting tabs to spaces
by converting them to &#09; before Tidy gets them.  Then Tidy
converts them back to real tabs, not spaces.

Reviewed by:	hrs, gjb
2012-01-29 07:25:49 +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
2030a127a3 Update DEPENDSET.events to support the split events.xml.
Spotted by:	jkois
2011-08-09 06:32:50 +00:00
Ulrich Spörlein
de198ef68d Typo and spelling fixes. 2011-05-15 20:41:31 +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
Murray Stokely
5adf9b1a1f Add past events XSL template. 2008-06-22 23:14:33 +00:00
Murray Stokely
a15c311719 Generate RSS 2.0 feed of FreeBSD in the Press stories.
PR:		www/113112
2008-01-16 08:21:47 +00:00
Murray Stokely
ed06c31652 Unbreak the web build in the -DWITH_DOC case by adding the same new
RSS XSLT defines here as in www/share/sgml/doc.xml.mk.
2008-01-07 10:08:29 +00:00
Bruce A. Mah
c90f3cf5c0 Eliminate duplicate traversal of directories in realinstall target.
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
2006-11-09 04:23:14 +00:00
Bruce A. Mah
98461ae9b3 Define ${SED} if it wasn't defined already...weird things were
happening if some other Makefile snippet didn't already define this.

Reviewed by:	hrs
2006-11-02 18:58:17 +00:00
Hiroki Sato
7bdf55bbde Add missing dependencies.
Spotted by:	ceri and simon
2006-09-22 21:05:04 +00:00
Hiroki Sato
10491c663b Fix doc tree build without the www tree.
Spotted by:	simon
2006-08-22 09:25:05 +00:00
Hiroki Sato
764a355ca7 Implement dynamic generation of &base; entity for XML documents and
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
2006-08-21 18:27:43 +00:00
Hiroki Sato
40cf1ee615 Remove navigation dependset. 2006-08-20 06:31:51 +00:00
Hiroki Sato
db0d286055 www cleanup mega commit:
- Clean up XML dependency set.

 - Add "make lint" for validation.
2006-08-19 21:18:54 +00:00
Vanilla I. Shu
b32fc2dead Make Traditional Chinese PDF/PostScript of FreeBSD Documents
PR:		docs/99260
Submitted by:	    Intron <intron@intron.at.ac>
2006-06-24 12:20:46 +00:00
Xin LI
890739d254 Since we can now generate txt files with html2text, remove zh_CN.GB2312
from the NO_PLAINTEXT_LANG list.

Spotted by:	intron at intron dot ac
2006-06-21 15:26:28 +00:00
Hiroki Sato
3ddafa632a Do not remove $XML_MIRRORS* by "make clean" when $LANGCODE=".".
Spotted by:	barbara.xxx1975 at libero dot it
2006-04-24 05:24:41 +00:00
Hiroki Sato
fd7a41a404 - Move build targets for book.{ps,pdf} of the handbook to the LI part.
- 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[*]
2006-04-17 17:50:34 +00:00
Hiroki Sato
3f70c9595b Move build targets for book.{ps,pdf} of the handbook to the LI part. 2006-04-17 17:49:24 +00:00
Hiroki Sato
89a832c5d0 Add JADETEX_PREPROCESS and PDFTEX_PREPROCESS for pre-processing
TeX file.
2006-04-07 14:34:34 +00:00
Xin LI
142d77ead9 Apply RTF fixups which improves our .rtf generation:
- 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
2006-03-22 14:50:30 +00:00
Hiroki Sato
0365ebc8cc Remove -i option and add -wrap 90 option for tidy (in doc.docbook.mk
the -i has been removed due to bad side-effects since 2003).
2006-02-25 23:19:40 +00:00
Xin LI
f16a0c0531 Improve the docbook build infrastructure's index.sgml build process:
- 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)
2005-12-13 08:03:57 +00:00
Xin LI
520a2bc162 Merge some improvements of build infrastructure from the Simplified Chinese
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
2005-12-10 14:02:03 +00:00
Hiroki Sato
36a03b0c94 Fix COMPAT_SYMLINK for ja_JP.eucJP.
Spotted by:	simon
2005-10-05 13:57:35 +00:00
Hiroki Sato
4d406540db Merge changes from www/share/mk. 2005-10-04 17:19:44 +00:00
Hiroki Sato
7dda15a1e0 Disable .ps and .pdf build of some languages---ja_JP.eucJP,
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
2005-09-23 19:38:22 +00:00
Hiroki Sato
a37ca37c91 - Add XML_INCLUDES to DEPENDS.<id> only when it is needed.
- Respect XSLTPROCFLAGS.
2005-09-19 07:01:03 +00:00
Hiroki Sato
3fb588c919 Fix a build breakage when the www tree is unavailable.
Spotted by:	nyan
Pointy hat to:	hrs
2005-09-18 08:19:20 +00:00
Hiroki Sato
341bef6be3 Add localization support for usergroups.xml. 2005-09-18 06:26:47 +00:00
Hiroki Sato
40d1ff2285 Introduce doc.xml.mk and XMLDOCS variable to simplify build
of XML docs.  Note that XML catalog support is still incomplete.
2005-09-18 04:33:25 +00:00
Pav Lucistnik
6a1ea94077 - Rework jade/openjade handling.
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)
2005-08-30 19:32:46 +00:00
Murray Stokely
6f977075d0 Make HTML and PDF targets .OBJDIR clean. 2005-08-29 03:18:58 +00:00
Murray Stokely
af99d2d8b9 Exclude 'CVS' directories when making OpenOffice .sxi files (.sxi
files are just zip files).
2005-08-29 02:50:45 +00:00
Murray Stokely
2f5f2b672d Remove pointless copy of template directory.
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.
2005-08-29 02:44:22 +00:00
Murray Stokely
7b589b1fa8 Add 'sxi' as a known format for the DocBook Slides infrastructure in
/usr/doc/${LANG}/slides.
2005-08-29 02:17:37 +00:00
Hiroki Sato
ab448daacd Add $X[MS]L_USERGROUP for usergroup.xml. 2005-07-16 09:58:33 +00:00
Hiroki Sato
c4f8b70665 Add a comment that explains why ${PREFIX}/share/texmf-dist/LICENSE.texmf
should be checked.

Suggested by:	simon
2005-02-20 17:14:25 +00:00
Hiroki Sato
d35150017e Add teTeX 3.0 support. This change should fix the "Fatal format file
error; I'm stymied" problem when $FORMATS is specified as "dvi", "ps",
and/or "pdf".

Spotted by:	marck
2005-02-20 16:54:37 +00:00