diff options
Diffstat (limited to 'release/doc/share')
| -rw-r--r-- | release/doc/share/mk/doc.relnotes.mk | 9 | ||||
| -rw-r--r-- | release/doc/share/xml/catalog | 15 | ||||
| -rw-r--r-- | release/doc/share/xml/catalog.xml | 5 | ||||
| -rw-r--r-- | release/doc/share/xml/default.dsl | 14 | ||||
| -rw-r--r-- | release/doc/share/xml/release.dsl | 225 | ||||
| -rw-r--r-- | release/doc/share/xml/release.ent | 11 | ||||
| -rw-r--r-- | release/doc/share/xml/release.xsl | 60 |
7 files changed, 75 insertions, 264 deletions
diff --git a/release/doc/share/mk/doc.relnotes.mk b/release/doc/share/mk/doc.relnotes.mk index 19247ac..8034c63 100644 --- a/release/doc/share/mk/doc.relnotes.mk +++ b/release/doc/share/mk/doc.relnotes.mk @@ -4,6 +4,8 @@ DOC_PREFIX?= ${RELN_ROOT}/../../../doc # XXX RELEASETYPE!= grep -o 'release.type "[a-z]*"' ${RELN_ROOT}/share/xml/release.ent | sed 's|[a-z.]* "\([a-z]*\)"|\1|' +RELEASEURL!= grep -o 'release.url \"[^\"]*\"' ${RELN_ROOT}/share/xml/release.ent | sed 's|[^ ]* "\([^"]*\)"|\1|' +RELEASEBRANCH!= grep -o 'release.branch "\([^"]*\)"' ${RELN_ROOT}/share/xml/release.ent | sed 's|[^ ]* "\([^"]*\)"|\1|' .if ${RELEASETYPE} == "current" PROFILING+= --param profile.attribute "'releasetype'" --param profile.value "'current'" .elif ${RELEASETYPE} == "snapshot" @@ -11,13 +13,14 @@ PROFILING+= --param profile.attribute "'releasetype'" --param profile.value "'sn .elif ${RELEASETYPE} == "release" PROFILING+= --param profile.attribute "'releasetype'" --param profile.value "'release'" .endif +XSLTPROCFLAGS+= --param release.url "'${RELEASEURL}'" +XSLTPROCFLAGS+= --param release.branch "'${RELEASEBRANCH}'" # Find the RELNOTESng document catalogs EXTRA_CATALOGS+= file://${RELN_ROOT}/${LANGCODE}/share/xml/catalog.xml \ - file://${RELN_ROOT}/share/xml/catalog.xml + file://${RELN_ROOT}/share/xml/catalog.xml -# Use the appropriate architecture-dependent RELNOTESng stylesheet -DSLPRINT?= ${RELN_ROOT}/share/xml/default.dsl +XSLXHTML= http://www.FreeBSD.org/release/XML/share/xml/release.xsl # # Automatic device list generation: diff --git a/release/doc/share/xml/catalog b/release/doc/share/xml/catalog deleted file mode 100644 index 3f91cf0..0000000 --- a/release/doc/share/xml/catalog +++ /dev/null @@ -1,15 +0,0 @@ - -- FreeBSD SGML Public Identifiers -- - -- Release-specific -- - - -- $FreeBSD$ -- - -PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" - "release.ent" - -PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Language Neutral Stylesheet//EN" - "release.dsl" - -PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Stylesheet//EN" - "../../en_US.ISO8859-1/share/xml/release.dsl" - - diff --git a/release/doc/share/xml/catalog.xml b/release/doc/share/xml/catalog.xml index 6eee6d9..c4e04b6 100644 --- a/release/doc/share/xml/catalog.xml +++ b/release/doc/share/xml/catalog.xml @@ -1,6 +1,11 @@ <?xml version="1.0"?> <!-- $FreeBSD$ --> <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> + <rewriteSystem systemIdStartString="http://www.FreeBSD.org/release/XML/" + rewritePrefix="../../"/> + <rewriteURI uriStartString="http://www.FreeBSD.org/release/XML/" + rewritePrefix="../../"/> + <public publicId="-//FreeBSD//ENTITIES Release Specification//EN" uri="release.ent"/> <public publicId="-//FreeBSD//ENTITIES Auto Generated Device Lists//EN" uri="dev-auto.ent"/> </catalog> diff --git a/release/doc/share/xml/default.dsl b/release/doc/share/xml/default.dsl deleted file mode 100644 index 58d8231..0000000 --- a/release/doc/share/xml/default.dsl +++ /dev/null @@ -1,14 +0,0 @@ -<!-- $FreeBSD$ --> - -<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [ -<!ENTITY release.dsl PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Stylesheet//EN" CDATA DSSSL> -]> - -<style-sheet> - <style-specification use="docbook"> - <style-specification-body> - </style-specification-body> - </style-specification> - - <external-specification id="docbook" document="release.dsl"> -</style-sheet> diff --git a/release/doc/share/xml/release.dsl b/release/doc/share/xml/release.dsl deleted file mode 100644 index 66e9ae2..0000000 --- a/release/doc/share/xml/release.dsl +++ /dev/null @@ -1,225 +0,0 @@ -<!-- $FreeBSD$ --> - -<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [ -<!ENTITY % output.html "IGNORE"> -<!ENTITY % output.print "IGNORE"> -<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN" CDATA DSSSL> -<!ENTITY % release.ent PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN"> -%release.ent; -]> - -<style-sheet> - <style-specification use="docbook"> - <style-specification-body> - -; String manipulation functions -(define (split-string-to-list STR) - ;; return list of STR separated with char #\ or #\, - (if (string? STR) - (let loop ((i (string-delim-index STR))) - (cond ((equal? (cdr i) '()) '()) - (else (cons (substring STR (list-ref i 0) (- (list-ref i 1) 1)) - (loop (cdr i)))))) - '())) - -(define (string-delim-index STR) - ;; return indexes of STR separated with char #\ or #\, - (if (string? STR) - (let ((strlen (string-length STR))) - (let loop ((i 0)) - (cond ((= i strlen) (cons (+ strlen 1) '())) - ((= i 0) (cons i (loop (+ i 1)))) - ((or (equal? (string-ref STR i) #\ ) - (equal? (string-ref STR i) #\,)) (cons (+ i 1) (loop (+ i 1)))) - (else (loop (+ i 1)))))) - '() - )) - -(define (string-list-match? STR STR-LIST) - (let loop ((s STR-LIST)) - (cond - ((equal? s #f) #f) - ((equal? s '()) #f) - ((equal? (car s) #f) #f) - ((equal? STR (car s)) #t) - (else (loop (cdr s)))))) - -; We might have some sect1 level elements where the modification times -; are significant. An example of this is the "What's New" section in -; the release notes. We enable the printing of pubdate entry in -; sect1info elements to support this. -(element (sect1info pubdate) (process-children)) - - <![ %output.print; [ -; Put URLs in footnotes, and put footnotes at the bottom of each page. - (define bop-footnotes #t) - (define %footnote-ulinks% #t) - - (define ($paragraph$) - (let ((arch (attribute-string (normalize "arch"))) - (role (attribute-string (normalize "role"))) - (arch-string (entity-text "arch")) - (merged-string (entity-text "merged"))) - (if (or (equal? (print-backend) 'tex) - (equal? (print-backend) #f)) - ;; avoid using country: characteristic because of a JadeTeX bug... - (make paragraph - first-line-start-indent: (if (is-first-para) - %para-indent-firstpara% - %para-indent%) - space-before: %para-sep% - space-after: (if (INLIST?) - 0pt - %para-sep%) - quadding: %default-quadding% - hyphenate?: %hyphenation% - language: (dsssl-language-code) - (make sequence - (cond - ;; If arch= not specified, then print unconditionally. This clause - ;; handles the majority of cases. - ((or (equal? arch #f) - (equal? arch "") - (equal? arch "all")) - (process-children-trim)) - (else - (make sequence - (literal "[") - (let loop ((prev (car (split-string-to-list arch))) - (rest (cdr (split-string-to-list arch)))) - (make sequence - (literal prev) - (if (not (null? rest)) - (make sequence - (literal ", ") - (loop (car rest) (cdr rest))) - (empty-sosofo)))) - (literal "] ") - (process-children-trim)))) - (if (and (not (null? role)) (equal? role "merged")) - (literal " [" merged-string "]") - (empty-sosofo)))) - (make paragraph - first-line-start-indent: (if (is-first-para) - %para-indent-firstpara% - %para-indent%) - space-before: %para-sep% - space-after: (if (INLIST?) - 0pt - %para-sep%) - quadding: %default-quadding% - hyphenate?: %hyphenation% - language: (dsssl-language-code) - country: (dsssl-country-code) - (make sequence - (cond - ;; If arch= not specified, then print unconditionally. This clause - ;; handles the majority of cases. - ((or (equal? arch #f) - (equal? arch "") - (equal? arch "all")) - (process-children-trim)) - (else - (make sequence - (literal "[") - (let loop ((prev (car (split-string-to-list arch))) - (rest (cdr (split-string-to-list arch)))) - (make sequence - (literal prev) - (if (not (null? rest)) - (make sequence - (literal ", ") - (loop (car rest) (cdr rest))) - (empty-sosofo)))) - (literal "] ") - (process-children-trim)))) - (if (and (not (null? role)) (equal? role "merged")) - (literal " [" merged-string "]") - (empty-sosofo))))))) - ]]> - - <![ %output.html; [ - (define %callout-graphics% - ;; Use graphics in callouts? - #f) - - <!-- Convert " ... " to `` ... '' in the HTML output. --> - (element quote - (make sequence - (literal "“") - (process-children) - (literal "”"))) - - <!-- Specify how to generate the man page link HREF --> - (define ($create-refentry-xref-link$ #!optional (n (current-node))) - (let* ((r (select-elements (children n) (normalize "refentrytitle"))) - (m (select-elements (children n) (normalize "manvolnum"))) - (v (attribute-string (normalize "vendor") n)) - (u (string-append "&release.man.url;?query=" - (data r) "&" "sektion=" (data m)))) - (case v - (("xorg") (string-append u "&" "manpath=Xorg+&release.manpath.xorg;" )) - (("netbsd") (string-append u "&" "manpath=NetBSD+&release.manpath.netbsd;")) - (("ports") (string-append u "&" "manpath=FreeBSD+&release.manpath.freebsd-ports;")) - (else (string-append u "&" "manpath=FreeBSD+&release.manpath.freebsd;"))))) - - ;; $paragraph$ function with arch attribute support. - (define ($paragraph$ #!optional (para-wrapper "P")) - (let ((footnotes (select-elements (descendants (current-node)) - (normalize "footnote"))) - (tgroup (have-ancestor? (normalize "tgroup"))) - (arch (attribute-string (normalize "arch"))) - (role (attribute-string (normalize "role"))) - (arch-string (entity-text "arch")) - (merged-string (entity-text "merged"))) - (make sequence - (make element gi: para-wrapper - attributes: (append - (if %default-quadding% - (list (list "ALIGN" %default-quadding%)) - '())) - (make sequence - (cond - ;; If arch= not specified, then print unconditionally. This clause - ;; handles the majority of cases. - ((or (equal? arch #f) - (equal? arch "") - (equal? arch "all")) - (process-children)) - (else - (sosofo-append - (make sequence - (literal "[") - (let loop ((prev (car (split-string-to-list arch))) - (rest (cdr (split-string-to-list arch)))) - (make sequence - (literal prev) - (if (not (null? rest)) - (make sequence - (literal ", ") - (loop (car rest) (cdr rest))) - (empty-sosofo)))) - (literal "] ") - (process-children))))) - (if (and (not (null? role)) (equal? role "merged")) - (literal " [" merged-string "]") - (empty-sosofo)) - (if (or %footnotes-at-end% tgroup (node-list-empty? footnotes)) - (empty-sosofo) - (make element gi: "BLOCKQUOTE" - attributes: (list - (list "CLASS" "FOOTNOTES")) - (with-mode footnote-mode - (process-node-list footnotes))))))))) - ]]> - - (define (toc-depth nd) - (if (string=? (gi nd) (normalize "book")) - 3 - 3)) - - </style-specification-body> - </style-specification> - - <external-specification id="docbook" document="freebsd.dsl"> -</style-sheet> diff --git a/release/doc/share/xml/release.ent b/release/doc/share/xml/release.ent index 12e77ef..8fb6161 100644 --- a/release/doc/share/xml/release.ent +++ b/release/doc/share/xml/release.ent @@ -6,17 +6,17 @@ <!-- Version of the OS we're describing. This needs to be updated with each new release. --> -<!ENTITY release.current "10.0-RELEASE"> +<!ENTITY release.current "10.0-STABLE"> <!-- The previous version used for comparison in the "What's New" section. For -CURRENT, we might point back to the last branchpoint. --> -<!ENTITY release.prev "10.0-CURRENT"> +<!ENTITY release.prev "10.0-RELEASE"> <!-- The previous stable release, useful for pointing user's at the release they SHOULD be running if they don't want the bleeding edge. --> -<!ENTITY release.prev.stable "9.2-RELEASE"> +<!ENTITY release.prev.stable "10.0-RELEASE"> <!-- The next version to be released, usually used for snapshots. --> <!ENTITY release.next "10.1-RELEASE"> @@ -52,7 +52,7 @@ <!ENTITY release.manpath.xorg "7.5.1"> <!ENTITY release.manpath.netbsd "5.1"> <!ENTITY release.manpath.freebsd-ports "Ports"> -<!ENTITY release.manpath.freebsd "10-current"> +<!ENTITY release.manpath.freebsd "10-stable"> <!-- Text constants which probably don't need to be changed.--> @@ -70,6 +70,3 @@ <!ENTITY arch.pc98 "pc98"> <!ENTITY arch.powerpc "powerpc"> <!ENTITY arch.sparc64 "sparc64"> - -<!-- The marker for MFCs. --> -<!ENTITY merged "MERGED"> diff --git a/release/doc/share/xml/release.xsl b/release/doc/share/xml/release.xsl new file mode 100644 index 0000000..787cb28 --- /dev/null +++ b/release/doc/share/xml/release.xsl @@ -0,0 +1,60 @@ +<?xml version="1.0"?> +<!-- $FreeBSD$ --> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + version='1.0' + xmlns="http://www.w3.org/TR/xhtml1/transitional" + xmlns:db="http://docbook.org/ns/docbook" + exclude-result-prefixes="db"> + + <xsl:import href="http://www.FreeBSD.org/XML/share/xml/freebsd-xhtml.xsl"/> + + <xsl:import href="http://www.FreeBSD.org/release/XML/lang/share/xml/release.xsl"/> + + <xsl:param name="release.url"/> + <xsl:param name="release.branch"/> + + <xsl:template name="paragraph"> + <xsl:param name="class" select="''"/> + <xsl:param name="content"/> + + <xsl:variable name="p"> + <p> + <xsl:choose> + <xsl:when test="$class != ''"> + <xsl:call-template name="common.html.attributes"> + <xsl:with-param name="class" select="$class"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="locale.html.attributes"/> + </xsl:otherwise> + </xsl:choose> + <xsl:if test="@arch"> + <xsl:value-of select="concat('[', @arch, ']')"/> + <xsl:value-of select='" "'/> + </xsl:if> + <xsl:copy-of select="$content"/> + <xsl:value-of select='" "'/> + <xsl:if test="@revision"> + <xsl:element name="a"> + <xsl:attribute name="href"> + <xsl:value-of select="concat('http://svn.freebsd.org/viewvc/base?view=revision&revision=', @revision)"/> + </xsl:attribute> + <xsl:value-of select="concat('[r', @revision, ']')"/> + </xsl:element> + </xsl:if> + </p> + </xsl:variable> + + <xsl:choose> + <xsl:when test="$html.cleanup != 0"> + <xsl:call-template name="unwrap.p"> + <xsl:with-param name="p" select="$p"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:copy-of select="$p"/> + </xsl:otherwise> + </xsl:choose> + </xsl:template> +</xsl:stylesheet> |
