You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2007/01/03 23:46:03 UTC
svn commit: r492325 - in /incubator/uima/uimaj/trunk/uima-docbooks/src:
css/stylesheet.css docbook/tools/tools.cvd.xml styles/html/custom.xsl
styles/pdf/custom.xsl
Author: schor
Date: Wed Jan 3 14:46:02 2007
New Revision: 492325
URL: http://svn.apache.org/viewvc?view=rev&rev=492325
Log:
UIMA-153 Fix DocBook style sheets, css, to properly center
tables and figures, including captions. Add width parm to
CVD figures to make them appear the right size in both IE,
Firefox, and PDF forms.
Modified:
incubator/uima/uimaj/trunk/uima-docbooks/src/css/stylesheet.css
incubator/uima/uimaj/trunk/uima-docbooks/src/docbook/tools/tools.cvd.xml
incubator/uima/uimaj/trunk/uima-docbooks/src/styles/html/custom.xsl
incubator/uima/uimaj/trunk/uima-docbooks/src/styles/pdf/custom.xsl
Modified: incubator/uima/uimaj/trunk/uima-docbooks/src/css/stylesheet.css
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uima-docbooks/src/css/stylesheet.css?view=diff&rev=492325&r1=492324&r2=492325
==============================================================================
--- incubator/uima/uimaj/trunk/uima-docbooks/src/css/stylesheet.css (original)
+++ incubator/uima/uimaj/trunk/uima-docbooks/src/css/stylesheet.css Wed Jan 3 14:46:02 2007
@@ -1,4 +1,4 @@
-<!--
+/*
Copyright 2006 The Apache Software Foundation.
Licensed under the Apache License, Version 2.0 (the "License")
@@ -12,7 +12,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
--->
+*/
html {
padding: 0pt;
@@ -195,7 +195,9 @@
}
div.table table {
- display: block;
+ /* display: block; */ /* in firefox, breaks centering */
+ margin-left: auto; /* see http://theodorakis.net/tablecentertest.html */
+ margin-right: auto;
}
div.table td {
@@ -238,14 +240,19 @@
font-size: 12px;
}
-div.figure {
- text-align: center;
+div.figure, div.screenshot {
+ text-align: center; /* needed for ms5 */
margin-top: 1em;
margin-bottom: 1em;
}
+div.figure table, div.screenshot table { /* see http://theodorakis.net/tablecentertest.html */
+ margin-left: auto;
+ margin-right: auto;
+}
+
div.figure p.title {
- text-align: center;
+ text-align: center;
margin-left: 15%;
margin-right: 15%;
}
Modified: incubator/uima/uimaj/trunk/uima-docbooks/src/docbook/tools/tools.cvd.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uima-docbooks/src/docbook/tools/tools.cvd.xml?view=diff&rev=492325&r1=492324&r2=492325
==============================================================================
--- incubator/uima/uimaj/trunk/uima-docbooks/src/docbook/tools/tools.cvd.xml (original)
+++ incubator/uima/uimaj/trunk/uima-docbooks/src/docbook/tools/tools.cvd.xml Wed Jan 3 14:46:02 2007
@@ -72,7 +72,7 @@
<title>A sample error dialog</title>
<mediaobject>
<imageobject>
- <imagedata format="JPG" fileref="&imgroot;ErrorExample.jpg"/>
+ <imagedata width="3.44in" format="JPG" fileref="&imgroot;ErrorExample.jpg"/>
</imageobject>
<textobject>
<phrase>Sample error dialog</phrase>
@@ -118,7 +118,7 @@
<title>The File menu</title>
<mediaobject>
<imageobject>
- <imagedata format="JPG" fileref="&imgroot;FileMenu.jpg"/>
+ <imagedata width="1.91in" format="JPG" fileref="&imgroot;FileMenu.jpg"/>
</imageobject>
<textobject>
<phrase>The File menu</phrase>
@@ -326,7 +326,7 @@
<title>The Edit menu</title>
<mediaobject>
<imageobject>
- <imagedata format="JPG" fileref="&imgroot;EditMenu.jpg" />
+ <imagedata width="2.15in" format="JPG" fileref="&imgroot;EditMenu.jpg" />
</imageobject>
<textobject>
<phrase>The Edit menu</phrase>
@@ -354,7 +354,7 @@
<title>The Run menu</title>
<mediaobject>
<imageobject>
- <imagedata format="JPG" fileref="&imgroot;RunMenu.jpg" />
+ <imagedata width="2.225in" format="JPG" fileref="&imgroot;RunMenu.jpg" />
</imageobject>
<textobject>
<phrase>The Run menu</phrase>
@@ -463,7 +463,7 @@
<screenshot>
<mediaobject>
<imageobject>
- <imagedata format="JPG"
+ <imagedata width="5.816in" format="JPG"
fileref="&imgroot;TypeSystemViewer.jpg" />
</imageobject>
</mediaobject>
@@ -500,7 +500,7 @@
</title>
<mediaobject>
<imageobject>
- <imagedata format="JPG" fileref="&imgroot;AnnotationViewer.jpg" />
+ <imagedata width="5.82in" format="JPG" fileref="&imgroot;AnnotationViewer.jpg" />
</imageobject>
</mediaobject>
</figure>
@@ -560,7 +560,7 @@
<title>State of GUI after running an analysis engine</title>
<mediaobject>
<imageobject>
- <imagedata format="JPG" fileref="&imgroot;Main1.jpg" />
+ <imagedata width="6.423in" format="JPG" fileref="&imgroot;Main1.jpg" />
</imageobject>
</mediaobject>
</figure>
@@ -598,7 +598,7 @@
</title>
<mediaobject>
<imageobject>
- <imagedata format="JPG" fileref="&imgroot;Main2.jpg" />
+ <imagedata width="6.39in" format="JPG" fileref="&imgroot;Main2.jpg" />
</imageobject>
</mediaobject>
</figure>
@@ -619,7 +619,7 @@
</title>
<mediaobject>
<imageobject>
- <imagedata format="JPG" fileref="&imgroot;Main3.jpg" />
+ <imagedata width="6.39in" format="JPG" fileref="&imgroot;Main3.jpg" />
</imageobject>
</mediaobject>
</figure>
@@ -710,7 +710,7 @@
<para>
The following table shows the supported keyboard shortcuts.
</para>
- <table frame="none" align="center" id="cvd.table.keyboardShortcuts">
+ <table frame="none" id="cvd.table.keyboardShortcuts">
<title>Keyboard shortcuts</title>
<tgroup cols="3">
<thead>
Modified: incubator/uima/uimaj/trunk/uima-docbooks/src/styles/html/custom.xsl
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uima-docbooks/src/styles/html/custom.xsl?view=diff&rev=492325&r1=492324&r2=492325
==============================================================================
--- incubator/uima/uimaj/trunk/uima-docbooks/src/styles/html/custom.xsl (original)
+++ incubator/uima/uimaj/trunk/uima-docbooks/src/styles/html/custom.xsl Wed Jan 3 14:46:02 2007
@@ -35,6 +35,11 @@
<xsl:param name="table.borders.with.css" select="1"/>
<xsl:param name="html.stylesheet.type">text/css</xsl:param>
+ <!--
+ <xsl:param name="use.extensions">1</xsl:param> causes lots of failed to load image msgs !
+ <xsl:param name="graphicsize.extension">1</xsl:param>
+ -->
+
<!-- Remove "Chapter" from the Chapter titles...
<xsl:param name="local.l10n.xml" select="document('')"/>
<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
Modified: incubator/uima/uimaj/trunk/uima-docbooks/src/styles/pdf/custom.xsl
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uima-docbooks/src/styles/pdf/custom.xsl?view=diff&rev=492325&r1=492324&r2=492325
==============================================================================
--- incubator/uima/uimaj/trunk/uima-docbooks/src/styles/pdf/custom.xsl (original)
+++ incubator/uima/uimaj/trunk/uima-docbooks/src/styles/pdf/custom.xsl Wed Jan 3 14:46:02 2007
@@ -60,6 +60,18 @@
</xsl:attribute-set>
<!--###################################################
+ Center figure captions
+ ################################################### -->
+
+ <xsl:attribute-set name="informalfigure.properties">
+ <xsl:attribute name="text-align">center</xsl:attribute>
+ </xsl:attribute-set>
+
+ <xsl:attribute-set name="figure.properties">
+ <xsl:attribute name="text-align">center</xsl:attribute>
+ </xsl:attribute-set>
+
+<!--###################################################
Page margins
################################################### -->
<xsl:param name="page.margin.top" select="'1cm'"/>
@@ -203,7 +215,7 @@
<xsl:param name="hyphenate">false</xsl:param>
<!-- Line height in body text -->
- <xsl:param name="line-height">1.4</xsl:param>
+ <xsl:param name="line-height">1.35</xsl:param>
<!--###################################################
Tables