Return-Path: Delivered-To: apmail-maven-doxia-dev-archive@www.apache.org Received: (qmail 29655 invoked from network); 29 Sep 2008 17:20:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 29 Sep 2008 17:20:21 -0000 Received: (qmail 52218 invoked by uid 500); 29 Sep 2008 17:20:19 -0000 Delivered-To: apmail-maven-doxia-dev-archive@maven.apache.org Received: (qmail 52170 invoked by uid 500); 29 Sep 2008 17:20:19 -0000 Mailing-List: contact doxia-dev-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: doxia-dev@maven.apache.org Delivered-To: mailing list doxia-dev@maven.apache.org Received: (qmail 51956 invoked by uid 99); 29 Sep 2008 17:20:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Sep 2008 10:20:17 -0700 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of vincent.siveton@gmail.com designates 64.233.184.235 as permitted sender) Received: from [64.233.184.235] (HELO wr-out-0506.google.com) (64.233.184.235) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Sep 2008 17:19:17 +0000 Received: by wr-out-0506.google.com with SMTP id c38so2210153wra.16 for ; Mon, 29 Sep 2008 10:19:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:to :subject:in-reply-to:mime-version:content-type :content-transfer-encoding:content-disposition:references; bh=EIvJrQd+1dnoFN8WBIX9cpS3FIIItrBi/v2JBDJhBWE=; b=ANScYAf1SRbEq6z4VacHBv/KqJ/EwndrqDe+eGJUpEsudmG8HMpWNrUWyXaTPL7AGr aKbzyfrufzf6cOS6K7CZ7izFeWx7KtujK7WmOuRUDYP+BcjAETsen7et9m7/zirfBbyV /dZjxD8biHJi2/3hJrRGsS8AY5O8O62YlIhiw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:in-reply-to:mime-version :content-type:content-transfer-encoding:content-disposition :references; b=f0DzW5Zj1hdDScd92Q8cAMBFenPY7MyYTppOrBT8sUqvYKjAech0bRdRE0Z4VV6BWF t/csls8WG6g1RtFb20OP1oM4IYAqZ6DWH+iNiUu7JAEl7epo4f/3QFKwTRkSdejolmy8 y2ER7uk7PDRfHsoGUqczgEaUlZdRwF+awOyB8= Received: by 10.100.111.5 with SMTP id j5mr4584205anc.3.1222708790775; Mon, 29 Sep 2008 10:19:50 -0700 (PDT) Received: by 10.101.70.7 with HTTP; Mon, 29 Sep 2008 10:19:50 -0700 (PDT) Message-ID: <9ae367340809291019g549f801ep8917375e9292a303@mail.gmail.com> Date: Mon, 29 Sep 2008 13:19:50 -0400 From: "Vincent Siveton" To: doxia-dev@maven.apache.org Subject: Re: svn commit: r700094 - /maven/doxia/doxia-tools/trunk/doxia-converter/src/main/java/org/apache/maven/doxia/DefaultConverter.java In-Reply-To: <9ae367340809291015t89c05bfmef541ecafe3af681@mail.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline References: <20080929122900.D21782388A01@eris.apache.org> <48E0D5D9.3020007@apache.org> <200809291849.30009.herve.boutemy@free.fr> <9ae367340809291015t89c05bfmef541ecafe3af681@mail.gmail.com> X-Virus-Checked: Checked by ClamAV on apache.org BTW I am not a docbook expert too :) Vincent 2008/9/29 Vincent Siveton : > 2008/9/29 Herv=E9 BOUTEMY : >> Hi Lukas, >> >> Thanks for pointing this out: I'm not a docbook expert neither, and did = not >> know this explanation of *Simple* Docbook. >> This is not written in the docbook Doxia module code (or I didn't find i= t ;) ) >> neither. >> I'll update the doc. > > Go 4 it :) > >> I got confused by 2 facts in the code: >> - these elements are in the DocBookParser class (as HIER_ELEMENTS consta= nt) >> - test/resources/book.xml is a book, not an article >> Should I remove these parts? >> Or simply mark them as experimental since out of the strict scope of the >> module? > > It is related to DOXIA-186. In fact, the DocBookSink uses wrong DTD > Also, the DocbookParser and DocbookMarkup specifies some unused tags > (like BOOK_TAG). It will be good to remove them to be sticked on the > simplified docbook definition [1]. > > Cheers, > > Vincent > >> Regards, >> >> Herv=E9 >> >> Le lundi 29 septembre 2008, Lukas Theussl a =E9crit : >>> Hi Herve, >>> >>> I haven't looked at the doxia modules for a while, and I am not a >>> docbook expert but IIRC, the doxia docbook module is for Simplified >>> Docbook only and in Simplified DocBook the root element is always >>>
. >>> >>> Correct me if I'm wrong... >>> >>> Cheers, >>> -Lukas >>> >>> hboutemy@apache.org wrote: >>> > Author: hboutemy >>> > Date: Mon Sep 29 05:29:00 2008 >>> > New Revision: 700094 >>> > >>> > URL: http://svn.apache.org/viewvc?rev=3D700094&view=3Drev >>> > Log: >>> > there are multiple root element values possible for Docbook format >>> > (article, but also book, part, chapter, ...) >>> > >>> > Modified: >>> > >>> > maven/doxia/doxia-tools/trunk/doxia-converter/src/main/java/org/apach= e/ma >>> >ven/doxia/DefaultConverter.java >>> > >>> > Modified: >>> > maven/doxia/doxia-tools/trunk/doxia-converter/src/main/java/org/apach= e/ma >>> >ven/doxia/DefaultConverter.java URL: >>> > http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-conv= erte >>> >r/src/main/java/org/apache/maven/doxia/DefaultConverter.java?rev=3D700= 094&r1 >>> >=3D700093&r2=3D700094&view=3Ddiff >>> > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >>> >=3D=3D=3D=3D=3D --- >>> > maven/doxia/doxia-tools/trunk/doxia-converter/src/main/java/org/apach= e/ma >>> >ven/doxia/DefaultConverter.java (original) +++ >>> > maven/doxia/doxia-tools/trunk/doxia-converter/src/main/java/org/apach= e/ma >>> >ven/doxia/DefaultConverter.java Mon Sep 29 05:29:00 2008 @@ -27,10 +27= ,12 >>> > @@ >>> > import java.io.Reader; >>> > import java.io.Writer; >>> > import java.util.HashMap; >>> > +import java.util.HashSet; >>> > import java.util.Iterator; >>> > import java.util.List; >>> > import java.util.Locale; >>> > import java.util.Map; >>> > +import java.util.Set; >>> > import java.util.regex.Matcher; >>> > import java.util.regex.Pattern; >>> > >>> > @@ -111,6 +113,37 @@ >>> > public static final String[] SUPPORTED_TO_FORMAT =3D >>> > { APT_SINK, DOCBOOK_SINK, FO_SINK, ITEXT_SINK, LATEX_SINK, >>> > RTF_SINK, XDOC_SINK, XHTML_SINK }; >>> > >>> > + private static final Set DOCBOOK_ROOT_ELEMENT =3D new HashSet(); >>> > + >>> > + static >>> > + { >>> > + DOCBOOK_ROOT_ELEMENT.add( "set" ); >>> > + DOCBOOK_ROOT_ELEMENT.add( "book" ); >>> > + DOCBOOK_ROOT_ELEMENT.add( "part" ); >>> > + DOCBOOK_ROOT_ELEMENT.add( "chapter" ); >>> > + DOCBOOK_ROOT_ELEMENT.add( "section" ); >>> > + DOCBOOK_ROOT_ELEMENT.add( "sect1" ); >>> > + DOCBOOK_ROOT_ELEMENT.add( "sect2" ); >>> > + DOCBOOK_ROOT_ELEMENT.add( "sect3" ); >>> > + DOCBOOK_ROOT_ELEMENT.add( "sect4" ); >>> > + DOCBOOK_ROOT_ELEMENT.add( "sect5" ); >>> > + DOCBOOK_ROOT_ELEMENT.add( "article" ); >>> > + DOCBOOK_ROOT_ELEMENT.add( "preface" ); >>> > + DOCBOOK_ROOT_ELEMENT.add( "partintro" ); >>> > + DOCBOOK_ROOT_ELEMENT.add( "appendix" ); >>> > + DOCBOOK_ROOT_ELEMENT.add( "bibliography" ); >>> > + DOCBOOK_ROOT_ELEMENT.add( "reference" ); >>> > + DOCBOOK_ROOT_ELEMENT.add( "bibliography" ); >>> > + DOCBOOK_ROOT_ELEMENT.add( "bibliodiv" ); >>> > + DOCBOOK_ROOT_ELEMENT.add( "glossary" ); >>> > + DOCBOOK_ROOT_ELEMENT.add( "refentry" ); >>> > + DOCBOOK_ROOT_ELEMENT.add( "refnamediv" ); >>> > + DOCBOOK_ROOT_ELEMENT.add( "refsection" ); >>> > + DOCBOOK_ROOT_ELEMENT.add( "refsect1" ); >>> > + DOCBOOK_ROOT_ELEMENT.add( "refsect2" ); >>> > + DOCBOOK_ROOT_ELEMENT.add( "refsect3" ); >>> > + } >>> > + >>> > /** Plexus container */ >>> > private PlexusContainer plexus; >>> > >>> > @@ -614,7 +647,7 @@ >>> > { >>> > continue; >>> > } >>> > - else if ( firstTag.equals( "article" ) >>> > + else if ( DOCBOOK_ROOT_ELEMENT.contains( firstTag ) >>> > && supportedFromFormat.equalsIgnoreCase( DOCBOOK_PAR= SER >>> > ) ) { >>> > return supportedFromFormat; >> >> >> >