incubator-odf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svanteschub...@apache.org
Subject [incubator-odftoolkit-site] 02/02: Fixing invalid markdown and using latest parser within pom.xml
Date Tue, 30 Jan 2018 17:24:47 GMT
This is an automated email from the ASF dual-hosted git repository.

svanteschubert pushed a commit to branch maven-site
in repository https://gitbox.apache.org/repos/asf/incubator-odftoolkit-site.git

commit 711f5bf6c0274b9238baa7c88d1381db60370b08
Author: Svante Schubert <Svante.Schubert@gmail.com>
AuthorDate: Tue Jan 30 18:24:20 2018 +0100

    Fixing invalid markdown and using latest parser within pom.xml
---
 pom.xml                                            |  13 +
 src/site/markdown/conformance/ODFValidator.md      |  12 +-
 src/site/markdown/docs/edit-cms.md                 |   4 +-
 src/site/markdown/docs/governance/voting.md        |   2 +-
 src/site/markdown/license.md                       |   2 +-
 src/site/markdown/odfdom/Development.md            |  20 +-
 src/site/markdown/odfdom/ReleaseNotes.md           |  24 +-
 src/site/markdown/sidenav.mdtext                   |  42 +++
 src/site/markdown/simple/Home.md                   |  16 +-
 src/site/markdown/simple/demo/demo2.md             |   2 +-
 src/site/markdown/simple/demo/demo6.md             |   2 +-
 src/site/markdown/simple/demo/demo9.md             |  18 +-
 src/site/markdown/simple/demo/index.md             | 230 +++++++++------
 src/site/markdown/simple/document/cookbook/Cell.md | 312 +++++++++++++--------
 .../markdown/simple/document/cookbook/Charts.md    | 250 ++++++++++-------
 .../markdown/simple/document/cookbook/Fields.md    | 238 +++++++++++-----
 .../markdown/simple/document/cookbook/index.md     |  14 +-
 src/site/markdown/simple/document/index.md         |   2 +-
 src/site/markdown/xsltrunner/ODFXSLTRunner.md      |   4 +-
 19 files changed, 794 insertions(+), 413 deletions(-)

diff --git a/pom.xml b/pom.xml
index e694dea..49fb4f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,19 @@
 		<extensions>
 		</extensions>
 		<plugins>
+			<plugin>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-site-plugin</artifactId>
+			<version>3.7</version>
+			<dependencies>
+				<dependency>
+					<groupId>org.apache.maven.doxia</groupId>
+					<artifactId>doxia-module-markdown</artifactId>
+					<version>1.8</version>
+				</dependency>
+				<!-- other doxia module(s) -->
+			</dependencies>
+		</plugin>
 		</plugins>
 	</build>
 	<reporting>
diff --git a/src/site/markdown/conformance/ODFValidator.md b/src/site/markdown/conformance/ODFValidator.md
index 49f7201..aa200ac 100644
--- a/src/site/markdown/conformance/ODFValidator.md
+++ b/src/site/markdown/conformance/ODFValidator.md
@@ -59,7 +59,7 @@ The **ODF Validator** may be called with the following options:
      odfvalidator -h
      odfvalidator -V
 
-If no parameters are specified, the files **<odffiles>** are validated using the schema that belongs to the ODF version of the file. For ODF 1.0 files the ODF 1.0 schema is used, for ODF 1.1 files the ODF 1.1 schema is used, and so on. The version of an ODF file is detected for each file separately.
+If no parameters are specified, the files **&lt;odffiles&gt;** are validated using the schema that belongs to the ODF version of the file. For ODF 1.0 files the ODF 1.0 schema is used, for ODF 1.1 files the ODF 1.1 schema is used, and so on. The version of an ODF file is detected for each file separately.
 
 The options have the following meaning:
 
@@ -221,7 +221,7 @@ The following actions take place before or during the validation:
     OpenOffice.org wrongly included a document type declaration.
     Ignoring the document type enables the validation of the manifest
     despite of this error.
-  - A namespace &quot;http://openoffice.org/2001/manifest&quot; within a
+  - A namespace http://openoffice.org/2001/manifest within a
     *manifest.xml* file is changed to &quot;urn:oasis:names:tc:opendocument:xmlns:manifest:1.0&quot;. For
     the logging level **all**, an information is displayed if this
     happens. <br/>**Note:** Early ODF implementations in OpenOffice.org
@@ -241,10 +241,10 @@ The following actions take place before or during the validation:
     displayed if this happens.<br/>**Note:** The truncation of this
     attribute value avoids a stack overflow in MSV while validating the
     attribute value against a regular expression.
-  - A namespace &quot;http://openoffice.org/2004/database&quot; within a
-    *content.xml* file is changed to &quot;urn:oasis:names:tc:opendocument:xmlns:database:1.0&quot;, and
-    a namespace &quot;http://openoffice.org/2004/office&quot; within a
-    *content.xml* file is changed to &quot;urn:oasis:names:tc:opendocument:xmlns:office:1.0&quot;. For
+  - A namespace http://openoffice.org/2004/database within a
+    *content.xml* file is changed to urn:oasis:names:tc:opendocument:xmlns:database:1.0, and
+    a namespace http://openoffice.org/2004/office within a
+    *content.xml* file is changed to urn:oasis:names:tc:opendocument:xmlns:office:1.0 For
     the logging level **all**, an information is displayed if this
     happens.<br/>**Note:** These namespaces were used in OpenOffice.org
     2.x database documents, because database documents are included in OpenDocument since version 1.2 only. Changing them enables the
diff --git a/src/site/markdown/docs/edit-cms.md b/src/site/markdown/docs/edit-cms.md
index a51c8a1..e7e4380 100644
--- a/src/site/markdown/docs/edit-cms.md
+++ b/src/site/markdown/docs/edit-cms.md
@@ -41,8 +41,8 @@ The general flow for updating the website is:
     into HTML files in the staging directory.  (You will see a commit mail with "Staging
     update by buildbot" as log message.)
  1. You verify that the staged webpage is correct and then tell the CMS to publish 
-    the changes to the production directory.  (You will see a commit mail with "Publishing
-    merge to odftoolkit site by <your Apache ID>" as log message.)
+    the changes to the production directory.  (You will see a commit mail with &ldquo;Publishing
+    merge to odftoolkit site by &lt;your Apache ID&gt;&ldquo; as log message.)
 
 The intent of this workflow is to allow committers flexibility in changing 
 webpages and testing changes on a staging website, before moving these changes to
diff --git a/src/site/markdown/docs/governance/voting.md b/src/site/markdown/docs/governance/voting.md
index db20054..fcf0607 100644
--- a/src/site/markdown/docs/governance/voting.md
+++ b/src/site/markdown/docs/governance/voting.md
@@ -103,7 +103,7 @@ The notation used in voting is:
     +1 Simon
     +1 Greg
 
-[See here for more information][2] <br>
+[See here for more information][2] <br/>
 [See here for more mail templates][3]
 
 
diff --git a/src/site/markdown/license.md b/src/site/markdown/license.md
index 90fb6ea..cbd8ba4 100644
--- a/src/site/markdown/license.md
+++ b/src/site/markdown/license.md
@@ -16,7 +16,7 @@ Notice:    Licensed to the Apache Software Foundation (ASF) under one
            specific language governing permissions and limitations
            under the License.
 
-Apache License<br></br>Version 2.0, January 2004<br></br>
+Apache License<br/>Version 2.0, January 2004<br/>
 [http://www.apache.org/licenses/](http://www.apache.org/licenses/) 
 
 TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
diff --git a/src/site/markdown/odfdom/Development.md b/src/site/markdown/odfdom/Development.md
index aef00f1..fb136ef 100644
--- a/src/site/markdown/odfdom/Development.md
+++ b/src/site/markdown/odfdom/Development.md
@@ -4,11 +4,11 @@ Title: Development
 
 1. Install latest Mercurial
 1. Setup Mercurial (optional):    
-Config file $Hg Install Dir\Mercurial.ini on Windows or <Hg Install Dir>/.hgrc on Unix.    
+Config file $Hg Install Dir\Mercurial.ini on Windows or &lt;Hg Install Dir&gt;/.hgrc on Unix.    
 Enhance the default configuration, using GIT diff and enable [default plugin][1] avoid different line breaks in the source.  
 
     [ui]
-    username = your Name <yourLoginName@odftoolkit.org>
+    username = your Name &lt;yourLoginName@odftoolkit.org&gt;
     ;merge = your-merge-program (or internal:merge)
     
     [diff]
@@ -100,20 +100,20 @@ Here a list of the most frequently used commands:
   // Please carefully check the output of "hg status" first
   hg addremove
   // Safe alternatives
-  hg add <myNewFile>
-  hg remove <myUnnecessaryFile>
-  hg remove -A <myAlreadyDeletedFile>  
+  hg add &lt;myNewFile&gt;
+  hg remove &lt;myUnnecessaryFile&gt;
+  hg remove -A &lt;myAlreadyDeletedFile&gt;
   // Commit your changes locally and display their revision number
   hg commit -A -u "your Name" -m "#bug XY# Description of changes"
   hg tip
   // Export your locally committed changes as patch
-  hg export -a -g -o ../myChanges.patch <RevisionNumbersOfYourCommit>
+  hg export -a -g -o ../myChanges.patch &lt;RevisionNumbersOfYourCommit&gt;
   // Import changes into your local repository
   hg import --no-commit ../someFile.patch
   // Get help
   hg help
   // Get help about a special command
-  hg help <command>
+  hg help &lt;command&gt;
   hg help export
   hg help addremove
   ...
@@ -134,7 +134,7 @@ That way others will review your patch for you. If everything is ok, the reviewe
   // Generate DOM layer elements and attributes from RelaxNG
   mvn clean test -P codegen
   // Generate code coverage documentation in
-  // <PROJECT_DIR>/target/site/cobertura/index.html
+  // &lt;PROJECT_DIR&gt;/target/site/cobertura/index.html
   // see http://mojo.codehaus.org/cobertura-maven-plugin/
   mvn cobertura:cobertura
 </pre>
@@ -220,12 +220,12 @@ The ODFDOM Code Generator is used to generate the core Classes for ODFDOM which
   [13]: http://maven.apache.org/
   [14]: http://wiki.netbeans.org/MercurialVersionControl
   [15]: http://mercurial.selenic.com/wiki/
-  [16]: http://odftoolkit.org/bugzilla/buglist.cgi?product=odfdom&order=bugs.bug_id
+  [16]: http://odftoolkit.org/bugzilla/buglist.cgi?product=odfdom&amp;order=bugs.bug_id
   [17]: http://maven.apache.org/
   [18]: http://java.sun.com/docs/codeconv/html/CodeConvTOC.doc.html
   [19]: http://java.sun.com/docs/codeconv/html/CodeConventions.doc8.html#367
   [20]: mailto:odf-dev@incubator.apache.org
-  [21]: https://odftoolkit.org/bugzilla/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=odfdom&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailtype1=substring&email1=&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdty [...]
+  [21]: https://odftoolkit.org/bugzilla/buglist.cgi?query_format=advanced&amp;short_desc_type=allwordssubstr&amp;short_desc=&amp;product=odfdom&amp;long_desc_type=allwordssubstr&amp;long_desc=&amp;bug_file_loc_type=allwordssubstr&amp;bug_file_loc=&amp;status_whiteboard_type=allwordssubstr&amp;status_whiteboard=&amp;bug_status=UNCONFIRMED&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;emailtype1=substring&amp;email1=&amp;emailtype2=substring&amp;email2=&amp;bugidty [...]
   [22]: ODFDOM-Code-Generator.html
   [23]: http://odftoolkit.org/hg/odfdom~relaxng2template
   [24]: ODFDOM-Class-Structure.html
diff --git a/src/site/markdown/odfdom/ReleaseNotes.md b/src/site/markdown/odfdom/ReleaseNotes.md
index a1e7b19..32a6369 100644
--- a/src/site/markdown/odfdom/ReleaseNotes.md
+++ b/src/site/markdown/odfdom/ReleaseNotes.md
@@ -208,9 +208,9 @@ Note: The first column 'Java class' package is relative to 'org.odftoolkit.odfdo
 <td>
 </td><td>OdfDrawPage  getSlideByIndex(int)
 </td><td>
-</td><td>OdfSlide  getSlideByIndex(int)
+</td><td>OdfSlide  getSlideByIndex(int)</td>
 </tr><tr>
-</td><td>
+<td>
 </td><td>OdfDrawPage  getSlideByName(String)
 </td><td>
 </td><td>OdfSlide  getSlideByName(String)</td>
@@ -238,9 +238,9 @@ Note: The first column 'Java class' package is relative to 'org.odftoolkit.odfdo
 <td>
 </td><td>OdfDocument  getEmbeddedDocument(String)
 </td><td>
-</td><td>OdfDocument  loadSubDocument(String)
+</td><td>OdfDocument  loadSubDocument(String)</td>
 </tr><tr>
-</td><td>
+<td>
 </td><td>List  getEmbeddedDocuments()
 </td><td>
 </td><td>Map  loadSubDocuments()
@@ -250,7 +250,7 @@ Note: The first column 'Java class' package is relative to 'org.odftoolkit.odfdo
 </td><td>
 </td><td>Map  loadSubDocuments(OdfDocument.OdfMediaType)
 </td></tr><tr>
-</td><td>
+<td>
 </td><td>String  getMediaType()
 </td><td>
 </td><td>OdfDocument.OdfMediaType  getOdfMediaType()
@@ -464,15 +464,15 @@ Note: The first column 'Java class' package is relative to 'org.odftoolkit.odfdo
       org.odftoolkit.odfdom.doc.xforms
 </td><td>use corresponding DOM layer classes directly. <br/>
  sample: org.odftoolkit.odfdom.doc.anim.OdfAnimate ->
-         org.odftoolkit.odfdom.dom.anim.AnimAnimateElement
+         org.odftoolkit.odfdom.dom.anim.AnimAnimateElement</td>
 </tr><tr>
 <td>remove get/setValue() from dom attribute classes 
 </td><td>use get/setValue() in XML DOM directly. 
-</tr><tr>
+</td></tr><tr>
 <td>remove classes:<br/>
  OdfAttributeNames, OdfElementNames, OdfNamespaceNames<br/>
  from package org.odftoolkit.odfdom.dom
-</td><td>use String to replace emun value. 
+</td><td>use String to replace emun value.</td> 
 </tr><tr>
 <td>remove the following methods:<br/>
     int getColumnSpannedNumber();<br/>
@@ -482,17 +482,17 @@ Note: The first column 'Java class' package is relative to 'org.odftoolkit.odfdo
     void setColumnSpannedNumber(int spannedNum);<br/>
     void setRowSpannedNumber(int spannedNum);<br/>
     from org.odftoolkit.odfdom.doc.table.OdfTable;
-</td><td>use OdfTableCellRange.merge(). 
+</td><td>use OdfTableCellRange.merge(). </td>
 </tr><tr>
 <td>remove method:<br/>
     OdfOfficeBody  getOfficeBody()<br/>
  from org.odftoolkit.odfdom.doc.OdfDocument
-</td><td> 
+</td><td> </td>
 </tr><tr>
 <td>remove class:<br/>
     OdfXMLHelper<br/>
  from org.odftoolkit.odfdom.pkg
-</td><td>
+</td><td></td>
 </tr>
 </table>
 
@@ -673,7 +673,7 @@ Note: The first column 'Java class' package is relative to 'org.odftoolkit.odfdo
 <table>
 <tr>
 <td>Previous Java Class</td><td>Previous API</td><td>New Java Class</td><td>New API</td>
-</td></tr><tr>
+</tr><tr>
 <td>pkg.element.OdfAlienElement
 </td><td>getOdfName()
 </td><td>OdfAlienElement
diff --git a/src/site/markdown/sidenav.mdtext b/src/site/markdown/sidenav.mdtext
new file mode 100644
index 0000000..d453895
--- /dev/null
+++ b/src/site/markdown/sidenav.mdtext
@@ -0,0 +1,42 @@
+# General
+
+  - [About](/odftoolkit/index.html)
+  - [Downloads](/odftoolkit/downloads.html)
+  - [Incubator page](http://incubator.apache.org/projects/odftoolkit.html)
+  - [License](/odftoolkit/license.html)
+  - [Privacy Policy](/odftoolkit/privacy.html)
+
+# Components
+
+ - [ODFDOM](/odftoolkit/odfdom/index.html)
+ - [Simple API](/odftoolkit/simple/index.html)
+ - [ODF Validator](/odftoolkit/conformance/ODFValidator.html)
+ - [XSLT Runner](/odftoolkit/xsltrunner/ODFXSLTRunner.html)
+
+# Community
+
+  - [Get Involved](/odftoolkit/get-involved.html)
+  - [Mailing Lists](/odftoolkit/mailing-lists.html)
+  - [People](/odftoolkit/people.html)
+  - [Community FAQs](/odftoolkit/community-faqs.html)
+
+# Development
+
+  - [Source Code](/odftoolkit/source.html)
+  - [Bug Tracker](https://issues.apache.org/jira/browse/ODFTOOLKIT)
+  - <a href="/odftoolkit/mvn-site/0.6-incubating/" target="_blank">Maven Reports</a>
+  - [Website](/odftoolkit/website-local.html)
+  - [Developer FAQs](/odftoolkit/developer-faqs.html)
+  
+# PPMC
+
+  - [PPMC FAQs](/odftoolkit/ppmc-faqs.html)
+  - [Release Guide](/odftoolkit/odftoolkit-release-guide.html)   
+
+# ASF
+
+  - [Apache Software Foundation](http://www.apache.org)
+  - [Thanks](http://www.apache.org/foundation/thanks.html)
+  - [Become a Sponsor](http://www.apache.org/foundation/sponsorship.html)
+  
+
diff --git a/src/site/markdown/simple/Home.md b/src/site/markdown/simple/Home.md
index b532197..6e024d7 100644
--- a/src/site/markdown/simple/Home.md
+++ b/src/site/markdown/simple/Home.md
@@ -77,11 +77,11 @@ The Simple Java API for ODF uses Bugzilla to track the defects. You can report d
 
 First, install [http://mercurial.selenic.com/wiki/ latest Mercurial]
 
-Second, setup Mercurial (optional):<br />Config file <Hg Install Dir>\Mercurial.ini on Windows or <Hg Install Dir>/.hgrc on Unix.
+Second, setup Mercurial (optional):<br/>Config file &lt;Hg Install Dir&gt;\Mercurial.ini on Windows or &lt;Hg Install Dir&gt;/.hgrc on Unix.
 Enhance the default configuration, using GIT diff and enable [http://mercurial.selenic.com/wiki/Win32TextExtension default plugin] avoid different line breaks in the source.
-
+<pre>
     [ui]
-    username = your Name <yourLoginName@odftoolkit.org>
+    username = your Name &lt;yourLoginName@odftoolkit.org&gt;
     ;merge = your-merge-program (or internal:merge)
     
     [diff]
@@ -113,8 +113,8 @@ Now, get the source code from the Simple project
 Please see below for a short introduction to using Mercurial on odftoolkit.org. 
 There's also a more general <a href="{{project help page 
 SourceControl}}">help</a> on how to use source control systems on 
-odftoolkit.org. The command <br /><pre>
-hg clone https://hg.odftoolkit.org/hg/simple~code-base</pre>will 
+odftoolkit.org. The command <br/>
+<pre>hg clone https://hg.odftoolkit.org/hg/simple~code-base</pre>will 
 download the repository into a new directory.
 
 Please note that by this you'll get the latest changeset. If you for example 
@@ -170,7 +170,7 @@ If you want to contribute a patch to this project, following below steps:
     [http://odftoolkit.org/projects/odfdom/pages/Development#Coding_Guidelines
     code guidelines] are same as ODFDOM.
   - Step 4. Test your contribution with Mecurial command to make sure all the unit tests pass.  mvn
-  - Step 5. Generate a patch with hg commands.  hg commit -A -u "Developer:xxx" -m "#bug XY# Description of changes"  hg export -a
+  - Step 5. Generate a patch with hg commands.  hg commit -A -u &quot;Developer:xxx&quot; -m &quot;&#35;bug XY&#35; Description of changes&quot;  hg export -a
     -g -o ../myChanges.patch
   - Step 6. Upload your patch to bugzilla.
   - Step 7. Refactor your patch if you get comments from reviewers.
@@ -191,8 +191,8 @@ As a reviewer, you need to carefully read the source code, run the unit tests, t
   - Step 8. Repeat step 2 to 7 after the contributor improves the patch.
   - Step 9. Push the patch to repository with Mecurial command if you think the patch is good enough:  hg commit -A -u "Developer:xxx
     Reviewer:yyy" -m "#bug XY# Description of changes"  hg push
-    https://<your user id>:<your
-    password>@odftoolkit.org/hg/simple~code-base
+    https://&lt;your user id&gt;:&lt;your
+    password&gt;@odftoolkit.org/hg/simple~code-base
 
 ##Reference material
 
diff --git a/src/site/markdown/simple/demo/demo2.md b/src/site/markdown/simple/demo/demo2.md
index 40c61ee..1560d4a 100644
--- a/src/site/markdown/simple/demo/demo2.md
+++ b/src/site/markdown/simple/demo/demo2.md
@@ -19,7 +19,7 @@ Here the original presentation documents "Pres1.odp" and "Pres2.odp" are used. P
 
 The contents of the text document which contains the notes of the presentation document is shown in the following picture, where each note is identified by the corresponding slide name.   
 
-<img src="image/ExtractedNotes.JPG" >
+<img src="image/ExtractedNotes.JPG"/>
 
 **Code Introduction**   
 
diff --git a/src/site/markdown/simple/demo/demo6.md b/src/site/markdown/simple/demo/demo6.md
index e703be0..922cb07 100644
--- a/src/site/markdown/simple/demo/demo6.md
+++ b/src/site/markdown/simple/demo/demo6.md
@@ -6,7 +6,7 @@ This demo shows the power of text box and paragraph support in Simple API.
 
 The background of this demo is that a travel agency has to help customers book hotel. They have a spreadsheet file in hand, which records all of the visitors' information. They need to generate an order form with the requirements of hotel reservation using these data. A order form template has been supplied. This program generates order forms for all the visitors based on records of passengers in spreadsheet and the given template.    
 
-<img src="image/demo6.png" ><br/><br/> 
+<img src="image/demo6.png" /><br/><br/> 
 **Code Introduction**
 
 There code of this demo is very simple. First, load template document and spreadsheet separately. Secondly, iterate data table and create new section and paragraph. The Text Boxes in the paragraph are also cloned. All of them are iterated and filled information from data table.<br/>
diff --git a/src/site/markdown/simple/demo/demo9.md b/src/site/markdown/simple/demo/demo9.md
index bcabe16..cc24bd5 100644
--- a/src/site/markdown/simple/demo/demo9.md
+++ b/src/site/markdown/simple/demo/demo9.md
@@ -20,7 +20,20 @@ Besides, we also supply some codes to show how to create chart in a spreadsheet
 
 **Code Introduction**
 	
-There code of this demo is very clear. First, we create a presentation document and load the data document. Second, we create cover page and set its content. Thirdly, we add charts to each slide. If you want to add chart to a slide, you must chose a layout which can hold chart. In Simple ODF 0.6, these layouts are "TITLE_PLUS_CHART", "TITLE_PLUS_2_CHART", "TITLE_LEFT_CHART_RIGHT_OUTLINE", "TITLE_PLUS_3_OBJECT", "TITLE_PLUS_4_OBJECT". Different layout can own different count of charts. Pl [...]
+There code of this demo is very clear. 
+First, we create a presentation document and load the data document. 
+Second, we create cover page and set its content. 
+Thirdly, we add charts to each slide. If you want to add chart to a slide, you must chose a layout which can hold chart. 
+In Simple ODF 0.6 these layouts are:
+* TITLE&lowbar;PLUS&lowbar;CHART
+* TITLE&lowbar;PLUS&lowbar;2&lowbar;CHART 
+* TITLE&lowbar;LEFT&lowbar;CHART&lowbar;RIGHT&lowbar;OUTLINE 
+* TITLE&lowbar;PLUS&lowbar;3&lowbar;OBJECT 
+* TITLE&lowbar;PLUS&lowbar;4&lowbar;OBJECT
+
+Different layout can own different count of charts. Please be sure you know that, otherwise chart insert would be failed.
+For slide, you needn't set the chart size or position, Simple ODF will do it automatically. 
+Finally, the data document is closed and the new created document is saved.
 
 	private static void generatePresentationChart() {
 		try {
@@ -133,9 +146,8 @@ The following codes show how to generate the text document format report. Differ
 			e.printStackTrace();
 		}
 	}
-
 Lastly, let's have a look at how to add chart to spreadsheet document. It's similar with text and presentation documents. On the other hand, it also has a special feature. You can specify a cell as the position where the chart should be located.    
- 
+
 	private static void generateSpreadsheetDocument() {
 		try {
 			SpreadsheetDocument spreadsheetDoc = SpreadsheetDocument.loadDocument("demo9_data.ods");
diff --git a/src/site/markdown/simple/demo/index.md b/src/site/markdown/simple/demo/index.md
index b921caa..867df8d 100644
--- a/src/site/markdown/simple/demo/index.md
+++ b/src/site/markdown/simple/demo/index.md
@@ -4,89 +4,151 @@
 This the demo list of Simple API. Each demo contains overview, code introduction and download resources. You can learn and try it easily.
 
 <ul>
-<li>
-<b>Automatically Formatting a Document</b><br/><br/>
-<div id="demotd"><div><a href="demo10.html"><img src="image/demo10_small.png"/></a></div>
-<br/>
-<div>It's a commen scenario that we need apply some necessary styles for plain text to improve its appearance. In this demo, a text document is created using plain text from a text file. The new document looks orderly and beautiful than before. <a href="demo10.html" >More...</a> 
-</div>
-</div>
-</li>
-<br/>
-<li>
-<b>Create Analysis Report with Charts</b><br/><br/>
-<div id="demotd"><div><a href="demo9.html"><img src="image/demo9_small.png"/></a></div>
-<br/>
-<div>In this demo, we will show how to create charts in presentation document, text document and spreadsheet document. Charts data is from a spreadsheet document. You can chose a cell range and using the values of these cells to generate a chart. It's easy and convenient. 
-<a href="demo9.html" >More...</a> 
-</div>
-</div>
-</li>
-<br/>
-<li>
-<b>Add 2D barcode image to a slide</b><br/><br/>
-<div id="demotd"><div><a href="demo8.html"><img src="image/demo8_small.png"/></a></div>
-<br/>
-<div>We get the author contact information from the metadata of a presentation document. With a RESTful web service, a 2D bar code image is generated based on these information. With image API, the bar code image will be added to the first slide of this presentation at last.
-<a href="demo8.html" >More...</a> 
-</div>
-</div>
-</li>
-<br/>
-<li>
-<b>Offer Letter with Text Fields</b><br/><br/>
-<div id="demotd"><div><a href="demo7.html"><img src="image/demo7_small.png"/></a></div>
-<br/>
-<div>We have introduced several samples about how to use Simple API to generate document from the predefined templete. But sounds like, we never talk about how to create a template document using Simple API. Today, let's do it! 
-<a href="demo7.html" >More...</a> 
-</div>
-</div>
-</li>
-<br/>
-<li>
-<b>Booking Sheet with Text Box</b><br/><br/>
-<div id="demotd"><div><a href="demo6.html"><img src="image/demo6-small.png"/></a></div>
-<br/>
-<div>This demo is similar with demo: Navigation API in Hotel Receipt. The different is that text box is included in the document template, so that we can show the text box feature in Simple API. Besides, this demo also shows the collaboration method between spreadsheet and text document templete. 
-<a href="demo6.html" >More...</a>
-</div>
-</div>
-</li>
-<br/>
-<li>
-<b>Multiple Presentations Assembler</b><br/><br/>
-<div id="demotd"><div><a href="demo5.html"><img src="image/demo5_doc small.jpg"/></a></div>
-<br/>
-<div>If you make a lot of presentations in your daily work, you know that you don't always create a presentation from scratch. This demo shows how to assemble several different presentations together to make a new presentation using Simple API. <a href="demo5.html" >More...</a> 
-</div>
-</div>
-</li>
-<br/>
-<li>
-<b>List and Table Conversion</b><br/><br/>
-<div id="demotd"><div><a href="demo4.html"><img src="image/demo4_organization_list_small.png"/></a></div>
-<br/>
-<div>Starting in version 0.4, we have added methods to support bullet, numbered and image lists. This includes frequently used features for processing lists and list item. This demo is designed to show the power of List API and help you learn how to use it. <a href="demo4.html" >More...</a> 
-</div>
-</div>
-</li>
-<br/>
-<li>
-<b>Navigation API in Hotel Receipt</b><br/><br/>
-<div id="demotd"><div><a href="demo3.html"><img src="image/Generated ODT small.jpg"/></a></div>
-<br/>
-<div>This demo is a simple template application about hotel receipt. By loading the configuration file and navigating the hotel receipt template, this demo could generate the ODF documents. <a href="demo3.html" >More...</a> 
-</div>
-</div>
-</li>
-<br/>
-<li>
-<b>Persentation Extraction and Combination<a href="demo2.html"></b><br/><br/>
-<div id="demotd"><div><a href="demo2.html"><img src="image/PresCombine.jpg"/></a></div>
-<br/>
-<div>To show the operation of Presentation in Simple API, the Presentation Codmbination demo is used which combine two independent presentation documents together and extract the notes of each slide out to a Text document. <a href="demo2.html" >More...</a>
-</div>
-</div> 
-</li>
+	<li>
+		<b>Automatically Formatting a Document</b>
+		<br/>
+		<br/>
+		<div id="demotd">
+			<div>
+				<a href="demo10.html">
+					<img src="image/demo10_small.png"/>
+				</a>
+			</div>
+			<br/>
+			<div>It's a commen scenario that we need apply some necessary styles for plain text to improve its appearance. In this demo, a text document is created using plain text from a text file. The new document looks orderly and beautiful than before. <a href="demo10.html">More...</a>
+			</div>
+		</div>
+	</li>
+	<br/>
+	<li>
+		<b>Create Analysis Report with Charts</b>
+		<br/>
+		<br/>
+		<div id="demotd">
+			<div>
+				<a href="demo9.html">
+					<img src="image/demo9_small.png"/>
+				</a>
+			</div>
+			<br/>
+			<div>In this demo, we will show how to create charts in presentation document, text document and spreadsheet document. Charts data is from a spreadsheet document. You can chose a cell range and using the values of these cells to generate a chart. It's easy and convenient. 
+				<a href="demo9.html">More...</a>
+			</div>
+		</div>
+	</li>
+	<br/>
+	<li>
+		<b>Add 2D barcode image to a slide</b>
+		<br/>
+		<br/>
+		<div id="demotd">
+			<div>
+				<a href="demo8.html">
+					<img src="image/demo8_small.png"/>
+				</a>
+			</div>
+			<br/>
+			<div>We get the author contact information from the metadata of a presentation document. With a RESTful web service, a 2D bar code image is generated based on these information. With image API, the bar code image will be added to the first slide of this presentation at last.
+				<a href="demo8.html">More...</a>
+			</div>
+		</div>
+	</li>
+	<br/>
+	<li>
+		<b>Offer Letter with Text Fields</b>
+		<br/>
+		<br/>
+		<div id="demotd">
+			<div>
+				<a href="demo7.html">
+					<img src="image/demo7_small.png"/>
+				</a>
+			</div>
+			<br/>
+			<div>We have introduced several samples about how to use Simple API to generate document from the predefined templete. But sounds like, we never talk about how to create a template document using Simple API. Today, let's do it! 
+				<a href="demo7.html">More...</a>
+			</div>
+		</div>
+	</li>
+	<br/>
+	<li>
+		<b>Booking Sheet with Text Box</b>
+		<br/>
+		<br/>
+		<div id="demotd">
+			<div>
+				<a href="demo6.html">
+					<img src="image/demo6-small.png"/>
+				</a>
+			</div>
+			<br/>
+			<div>This demo is similar with demo: Navigation API in Hotel Receipt. The different is that text box is included in the document template, so that we can show the text box feature in Simple API. Besides, this demo also shows the collaboration method between spreadsheet and text document templete. 
+				<a href="demo6.html">More...</a>
+			</div>
+		</div>
+	</li>
+	<br/>
+	<li>
+		<b>Multiple Presentations Assembler</b>
+		<br/>
+		<br/>
+		<div id="demotd">
+			<div>
+				<a href="demo5.html">
+					<img src="image/demo5_doc small.jpg"/>
+				</a>
+			</div>
+			<br/>
+			<div>If you make a lot of presentations in your daily work, you know that you don't always create a presentation from scratch. This demo shows how to assemble several different presentations together to make a new presentation using Simple API. <a href="demo5.html">More...</a>
+			</div>
+		</div>
+	</li>
+	<br/>
+	<li>
+		<b>List and Table Conversion</b>
+		<br/>
+		<br/>
+		<div id="demotd">
+			<div>
+				<a href="demo4.html">
+					<img src="image/demo4_organization_list_small.png"/>
+				</a>
+			</div>
+			<br/>
+			<div>Starting in version 0.4, we have added methods to support bullet, numbered and image lists. This includes frequently used features for processing lists and list item. This demo is designed to show the power of List API and help you learn how to use it. <a href="demo4.html">More...</a>
+			</div>
+		</div>
+	</li>
+	<br/>
+	<li>
+		<b>Navigation API in Hotel Receipt</b>
+		<br/>
+		<br/>
+		<div id="demotd">
+			<div>
+				<a href="demo3.html">
+					<img src="image/Generated ODT small.jpg"/>
+				</a>
+			</div>
+			<br/>
+			<div>This demo is a simple template application about hotel receipt. By loading the configuration file and navigating the hotel receipt template, this demo could generate the ODF documents. <a href="demo3.html">More...</a>
+			</div>
+		</div>
+	</li>
+	<br/>
+	<li>
+		<b>Persentation Extraction and Combination<a href="demo2.html"/>
+		</b>
+		<br/>
+		<br/>
+		<div id="demotd">
+			<a href="demo2.html">
+				<img src="image/PresCombine.jpg"/>
+			</a>
+		</div>
+		<br/>
+		<div>To show the operation of Presentation in Simple API, the Presentation Codmbination demo is used which combine two independent presentation documents together and extract the notes of each slide out to a Text document. <a href="demo2.html">More...</a>
+		</div>
+	</li>
 </ul>
 <br/>
\ No newline at end of file
diff --git a/src/site/markdown/simple/document/cookbook/Cell.md b/src/site/markdown/simple/document/cookbook/Cell.md
index b8e6320..94f5daa 100644
--- a/src/site/markdown/simple/document/cookbook/Cell.md
+++ b/src/site/markdown/simple/document/cookbook/Cell.md
@@ -1,60 +1,85 @@
-<strong><a href="../index.html">Documents</a></strong> > <strong><a href="index.html">Cookbook</a></strong> ><strong><a href="Cell.html">Cell</a></strong>
+
+<strong>
+	<a href="../index.html">Documents</a>
+</strong> > <strong><a href="index.html">Cookbook</a>
+</strong> ><strong><a href="Cell.html">Cell</a>
+</strong>
 <div class="navigation">
- <ul>
-  <li><a href="Column and Row.html">previous</a></li>
-  <li><a href="Cell Range.html">next</a></li>
- </ul>
+	<ul>
+		<li>
+			<a href="Column and Row.html">previous</a>
+		</li>
+		<li>
+			<a href="Cell Range.html">next</a>
+		</li>
+	</ul>
 </div>
 <br/>
-<br/><strong><a href="#Get Cell" >Get Cell</a></strong>
+<br/>
+<strong>
+	<a href="#Get Cell">Get Cell</a>
+</strong>
 <div class="bodytext">
 If you want to get the specified cell in a table,you can use the getCellByPosition method of Table.
 </div>
 <div class="bodytext">
 The first parameter is the column index,the second parameter is the row index.
 </div>
-<br/><pre class='code' id="code0">
-         <span class='javaclass'>TextDocument</span> document = (<span class='javaclass'>TextDocument</span>) <span class='javaclass'>TextDocument</span>.loadDocument(filePath);<br/>
-	 <span class='javaclass'>Table</span> table=document.getTableByName("stringTable");<br/>
-	 <span class='javaclass'>Cell</span> cell=table.getCellByPosition(1, 1);<br/>
+<br/>
+<pre class="code" id="code0">
+	<span class="javaclass">TextDocument</span> document = (<span class="javaclass">TextDocument</span>) <span class="javaclass">TextDocument</span>.loadDocument(filePath);<br/>
+	<span class="javaclass">Table</span> table=document.getTableByName("stringTable");<br/>
+	<span class="javaclass">Cell</span> cell=table.getCellByPosition(1, 1);<br/>
 </pre>
-<br/><div class="bodytext">
+<br/>
+<div class="bodytext">
 If you are manipulating a spreadsheet,you can get the cell by its address:
 </div>
-<br/><pre class='code' id="code1">
-	 <span class='javaclass'>Table</span> sheet1 = document.getTableByName("Sheet1");<br/>
-	 <span class='javaclass'>Cell</span> odsCell=sheet1.getCellByPosition("A1");<br/>
+<br/>
+<pre class="code" id="code1">
+	<span class="javaclass">Table</span> sheet1 = document.getTableByName("Sheet1");<br/>
+	<span class="javaclass">Cell</span> odsCell=sheet1.getCellByPosition("A1");<br/>
 </pre>
-<br/><div class="bodytext">
+<br/>
+<div class="bodytext">
 If you want to get a cell from a row,you can specify the index of the cell in the row.
 </div>
-<br/><pre class='code' id="code2">
-	 <span class='javaclass'>Row</span> row=table.getRowByIndex(1);<br/>
-	 <span class='javaclass'>Cell</span> cell2=row.getCellByIndex(1);<br/>
-	 <span class='javaclass'>System</span>.out.println(cell2.getStringValue());<br/>
+<br/>
+<pre class="code" id="code2">
+	<span class="javaclass">Row</span> row=table.getRowByIndex(1);<br/>
+	<span class="javaclass">Cell</span> cell2=row.getCellByIndex(1);<br/>
+	<span class="javaclass">System</span>.out.println(cell2.getStringValue());<br/>
 </pre>
-<br/><div class="bodytext">
+<br/>
+<div class="bodytext">
 What can I do if I have a Cell instance and want to know which column and row it belongs to ?
 </div>
 <div class="bodytext">
 The code below shows how you can do that:
 </div>
-<br/><pre class='code' id="code3">
-	 <span class='javaclass'>Row</span> row1=cell.getTableRow();<br/>
-	 <span class='javaclass'>Column</span> column1=cell.getTableColumn();<br/>
+<br/>
+<pre class="code" id="code3">
+	<span class="javaclass">Row</span> row1=cell.getTableRow();<br/>
+	<span class="javaclass">Column</span> column1=cell.getTableColumn();<br/>
 </pre>
-<br/><br/><strong><a href="#Control Cell Attributes" >Control Cell Attributes</a></strong>
+<br/>
+<br/>
+<strong>
+	<a href="#Control Cell Attributes">Control Cell Attributes</a>
+</strong>
 <div class="bodytext">
 Use the getStyleName() method you can get the style name of the cell.
 </div>
 <div class="bodytext">
 If you want to change the style,it must be set when you set the display text.
 </div>
-<br/><pre class='code' id="code4">
-	 <span class='javaclass'>String</span> cellSytle=cell.getStyleName();<br/>
+<br/>
+<pre class="code" id="code4">
+	<span class="javaclass">String</span> cellSytle=cell.getStyleName();<br/>
 	 cell.setDisplayText("content", cellSytle);<br/>
 </pre>
-<br/><div class="bodytext">
+<br/>
+<div class="bodytext">
 What can I do if I want to control the display alignment of the cell?
 </div>
 <div class="bodytext">
@@ -63,59 +88,74 @@ You can set the horizontal and vertical alignment to do so.
 <div class="bodytext">
 The code below shows how to get and set the alignment.You can refer to the javadoc about the alignment type.
 </div>
-<br/><pre class='code' id="code5">
-	  <span class='javaclass'>StyleTypeDefinitions</span>.<span class='javaclass'>HorizontalAlignmentType</span> horizontalAlign=cell.getHorizontalAlignmentType();<br/>
-	  <span class='javaclass'>StyleTypeDefinitions</span>.<span class='javaclass'>VerticalAlignmentType</span> verticalAlign=cell.getVerticalAlignmentType();<br/>
-	  cell.setHorizontalAlignment(<span class='javaclass'>StyleTypeDefinitions</span>.<span class='javaclass'>HorizontalAlignmentType</span>.<span class='javaclass'>CENTER</span>);<br/>
-	  cell.setVerticalAlignment(<span class='javaclass'>StyleTypeDefinitions</span>.<span class='javaclass'>VerticalAlignmentType</span>.<span class='javaclass'>BOTTOM</span>);<br/>
+<br/>
+<pre class="code" id="code5">
+	<span class="javaclass">StyleTypeDefinitions</span>.<span class="javaclass">HorizontalAlignmentType</span> horizontalAlign=cell.getHorizontalAlignmentType();<br/>
+	<span class="javaclass">StyleTypeDefinitions</span>.<span class="javaclass">VerticalAlignmentType</span> verticalAlign=cell.getVerticalAlignmentType();<br/>
+	  cell.setHorizontalAlignment(<span class="javaclass">StyleTypeDefinitions</span>.<span class="javaclass">HorizontalAlignmentType</span>.<span class="javaclass">CENTER</span>);<br/>
+	  cell.setVerticalAlignment(<span class="javaclass">StyleTypeDefinitions</span>.<span class="javaclass">VerticalAlignmentType</span>.<span class="javaclass">BOTTOM</span>);<br/>
 </pre>
-<br/><div class="bodytext">
+<br/>
+<div class="bodytext">
 If the content of the cell is too long,you can set the wrap option of the cell.
 </div>
-<br/><pre class='code' id="code6">
-	   cell.setTextWrapped(<span class='basic'>true</span>);<br/>
+<br/>
+<pre class="code" id="code6">
+	   cell.setTextWrapped(<span class="basic">true</span>);<br/>
 </pre>
-<br/><div class="bodytext">
+<br/>
+<div class="bodytext">
 If don't know the cell is wrapped or not,you can use the method:
 </div>
-<br/><pre class='code' id="code7">
-	   <span class='basic'>boolean</span> isTextWrapped=cell.isTextWrapped();<br/>
+<br/>
+<pre class="code" id="code7">
+	<span class="basic">boolean</span> isTextWrapped=cell.isTextWrapped();<br/>
 </pre>
-<br/><div class="bodytext">
+<br/>
+<div class="bodytext">
 If you want to set the background color of the cell,be care that the color type is org.odftoolkit.odfdom.type.Color.
 </div>
-<br/><pre class='code' id="code8">
-	    <span class='javaclass'>Color</span> cellBackgroundColor=cell.getCellBackgroundColor();<br/>
-	    cell.setCellBackgroundColor(<span class='javaclass'>Color</span>.valueOf("#000000"));<br/>
+<br/>
+<pre class="code" id="code8">
+	<span class="javaclass">Color</span> cellBackgroundColor=cell.getCellBackgroundColor();<br/>
+	    cell.setCellBackgroundColor(<span class="javaclass">Color</span>.valueOf("#000000"));<br/>
 </pre>
-<br/><div class="bodytext">
+<br/>
+<div class="bodytext">
 How can I control the spanned number of the column/row:
 </div>
-<br/><pre class='code' id="code9">
-	    <span class='basic'>int</span> spannedNum=cell.getcgetColumnSpannedNumber();<br/>
+<br/>
+<pre class="code" id="code9">
+	<span class="basic">int</span> spannedNum=cell.getcgetColumnSpannedNumber();<br/>
 	    cell.setColumnSpannedNumber(spannedNum);<br/>
-	    <span class='basic'>int</span> rowSpannedNum=cell.getRowSpannedNumber();<br/>
+	<span class="basic">int</span> rowSpannedNum=cell.getRowSpannedNumber();<br/>
 	    cell.setRowSpannedNumber(rowSpannedNum);<br/>
 </pre>
-<br/><div class="bodytext">
+<br/>
+<div class="bodytext">
 For column,maybe you want to know the column repeated number:
 </div>
-<br/><pre class='code' id="code10">
-	    <span class='basic'>int</span> repeatedNum=cell.getColumnsRepeatedNumber();<br/>
+<br/>
+<pre class="code" id="code10">
+	<span class="basic">int</span> repeatedNum=cell.getColumnsRepeatedNumber();<br/>
 	    cell.setColumnsRepeatedNumber(repeatedNum);<br/>
 </pre>
-<br/><div class="bodytext">
+<br/>
+<div class="bodytext">
 How about formatting a cell's content? You can set the format string of the cell to do so.
 </div>
 <div class="bodytext">
 For example you want to format the date to yyyy-MM-dd ,you can:
 </div>
-<br/><pre class='code' id="code11">
-	      <span class='javaclass'>String</span> cellFormatStr=cell.getFormatString();<br/>
-	      cell.setDateValue(<span class='modifier'>new</span> <span class='javaclass'>GregorianCalendar</span>(2010,5,1));<br/>
-	      cell.setFormatString("yyyy-<span class='javaclass'>MM</span>-dd");<br/>
+<br/>
+<pre class="code" id="code11">
+	<span class="javaclass">String</span> cellFormatStr=cell.getFormatString();<br/>
+	      cell.setDateValue(<span class="modifier">new</span>
+	<span class="javaclass">GregorianCalendar</span>(2010,5,1));<br/>
+	      cell.setFormatString("yyyy-<span class="javaclass">MM</span>-dd");<br/>
 </pre>
-<br/><div class="bodytext">
+<br/>
+<div class="bodytext">
 Be care that the setFormatString only works for float, date and percentage.
 </div>
 <div class="bodytext">
@@ -124,121 +164,173 @@ You may be confused by the difference between getFormatString and getFormula,the
 <div class="bodytext">
 For the setFormula method,it just sets as a formula attribute,the cell value will not be calculated.
 </div>
-<br/><pre class='code' id="code12">
-	      <span class='javaclass'>String</span> formula=cell.getFormula();<br/>
+<br/>
+<pre class="code" id="code12">
+	<span class="javaclass">String</span> formula=cell.getFormula();<br/>
 	      cell.setFormula(formula);    <br/>
 </pre>
-<br/><div class="bodytext">
+<br/>
+<div class="bodytext">
 How can I clear the content of the cell?
 </div>
 <div class="bodytext">
 RemoveContent remove all of the cell while the removeTextContent only remove the text content of the cell.
 </div>
-<br/><pre class='code' id="code13">
+<br/>
+<pre class="code" id="code13">
 	   cell.removeContent();<br/>
 	   cell.removeTextContent();<br/>
 </pre>
-<br/><br/><strong><a href="#Get&Set Cell Value Type" >Get&Set Cell Value Type</a></strong>
+<br/>
+<br/>
+<strong>
+	<a href="#Get&amp;Set Cell Value Type">Get&amp;Set Cell Value Type</a>
+</strong>
 <div class="bodytext">
-	 The cell value can have different types,for the setValueType method:	 the parameter can be 	 <ul><li>"boolean"</li>	 <li>"currency"</li>	 <li>"date"</li>	 <li>"float"</li>         <li>"percentage"</li>	 <li>"string"</li>	 <li>"time"</li>	 <li>"void"</li>	 </ul>	 If the parameter type is not a valid cell type, an IllegalArgumentException will be thrown.
+	 The cell value can have different types,for the setValueType method:	 the parameter can be 	 <ul><li>"boolean"</li>
+		<li>"currency"</li>
+		<li>"date"</li>
+		<li>"float"</li>
+		<li>"percentage"</li>
+		<li>"string"</li>
+		<li>"time"</li>
+		<li>"void"</li>
+	</ul>	 If the parameter type is not a valid cell type, an IllegalArgumentException will be thrown.
 </div>
-<br/><pre class='code' id="code14">
-	   <span class='javaclass'>String</span> valueType=cell.getValueType();<br/>
+<br/>
+<pre class="code" id="code14">
+	<span class="javaclass">String</span> valueType=cell.getValueType();<br/>
 	   cell.setValueType(valueType);<br/>
 </pre>
-<br/><div class="bodytext">
+<br/>
+<div class="bodytext">
 For the following getXXXValue() method:it gets the cell value as xxx type.An IllegalArgumentException will be thrown if the cell type is not xxx.
 </div>
-<a href="#Get&Set boolean type Cell" >Get&Set boolean type Cell</a>
+<a href="#Get&amp;Set boolean type Cell">Get&amp;Set boolean type Cell</a>
 <div class="bodytext">
 	For setBooleanValue method:it sets the cell value as a boolean and sets the value type to be boolean.
 </div>
-<br/><pre class='code' id="code15">
-	   <span class='basic'>boolean</span> booleanValue=cell.getBooleanValue();<br/>
+<br/>
+<pre class="code" id="code15">
+	<span class="basic">boolean</span> booleanValue=cell.getBooleanValue();<br/>
 	   cell.setBooleanValue(booleanValue);<br/>
 </pre>
-<br/><a href="#Get&Set currency type Cell" >Get&Set currency type Cell</a>
+<br/>
+<a href="#Get&amp;Set currency type Cell">Get&amp;Set currency type Cell</a>
 <div class="bodytext">
 For the following getting methods,if the value type is not "currency", an IllegalArgumentException will be thrown.
 </div>
 <div class="bodytext">
 The currency code of the cell is like "USD", "EUR", "CNY", and the currency symbol is like "$"
 </div>
-<br/><pre class='code' id="code16">
-	   <span class='javaclass'>String</span> currencyCode=cell.getCurrencyCode();  <br/>
-	   cell.setCurrencyCode("<span class='javaclass'>USD</span>");<br/>
+<br/>
+<pre class="code" id="code16">
+	<span class="javaclass">String</span> currencyCode=cell.getCurrencyCode();  <br/>
+	   cell.setCurrencyCode("<span class="javaclass">USD</span>");<br/>
 </pre>
-<br/><div class="bodytext">
+<br/>
+<div class="bodytext">
 You can also set currency value and currency format.Please note the overall format includes the symbol character, for example: $#,##0.00.
 </div>
-<br/><pre class='code' id="code17">
-	   cell.setCurrencyValue(100.00, "<span class='javaclass'>USD</span>");<br/>
+<br/>
+<pre class="code" id="code17">
+	   cell.setCurrencyValue(100.00, "<span class="javaclass">USD</span>");<br/>
 	   cell.setCurrencyFormat("$", "$#,##0.00");<br/>
 </pre>
-<br/><a href="#Get&Set date type Cell" >Get&Set date type Cell</a>
-<br/><pre class='code' id="code18">
-	   <span class='javaclass'>Calendar</span> dateValue=cell.getDateValue(); <br/>
-	   cell.setDateValue(<span class='modifier'>new</span> <span class='javaclass'>GregorianCalendar</span>(2010,5,1));<br/>
+<br/>
+<a href="#Get&amp;Set date type Cell">Get&amp;Set date type Cell</a>
+<br/>
+<pre class="code" id="code18">
+	<span class="javaclass">Calendar</span> dateValue=cell.getDateValue(); <br/>
+	   cell.setDateValue(<span class="modifier">new</span>
+	<span class="javaclass">GregorianCalendar</span>(2010,5,1));<br/>
 </pre>
-<br/><a href="#Get&Set float type Cell" >Get&Set float type Cell</a>
-<br/><pre class='code' id="code19">
-	  <span class='basic'>double</span> floatValue=cell.getDoubleValue();  <br/>
-	  cell.setDoubleValue(<span class='modifier'>new</span> <span class='javaclass'>Double</span>(22.99f));<br/>
+<br/>
+<a href="#Get&amp;Set float type Cell">Get&amp;Set float type Cell</a>
+<br/>
+<pre class="code" id="code19">
+	<span class="basic">double</span> floatValue=cell.getDoubleValue();  <br/>
+	  cell.setDoubleValue(<span class="modifier">new</span>
+	<span class="javaclass">Double</span>(22.99f));<br/>
 </pre>
-<br/><a href="#Get&Set percentage type Cell" >Get&Set percentage type Cell</a>
-<br/><pre class='code' id="code20">
-	  <span class='basic'>double</span> percentageValue=cell.getPercentageValue();<br/>
+<br/>
+<a href="#Get&amp;Set percentage type Cell">Get&amp;Set percentage type Cell</a>
+<br/>
+<pre class="code" id="code20">
+	<span class="basic">double</span> percentageValue=cell.getPercentageValue();<br/>
 	  cell.setPercentageValue(0.89);<br/>
 </pre>
-<br/><a href="#Get&Set string type Cell" >Get&Set string type Cell</a>
+<br/>
+<a href="#Get&amp;Set string type Cell">Get&amp;Set string type Cell</a>
 <div class="bodytext">
 If the cell type is not string, the display text will be returned.
 </div>
-<br/><pre class='code' id="code21">
-	  <span class='javaclass'>String</span> stringValue=cell.getStringValue();   <br/>
+<br/>
+<pre class="code" id="code21">
+	<span class="javaclass">String</span> stringValue=cell.getStringValue();   <br/>
 	  cell.setStringValue("simple");<br/>
 </pre>
-<br/><a href="#Deal with the Time Value" >Deal with the Time Value</a>
+<br/>
+<a href="#Deal with the Time Value">Deal with the Time Value</a>
 <div class="bodytext">
 If you want to get the string type of time value,you can format it:
 </div>
-<br/><pre class='code' id="code22">
-	  cell.setTimeValue(<span class='javaclass'>Calendar</span>.getInstance());<br/>
-	  <span class='javaclass'>SimpleDateFormat</span> simpleFormat = <span class='modifier'>new</span> <span class='javaclass'>SimpleDateFormat</span>("'<span class='javaclass'>PT</span>'<span class='javaclass'>HH</span>'H'mm'M'ss'S'");<br/>
-          <span class='javaclass'>String</span>  timeString= simpleFormat.format(cell.getTimeValue().getTime());<br/>
+<br/>
+<pre class="code" id="code22">
+	  cell.setTimeValue(<span class="javaclass">Calendar</span>.getInstance());<br/>
+	<span class="javaclass">SimpleDateFormat</span> simpleFormat = <span class="modifier">new</span>
+	<span class="javaclass">SimpleDateFormat</span>("'<span class="javaclass">PT</span>'<span class="javaclass">HH</span>'H'mm'M'ss'S'");<br/>
+	<span class="javaclass">String</span>  timeString= simpleFormat.format(cell.getTimeValue().getTime());<br/>
 </pre>
-<br/><a href="#Something about Display Text" >Something about Display Text</a>
+<br/>
+<a href="#Something about Display Text">Something about Display Text</a>
 <div class="bodytext">
           Please note the display text in ODF viewer might be different from the value set by this method,	  because the displayed text in ODF viewer is calculated and set by editor. 
 </div>
-<br/><pre class='code' id="code23">
-	  <span class='javaclass'>String</span> displayText=cell.getDisplayText();<br/>
+<br/>
+<pre class="code" id="code23">
+	<span class="javaclass">String</span> displayText=cell.getDisplayText();<br/>
 	  cell.setDisplayText(displayText);<br/>
 </pre>
-<br/><br/><strong><a href="#Set image" >Set image</a></strong>
+<br/>
+<br/>
+<strong>
+	<a href="#Set image">Set image</a>
+</strong>
 <div class="bodytext">
 		From version 0.5.5, we support high level APIs for images.	    You can use following codes to set an image to a cell.
 </div>
-<br/><pre class='code' id="code24">
-	    <span class='javaclass'>Image</span> myImage = cell.setImage(<span class='modifier'>new</span> <span class='javaclass'>URI</span>("http://www.xxx.com/a.jpg"));<br/>
+<br/>
+<pre class="code" id="code24">
+	<span class="javaclass">Image</span> myImage = cell.setImage(<span class="modifier">new</span>
+	<span class="javaclass">URI</span>( http://www.xxx.com/a.jpg ));<br/>
 </pre>
-<br/><div class="bodytext">
+<br/>
+<div class="bodytext">
 	    You can use following codes to access an image in a cell.
 </div>
-<br/><pre class='code' id="code25">
-	    <span class='javaclass'>Image</span> image = cell.getImage();<br/>
-	    <span class='javaclass'>String</span> imagename = image.getName();<br/>
-	    <span class='javaclass'>FrameRectangle</span> rect = image.getRectangle();<br/>
+<br/>
+<pre class="code" id="code25">
+	<span class="javaclass">Image</span> image = cell.getImage();<br/>
+	<span class="javaclass">String</span> imagename = image.getName();<br/>
+	<span class="javaclass">FrameRectangle</span> rect = image.getRectangle();<br/>
 	    rect.setX(1);<br/>
 	    rect.setY(1);<br/>
 	    image.setRectangle(rect);<br/>
 </pre>
-<br/><br/> 
+<br/>
+<br/>
 <div class="navigation">
- <ul>
-  <li><a href="Column and Row.html">previous</a></li>
-  <li><a href="Cell Range.html">next</a></li>
-  <li><a href="#">top</a></li>
- </ul>
+	<ul>
+		<li>
+			<a href="Column and Row.html">previous</a>
+		</li>
+		<li>
+			<a href="Cell Range.html">next</a>
+		</li>
+		<li>
+			<a href="#">top</a>
+		</li>
+	</ul>
 </div>
 <link type="text/css" rel="stylesheet" href="cookbook.css"/>
diff --git a/src/site/markdown/simple/document/cookbook/Charts.md b/src/site/markdown/simple/document/cookbook/Charts.md
index 8cff104..372b2fd 100644
--- a/src/site/markdown/simple/document/cookbook/Charts.md
+++ b/src/site/markdown/simple/document/cookbook/Charts.md
@@ -1,125 +1,187 @@
-<strong><a href="../index.html">Documents</a></strong> > <strong><a href="index.html">Cookbook</a></strong> ><strong><a href="Charts.html">Charts</a></strong>
+<strong>
+	<a href="../index.html">Documents</a>
+</strong> > <strong><a href="index.html">Cookbook</a>
+</strong> ><strong><a href="Charts.html">Charts</a>
+</strong>
 <div class="navigation">
- <ul>
-  <li><a href="Cell Range.html">previous</a></li>
-  <li><a href="Style Handling.html">next</a></li>
- </ul>
+	<ul>
+		<li>
+			<a href="Cell Range.html">previous</a>
+		</li>
+		<li>
+			<a href="Style Handling.html">next</a>
+		</li>
+	</ul>
 </div>
 <br/>
-<br/><strong><a href="#Overview" >Overview</a></strong>
+<br/>
+<strong>
+	<a href="#Overview">Overview</a>
+</strong>
 <div class="bodytext">
-	    Since 0.6, Simple ODF provides methods to manipulate charts in text document, spreadsheet document and presentation document.		You can create, update and delete charts with these methods.
+ Since 0.6, Simple ODF provides methods to manipulate charts in text document, spreadsheet document and presentation document. You can create, update and delete charts with these methods.
 </div>
-<br/><strong><a href="#Create charts" >Create charts</a></strong>
+<br/>
+<strong>
+	<a href="#Create charts">Create charts</a>
+</strong>
 <div class="bodytext">
-		We all know, a chart is associated with a table. In order to create a chart, you must determine the data set of this chart.		The data set can be a cell range of a table, for example:
+ We all know, a chart is associated with a table. In order to create a chart, you must determine the data set of this chart. The data set can be a cell range of a table, for example:
 </div>
-<br/><pre class='code' id="code0">
-		<span class='javaclass'>CellRangeAddressList</span> cellRange = <span class='javaclass'>CellRangeAddressList</span>.valueOf("A.A1:A.B3");<br/>
-		<span class='javaclass'>DataSet</span> dataSet = <span class='modifier'>new</span> <span class='javaclass'>DataSet</span>(cellRange, spreadsheetDoc, <span class='basic'>true</span>, <span class='basic'>true</span>, <span class='basic'>false</span>);<br/>
+<br/>
+<pre class="code" id="code0">
+	<span class="javaclass">CellRangeAddressList</span> cellRange = <span class="javaclass">CellRangeAddressList</span>.valueOf(&amp;quot;A.A1:A.B3&amp;quot;);<br/>
+	<span class="javaclass">DataSet</span> dataSet = <span class="modifier">new</span>
+	<span class="javaclass">DataSet</span>(cellRange, spreadsheetDoc, <span class="basic">true</span>, <span class="basic">true</span>, <span class="basic">false</span>);<br/>
 </pre>
-<br/><div class="bodytext">
-		Or a two dimensional array, for example:
-</div>
-<br/><pre class='code' id="code1">
-		<span class='basic'>int</span> row = 2, column = 3;<br/>
-		<span class='basic'>double</span>[][] data = <span class='modifier'>new</span> <span class='basic'>double</span>[column][row];<br/>
-		<span class='javaclass'>String</span>[] labels = <span class='modifier'>new</span> <span class='javaclass'>String</span>[row];<br/>
-		<span class='javaclass'>String</span>[] legends = <span class='modifier'>new</span> <span class='javaclass'>String</span>[column];<br/>
-		<span class='javaclass'>DataSet</span> dataset = <span class='modifier'>new</span> <span class='javaclass'>DataSet</span>(labels, legends, data);<br/>
+<br/>
+<div class="bodytext">
+ Or a two dimensional array, for example:
+</div>
+<br/>
+<pre class="code" id="code1">
+	<span class="basic">int</span> row = 2, column = 3;<br/>
+	<span class="basic">double</span>[][] data = <span class="modifier">new</span>
+	<span class="basic">double</span>[column][row];<br/>
+	<span class="javaclass">String</span>[] labels = <span class="modifier">new</span>
+	<span class="javaclass">String</span>[row];<br/>
+	<span class="javaclass">String</span>[] legends = <span class="modifier">new</span>
+	<span class="javaclass">String</span>[column];<br/>
+	<span class="javaclass">DataSet</span> dataset = <span class="modifier">new</span>
+	<span class="javaclass">DataSet</span>(labels, legends, data);<br/>
 </pre>
-<br/><div class="bodytext">
-		You should also use rectangle to define the position and the size of this chart. For example: 
-</div>
-<br/><pre class='code' id="code2">
-		<span class='javaclass'>Rectangle</span> rect = <span class='modifier'>new</span> <span class='javaclass'>Rectangle</span>();<br/>
-		rect.x = 2000;<br/>
-		rect.y = 2700;<br/>
-		rect.width = 15000;<br/>
-		rect.height = 8000;<br/>
-		rect.y = 110000;<br/>
+<br/>
+<div class="bodytext">
+ You should also use rectangle to define the position and the size of this chart. For example: 
+</div>
+<br/>
+<pre class="code" id="code2">
+	<span class="javaclass">Rectangle</span> rect = <span class="modifier">new</span>
+	<span class="javaclass">Rectangle</span>();<br/>
+ rect.x = 2000;<br/>
+ rect.y = 2700;<br/>
+ rect.width = 15000;<br/>
+ rect.height = 8000;<br/>
+ rect.y = 110000;<br/>
 </pre>
-<br/><div class="bodytext">
-		Then you can create a chart:
+<br/>
+<div class="bodytext">
+ Then you can create a chart:
 </div>
-<br/><pre class='code' id="code3">
-		spreadsheetDoc.createChart("<span class='javaclass'>Page</span> <span class='javaclass'>Visit</span>", dataSet,rect);<br/>
+<br/>
+<pre class="code" id="code3">
+ spreadsheetDoc.createChart(&amp;quot;<span class="javaclass">Page</span>
+	<span class="javaclass">Visit</span>&amp;quot;, dataSet,rect);<br/>
 </pre>
-<br/><div class="bodytext">
-		There are some shortcut methods to create charts, for example, below codes show how to create a chart in a text document:
+<br/>
+<div class="bodytext">
+ There are some shortcut methods to create charts, for example, below codes show how to create a chart in a text document:
 </div>
-<br/><pre class='code' id="code4">
-		<span class='javaclass'>Chart</span> chart = textDoc.createChart(<br/>
-				"<span class='javaclass'>Page</span> <span class='javaclass'>Visit</span>", spreadsheetDoc,<br/>
-				cellRange, <span class='basic'>true</span>, <span class='basic'>true</span>, <span class='basic'>false</span>, rect);<br/>
+<br/>
+<pre class="code" id="code4">
+	<span class="javaclass">Chart</span> chart = textDoc.createChart(<br/>
+ "<span class="javaclass">Page</span>
+	<span class="javaclass">Visit</span>", spreadsheetDoc,<br/>
+ cellRange, <span class="basic">true</span>, <span class="basic">true</span>, <span class="basic">false</span>, rect);<br/>
 </pre>
-<br/><div class="bodytext">
-		If you want to create a chart in a spreadsheet document, you need to specify a cell to be the anchor of this chart, for example: 
+<br/>
+<div class="bodytext">
+ If you want to create a chart in a spreadsheet document, you need to specify a cell to be the anchor of this chart, for example: 
 </div>
-<br/><pre class='code' id="code5">
-		spreadsheetDoc.createChart("<span class='javaclass'>Page</span> <span class='javaclass'>Visit</span>", spreadsheetDoc, cellRange,<br/>
-				<span class='basic'>true</span>, <span class='basic'>true</span>, <span class='basic'>false</span>, rect, spreadsheetDoc.getTableByName("C")<br/>
-						.getCellByPosition("D10"));<br/>
+<br/>
+<pre class="code" id="code5">
+ spreadsheetDoc.createChart("<span class="javaclass">Page</span>
+	<span class="javaclass">Visit</span>", spreadsheetDoc, cellRange,<br/>
+	<span class="basic">true</span>, <span class="basic">true</span>, <span class="basic">false</span>, rect, spreadsheetDoc.getTableByName("C")<br/>
+ .getCellByPosition("D10"));<br/>
 </pre>
-<br/><div class="bodytext">
-		If you want to create a chart in a presentation document, you can use the existing layout of a slide, which means, you don't need to specify		a rectangle. The layouts that could contain a chart include: TITLE_PLUS_CHART, TITLE_PLUS_2_CHART, TITLE_LEFT_CHART_RIGHT_OUTLINE,		TITLE_PLUS_3_OBJECT, and TITLE_PLUS_4_OBJECT. For example:
-</div>
-<br/><pre class='code' id="code6">
-		<span class='javaclass'>Slide</span> slide = presentationDoc.newSlide(2, "Slide3",<br/>
-				<span class='javaclass'>SlideLayout</span>.TITLE_PLUS_2_CHART);<br/>
-		chart = slide.createChart("<span class='javaclass'>Count</span> of <span class='javaclass'>Visits</span>", spreadsheetDoc,<br/>
-				cellRange, <span class='basic'>true</span>, <span class='basic'>true</span>, <span class='basic'>false</span>, <span class='basic'>null</span>);<br/>
+<br/>
+<div class="bodytext">
+ If you want to create a chart in a presentation document, you can use the existing layout of a slide, which means, you don't need to specify a rectangle. The layouts that could contain a chart include: TITLE_PLUS_CHART, TITLE_PLUS_2_CHART, TITLE_LEFT_CHART_RIGHT_OUTLINE, TITLE_PLUS_3_OBJECT, and TITLE_PLUS_4_OBJECT. For example:
+</div>
+<br/>
+<pre class="code" id="code6">
+	<span class="javaclass">Slide</span> slide = presentationDoc.newSlide(2, "Slide3",<br/>
+	<span class="javaclass">SlideLayout</span>.TITLE_PLUS_2_CHART);<br/>
+ chart = slide.createChart("<span class="javaclass">Count</span> of <span class="javaclass">Visits</span>", spreadsheetDoc,<br/>
+ cellRange, <span class="basic">true</span>, <span class="basic">true</span>, <span class="basic">false</span>, <span class="basic">null</span>);<br/>
 </pre>
-<br/><br/><strong><a href="#Update charts" >Update charts</a></strong>
+<br/>
+<br/>
+<strong>
+	<a href="#Update charts">Update charts</a>
+</strong>
 <div class="bodytext">
-		You can update charts properties, for example, the title, axis title, chart type, whether to apply 3D effect, whether to use legend with API.		For example:
-</div>
-<br/><pre class='code' id="code7">
-		chart.setChartTitle("<span class='javaclass'>New</span> title");<br/>
-		chart.setAxisTitle("<span class='javaclass'>Hour</span>", "<span class='javaclass'>Number</span>");<br/>
-		chart.setChartType(<span class='javaclass'>ChartType</span>.<span class='javaclass'>AREA</span>);<br/>
-		chart.setApply3DEffect(<span class='basic'>true</span>);<br/>
-		chart.setUseLegend(<span class='basic'>true</span>);<br/>
+ You can update charts properties, for example, the title, axis title, chart type, whether to apply 3D effect, whether to use legend with API. For example:
+</div>
+<br/>
+<pre class="code" id="code7">
+ chart.setChartTitle(&amp;quot;<span class="javaclass">New</span> title");<br/>
+ chart.setAxisTitle(&amp;quot;<span class="javaclass">Hour</span>&amp;quot;, &amp;quot;<span class="javaclass">Number</span>&amp;quot;);<br/>
+ chart.setChartType(<span class="javaclass">ChartType</span>.<span class="javaclass">AREA</span>);<br/>
+ chart.setApply3DEffect(<span class="basic">true</span>);<br/>
+ chart.setUseLegend(<span class="basic">true</span>);<br/>
 </pre>
-<br/><div class="bodytext">
-		You can update the data set too. For example:
+<br/>
+<div class="bodytext">
+ You can update the data set too. For example:
 </div>
-<br/><pre class='code' id="code8">
-		chart.setChartData(<span class='modifier'>new</span> <span class='javaclass'>DataSet</span>(<span class='javaclass'>CellRangeAddressList</span>.valueOf("A.A1:A.C4"), spreadsheetDoc, true, true, true));<br/>
+<br/>
+<pre class="code" id="code8">
+ chart.setChartData(<span class="modifier">new</span>
+	<span class="javaclass">DataSet</span>(<span class="javaclass">CellRangeAddressList</span>.valueOf(&amp;quot;A.A1:A.C4&amp;quot;), spreadsheetDoc, true, true, true));<br/>
 </pre>
-<br/><br/><strong><a href="#Get and delete charts" >Get and delete charts</a></strong>
+<br/>
+<br/>
+<strong>
+	<a href="%23Get and delete charts">Get and delete charts</a>
+</strong>
 <div class="bodytext">
-		You can get charts by title e.g.
+ You can get charts by title e.g.
 </div>
-<br/><pre class='code' id="code9">
-		chart = textDoc.getChartByTitle("<span class='javaclass'>New</span> title").get(0);<br/>
+<br/>
+<pre class="code" id="code9">
+ chart = textDoc.getChartByTitle(<span class="javaclass">New</span> title).get(0);<br/>
 </pre>
-<br/><div class="bodytext">
-		You can also get a chart by its unique ID. The unique ID of a chart in Simple ODF API is the path of the chart document (relative to the ODF document package).		The unique ID can be gotten with method:
+<br/>
+<div class="bodytext">
+ You can also get a chart by its unique ID. The unique ID of a chart in Simple ODF API is the path of the chart document (relative to the ODF document package). The unique ID can be gotten with method:
 </div>
-<br/><pre class='code' id="code10">
-		<span class='javaclass'>String</span> chartid = chart.getChartID();<br/>
-		chart = textDoc.getChartById(chartid);<br/>
+<br/>
+<pre class="code" id="code10">
+	<span class="javaclass">String</span> chartid = chart.getChartID();<br/>
+ chart = textDoc.getChartById(chartid);<br/>
 </pre>
-<br/><div class="bodytext">
-		You can also get the count of charts in this document.
+<br/>
+<div class="bodytext">
+ You can also get the count of charts in this document.
 </div>
-<br/><pre class='code' id="code11">
-		<span class='basic'>int</span> count = textDoc.getChartCount();<br/>
+<br/>
+<pre class="code" id="code11">
+	<span class="basic">int</span> count = textDoc.getChartCount();<br/>
 </pre>
-<br/><div class="bodytext">
-		You can delete a chart by ID or by title, e.g.
+<br/>
+<div class="bodytext">
+ You can delete a chart by ID or by title, e.g.
 </div>
-<br/><pre class='code' id="code12">
-		textDoc.deleteChartById(chartid);<br/>
-		textDoc.deleteChartByTitle("<span class='javaclass'>New</span> title");<br/>
+<br/>
+<pre class="code" id="code12">
+ textDoc.deleteChartById(chartid);<br/>
+ textDoc.deleteChartByTitle(&amp;quot;<span class="javaclass">New</span> title&amp;quot;);<br/>
 </pre>
-<br/><br/> 
+<br/>
+<br/>
 <div class="navigation">
- <ul>
-  <li><a href="Cell Range.html">previous</a></li>
-  <li><a href="Style Handling.html">next</a></li>
-  <li><a href="#">top</a></li>
- </ul>
-</div>
-<link type="text/css" rel="stylesheet" href="cookbook.css"/>
+	<ul>
+		<li>
+			<a href="Cell Range.html">previous</a>
+		</li>
+		<li>
+			<a href="Style Handling.html">next</a>
+		</li>
+		<li>
+			<a href="#">top</a>
+		</li>
+	</ul>
+</div>
+<link type="text/css" rel="stylesheet" href="cookbook.css"/>
\ No newline at end of file
diff --git a/src/site/markdown/simple/document/cookbook/Fields.md b/src/site/markdown/simple/document/cookbook/Fields.md
index d1a0170..56ba43c 100644
--- a/src/site/markdown/simple/document/cookbook/Fields.md
+++ b/src/site/markdown/simple/document/cookbook/Fields.md
@@ -1,134 +1,232 @@
-<strong><a href="../index.html">Documents</a></strong> > <strong><a href="index.html">Cookbook</a></strong> ><strong><a href="Fields.html">Fields</a></strong>
+<strong>
+	<a href="../index.html">Documents</a>
+</strong>
+<strong>
+	<a href="index.html">Cookbook</a>
+</strong>
+<strong>
+	<a href="Fields.html">Fields</a>
+</strong>
 <div class="navigation">
- <ul>
-  <li><a href="TextExtractor.html">previous</a></li>
-  <li><a href="Forms.html">next</a></li>
- </ul>
+	<ul>
+		<li>
+			<a href="TextExtractor.html">previous</a>
+		</li>
+		<li>
+			<a href="Forms.html">next</a>
+		</li>
+	</ul>
 </div>
 <br/>
-<br/><strong><a href="#Variable Field" >Variable Field</a></strong>
+<br/>
+<strong>
+	<a href="#Variable Field">Variable Field</a>
+</strong>
 <div class="bodytext">
 			You can use the following code to create a variable field, and set the value.
 </div>
-<br/><pre class='code' id="code0">
-			<span class='javaclass'>TextDocument</span> doc = <span class='javaclass'>TextDocument</span>.newTextDocument();<br/>
-			<span class='javaclass'>Paragraph</span> paragraph = doc.addParagraph("test_con_variable:");<br/>
-			<span class='javaclass'>VariableField</span> simpleVariableField = <span class='javaclass'>Fields</span>.createSimpleVariableField(doc, "test_con_variable");<br/>
+<br/>
+<pre class="code" id="code0">
+	<span class="javaclass">TextDocument</span> doc = <span class="javaclass">TextDocument</span>.newTextDocument();<br/>
+	<span class="javaclass">Paragraph</span> paragraph = doc.addParagraph("test_con_variable:");<br/>
+	<span class="javaclass">VariableField</span> simpleVariableField = <span class="javaclass">Fields</span>.createSimpleVariableField(doc, "test_con_variable");<br/>
 			simpleVariableField.updateField("true", paragraph.getOdfElement());<br/>
 </pre>
-<br/><div class="bodytext">
+<br/>
+<div class="bodytext">
 			Following code can be used to set value to variable field, and append it to an ODF element.
 </div>
-<br/><pre class='code' id="code1">
+<br/>
+<pre class="code" id="code1">
 			simpleVariableField.updateField("user variable content", null);<br/>
 			simpleVariableField.displayField(paragraph.getOdfElement());<br/>
 </pre>
-<br/><br/><strong><a href="#Condition Field" >Condition Field</a></strong>
+<br/>
+<br/>
+<strong>
+	<a href="#Condition Field">Condition Field</a>
+</strong>
 <div class="bodytext">
 			Following code can be used to create a condition field.
 </div>
-<br/><pre class='code' id="code2">
-			<span class='javaclass'>Paragraph</span> newParagraph = doc.addParagraph("<span class='javaclass'>Condition</span> <span class='javaclass'>Field</span> <span class='javaclass'>Test</span>:");<br/>
-			<span class='javaclass'>ConditionField</span> conditionField = <span class='javaclass'>Fields</span>.createConditionField(newParagraph.getOdfElement(), "test_con_variable == \"true\"",<br/>
+<br/>
+<pre class="code" id="code2">
+	<span class="javaclass">Paragraph</span> newParagraph = doc.addParagraph("<span class="javaclass">Condition</span>
+	<span class="javaclass">Field</span>
+	<span class="javaclass">Test</span>:");<br/>
+	<span class="javaclass">ConditionField</span> conditionField = <span class="javaclass">Fields</span>.createConditionField(newParagraph.getOdfElement(), "test_con_variable == \"true\"",<br/>
 					"trueText", "falseText");<br/>
 </pre>
-<br/><br/><strong><a href="#Hidden Field" >Hidden Field</a></strong>
+<br/>
+<br/>
+<strong>
+	<a href="#Hidden Field">Hidden Field</a>
+</strong>
 <div class="bodytext">
 			Following code can be used to create a hidden field.
 </div>
-<br/><pre class='code' id="code3">
-			newParagraph = doc.addParagraph("<span class='javaclass'>Hide</span> <span class='javaclass'>Text</span> <span class='javaclass'>Field</span> <span class='javaclass'>Test</span>:");<br/>
-			conditionField = <span class='javaclass'>Fields</span>.createHiddenTextField(newParagraph.getOdfElement(), "test_con_variable == \"true\"", "hiddenText");<br/>
+<br/>
+<pre class="code" id="code3">
+			newParagraph = doc.addParagraph("<span class="javaclass">Hide</span>
+	<span class="javaclass">Text</span>
+	<span class="javaclass">Field</span>
+	<span class="javaclass">Test</span>:");<br/>
+			conditionField = <span class="javaclass">Fields</span>.createHiddenTextField(newParagraph.getOdfElement(), "test_con_variable == \"true\"", "hiddenText");<br/>
 </pre>
-<br/><br/><strong><a href="#Cross Reference Field" >Cross Reference Field</a></strong>
+<br/>
+<br/>
+<strong>
+	<a href="#Cross Reference Field">Cross Reference Field</a>
+</strong>
 <div class="bodytext">
 			Following code can be used to create a reference field.
 </div>
-<br/><pre class='code' id="code4">
-			<span class='javaclass'>OdfElement</span> newTextSpanElement = ((<span class='javaclass'>TextPElement</span>)doc.addParagraph("<span class='javaclass'>Reference</span> <span class='javaclass'>Content</span>:").getOdfElement()).newTextSpanElement();<br/>
-			newTextSpanElement.setTextContent("<span class='javaclass'>This</span> is a test reference content.");<br/>
-			<span class='javaclass'>ReferenceField</span> referenceField = <span class='javaclass'>Fields</span>.createReferenceField(newTextSpanElement, "test-ref");<br/>
+<br/>
+<pre class="code" id="code4">
+	<span class="javaclass">OdfElement</span> newTextSpanElement = ((<span class="javaclass">TextPElement</span>)doc.addParagraph("<span class="javaclass">Reference</span>
+	<span class="javaclass">Content</span>:").getOdfElement()).newTextSpanElement();<br/>
+			newTextSpanElement.setTextContent("<span class="javaclass">This</span> is a test reference content.");<br/>
+	<span class="javaclass">ReferenceField</span> referenceField = <span class="javaclass">Fields</span>.createReferenceField(newTextSpanElement, "test-ref");<br/>
 </pre>
-<br/><div class="bodytext">
+<br/>
+<div class="bodytext">
 			Following code can be used to append a reference field.
 </div>
-<br/><pre class='code' id="code5">
-			referenceField.appendReferenceTo(doc.addParagraph("<span class='javaclass'>User</span> <span class='javaclass'>Reference</span> <span class='javaclass'>Field</span>:").getOdfElement(), <span class='javaclass'>ReferenceField</span>.<span class='javaclass'>DisplayType</span>.<span class='javaclass'>TEXT</span>);<br/>
+<br/>
+<pre class="code" id="code5">
+			referenceField.appendReferenceTo(doc.addParagraph("<span class="javaclass">User</span>
+	<span class="javaclass">Reference</span>
+	<span class="javaclass">Field</span>:").getOdfElement(), <span class="javaclass">ReferenceField</span>.<span class="javaclass">DisplayType</span>.<span class="javaclass">TEXT</span>);<br/>
 </pre>
-<br/><br/><strong><a href="#Chapter Field" >Chapter Field</a></strong>
+<br/>
+<br/>
+<strong>
+	<a href="#Chapter Field">Chapter Field</a>
+</strong>
 <div class="bodytext">
 			Following code can be used to create a chapter field.
 </div>
-<br/><pre class='code' id="code6">
-			<span class='javaclass'>ChapterField</span> chapterField = <span class='javaclass'>Fields</span>.createChapterField(doc.addParagraph("<span class='javaclass'>Chapter</span>:").getOdfElement());<br/>
+<br/>
+<pre class="code" id="code6">
+	<span class="javaclass">ChapterField</span> chapterField = <span class="javaclass">Fields</span>.createChapterField(doc.addParagraph("<span class="javaclass">Chapter</span>:").getOdfElement());<br/>
 </pre>
-<br/><br/><strong><a href="#Title and Subject Field" >Title and Subject Field</a></strong>
+<br/>
+<br/>
+<strong>
+	<a href="#Title and Subject Field">Title and Subject Field</a>
+</strong>
 <div class="bodytext">
 			Following code can be used to create a title field.
 </div>
-<br/><pre class='code' id="code7">
-			<span class='javaclass'>TitleField</span> titleField = <span class='javaclass'>Fields</span>.createTitleField(doc.addParagraph("<span class='javaclass'>The</span> <span class='javaclass'>Title</span>:").getOdfElement());<br/>
+<br/>
+<pre class="code" id="code7">
+	<span class="javaclass">TitleField</span> titleField = <span class="javaclass">Fields</span>.createTitleField(doc.addParagraph("<span class="javaclass">The</span>
+	<span class="javaclass">Title</span>:").getOdfElement());<br/>
 </pre>
-<br/><div class="bodytext">
+<br/>
+<div class="bodytext">
 			Following code can be used to create a subject field.
 </div>
-<br/><pre class='code' id="code8">
-			<span class='javaclass'>SubjectField</span> subjectField = <span class='javaclass'>Fields</span>.createSubjectField(doc.addParagraph("<span class='javaclass'>The</span> <span class='javaclass'>Subject</span>:").getOdfElement());<br/>
+<br/>
+<pre class="code" id="code8">
+	<span class="javaclass">SubjectField</span> subjectField = <span class="javaclass">Fields</span>.createSubjectField(doc.addParagraph("<span class="javaclass">The</span>
+	<span class="javaclass">Subject</span>:").getOdfElement());<br/>
 </pre>
-<br/><br/><strong><a href="#Author Field" >Author Field</a></strong>
+<br/>
+<br/>
+<strong>
+	<a href="#Author Field">Author Field</a>
+</strong>
 <div class="bodytext">
 			Following code can be used to create a author initial field and a author name field.
 </div>
-<br/><pre class='code' id="code9">
-			<span class='javaclass'>AuthorField</span> authorField = <span class='javaclass'>Fields</span>.createAuthorInitialsField(doc.addParagraph("<span class='javaclass'>The</span> initials of the author :").getOdfElement());<br/>
-			authorField = <span class='javaclass'>Fields</span>.createAuthorNameField(doc.addParagraph("<span class='javaclass'>Author</span>:").getOdfElement());<br/>
+<br/>
+<pre class="code" id="code9">
+	<span class="javaclass">AuthorField</span> authorField = <span class="javaclass">Fields</span>.createAuthorInitialsField(doc.addParagraph("<span class="javaclass">The</span> initials of the author :").getOdfElement());<br/>
+			authorField = <span class="javaclass">Fields</span>.createAuthorNameField(doc.addParagraph("<span class="javaclass">Author</span>:").getOdfElement());<br/>
 </pre>
-<br/><br/><strong><a href="#Page Number Field" >Page Number Field</a></strong>
+<br/>
+<br/>
+<strong>
+	<a href="#Page Number Field">Page Number Field</a>
+</strong>
 <div class="bodytext">
 			Following code can be used to create a current page number field.
 </div>
-<br/><pre class='code' id="code10">
-			<span class='javaclass'>PageNumberField</span> numberField = <span class='javaclass'>Fields</span>.createCurrentPageNumberField(doc.addParagraph("<span class='javaclass'>Current</span> <span class='javaclass'>Page</span> <span class='javaclass'>Number</span>:").getOdfElement());<br/>
-			numberField.setNumberFormat(<span class='javaclass'>NumberFormat</span>.UPPERCASE_LATIN_ALPHABET);<br/>
-			numberField.setDisplayPage(<span class='javaclass'>DisplayType</span>.NEXT_PAGE);<br/>
+<br/>
+<pre class="code" id="code10">
+	<span class="javaclass">PageNumberField</span> numberField = <span class="javaclass">Fields</span>.createCurrentPageNumberField(doc.addParagraph("<span class="javaclass">Current</span>
+	<span class="javaclass">Page</span>
+	<span class="javaclass">Number</span>:").getOdfElement());<br/>
+			numberField.setNumberFormat(<span class="javaclass">NumberFormat</span>.UPPERCASE_LATIN_ALPHABET);<br/>
+			numberField.setDisplayPage(<span class="javaclass">DisplayType</span>.NEXT_PAGE);<br/>
 </pre>
-<br/><div class="bodytext">
+<br/>
+<div class="bodytext">
 			Following code can be used to create a previous page number and a next page number field.
 </div>
-<br/><pre class='code' id="code11">
-			numberField = <span class='javaclass'>Fields</span>.createPreviousPageNumberField(doc.addParagraph("<span class='javaclass'>Previous</span> <span class='javaclass'>Page</span> <span class='javaclass'>Number</span>:").getOdfElement());<br/>
-			numberField = <span class='javaclass'>Fields</span>.createNextPageNumberField(doc.addParagraph("<span class='javaclass'>Next</span> <span class='javaclass'>Page</span> <span class='javaclass'>Number</span>:").getOdfElement());<br/>
+<br/>
+<pre class="code" id="code11">
+			numberField = <span class="javaclass">Fields</span>.createPreviousPageNumberField(doc.addParagraph("<span class="javaclass">Previous</span>
+	<span class="javaclass">Page</span>
+	<span class="javaclass">Number</span>:").getOdfElement());<br/>
+			numberField = <span class="javaclass">Fields</span>.createNextPageNumberField(doc.addParagraph("<span class="javaclass">Next</span>
+	<span class="javaclass">Page</span>
+	<span class="javaclass">Number</span>:").getOdfElement());<br/>
 </pre>
-<br/><br/><strong><a href="#Page Number Field" >Page Number Field</a></strong>
+<br/>
+<br/>
+<strong>
+	<a href="#Page Number Field">Page Number Field</a>
+</strong>
 <div class="bodytext">
 			Following code can be used to create a page count field, and set the number format.
 </div>
-<br/><pre class='code' id="code12">
-			<span class='javaclass'>PageCountField</span> countField = <span class='javaclass'>Fields</span>.createPageCountField(doc.addParagraph("<span class='javaclass'>Page</span> <span class='javaclass'>Count</span>:").getOdfElement());<br/>
-			countField.setNumberFormat(<span class='javaclass'>NumberFormat</span>.UPPERCASE_LATIN_ALPHABET);<br/>
+<br/>
+<pre class="code" id="code12">
+	<span class="javaclass">PageCountField</span> countField = <span class="javaclass">Fields</span>.createPageCountField(doc.addParagraph("<span class="javaclass">Page</span>
+	<span class="javaclass">Count</span>:").getOdfElement());<br/>
+			countField.setNumberFormat(<span class="javaclass">NumberFormat</span>.UPPERCASE_LATIN_ALPHABET);<br/>
 </pre>
-<br/><br/><strong><a href="#Date Field" >Date Field</a></strong>
+<br/>
+<br/>
+<strong>
+	<a href="#Date Field">Date Field</a>
+</strong>
 <div class="bodytext">
 			Following code can be used to create a date field, and set the format.
 </div>
-<br/><pre class='code' id="code13">
-			<span class='javaclass'>DateField</span> dateField = <span class='javaclass'>Fields</span>.createDateField(doc.addParagraph("<span class='javaclass'>Date</span>:").getOdfElement());<br/>
-			dateField.formatDate("yy-<span class='javaclass'>MM</span>-dd");<br/>
+<br/>
+<pre class="code" id="code13">
+	<span class="javaclass">DateField</span> dateField = <span class="javaclass">Fields</span>.createDateField(doc.addParagraph("<span class="javaclass">Date</span>:").getOdfElement());<br/>
+			dateField.formatDate("yy-<span class="javaclass">MM</span>-dd");<br/>
 </pre>
-<br/><br/><strong><a href="#Time Field" >Time Field</a></strong>
+<br/>
+<br/>
+<strong>
+	<a href="#Time Field">Time Field</a>
+</strong>
 <div class="bodytext">
 			Following code can be used to create a time field, and set the format.
 </div>
-<br/><pre class='code' id="code14">
-			<span class='javaclass'>TimeField</span> timeField = <span class='javaclass'>Fields</span>.createTimeField(doc.addParagraph("<span class='javaclass'>Time</span>:").getOdfElement());<br/>
-			timeField.formatTime("<span class='javaclass'>HH</span>:mm:ss a");<br/>
+<br/>
+<pre class="code" id="code14">
+	<span class="javaclass">TimeField</span> timeField = <span class="javaclass">Fields</span>.createTimeField(doc.addParagraph("<span class="javaclass">Time</span>:").getOdfElement());<br/>
+			timeField.formatTime("<span class="javaclass">HH</span>:mm:ss a");<br/>
 </pre>
-<br/><br/> 
+<br/>
+<br/>
 <div class="navigation">
- <ul>
-  <li><a href="TextExtractor.html">previous</a></li>
- <li><a href="Forms.html">next</a></li>
-  <li><a href="#">top</a></li>
- </ul>
-</div>
-<link type="text/css" rel="stylesheet" href="cookbook.css"/>
+	<ul>
+		<li>
+			<a href="TextExtractor.html">previous</a>
+		</li>
+		<li>
+			<a href="Forms.html">next</a>
+		</li>
+		<li>
+			<a href="#">top</a>
+		</li>
+	</ul>
+</div>
+<link type="text/css" rel="stylesheet" href="cookbook.css"/>
\ No newline at end of file
diff --git a/src/site/markdown/simple/document/cookbook/index.md b/src/site/markdown/simple/document/cookbook/index.md
index fb27460..c6a18fa 100644
--- a/src/site/markdown/simple/document/cookbook/index.md
+++ b/src/site/markdown/simple/document/cookbook/index.md
@@ -64,14 +64,14 @@
   <ul>
  <li><a href="Cell.html#Get Cell">Get Cell</a></li>
  <li><a href="Cell.html#Control Cell Attributes">Control Cell Attributes</a></li>
- <li><a href="Cell.html#Get&Set Cell Value Type">Get&Set Cell Value Type</a></li>
+ <li><a href="Cell.html#Get&amp;Set Cell Value Type">Get&amp;Set Cell Value Type</a></li>
   <ul>
-    <li><a href="Cell.html#Get&Set boolean type Cell">Get&Set boolean type Cell</a></li>
-    <li><a href="Cell.html#Get&Set currency type Cell">Get&Set currency type Cell</a></li>
-    <li><a href="Cell.html#Get&Set date type Cell">Get&Set date type Cell</a></li>
-    <li><a href="Cell.html#Get&Set float type Cell">Get&Set float type Cell</a></li>
-    <li><a href="Cell.html#Get&Set percentage type Cell">Get&Set percentage type Cell</a></li>
-    <li><a href="Cell.html#Get&Set string type Cell">Get&Set string type Cell</a></li>
+    <li><a href="Cell.html#Get&amp;Set boolean type Cell">Get&amp;Set boolean type Cell</a></li>
+    <li><a href="Cell.html#Get&amp;Set currency type Cell">Get&amp;Set currency type Cell</a></li>
+    <li><a href="Cell.html#Get&amp;Set date type Cell">Get&amp;Set date type Cell</a></li>
+    <li><a href="Cell.html#Get&amp;Set float type Cell">Get&amp;Set float type Cell</a></li>
+    <li><a href="Cell.html#Get&amp;Set percentage type Cell">Get&amp;Set percentage type Cell</a></li>
+    <li><a href="Cell.html#Get&amp;Set string type Cell">Get&amp;Set string type Cell</a></li>
     <li><a href="Cell.html#Deal with the Time Value">Deal with the Time Value</a></li>
     <li><a href="Cell.html#Something about Display Text">Something about Display Text</a></li>
   </ul>
diff --git a/src/site/markdown/simple/document/index.md b/src/site/markdown/simple/document/index.md
index a239463..b422dde 100644
--- a/src/site/markdown/simple/document/index.md
+++ b/src/site/markdown/simple/document/index.md
@@ -12,7 +12,7 @@ You can download the Javadoc of different versions on the [Downloads Page][1].
 
 **Cook Book**  
   
-[Cookbook][2] provides simple codes to help developers know how to use Simple API.</p>
+[Cookbook][2] provides simple codes to help developers know how to use Simple API.
 
 **Frequently Asked Questions**     
 
diff --git a/src/site/markdown/xsltrunner/ODFXSLTRunner.md b/src/site/markdown/xsltrunner/ODFXSLTRunner.md
index 7eccf9c..bbfa75b 100644
--- a/src/site/markdown/xsltrunner/ODFXSLTRunner.md
+++ b/src/site/markdown/xsltrunner/ODFXSLTRunner.md
@@ -40,9 +40,9 @@ Please see Requirements for details.
      java -jar odfxsltrunner.jar <style sheet> [-v] [-f <factory>] [-p <path in package&gt;]
       [-l log file] -i <input file> <output package> [name=value ...]
 
-The default is to apply the XSLT stylesheet **<style-sheet>** to the stream 
+The default is to apply the XSLT stylesheet **&lt;style-sheet&gt;** to the stream 
 **content.xml** of the ODF file **&lt;input package&gt;**. 
-If no **<output package>** parameter is specified, then the result of the transformation will be printed to the standard output. If an **&lt;output package&gt;** is specified, the **&lt;input package&gt;** is copied to the **&lt;output package&gt;**, and the steam **content.xml** of the **&lt;output package&gt;** is replaced with the result of the transformation.
+If no **&lt;output package&gt;** parameter is specified, then the result of the transformation will be printed to the standard output. If an **&lt;output package&gt;** is specified, the **&lt;input package&gt;** is copied to the **&lt;output package&gt;**, and the steam **content.xml** of the **&lt;output package&gt;** is replaced with the result of the transformation.
 
 The **-p** option allows to specify another stream in the package as source of the transformation than **content.xml**.
 

-- 
To stop receiving notification emails like this one, please contact
svanteschubert@apache.org.

Mime
View raw message