From: <ai...@us...> - 2013-08-20 19:10:11
|
Revision: 12492 http://sourceforge.net/p/plplot/code/12492 Author: airwin Date: 2013-08-20 19:10:05 +0000 (Tue, 20 Aug 2013) Log Message: ----------- Make stylesheet.css configurable with a separate template file for the -DDOCBOOK_XML_BACKEND=OFF and (default) -DDOCBOOK_XML_BACKEND=ON cases. The -DDOCBOOK_XML_BACKEND=OFF case is untested but should work since the changes are pretty trivial. The -DDOCBOOK_XML_BACKEND=ON case has been tested and shows the desired coloured output for the TABLE.funcprototype-table and .variablelist parts of the api documentation that occurs in the many links from the API chapter. Tested by Alan W. Irwin <ai...@us...> using the scripts/generate_website.sh scripts. Modified Paths: -------------- trunk/doc/docbook/src/CMakeLists.txt trunk/doc/docbook/src/plplotdoc-html.xsl.in Added Paths: ----------- trunk/doc/docbook/src/stylesheet.css.dsssl.in trunk/doc/docbook/src/stylesheet.css.xsl.in Removed Paths: ------------- trunk/doc/docbook/src/stylesheet.css Modified: trunk/doc/docbook/src/CMakeLists.txt =================================================================== --- trunk/doc/docbook/src/CMakeLists.txt 2013-08-20 17:16:26 UTC (rev 12491) +++ trunk/doc/docbook/src/CMakeLists.txt 2013-08-20 19:10:05 UTC (rev 12492) @@ -305,6 +305,12 @@ ${CMAKE_CURRENT_BINARY_DIR}/${STYLESHEET_HTML} @ONLY ) + + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/stylesheet.css.xsl.in + ${CMAKE_CURRENT_BINARY_DIR}/stylesheet.css + ) + set(HTML_TMPDIR ${CMAKE_CURRENT_BINARY_DIR}/html) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${HTML_MANIFEST} @@ -410,6 +416,12 @@ ${CMAKE_CURRENT_SOURCE_DIR}/${STYLESHEET_HTML_IN} ${CMAKE_CURRENT_BINARY_DIR}/${STYLESHEET_HTML} ) + + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/stylesheet.css.dsssl.in + ${CMAKE_CURRENT_BINARY_DIR}/stylesheet.css + ) + add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${HTML_MANIFEST} COMMAND ${OPENJADE} -b utf-8 @@ -652,7 +664,7 @@ endif(BUILD_MAN OR PREBUILT_DOC) if(BUILD_HTML OR PREBUILT_DOC) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HTML_MANIFEST} stylesheet.css DESTINATION ${DOC_DIR}/html ) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HTML_MANIFEST} ${CMAKE_CURRENT_BINARY_DIR}/stylesheet.css DESTINATION ${DOC_DIR}/html ) install(CODE " # Suppress empty element warning. cmake_policy(SET CMP0007 NEW) @@ -713,10 +725,12 @@ COMMAND rm -rf ${BASE_HTML} COMMAND mkdir ${BASE_HTML} COMMAND cp `cat ${HTML_MANIFEST}` ${BASE_HTML} - COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/stylesheet.css ${BASE_HTML} + COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/stylesheet.css ${BASE_HTML} COMMAND tar cfz ${HTML_TARBALL} ${BASE_HTML} COMMAND rm -rf ${BASE_HTML} - DEPENDS ${HTML_MANIFEST} ${CMAKE_CURRENT_SOURCE_DIR}/stylesheet.css + DEPENDS + ${HTML_MANIFEST} + ${CMAKE_CURRENT_BINARY_DIR}/stylesheet.css ) set(tarball_list Modified: trunk/doc/docbook/src/plplotdoc-html.xsl.in =================================================================== --- trunk/doc/docbook/src/plplotdoc-html.xsl.in 2013-08-20 17:16:26 UTC (rev 12491) +++ trunk/doc/docbook/src/plplotdoc-html.xsl.in 2013-08-20 19:10:05 UTC (rev 12492) @@ -45,5 +45,6 @@ <xsl:param name="chunk.quietly" select="1"/> <xsl:param name="use.id.as.filename" select="1"/> +<xsl:param name="html.stylesheet" select="'stylesheet.css'"/> </xsl:stylesheet> Deleted: trunk/doc/docbook/src/stylesheet.css =================================================================== --- trunk/doc/docbook/src/stylesheet.css 2013-08-20 17:16:26 UTC (rev 12491) +++ trunk/doc/docbook/src/stylesheet.css 2013-08-20 19:10:05 UTC (rev 12492) @@ -1,68 +0,0 @@ -/* - HTML Cascade Style Sheet file for the PLplot documentation in Docbook - - Copyright (C) 2004 Rafael Laboissiere - - Redistribution and use in source (XML DocBook) and "compiled" forms - (HTML, PDF, PostScript, DVI, TeXinfo and so forth) with or without - modification, are permitted provided that the following conditions are - met: - - 1. Redistributions of source code (XML DocBook) must retain the - above copyright notice, this list of conditions and the following - disclaimer as the first lines of this file unmodified. - - 2. Redistributions in compiled form (transformed to other DTDs, - converted to HTML, PDF, PostScript, and other formats) must - reproduce the above copyright notice, this list of conditions and - the following disclaimer in the documentation and/or other - materials provided with the distribution. - - Important: THIS DOCUMENTATION IS PROVIDED BY THE PLPLOT PROJECT "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PLPLOT PROJECT BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, - EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -SPAN.underline { text-decoration: underline } -SPAN.overline { text-decoration: overline } - -TABLE.funcprototype { - width: 90%; - margin-top: 5px; - margin-bottom: 5px; - margin-left: 5%; - margin-right: 5%; - border: solid 1px; - background: #D6E8FF; - padding: 5px; -} - -TABLE.variablelist { - width: 90%; - margin-top: 5px; - margin-bottom: 5px; - margin-left: 5%; - margin-right: 5%; - border: solid 1px; - background: #FFF0D0; - padding: 5px; -} - -.verbatim { - width: 90%; - margin-top: 5px; - margin-bottom: 5px; - margin-left: 5%; - margin-right: 5%; - border: solid 1px; - background: #E0FFE0; - padding: 5px; -} Copied: trunk/doc/docbook/src/stylesheet.css.dsssl.in (from rev 12482, trunk/doc/docbook/src/stylesheet.css) =================================================================== --- trunk/doc/docbook/src/stylesheet.css.dsssl.in (rev 0) +++ trunk/doc/docbook/src/stylesheet.css.dsssl.in 2013-08-20 19:10:05 UTC (rev 12492) @@ -0,0 +1,68 @@ +/* + HTML Cascade Style Sheet file for the PLplot documentation in Docbook + + Copyright (C) 2004 Rafael Laboissiere + + Redistribution and use in source (XML DocBook) and "compiled" forms + (HTML, PDF, PostScript, DVI, TeXinfo and so forth) with or without + modification, are permitted provided that the following conditions are + met: + + 1. Redistributions of source code (XML DocBook) must retain the + above copyright notice, this list of conditions and the following + disclaimer as the first lines of this file unmodified. + + 2. Redistributions in compiled form (transformed to other DTDs, + converted to HTML, PDF, PostScript, and other formats) must + reproduce the above copyright notice, this list of conditions and + the following disclaimer in the documentation and/or other + materials provided with the distribution. + + Important: THIS DOCUMENTATION IS PROVIDED BY THE PLPLOT PROJECT "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PLPLOT PROJECT BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, + EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +SPAN.underline { text-decoration: underline } +SPAN.overline { text-decoration: overline } + +TABLE.funcprototype { + width: 90%; + margin-top: 5px; + margin-bottom: 5px; + margin-left: 5%; + margin-right: 5%; + border: solid 1px; + background: #D6E8FF; + padding: 5px; +} + +TABLE.variablelist { + width: 90%; + margin-top: 5px; + margin-bottom: 5px; + margin-left: 5%; + margin-right: 5%; + border: solid 1px; + background: #FFF0D0; + padding: 5px; +} + +.verbatim { + width: 90%; + margin-top: 5px; + margin-bottom: 5px; + margin-left: 5%; + margin-right: 5%; + border: solid 1px; + background: #E0FFE0; + padding: 5px; +} Added: trunk/doc/docbook/src/stylesheet.css.xsl.in =================================================================== --- trunk/doc/docbook/src/stylesheet.css.xsl.in (rev 0) +++ trunk/doc/docbook/src/stylesheet.css.xsl.in 2013-08-20 19:10:05 UTC (rev 12492) @@ -0,0 +1,68 @@ +/* + HTML Cascade Style Sheet file for the PLplot documentation in Docbook + + Copyright (C) 2004 Rafael Laboissiere + + Redistribution and use in source (XML DocBook) and "compiled" forms + (HTML, PDF, PostScript, DVI, TeXinfo and so forth) with or without + modification, are permitted provided that the following conditions are + met: + + 1. Redistributions of source code (XML DocBook) must retain the + above copyright notice, this list of conditions and the following + disclaimer as the first lines of this file unmodified. + + 2. Redistributions in compiled form (transformed to other DTDs, + converted to HTML, PDF, PostScript, and other formats) must + reproduce the above copyright notice, this list of conditions and + the following disclaimer in the documentation and/or other + materials provided with the distribution. + + Important: THIS DOCUMENTATION IS PROVIDED BY THE PLPLOT PROJECT "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PLPLOT PROJECT BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, + EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +SPAN.underline { text-decoration: underline } +SPAN.overline { text-decoration: overline } + +TABLE.funcprototype-table { + width: 90%; + margin-top: 5px; + margin-bottom: 5px; + margin-left: 5%; + margin-right: 5%; + border: solid 1px; + background: #D6E8FF; + padding: 5px; +} + +.variablelist { + width: 90%; + margin-top: 5px; + margin-bottom: 5px; + margin-left: 5%; + margin-right: 5%; + border: solid 1px; + background: #FFF0D0; + padding: 5px; +} + +.verbatim { + width: 90%; + margin-top: 5px; + margin-bottom: 5px; + margin-left: 5%; + margin-right: 5%; + border: solid 1px; + background: #E0FFE0; + padding: 5px; +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |