Author: oltka
Date: Tue Aug 14 08:11:21 2012
New Revision: 1372763
URL: http://svn.apache.org/viewvc?rev=1372763&view=rev
Log:
CAY-1733 update pdf doc: fix problem with tables (text goes beyond the page),
remove empty pages, add style to code
Modified:
cayenne/main/trunk/docs/docbook/cayenne-guide/src/docbkx/including-cayenne-in-project.xml
cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/index.xml
cayenne/main/trunk/docs/docbook/stylesheets/pdf.xsl
Modified:
cayenne/main/trunk/docs/docbook/cayenne-guide/src/docbkx/including-cayenne-in-project.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/docs/docbook/cayenne-guide/src/docbkx/including-cayenne-in-project.xml?rev=1372763&r1=1372762&r2=1372763&view=diff
==============================================================================
---
cayenne/main/trunk/docs/docbook/cayenne-guide/src/docbkx/including-cayenne-in-project.xml
(original)
+++
cayenne/main/trunk/docs/docbook/cayenne-guide/src/docbkx/including-cayenne-in-project.xml
Tue Aug 14 08:11:21 2012
@@ -241,11 +241,12 @@
<title>cdbgen</title>
<para><code>cdbgen</code> is a
<code>maven-cayenne-plugin</code> goal that drops and/or generates
tables in a database on Cayenne DataMap. By
default, it is bound to the
- pre-integration-test phase.<table frame="void">
+ pre-integration-test phase.
+ <table frame="void">
<caption>cdbgen required
parameters</caption>
<col width="14%"/>
- <col width="6%"/>
- <col width="80%"/>
+ <col width="8%"/>
+ <col width="78%"/>
<thead>
<tr>
<th>Name</th>
@@ -275,11 +276,11 @@
</tbody>
</table></para>
<para>
- <table frame="void" width="792">
+ <table frame="void">
<caption>cdbgen optional
parameters</caption>
<col width="18%"/>
- <col width="7%"/>
- <col width="79%"/>
+ <col width="8%"/>
+ <col width="74%"/>
<thead>
<tr>
<th>Name</th>
@@ -365,12 +366,12 @@
<para><code>cdbimport</code> is a
<code>maven-cayenne-plugin</code> goal that generates
a DataMap based on an existing database schema.
By default, it is bound to the
generate-sources phase. This allows you to
generate your DataMap prior to building
- your project, which may be necessary if you are
also using the cgen task.<table
- frame="void">
+ your project, which may be necessary if you are
also using the cgen task.
+ <table frame="void">
<caption>cdbimport required
parameters</caption>
<col width="14%"/>
- <col width="6%"/>
- <col width="80%"/>
+ <col width="7%"/>
+ <col width="79%"/>
<thead>
<tr>
<th>Name</th>
@@ -401,11 +402,11 @@
</tbody>
</table></para>
<para>
- <table frame="void" width="822">
+ <table frame="void">
<caption>cdbimport optional
parameters</caption>
<col width="24%"/>
- <col width="7%"/>
- <col width="79%"/>
+ <col width="8%"/>
+ <col width="68%"/>
<thead>
<tr>
<th>Name</th>
Modified: cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/index.xml
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/index.xml?rev=1372763&r1=1372762&r2=1372763&view=diff
==============================================================================
--- cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/index.xml
(original)
+++ cayenne/main/trunk/docs/docbook/getting-started/src/docbkx/index.xml Tue
Aug 14 08:11:21 2012
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<book xmlns="http://docbook.org/ns/docbook";
xmlns:xlink="http://www.w3.org/1999/xlink"; version="5.0"
xml:id="getting-started" xmlns:xi="http://www.w3.org/2001/XInclude";>
- <info>
+ <bookinfo>
<title>Getting Started with Cayenne</title>
<copyright>
<year>2011-2012</year>
@@ -21,7 +21,7 @@
CONDITIONS OF ANY KIND, either express or implied. See the
License for the specific
language governing permissions and limitations under the
License.</para>
</legalnotice>
- </info>
+ </bookinfo>
<xi:include href="part1.xml"/>
<xi:include href="part2.xml"/>
<xi:include href="part3.xml"/>
Modified: cayenne/main/trunk/docs/docbook/stylesheets/pdf.xsl
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/docs/docbook/stylesheets/pdf.xsl?rev=1372763&r1=1372762&r2=1372763&view=diff
==============================================================================
--- cayenne/main/trunk/docs/docbook/stylesheets/pdf.xsl (original)
+++ cayenne/main/trunk/docs/docbook/stylesheets/pdf.xsl Tue Aug 14 08:11:21 2012
@@ -26,11 +26,31 @@
<!-- don't indent the body text -->
<xsl:param name="body.start.indent">0pt</xsl:param>
+ <!-- ////////// Extensions /////////////// -->
+ <!-- These extensions are required for table printing and other stuff
-->
+
+ <xsl:param name="use.extensions">1</xsl:param>
+ <xsl:param name="tablecolumns.extension">0</xsl:param>
+ <xsl:param name="callout.extensions">1</xsl:param>
+ <!-- <xsl:param name="fop.extensions">1</xsl:param> -->
+ <xsl:param name="fop1.extensions" select="1"/>
+
+
+ <!-- ///////// Paper & Page Size ///////////// -->
+
<!-- print headers and footers mirrored so double sided printing works
-->
- <xsl:param name="fop1.extensions" select="1"/>
- <xsl:param name="double.sided" select="1"/>
+ <xsl:param name="double.sided" select="0"/> <!-- no no!!!!!!!!! -->
+ <xsl:attribute-set name="footer.content">
+ <xsl:attribute name="position">right</xsl:attribute>
+ </xsl:attribute-set>
+
+ <!-- Paper type, no headers on blank pages -->
+ <xsl:param name="headers.on.blank.pages" select="0"/>
+ <xsl:param name="footers.on.blank.pages" select="0"/>
+
+
- <xsl:param name="admon.graphics" select="0"/>
+ <xsl:param name="admon.graphics" select="1"/>
<xsl:param name="admon.graphics.extension">.png</xsl:param>
<xsl:param
name="admon.graphics.path">stylesheets/docbook-xsl-ns/images/</xsl:param>
<xsl:param name="admon.textlabel" select="1"/>
@@ -63,11 +83,43 @@
<!-- Specifies the default point size for body text. The body font
size is specified in two parameters (body.font.master and body.font.size) so
that math can be performed on the font size by XSLT. -->
<xsl:param name="body.font.master">11</xsl:param>
+ <xsl:param name="body.font.small">8</xsl:param>
<xsl:param name="hyphenate">false</xsl:param>
<!-- "normal" is 1.6. This value is multiplied by the font size -->
- <xsl:param name="line-height">1.5</xsl:param>
+ <xsl:param name="line-height">1.4</xsl:param>
+
+ <!-- Chapter title size -->
+ <xsl:attribute-set name="chapter.titlepage.recto.style">
+ <xsl:attribute name="text-align">left</xsl:attribute>
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
+ <xsl:attribute name="font-size">
+ <xsl:value-of select="$body.font.master * 1.8"/>
+ <xsl:text>pt</xsl:text>
+ </xsl:attribute>
+ </xsl:attribute-set>
+
+
+
+ <!-- //////////////// Tables ////////////////////////// -->
+
+ <!-- The table width should be adapted to the paper size -->
+ <xsl:param name="default.table.width">17.4cm</xsl:param>
+
+ <!-- Some padding inside tables -->
+ <xsl:attribute-set name="table.cell.padding">
+ <xsl:attribute name="padding-left">4pt</xsl:attribute>
+ <xsl:attribute name="padding-right">4pt</xsl:attribute>
+ <xsl:attribute name="padding-top">4pt</xsl:attribute>
+ <xsl:attribute name="padding-bottom">4pt</xsl:attribute>
+ </xsl:attribute-set>
+
+ <!-- Only hairlines as frame and cell borders in tables -->
+ <xsl:param name="table.frame.border.thickness">0.1pt</xsl:param>
+ <xsl:param name="table.cell.border.thickness">0.1pt</xsl:param>
+
+
<!-- Specify the spacing required between normal paragraphs. -->
<xsl:attribute-set name="normal.para.spacing">
@@ -75,29 +127,72 @@
<xsl:attribute name="space-before.minimum">0.6em</xsl:attribute>
<xsl:attribute name="space-before.maximum">1.0em</xsl:attribute>
</xsl:attribute-set>
+
+
+
+ <!-- ///////////////// Programlistings ////////////////// -->
+
+ <!-- Verbatim text formatting (programlistings) -->
+ <xsl:attribute-set name="monospace.verbatim.properties">
+ <xsl:attribute name="font-size">
+ <xsl:value-of select="$body.font.small * 1.0"/>
+ <xsl:text>pt</xsl:text>
+ </xsl:attribute>
+ </xsl:attribute-set>
+
+ <xsl:attribute-set name="verbatim.properties">
+ <xsl:attribute name="space-before.minimum">1em</xsl:attribute>
+ <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
+ <xsl:attribute name="space-before.maximum">1em</xsl:attribute>
+ <xsl:attribute name="border-color">#444444</xsl:attribute>
+ <xsl:attribute name="border-style">solid</xsl:attribute>
+ <xsl:attribute name="border-width">0.1pt</xsl:attribute>
+ <xsl:attribute name="padding-top">0.5em</xsl:attribute>
+ <xsl:attribute name="padding-left">0.5em</xsl:attribute>
+ <xsl:attribute name="padding-right">0.5em</xsl:attribute>
+ <xsl:attribute name="padding-bottom">0.5em</xsl:attribute>
+ <xsl:attribute name="margin-left">0.5em</xsl:attribute>
+ <xsl:attribute name="margin-right">0.5em</xsl:attribute>
+ </xsl:attribute-set>
+
+ <!-- Shade (background) programlistings -->
+ <xsl:param name="shade.verbatim">1</xsl:param>
+ <xsl:attribute-set name="shade.verbatim.style">
+ <xsl:attribute name="background-color">#F0F0F0</xsl:attribute>
+ </xsl:attribute-set>
+
<!-- Tables, examples, figures, and equations don't need to be forced
onto onto one page without page breaks. -->
<xsl:attribute-set name="formal.object.properties">
<xsl:attribute
name="keep-together.within-column">auto</xsl:attribute>
</xsl:attribute-set>
+
- <!-- The body bottom margin is the distance from the last line of text
in the page body to the bottom of the region-after. -->
- <xsl:param name="body.margin.bottom">20mm</xsl:param>
-
+ <!-- TOP -->
<!-- The body top margin is the distance from the top of the
region-before to the first line of text in the page body. -->
- <xsl:param name="body.margin.top">20mm</xsl:param>
+ <xsl:param name="body.margin.top">10mm</xsl:param>
<!-- The top page margin is the distance from the physical top of the
page to the top of the region-before. -->
- <xsl:param name="page.margin.top">10mm</xsl:param>
+ <xsl:param name="page.margin.top">5mm</xsl:param>
+
+ <!-- BOTTOM -->
+ <!-- The body bottom margin is the distance from the last line of text
in the page body to the bottom of the region-after. -->
+ <xsl:param name="body.margin.bottom">15mm</xsl:param>
<!-- The bottom page margin is the distance from the bottom of the
region-after to the physical bottom of the page. -->
- <xsl:param name="page.margin.bottom">10mm</xsl:param>
+ <xsl:param name="page.margin.bottom">5mm</xsl:param>
+
+ <xsl:param name="region.before.extent">10mm</xsl:param>
+ <xsl:param name="region.after.extent">10mm</xsl:param>
+
+ <!-- No intendation of Titles -->
+ <!-- <xsl:param name="title.margin.left">0pc</xsl:param> -->
<!-- The inner page margin. The inner page margin is the distance from
binding edge of the page to the first column of text. In the left-to-right,
top-to-bottom writing direction, this is the left margin of recto pages. The
inner and outer margins are usually the same unless the output is double-sided.
-->
- <xsl:param name="page.margin.inner">25mm</xsl:param>
+ <xsl:param name="page.margin.inner">18mm</xsl:param>
<!-- The outer page margin. The outer page margin is the distance from
non-binding edge of the page to the last column of text. In the left-to-right,
top-to-bottom writing direction, this is the right margin of recto pages. The
inner and outer margins are usually the same unless the output is double-sided.
-->
- <xsl:param name="page.margin.outer">15mm</xsl:param>
+ <xsl:param name="page.margin.outer">18mm</xsl:param>
<!-- Make hyperlinks blue and don't display the underlying URL -->
<xsl:param name="ulink.show" select="0" />
