Author: jpages Date: 2012-05-30 17:34:49 +0200 (Wed, 30 May 2012) New Revision: 688 Url: http://nuiton.org/repositories/revision/jrst/688 Log: Correction de la documentation en tenant compte des remarques de Sylvain Added: branches/jrst-docutils-jython/jrst-doc/src/site/resources/images/ branches/jrst-docutils-jython/jrst-doc/src/site/resources/images/biohazard.png Removed: branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/Todo.rst branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/images/DiagrammeClass.png branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/images/DiagrammeSequance.png branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/images/diagrammeGeneration.png branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/images/presentationXSL.png branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/user/functionality.rst branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/user/images/biohazard.png branches/jrst-docutils-jython/jrst-doc/src/site/rst/devel/Todo.rst branches/jrst-docutils-jython/jrst-doc/src/site/rst/user/fonctionnalites.rst branches/jrst-docutils-jython/jrst-doc/src/site/rst/user/images/biohazard.png Modified: branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/XSLpresentation.rst branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/developerDoc.rst branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/library.rst branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/index.rst branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/user/RSTpresentation.rst branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/user/index.rst branches/jrst-docutils-jython/jrst-doc/src/site/resources/schemas/diagrammeClass.png branches/jrst-docutils-jython/jrst-doc/src/site/resources/schemas/diagrammeSequence.png branches/jrst-docutils-jython/jrst-doc/src/site/rst/devel/docDeveloppeur.rst branches/jrst-docutils-jython/jrst-doc/src/site/rst/devel/librairies.rst branches/jrst-docutils-jython/jrst-doc/src/site/rst/index.rst branches/jrst-docutils-jython/jrst-doc/src/site/rst/user/index.rst branches/jrst-docutils-jython/jrst-doc/src/site/rst/user/presentationRST.rst branches/jrst-docutils-jython/jrst-doc/src/site/site_en.xml branches/jrst-docutils-jython/jrst-doc/src/site/site_fr.xml Deleted: branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/Todo.rst =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/Todo.rst 2012-05-30 12:55:52 UTC (rev 687) +++ branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/Todo.rst 2012-05-30 15:34:49 UTC (rev 688) @@ -1,47 +0,0 @@ -.. - -.. * #%L -.. * JRst :: Documentation -.. * -.. * $Id$ -.. * $HeadURL$ -.. * %% -.. * Copyright (C) 2009 - 2010 CodeLutin -.. * %% -.. * This program is free software: you can redistribute it and/or modify -.. * it under the terms of the GNU Lesser General Public License as -.. * published by the Free Software Foundation, either version 3 of the -.. * License, or (at your option) any later version. -.. * -.. * This program is distributed in the hope that it will be useful, -.. * but WITHOUT ANY WARRANTY; without even the implied warranty of -.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.. * GNU General Lesser Public License for more details. -.. * -.. * You should have received a copy of the GNU General Lesser Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. -.. * #L% -.. - - -==== -Todo -==== - -This is a list of the tasks which remains to be made. If somebody wants to help -or has ideas, don't hesitate. - -- multiformat date -- xsl file to converts xhtml -> xdoc - -- English documentation (somebody to correct me :) ) -- ant rules to generation help like : - <jrst include="..." exclude="..." destination="" extension="...."/> - destination is destination folder - extension is extension modification of the source file with this one. - -- export yo pretion, magic, or an other presentation tool. - -- to allow the importation of other format that rst, for example .sxw. - to make possible the simple convertion of the .sxw in rst. - -- make a doclet to produce RST JavaDoc Modified: branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/XSLpresentation.rst =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/XSLpresentation.rst 2012-05-30 12:55:52 UTC (rev 687) +++ branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/XSLpresentation.rst 2012-05-30 15:34:49 UTC (rev 688) @@ -183,5 +183,5 @@ - Article : http://www.commentcamarche.net/xml/xmlxsl.php3 - Diagram : http://fr.wikipedia.org/wiki/Extended_stylesheet_language_transformations -.. |presentationxsl| image:: images/presentationXSL.png +.. |presentationxsl| image:: ../../schemas/presentationXSL.png Modified: branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/developerDoc.rst =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/developerDoc.rst 2012-05-30 12:55:52 UTC (rev 687) +++ branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/developerDoc.rst 2012-05-30 15:34:49 UTC (rev 688) @@ -32,28 +32,30 @@ Class diagram ============= -.. image:: ../../schemas/diagrammeGeneration.png +.. image:: ../../schemas/diagrammeClass.png :align: center -**JRST** Class contents main() method, it's looking after options, files reading and writing. Iinitially, it calls Jython_ class **PythonInterpreter** which allows to execute DocUtils' Python script to generate an intermediate file. Then it only remains to apply the wish XSL (if needed) by using **JRSTGenerator** Class. +**JRST** Class contents main() method, it's looking after options, files reading and writing. Initially, it calls Jython_ class **PythonInterpreter** which allows to execute DocUtils' Python script to generate an intermediate file. Then it only remains to apply several desired XSL (if needed) by using **JRSTGenerator** Class. +This sequence diagram describes the parser's mechanism throughout the generation : + +.. image:: ../../schemas/diagrammeSequence.png + :align: center + Generation ========== -.. image:: ../../schemas/classDiagramme.png +.. image:: ../../schemas/diagrammeGeneration.png :align: center Links : - * xml2rst.xsl (convertion from xml of docutils towards rst) : http://www.merten-home.de/FreeSoftware/xml2rst - * dn2dbk.xsl (convertion from xml of docutils towards docbook) : http://membres.lycos.fr/ebellot/dn2dbk - * nwalsh xsl (convertion from docbook towards FO and xhtml) : http://nwalsh.com + * xml2rst.xsl (conversion from xml of docutils towards rst) : http://www.merten-home.de/FreeSoftware/xml2rst + * dn2dbk.xsl (conversion from xml of docutils towards docbook) : http://membres.lycos.fr/ebellot/dn2dbk + * nwalsh xsl (conversion from docbook towards FO and xhtml) : http://nwalsh.com + * IText (conversion from HTML towards PDF) : http://itextpdf.com/ - * XMLmind (convertion from FO towards ODT and RTF) : http://www.xmlmind.com/foconverter/what_is_xfc.html - * FOP (convertion from FO towards PDF) : http://xmlgraphics.apache.org/fop - * IText (convertion from HTML towards PDF) : http://itextpdf.com/ - -Use exemple +Use example =========== We want to convert this following reStructuredText document (text.rst) to html (text.html) : @@ -74,11 +76,6 @@ JRST -t html -o text.html text.rst -This sequence diagramme describes the parser's mechanism throughout the generation : - -.. image:: ../../schemas/diagrammeSequence.png - :align: center - **JRSTGenerator** Class with the XSL file rst2xhtml.xsl, returns following html file:: <?xml version="1.0" encoding="UTF-8"?> @@ -124,7 +121,7 @@ Uses external XSL ================= -JRST able to transform DocUtils XML with external XSL [2]_ files. +JRST is able to transform DocUtils XML with external XSL [2]_ files. You must use this following command:: JRST -x XSLfile, XSLfile2 RSTfile Deleted: branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/images/DiagrammeClass.png =================================================================== (Binary files differ) Deleted: branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/images/DiagrammeSequance.png =================================================================== (Binary files differ) Deleted: branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/images/diagrammeGeneration.png =================================================================== (Binary files differ) Deleted: branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/images/presentationXSL.png =================================================================== (Binary files differ) Modified: branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/library.rst =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/library.rst 2012-05-30 12:55:52 UTC (rev 687) +++ branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/devel/library.rst 2012-05-30 15:34:49 UTC (rev 688) @@ -40,10 +40,10 @@ Librairy used to the XSL transformation. -SDoc_ -===== +IText_ +====== -SDoc_ provide Swing composants which includes syntax coloration for many languages. +IText_ is a library to generate PDF documents from (x)HTML pages. Xmlunit_ ======== @@ -53,7 +53,7 @@ DocUtils_ ========= -DocUtils_ is a set of scripts to transform RST_ files into useful formats, such as HTML, ODT, Latex and more. +DocUtils_ is a set of Python scripts to transform RST_ files into useful formats, such as HTML, ODT, Latex and more. Jython_ ======= @@ -64,7 +64,7 @@ .. _dom4j: http://www.dom4j.org .. _javax.xml.transform: http://java.sun.com/javase/6/docs/api/javax/xml/transform/package-summary.ht... -.. _SDoc: http://sdoc.sourceforge.net/wiki/pmwiki.php +.. _IText: http://itextpdf.com/ .. _Xmlunit: http://xmlunit.sourceforge.net/ .. _RST: http://docutils.sourceforge.net/rst.html .. _DocUtils: http://docutils.sourceforge.net/docs/ref/doctree.html Modified: branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/index.rst =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/index.rst 2012-05-30 12:55:52 UTC (rev 687) +++ branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/index.rst 2012-05-30 15:34:49 UTC (rev 688) @@ -27,8 +27,8 @@ reStructuredText_ parser : JRst =============================== -Documentation utilisateur -========================= +User Documentation +================== .. contents:: @@ -43,16 +43,18 @@ document. RST has a so simple syntax that it becomes almost invisible. JRST uses Jython_ and DocUtils_ to transform RST_ files to XML to create a tree representation -document. It becomes easy to generate document representation towards differents -fomats. +document. It becomes easy to generate document representation towards different +formats. How to use it ------------- JRST takes a reStructuredText_ file and generates XML file. Which could be used to produce various files formats with generation XSL_ files. The available output formats are HTML, xhtml, -rst, pdf, docbook, odt(Open-Office), rtf, or XML [1]_. +rst, pdf, docbook or odt(Open-Office) [1]_. +If JRST is launched without arguments, a graphical user interface is displayed for the user. Thus, we can choose easily files, output type or external XSL stylesheets to apply. + :: JRST myfile.rst Modified: branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/user/RSTpresentation.rst =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/user/RSTpresentation.rst 2012-05-30 12:55:52 UTC (rev 687) +++ branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/user/RSTpresentation.rst 2012-05-30 15:34:49 UTC (rev 688) @@ -367,18 +367,18 @@ To include an image in your document, you use the the ``image`` directive__. For example:: - .. image:: images/biohazard.png + .. image:: ../../images/biohazard.png results in: -.. image:: images/biohazard.png +.. image:: ../../images/biohazard.png -The ``images/biohazard.png`` part indicates the filename of the image +The ``../../images/biohazard.png`` part indicates the filename of the image you wish to appear in the document. There's no restriction placed on the image (format, size etc). If the image is to appear in HTML and you wish to supply additional information, you may:: - .. image:: images/biohazard.png + .. image:: ../../images/biohazard.png :height: 100 :width: 200 :scale: 50 Deleted: branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/user/functionality.rst =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/user/functionality.rst 2012-05-30 12:55:52 UTC (rev 687) +++ branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/user/functionality.rst 2012-05-30 15:34:49 UTC (rev 688) @@ -1,274 +0,0 @@ -.. - -.. * #%L -.. * JRst :: Documentation -.. * -.. * $Id$ -.. * $HeadURL$ -.. * %% -.. * Copyright (C) 2009 - 2010 CodeLutin -.. * %% -.. * This program is free software: you can redistribute it and/or modify -.. * it under the terms of the GNU Lesser General Public License as -.. * published by the Free Software Foundation, either version 3 of the -.. * License, or (at your option) any later version. -.. * -.. * This program is distributed in the hope that it will be useful, -.. * but WITHOUT ANY WARRANTY; without even the implied warranty of -.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.. * GNU General Lesser Public License for more details. -.. * -.. * You should have received a copy of the GNU General Lesser Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. -.. * #L% -.. - - -========================= -Functionalities suggested -========================= - -Docutils DTD : http://docutils.sourceforge.net/docs/ref/doctree.html - -.. contents:: Summary - -Functionalities established -=========================== - -Root element ------------- - -- document_ - -Title elements --------------- - -- subtitle_ -- title_ - -Bibliographic elements ----------------------- - -- docinfo_ -- author_ -- authors_ -- organization_ -- address_ -- contact_ -- version_ -- revision_ -- status_ -- date_ -- copyright_ - -Decoration elements -------------------- - -- decoration_ -- footer_ -- header_ - -Structural elements -------------------- - -- section_ -- topic_ -- sidebar_ -- transition_ - -Body elements -------------- - -- admonition_ -- attention_ -- block_quote_ -- bullet_list_ -- caution_ -- classifier_ -- danger_ -- definition_ -- definition_list_ -- definition_list_item_ -- description_ -- doctest_block_ -- enumerated_list_ -- error_ -- field_ -- field_body_ -- field_list_ -- field_name_ -- footnote_ -- hint_ -- image_ -- important_ -- line_ -- line_block_ -- list_item_ -- literal_block_ -- note_ -- option_ -- option_argument_ -- option_group_ -- option_list_ -- option_list_item_ -- option_string_ -- paragraph_ -- term_ -- tip_ -- warning_ - -Table elements --------------- - -- table_ -- tbody_ -- entry_ -- row_ -- colspec_ -- thead_ -- tgroup_ - -Inline elements ---------------- - -- emphasis_ -- strong_ -- literal_ -- reference_ -- footnote_reference_ - - -Unimplemented functionalities -============================= - -- abbreviation_ -- acronym_ -- attribution_ -- caption_ -- citation_ -- citation_reference_ -- comment_ -- compound_ -- container_ -- figure_ -- generated_ -- inline_ -- label_ -- legend_ -- pending_ -- problematic_ -- raw_ -- rubric_ -- subscript_ -- substitution_definition_ -- substitution_reference_ -- superscript_ -- system_message_ -- target_ -- title_reference_ - -.. _abbreviation: http://docutils.sourceforge.net/docs/ref/doctree.html#abbreviation -.. _acronym: http://docutils.sourceforge.net/docs/ref/doctree.html#acronym -.. _address: http://docutils.sourceforge.net/docs/ref/doctree.html#address -.. _admonition: http://docutils.sourceforge.net/docs/ref/doctree.html#admonition -.. _attention: http://docutils.sourceforge.net/docs/ref/doctree.html#attention - -.. _attribution: http://docutils.sourceforge.net/docs/ref/doctree.html#attribution -.. _author: http://docutils.sourceforge.net/docs/ref/doctree.html#author -.. _authors: http://docutils.sourceforge.net/docs/ref/doctree.html#authors -.. _block_quote: http://docutils.sourceforge.net/docs/ref/doctree.html#block-quote -.. _bullet_list: http://docutils.sourceforge.net/docs/ref/doctree.html#bullet-list -.. _caption: http://docutils.sourceforge.net/docs/ref/doctree.html#caption -.. _caution: http://docutils.sourceforge.net/docs/ref/doctree.html#caution -.. _citation: http://docutils.sourceforge.net/docs/ref/doctree.html#citation -.. _citation_reference: http://docutils.sourceforge.net/docs/ref/doctree.html#citation-reference - -.. _classifier: http://docutils.sourceforge.net/docs/ref/doctree.html#classifier -.. _colspec: http://docutils.sourceforge.net/docs/ref/doctree.html#colspec -.. _comment: http://docutils.sourceforge.net/docs/ref/doctree.html#comment -.. _compound: http://docutils.sourceforge.net/docs/ref/doctree.html#compound -.. _contact: http://docutils.sourceforge.net/docs/ref/doctree.html#contact -.. _container: http://docutils.sourceforge.net/docs/ref/doctree.html#container -.. _copyright: http://docutils.sourceforge.net/docs/ref/doctree.html#copyright -.. _danger: http://docutils.sourceforge.net/docs/ref/doctree.html#danger -.. _date: http://docutils.sourceforge.net/docs/ref/doctree.html#date - -.. _decoration: http://docutils.sourceforge.net/docs/ref/doctree.html#decoration -.. _definition: http://docutils.sourceforge.net/docs/ref/doctree.html#definition -.. _definition_list: http://docutils.sourceforge.net/docs/ref/doctree.html#definition-list -.. _definition_list_item: http://docutils.sourceforge.net/docs/ref/doctree.html#definition-list-item -.. _description: http://docutils.sourceforge.net/docs/ref/doctree.html#description -.. _docinfo: http://docutils.sourceforge.net/docs/ref/doctree.html#docinfo -.. _doctest_block: http://docutils.sourceforge.net/docs/ref/doctree.html#doctest-block -.. _document: http://docutils.sourceforge.net/docs/ref/doctree.html#document -.. _emphasis: http://docutils.sourceforge.net/docs/ref/doctree.html#emphasis - -.. _entry: http://docutils.sourceforge.net/docs/ref/doctree.html#entry -.. _enumerated_list: http://docutils.sourceforge.net/docs/ref/doctree.html#enumerated-list -.. _error: http://docutils.sourceforge.net/docs/ref/doctree.html#error -.. _field: http://docutils.sourceforge.net/docs/ref/doctree.html#field -.. _field_body: http://docutils.sourceforge.net/docs/ref/doctree.html#field-body -.. _field_list: http://docutils.sourceforge.net/docs/ref/doctree.html#field-list -.. _field_name: http://docutils.sourceforge.net/docs/ref/doctree.html#field-name -.. _figure: http://docutils.sourceforge.net/docs/ref/doctree.html#figure -.. _footer: http://docutils.sourceforge.net/docs/ref/doctree.html#footer - -.. _footnote: http://docutils.sourceforge.net/docs/ref/doctree.html#footnote -.. _footnote_reference: http://docutils.sourceforge.net/docs/ref/doctree.html#footnote-reference -.. _generated: http://docutils.sourceforge.net/docs/ref/doctree.html#generated -.. _header: http://docutils.sourceforge.net/docs/ref/doctree.html#header -.. _hint: http://docutils.sourceforge.net/docs/ref/doctree.html#hint -.. _image: http://docutils.sourceforge.net/docs/ref/doctree.html#image -.. _important: http://docutils.sourceforge.net/docs/ref/doctree.html#important -.. _inline: http://docutils.sourceforge.net/docs/ref/doctree.html#inline -.. _label: http://docutils.sourceforge.net/docs/ref/doctree.html#label - -.. _legend: http://docutils.sourceforge.net/docs/ref/doctree.html#legend -.. _line: http://docutils.sourceforge.net/docs/ref/doctree.html#line -.. _line_block: http://docutils.sourceforge.net/docs/ref/doctree.html#line-block -.. _list_item: http://docutils.sourceforge.net/docs/ref/doctree.html#list-item -.. _literal: http://docutils.sourceforge.net/docs/ref/doctree.html#literal -.. _literal_block: http://docutils.sourceforge.net/docs/ref/doctree.html#literal-block -.. _note: http://docutils.sourceforge.net/docs/ref/doctree.html#note -.. _option: http://docutils.sourceforge.net/docs/ref/doctree.html#option -.. _option_argument: http://docutils.sourceforge.net/docs/ref/doctree.html#option-argument - -.. _option_group: http://docutils.sourceforge.net/docs/ref/doctree.html#option-group -.. _option_list: http://docutils.sourceforge.net/docs/ref/doctree.html#option-list -.. _option_list_item: http://docutils.sourceforge.net/docs/ref/doctree.html#option-list-item -.. _option_string: http://docutils.sourceforge.net/docs/ref/doctree.html#option-string -.. _organization: http://docutils.sourceforge.net/docs/ref/doctree.html#organization -.. _paragraph: http://docutils.sourceforge.net/docs/ref/doctree.html#paragraph -.. _pending: http://docutils.sourceforge.net/docs/ref/doctree.html#pending -.. _problematic: http://docutils.sourceforge.net/docs/ref/doctree.html#problematic -.. _raw: http://docutils.sourceforge.net/docs/ref/doctree.html#raw - -.. _reference: http://docutils.sourceforge.net/docs/ref/doctree.html#reference -.. _revision: http://docutils.sourceforge.net/docs/ref/doctree.html#revision -.. _row: http://docutils.sourceforge.net/docs/ref/doctree.html#row -.. _rubric: http://docutils.sourceforge.net/docs/ref/doctree.html#rubric -.. _section: http://docutils.sourceforge.net/docs/ref/doctree.html#section -.. _sidebar: http://docutils.sourceforge.net/docs/ref/doctree.html#sidebar -.. _status: http://docutils.sourceforge.net/docs/ref/doctree.html#status -.. _strong: http://docutils.sourceforge.net/docs/ref/doctree.html#strong -.. _subscript: http://docutils.sourceforge.net/docs/ref/doctree.html#subscript - -.. _substitution_definition: http://docutils.sourceforge.net/docs/ref/doctree.html#substitution-definitio... -.. _substitution_reference: http://docutils.sourceforge.net/docs/ref/doctree.html#substitution-reference -.. _subtitle: http://docutils.sourceforge.net/docs/ref/doctree.html#subtitle -.. _superscript: http://docutils.sourceforge.net/docs/ref/doctree.html#superscript -.. _system_message: http://docutils.sourceforge.net/docs/ref/doctree.html#system-message -.. _table: http://docutils.sourceforge.net/docs/ref/doctree.html#table -.. _target: http://docutils.sourceforge.net/docs/ref/doctree.html#target -.. _tbody: http://docutils.sourceforge.net/docs/ref/doctree.html#tbody -.. _term: http://docutils.sourceforge.net/docs/ref/doctree.html#term - -.. _tgroup: http://docutils.sourceforge.net/docs/ref/doctree.html#tgroup -.. _thead: http://docutils.sourceforge.net/docs/ref/doctree.html#thead -.. _tip: http://docutils.sourceforge.net/docs/ref/doctree.html#tip -.. _title: http://docutils.sourceforge.net/docs/ref/doctree.html#title -.. _title_reference: http://docutils.sourceforge.net/docs/ref/doctree.html#title-reference -.. _topic: http://docutils.sourceforge.net/docs/ref/doctree.html#topic -.. _transition: http://docutils.sourceforge.net/docs/ref/doctree.html#transition -.. _version: http://docutils.sourceforge.net/docs/ref/doctree.html#version -.. _warning: http://docutils.sourceforge.net/docs/ref/doctree.html#warning - Deleted: branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/user/images/biohazard.png =================================================================== (Binary files differ) Modified: branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/user/index.rst =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/user/index.rst 2012-05-30 12:55:52 UTC (rev 687) +++ branches/jrst-docutils-jython/jrst-doc/src/site/en/rst/user/index.rst 2012-05-30 15:34:49 UTC (rev 688) @@ -27,8 +27,8 @@ reStructuredText_ parser : JRst =============================== -Documentation utilisateur -========================= +User Documentation +================== .. contents:: @@ -43,16 +43,18 @@ document. RST has a so simple syntax that it becomes almost invisible. JRST uses Jython_ and DocUtils_ to transform RST_ files to XML to create a tree representation -document. It becomes easy to generate document representation towards differents -fomats. +document. It becomes easy to generate document representation towards different +formats. How to use it ------------- JRST takes a reStructuredText_ file and generates XML file. Which could be used to produce various files formats with generation XSL_ files. The available output formats are HTML, xhtml, -rst, pdf, docbook, odt(Open-Office), rtf, or XML [1]_. +rst, pdf, docbook or odt(Open-Office) [1]_. +If JRST is launched without arguments, a graphical user interface is displayed for the user. Thus, we can choose easily files, output type or external XSL stylesheets to apply. + :: JRST myfile.rst Copied: branches/jrst-docutils-jython/jrst-doc/src/site/resources/images/biohazard.png (from rev 685, branches/jrst-docutils-jython/jrst-doc/src/site/rst/user/images/biohazard.png) =================================================================== (Binary files differ) Property changes on: branches/jrst-docutils-jython/jrst-doc/src/site/resources/images/biohazard.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:mergeinfo + Modified: branches/jrst-docutils-jython/jrst-doc/src/site/resources/schemas/diagrammeClass.png =================================================================== (Binary files differ) Modified: branches/jrst-docutils-jython/jrst-doc/src/site/resources/schemas/diagrammeSequence.png =================================================================== (Binary files differ) Deleted: branches/jrst-docutils-jython/jrst-doc/src/site/rst/devel/Todo.rst =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/rst/devel/Todo.rst 2012-05-30 12:55:52 UTC (rev 687) +++ branches/jrst-docutils-jython/jrst-doc/src/site/rst/devel/Todo.rst 2012-05-30 15:34:49 UTC (rev 688) @@ -1,53 +0,0 @@ -.. - -.. * #%L -.. * JRst :: Documentation -.. * -.. * $Id$ -.. * $HeadURL$ -.. * %% -.. * Copyright (C) 2009 - 2010 CodeLutin -.. * %% -.. * This program is free software: you can redistribute it and/or modify -.. * it under the terms of the GNU Lesser General Public License as -.. * published by the Free Software Foundation, either version 3 of the -.. * License, or (at your option) any later version. -.. * -.. * This program is distributed in the hope that it will be useful, -.. * but WITHOUT ANY WARRANTY; without even the implied warranty of -.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.. * GNU General Lesser Public License for more details. -.. * -.. * You should have received a copy of the GNU General Lesser Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. -.. * #L% -.. - - -==== -Todo -==== - -Voici la liste des tâches qui reste à faire. Si quelqu'un souhaite aider, ou -a une idée à proposer il ne faut pas hésiter. - -- intégrer une date multiformat -- faire une feuille de style de conversion de xhtml -> xdoc - -- la documentation en anglais (si quelqu'un pouvait me relire :) ) -- faire une règle ant pour aider à la génération - <jrst include="..." exclude="..." destination="" extension="...."/> - destination est le répertoire destination - extension est la modification de l'extension des fichiers sources avec - cette extension - -- un export vers pretion, magic, ou autre outil de présentation. - -- permettre l'import de d'autre format que rst, par exemple .odt - ce qui permettra de convertir simplement du .odt en rst. - -- Faire une doclet qui permette d'écrire les Javadocs en RST - -- Correction du bug sur les URIResolver, lors de la génération DocBook -> fo - il va chercher les imports à la racine du jrst, et non dans le jar. - -- ajouter une directive pour supporter les equations mathematiques f(x)=a^3/x qui sera rendu graphiquement Modified: branches/jrst-docutils-jython/jrst-doc/src/site/rst/devel/docDeveloppeur.rst =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/rst/devel/docDeveloppeur.rst 2012-05-30 12:55:52 UTC (rev 687) +++ branches/jrst-docutils-jython/jrst-doc/src/site/rst/devel/docDeveloppeur.rst 2012-05-30 15:34:49 UTC (rev 688) @@ -36,8 +36,14 @@ :alt: Diagramme de classes :align: center -La classe **JRST** contient la méthode main(), elle gère les options, la lecture et l'écriture des fichiers. Elle appelle dans un premier temps la classe **PythonInterpreter** de Jython_ permettant d'exécuter les scripts en Python de DocUtils_ pour générer un fichier XML intermédiaire. Ensuite, il ne reste qu'à appliquer le XSL désiré (si besoin) grâce à la classe **JRSTGenerator**. +La classe **JRST** contient la méthode main(), elle gère les options, la lecture et l'écriture des fichiers. Elle appelle dans un premier temps la classe **PythonInterpreter** de Jython_ permettant d'exécuter les scripts en Python de DocUtils_ pour générer un fichier XML intermédiaire. Ensuite, il ne reste qu'à appliquer le ou les XSL désiré(s) (si besoin) grâce à la classe **JRSTGenerator**. +Ce diagramme de séquence décrit le fonctionnement du parseur tout au long de la génération : + +.. image:: ../schemas/diagrammeSequence.png + :alt: Diagramme de séquence d'une génération + :align: center + La génération ============= @@ -50,9 +56,6 @@ * xml2rst.xsl (convertion de xml de docutils vers rst) : http://www.merten-home.de/FreeSoftware/xml2rst * dn2dbk.xsl (convertion de xml de docutils vers docbook) : http://membres.lycos.fr/ebellot/dn2dbk * les xsl de nwalsh (convertion de docbook vers FO et xhtml) : http://nwalsh.com - - * XMLmind (convertion de FO vers ODT et RTF) : http://www.xmlmind.com/foconverter/what_is_xfc.html - * FOP (convertion de FO vers PDF) : http://xmlgraphics.apache.org/fop * IText (convertion de HTML vers PDF) : http://itextpdf.com/ @@ -77,12 +80,6 @@ JRST -t html -o text.html text.rst -Ce diagramme de séquence décrit le fonctionnement du parseur tout au long de la génération : - -.. image:: ../schemas/diagrammeSequence.png - :alt: Diagramme de séquence d'une génération - :align: center - La Classe **JRSTGenerator**, grâce au fichier XSL rst2xhtml.xsl, renvoie le fichier html suivant:: <?xml version="1.0" encoding="UTF-8"?> Modified: branches/jrst-docutils-jython/jrst-doc/src/site/rst/devel/librairies.rst =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/rst/devel/librairies.rst 2012-05-30 12:55:52 UTC (rev 687) +++ branches/jrst-docutils-jython/jrst-doc/src/site/rst/devel/librairies.rst 2012-05-30 15:34:49 UTC (rev 688) @@ -39,10 +39,10 @@ Librairie permettant la transformation XSL. -SDoc_ -===== +IText_ +====== -SDoc_ fournit des composants Swing qui inclut la coloration syntaxique pour de nombreux langages. +IText_ est une bibliothèque permettant de générer des documents PDF à partir de pages (x)HTML. Xmlunit_ ======== @@ -52,7 +52,7 @@ DocUtils_ ========= -DocUtils_ est un ensemble de scripts permettant de transformer des fichiers RST_ en formats plus répendus comme le HTML, ODT, Latex et bien plus encore. +DocUtils_ est un ensemble de scripts en Python permettant de transformer des fichiers RST_ en formats plus répendus comme le HTML, ODT, Latex et bien plus encore. Jython_ ======= @@ -61,7 +61,7 @@ .. _dom4j: http://www.dom4j.org .. _javax.xml.transform: http://java.sun.com/javase/6/docs/api/javax/xml/transform/package-summary.ht... -.. _SDoc: http://sdoc.sourceforge.net/wiki/pmwiki.php +.. _IText: http://itextpdf.com/ .. _Xmlunit: http://xmlunit.sourceforge.net/ .. _RST: http://docutils.sourceforge.net/rst.html .. _DocUtils: http://docutils.sourceforge.net/docs/ref/doctree.html Modified: branches/jrst-docutils-jython/jrst-doc/src/site/rst/index.rst =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/rst/index.rst 2012-05-30 12:55:52 UTC (rev 687) +++ branches/jrst-docutils-jython/jrst-doc/src/site/rst/index.rst 2012-05-30 15:34:49 UTC (rev 688) @@ -52,8 +52,10 @@ JRST prend un fichier reStructuredText_ en entrée et génère un fichier XML qui pourra ensuite servir à produire divers formats de fichiers grâce à des fichiers XSL de générations. Les formats de sortie disponibles sont le html, le xhtml, le rst, -le pdf, le docbook_, le odt (Open-Office), le rtf, ou encore le XML [1]_. +le pdf, le docbook_ ou de l'odt (Open-Office) [1]_. +Lorsque JRST est lancé sans argument, une interface graphique est proposée à l'utilisateur. Ainsi, on peut choisir plus aisément les fichiers, le type de sortie ou bien les feuilles de style XSL externes à appliquer. + :: JRST myfile.rst Deleted: branches/jrst-docutils-jython/jrst-doc/src/site/rst/user/fonctionnalites.rst =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/rst/user/fonctionnalites.rst 2012-05-30 12:55:52 UTC (rev 687) +++ branches/jrst-docutils-jython/jrst-doc/src/site/rst/user/fonctionnalites.rst 2012-05-30 15:34:49 UTC (rev 688) @@ -1,273 +0,0 @@ -.. - -.. * #%L -.. * JRst :: Documentation -.. * -.. * $Id$ -.. * $HeadURL$ -.. * %% -.. * Copyright (C) 2009 - 2010 CodeLutin -.. * %% -.. * This program is free software: you can redistribute it and/or modify -.. * it under the terms of the GNU Lesser General Public License as -.. * published by the Free Software Foundation, either version 3 of the -.. * License, or (at your option) any later version. -.. * -.. * This program is distributed in the hope that it will be useful, -.. * but WITHOUT ANY WARRANTY; without even the implied warranty of -.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.. * GNU General Lesser Public License for more details. -.. * -.. * You should have received a copy of the GNU General Lesser Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. -.. * #L% -.. - - -========================= -Fonctionnalités proposées -========================= - -La DTD de Docutils : http://docutils.sourceforge.net/docs/ref/doctree.html - -.. contents:: Sommaire - -Fonctionnalités implantées -========================== - -Element racine --------------- - -- document_ - -Elements titre --------------- - -- subtitle_ -- title_ - -Elements bibliographiques -------------------------- - -- docinfo_ -- author_ -- authors_ -- organization_ -- address_ -- contact_ -- version_ -- revision_ -- status_ -- date_ -- copyright_ - -Elements de décoration ----------------------- - -- decoration_ -- footer_ -- header_ - -Elements structurels --------------------- - -- section_ -- topic_ -- sidebar_ -- transition_ - -Elements du corps ------------------ - -- admonition_ -- attention_ -- block_quote_ -- bullet_list_ -- caution_ -- classifier_ -- danger_ -- definition_ -- definition_list_ -- definition_list_item_ -- description_ -- doctest_block_ -- enumerated_list_ -- error_ -- field_ -- field_body_ -- field_list_ -- field_name_ -- footnote_ -- hint_ -- image_ -- important_ -- line_ -- line_block_ -- list_item_ -- literal_block_ -- note_ -- option_ -- option_argument_ -- option_group_ -- option_list_ -- option_list_item_ -- option_string_ -- paragraph_ -- term_ -- tip_ -- warning_ - -Elements des tableaux ---------------------- - -- table_ -- tbody_ -- entry_ -- row_ -- colspec_ -- thead_ -- tgroup_ - -Elements de la ligne --------------------- - -- emphasis_ -- strong_ -- literal_ -- reference_ -- footnote_reference_ - -Fonctionnalités non-implantées -============================== - -- abbreviation_ -- acronym_ -- attribution_ -- caption_ -- citation_ -- citation_reference_ -- comment_ -- compound_ -- container_ -- figure_ -- generated_ -- inline_ -- label_ -- legend_ -- pending_ -- problematic_ -- raw_ -- rubric_ -- subscript_ -- substitution_definition_ -- substitution_reference_ -- superscript_ -- system_message_ -- target_ -- title_reference_ - -.. _abbreviation: http://docutils.sourceforge.net/docs/ref/doctree.html#abbreviation -.. _acronym: http://docutils.sourceforge.net/docs/ref/doctree.html#acronym -.. _address: http://docutils.sourceforge.net/docs/ref/doctree.html#address -.. _admonition: http://docutils.sourceforge.net/docs/ref/doctree.html#admonition -.. _attention: http://docutils.sourceforge.net/docs/ref/doctree.html#attention - -.. _attribution: http://docutils.sourceforge.net/docs/ref/doctree.html#attribution -.. _author: http://docutils.sourceforge.net/docs/ref/doctree.html#author -.. _authors: http://docutils.sourceforge.net/docs/ref/doctree.html#authors -.. _block_quote: http://docutils.sourceforge.net/docs/ref/doctree.html#block-quote -.. _bullet_list: http://docutils.sourceforge.net/docs/ref/doctree.html#bullet-list -.. _caption: http://docutils.sourceforge.net/docs/ref/doctree.html#caption -.. _caution: http://docutils.sourceforge.net/docs/ref/doctree.html#caution -.. _citation: http://docutils.sourceforge.net/docs/ref/doctree.html#citation -.. _citation_reference: http://docutils.sourceforge.net/docs/ref/doctree.html#citation-reference - -.. _classifier: http://docutils.sourceforge.net/docs/ref/doctree.html#classifier -.. _colspec: http://docutils.sourceforge.net/docs/ref/doctree.html#colspec -.. _comment: http://docutils.sourceforge.net/docs/ref/doctree.html#comment -.. _compound: http://docutils.sourceforge.net/docs/ref/doctree.html#compound -.. _contact: http://docutils.sourceforge.net/docs/ref/doctree.html#contact -.. _container: http://docutils.sourceforge.net/docs/ref/doctree.html#container -.. _copyright: http://docutils.sourceforge.net/docs/ref/doctree.html#copyright -.. _danger: http://docutils.sourceforge.net/docs/ref/doctree.html#danger -.. _date: http://docutils.sourceforge.net/docs/ref/doctree.html#date - -.. _decoration: http://docutils.sourceforge.net/docs/ref/doctree.html#decoration -.. _definition: http://docutils.sourceforge.net/docs/ref/doctree.html#definition -.. _definition_list: http://docutils.sourceforge.net/docs/ref/doctree.html#definition-list -.. _definition_list_item: http://docutils.sourceforge.net/docs/ref/doctree.html#definition-list-item -.. _description: http://docutils.sourceforge.net/docs/ref/doctree.html#description -.. _docinfo: http://docutils.sourceforge.net/docs/ref/doctree.html#docinfo -.. _doctest_block: http://docutils.sourceforge.net/docs/ref/doctree.html#doctest-block -.. _document: http://docutils.sourceforge.net/docs/ref/doctree.html#document -.. _emphasis: http://docutils.sourceforge.net/docs/ref/doctree.html#emphasis - -.. _entry: http://docutils.sourceforge.net/docs/ref/doctree.html#entry -.. _enumerated_list: http://docutils.sourceforge.net/docs/ref/doctree.html#enumerated-list -.. _error: http://docutils.sourceforge.net/docs/ref/doctree.html#error -.. _field: http://docutils.sourceforge.net/docs/ref/doctree.html#field -.. _field_body: http://docutils.sourceforge.net/docs/ref/doctree.html#field-body -.. _field_list: http://docutils.sourceforge.net/docs/ref/doctree.html#field-list -.. _field_name: http://docutils.sourceforge.net/docs/ref/doctree.html#field-name -.. _figure: http://docutils.sourceforge.net/docs/ref/doctree.html#figure -.. _footer: http://docutils.sourceforge.net/docs/ref/doctree.html#footer - -.. _footnote: http://docutils.sourceforge.net/docs/ref/doctree.html#footnote -.. _footnote_reference: http://docutils.sourceforge.net/docs/ref/doctree.html#footnote-reference -.. _generated: http://docutils.sourceforge.net/docs/ref/doctree.html#generated -.. _header: http://docutils.sourceforge.net/docs/ref/doctree.html#header -.. _hint: http://docutils.sourceforge.net/docs/ref/doctree.html#hint -.. _image: http://docutils.sourceforge.net/docs/ref/doctree.html#image -.. _important: http://docutils.sourceforge.net/docs/ref/doctree.html#important -.. _inline: http://docutils.sourceforge.net/docs/ref/doctree.html#inline -.. _label: http://docutils.sourceforge.net/docs/ref/doctree.html#label - -.. _legend: http://docutils.sourceforge.net/docs/ref/doctree.html#legend -.. _line: http://docutils.sourceforge.net/docs/ref/doctree.html#line -.. _line_block: http://docutils.sourceforge.net/docs/ref/doctree.html#line-block -.. _list_item: http://docutils.sourceforge.net/docs/ref/doctree.html#list-item -.. _literal: http://docutils.sourceforge.net/docs/ref/doctree.html#literal -.. _literal_block: http://docutils.sourceforge.net/docs/ref/doctree.html#literal-block -.. _note: http://docutils.sourceforge.net/docs/ref/doctree.html#note -.. _option: http://docutils.sourceforge.net/docs/ref/doctree.html#option -.. _option_argument: http://docutils.sourceforge.net/docs/ref/doctree.html#option-argument - -.. _option_group: http://docutils.sourceforge.net/docs/ref/doctree.html#option-group -.. _option_list: http://docutils.sourceforge.net/docs/ref/doctree.html#option-list -.. _option_list_item: http://docutils.sourceforge.net/docs/ref/doctree.html#option-list-item -.. _option_string: http://docutils.sourceforge.net/docs/ref/doctree.html#option-string -.. _organization: http://docutils.sourceforge.net/docs/ref/doctree.html#organization -.. _paragraph: http://docutils.sourceforge.net/docs/ref/doctree.html#paragraph -.. _pending: http://docutils.sourceforge.net/docs/ref/doctree.html#pending -.. _problematic: http://docutils.sourceforge.net/docs/ref/doctree.html#problematic -.. _raw: http://docutils.sourceforge.net/docs/ref/doctree.html#raw - -.. _reference: http://docutils.sourceforge.net/docs/ref/doctree.html#reference -.. _revision: http://docutils.sourceforge.net/docs/ref/doctree.html#revision -.. _row: http://docutils.sourceforge.net/docs/ref/doctree.html#row -.. _rubric: http://docutils.sourceforge.net/docs/ref/doctree.html#rubric -.. _section: http://docutils.sourceforge.net/docs/ref/doctree.html#section -.. _sidebar: http://docutils.sourceforge.net/docs/ref/doctree.html#sidebar -.. _status: http://docutils.sourceforge.net/docs/ref/doctree.html#status -.. _strong: http://docutils.sourceforge.net/docs/ref/doctree.html#strong -.. _subscript: http://docutils.sourceforge.net/docs/ref/doctree.html#subscript - -.. _substitution_definition: http://docutils.sourceforge.net/docs/ref/doctree.html#substitution-definitio... -.. _substitution_reference: http://docutils.sourceforge.net/docs/ref/doctree.html#substitution-reference -.. _subtitle: http://docutils.sourceforge.net/docs/ref/doctree.html#subtitle -.. _superscript: http://docutils.sourceforge.net/docs/ref/doctree.html#superscript -.. _system_message: http://docutils.sourceforge.net/docs/ref/doctree.html#system-message -.. _table: http://docutils.sourceforge.net/docs/ref/doctree.html#table -.. _target: http://docutils.sourceforge.net/docs/ref/doctree.html#target -.. _tbody: http://docutils.sourceforge.net/docs/ref/doctree.html#tbody -.. _term: http://docutils.sourceforge.net/docs/ref/doctree.html#term - -.. _tgroup: http://docutils.sourceforge.net/docs/ref/doctree.html#tgroup -.. _thead: http://docutils.sourceforge.net/docs/ref/doctree.html#thead -.. _tip: http://docutils.sourceforge.net/docs/ref/doctree.html#tip -.. _title: http://docutils.sourceforge.net/docs/ref/doctree.html#title -.. _title_reference: http://docutils.sourceforge.net/docs/ref/doctree.html#title-reference -.. _topic: http://docutils.sourceforge.net/docs/ref/doctree.html#topic -.. _transition: http://docutils.sourceforge.net/docs/ref/doctree.html#transition -.. _version: http://docutils.sourceforge.net/docs/ref/doctree.html#version -.. _warning: http://docutils.sourceforge.net/docs/ref/doctree.html#warning - Deleted: branches/jrst-docutils-jython/jrst-doc/src/site/rst/user/images/biohazard.png =================================================================== (Binary files differ) Modified: branches/jrst-docutils-jython/jrst-doc/src/site/rst/user/index.rst =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/rst/user/index.rst 2012-05-30 12:55:52 UTC (rev 687) +++ branches/jrst-docutils-jython/jrst-doc/src/site/rst/user/index.rst 2012-05-30 15:34:49 UTC (rev 688) @@ -52,8 +52,10 @@ JRST prend un fichier reStructuredText_ en entrée et génère un fichier XML qui pourra ensuite servir à produire divers formats de fichiers grâce à des fichiers XSL de générations. Les formats de sortie disponibles sont le html, le xhtml, le rst, -le pdf, le docbook_, le odt (Open-Office), le rtf, ou encore le XML [1]_. +le pdf, le docbook_ ou de l'odt (Open-Office) [1]_. +Lorsque JRST est lancé sans argument, une interface graphique est proposée à l'utilisateur. Ainsi, on peut choisir plus aisément les fichiers, le type de sortie ou bien les feuilles de style XSL externes à appliquer. + :: JRST myfile.rst Modified: branches/jrst-docutils-jython/jrst-doc/src/site/rst/user/presentationRST.rst =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/rst/user/presentationRST.rst 2012-05-30 12:55:52 UTC (rev 687) +++ branches/jrst-docutils-jython/jrst-doc/src/site/rst/user/presentationRST.rst 2012-05-30 15:34:49 UTC (rev 688) @@ -340,18 +340,18 @@ ``image``. Par exemple:: - .. image:: images/biohazard.png + .. image:: ../images/biohazard.png Le résultat: -.. image:: images/biohazard.png +.. image:: ../images/biohazard.png -La partie ``images/biohazard.png`` indique le chemin d'accès au fichier +La partie ``../images/biohazard.png`` indique le chemin d'accès au fichier de l'image qui doit apparaître. Il n'y a pas de restriction sur l'image (format, taille etc). Si l'image doit apparaître en HTML et que vous souhaitez lui ajouter des informations:: - .. image:: images/biohazard.png + .. image:: ../images/biohazard.png :height: 100 :width: 200 :scale: 50 Modified: branches/jrst-docutils-jython/jrst-doc/src/site/site_en.xml =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/site_en.xml 2012-05-30 12:55:52 UTC (rev 687) +++ branches/jrst-docutils-jython/jrst-doc/src/site/site_en.xml 2012-05-30 15:34:49 UTC (rev 688) @@ -57,14 +57,12 @@ <menu name="User"> <item href="/user/index.html" name="About"/> <item href="/user/RSTpresentation.html" name="A ReStructuredText Primer"/> - <item href="/user/functionality.html" name="Functionalities suggested"/> </menu> <menu name="Developer"> <item name="Documentation" href="/devel/developerDoc.html"/> <item name="A XSL primer" href="/devel/XSLpresentation.html"/> <item name="Librairy used" href="/devel/library.html"/> - <item name="Todo" href="/devel/Todo.html"/> <item name="External documentation" href="/devel/externalDoc.html"/> </menu> Modified: branches/jrst-docutils-jython/jrst-doc/src/site/site_fr.xml =================================================================== --- branches/jrst-docutils-jython/jrst-doc/src/site/site_fr.xml 2012-05-30 12:55:52 UTC (rev 687) +++ branches/jrst-docutils-jython/jrst-doc/src/site/site_fr.xml 2012-05-30 15:34:49 UTC (rev 688) @@ -54,17 +54,15 @@ <menu ref="parent"/> <menu name="Utilisateur"> - <item href="/user/index.html" name="Présentation du JRST"/> + <item href="/user/index.html" name="Présentation de JRST"/> <item href="/user/presentationRST.html" name="Introduction à ReStructuredText"/> - <item href="/user/fonctionnalites.html" name="Fonctionnalités incluses"/> </menu> <menu name="Developpeur"> <item name="Fonctionnement" href="/devel/docDeveloppeur.html"/> - <item name="Presentation au XSL" href="/devel/presentationXSL.html"/> + <item name="Presentation du XSL" href="/devel/presentationXSL.html"/> <item name="Librairies utilisées" href="/devel/librairies.html"/> - <item name="Todo" href="/devel/Todo.html"/> <item name="Documentation externe" href="/devel/docExterne.html"/> </menu>