|
From: <den...@us...> - 2010-10-04 14:22:57
|
Revision: 7296
http://winmerge.svn.sourceforge.net/winmerge/?rev=7296&view=rev
Author: denisbradford
Date: 2010-10-04 14:22:51 +0000 (Mon, 04 Oct 2010)
Log Message:
-----------
Manually merge doc build changes not included in merge from 2_12 branch
Modified Paths:
--------------
branches/R2_14/Docs/Users/Manual/build/build_common.xsl
branches/R2_14/Docs/Users/Manual/build/build_html.bat
branches/R2_14/Docs/Users/Manual/build/build_html.xsl
Modified: branches/R2_14/Docs/Users/Manual/build/build_common.xsl
===================================================================
--- branches/R2_14/Docs/Users/Manual/build/build_common.xsl 2010-10-02 14:32:33 UTC (rev 7295)
+++ branches/R2_14/Docs/Users/Manual/build/build_common.xsl 2010-10-04 14:22:51 UTC (rev 7296)
@@ -20,8 +20,8 @@
********************************************************************
Changes
Created July 2008
+ 3 Aug 2009: Added 'header.ads' custom template
******************************************************************** -->
-
<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
html/param.xsl parameters
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
@@ -40,6 +40,7 @@
<xsl:param name="chunk.section.depth" select="0" />
<xsl:param name="generate.toc">book toc,title article nop</xsl:param>
<xsl:param name="toc.section.depth">1</xsl:param>
+<xsl:param name="runinhead.default.title.end.punct">:</xsl:param>
<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
common/local.l10n.xml
@@ -48,6 +49,9 @@
<xsl:param name="local.l10n.xml" select="document('')"/>
<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
<l:l10n language="en">
+ <l:context name="xref">
+ <l:template name="section" text="%t"/>
+ </l:context>
<l:context name="xref-number-and-title">
<l:template name="section" text="%t"/>
</l:context>
@@ -57,6 +61,7 @@
<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
html/docbook.xsl
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+<!-- Link to the appropriate css stylesheets -->
<xsl:template name="user.head.content">
<link rel="stylesheet" type="text/css" href="css/all.css" />
<link rel="stylesheet" type="text/css" media="print" href="css/print.css" />
@@ -112,4 +117,31 @@
</span>
</xsl:template>
+<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+WinMerge custom templates
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+<!-- This template adds ads to the top of HTML pages when you use the
+ 'build html withads' command line to generate commercialized
+ pages for the WinMerge web site. -->
+<xsl:template name="header.ads">
+ <div id="ads">
+ <script type="text/javascript"><!--
+ google_ad_client = "pub-1411904495533584";
+ google_ad_width = 728;
+ google_ad_height = 90;
+ google_ad_format = "728x90_as";
+ google_ad_type = "text";
+ google_ad_channel ="";
+ google_color_border = "FFCC00";
+ google_color_bg = "FFFFCC";
+ google_color_link = "0000FF";
+ google_color_text = "000000";
+ google_color_url = "008000";
+ //--></script>
+ <script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
+ </script>
+ </div>
+</xsl:template>
+
+
</xsl:stylesheet>
Modified: branches/R2_14/Docs/Users/Manual/build/build_html.bat
===================================================================
--- branches/R2_14/Docs/Users/Manual/build/build_html.bat 2010-10-02 14:32:33 UTC (rev 7295)
+++ branches/R2_14/Docs/Users/Manual/build/build_html.bat 2010-10-04 14:22:51 UTC (rev 7296)
@@ -3,14 +3,16 @@
call configuration.bat
set docbook_inputfile=..\WinMerge_help.xml
+set tour_inputfile=..\tour\WinMerge_tour.xml
set docbook_use_stylesheet=build_html.xsl
set docbook_outputdir=%docbook_build_path%\html
+set ads=false
if "%1" == "withads" goto withads
if not "%1" == "" goto withadserror
goto start
:withads
-set docbook_use_stylesheet=build_html_withads.xsl
+set ads=true
echo **************************************
echo * The manual includes advertisements *
echo **************************************
@@ -23,7 +25,7 @@
:start
if not exist "%docbook_outputdir%" mkdir "%docbook_outputdir%"
-echo Copy images...
+echo Copy images ...
if not exist "%docbook_outputdir%\images" mkdir "%docbook_outputdir%\images"
copy "..\images\*.gif" "%docbook_outputdir%\images\."
copy "..\images\*.png" "%docbook_outputdir%\images\."
@@ -38,11 +40,10 @@
echo Copy stylesheets...
if not exist "%docbook_outputdir%\css" mkdir "%docbook_outputdir%\css"
-copy "..\css\all.css" "%docbook_outputdir%\css\all.css"
-copy "..\css\print.css" "%docbook_outputdir%\css\print.css"
+copy "..\css\*.css" "%docbook_outputdir%\css"
-echo Create HTML files...
-%docbook_java_exe% %docbook_java_parameters% -cp %docbook_saxon_jar%;%docbook_xerces_jar%;%docbook_saxon_xsl% -Djavax.xml.parsers.DocumentBuilderFactory=%DBFACTORY% -Djavax.xml.parsers.SAXParserFactory=%SPFACTORY% -Dorg.apache.xerces.xni.parser.XMLParserConfiguration=%XINCLUDE% com.icl.saxon.StyleSheet %docbook_inputfile% %docbook_use_stylesheet% base.dir=%docbook_outputdir%\
+echo Create Manual HTML files...
+%docbook_java_exe% %docbook_java_parameters% -cp %docbook_saxon_jar%;%docbook_xerces_jar%;%docbook_saxon_xsl% -Djavax.xml.parsers.DocumentBuilderFactory=%DBFACTORY% -Djavax.xml.parsers.SAXParserFactory=%SPFACTORY% -Dorg.apache.xerces.xni.parser.XMLParserConfiguration=%XINCLUDE% com.icl.saxon.StyleSheet %docbook_inputfile% %docbook_use_stylesheet% base.dir=%docbook_outputdir%\ withads=%ads%
echo Finished!
Modified: branches/R2_14/Docs/Users/Manual/build/build_html.xsl
===================================================================
--- branches/R2_14/Docs/Users/Manual/build/build_html.xsl 2010-10-02 14:32:33 UTC (rev 7295)
+++ branches/R2_14/Docs/Users/Manual/build/build_html.xsl 2010-10-04 14:22:51 UTC (rev 7296)
@@ -13,19 +13,27 @@
********************************************************************
Changes:
Created July 2008
+ 3 Aug 2009: Added 'user.header.content' template
******************************************************************** -->
<xsl:import href="../build/xsl/html/chunk.xsl"/>
<xsl:import href="build_common.xsl"/>
-<!-- Define suffix to appear after title text in head/title element of every topic -->
+
+<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+Custom parameters
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+<!-- Define suffix to appear after title text in head/title element of
+every topic -->
<xsl:param name="headtitle.suffix" select="' - WinMerge 2.12 Manual'"/>
+<!-- Detect if we're displaying ads for the Web pages -->
+<xsl:param name="withads">false</xsl:param>
<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
html/docbook.xsl
- Add suffix to head title text
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+<!-- Add headtitle.suffix to head title text -->
<xsl:template name="head.content">
<xsl:param name="node" select="."/>
<xsl:param name="title">
@@ -108,4 +116,12 @@
<xsl:apply-templates select="." mode="head.keywords.content"/>
</xsl:template>
+<!-- For web pages add banner image. Add Google ad scripts
+ if 'withads' param is set to true. -->
+<xsl:template name="user.header.content">
+ <xsl:if test="$withads = 'true'">
+ <xsl:call-template name="header.ads"/>
+ </xsl:if>
+</xsl:template>
+
</xsl:stylesheet>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
