cvs commit: jakarta-turbine-maven/src/plugins-build/aptdoc/src/java/org/apache/maven/aptdoc XdocSink.java

[ka...@apache.org]

kaz         2003/01/14 13:42:53

  Modified:    src/plugins-build/aptdoc project.xml
               src/plugins-build/aptdoc/src/java/org/apache/maven/aptdoc
                        XdocSink.java
  Log:
  Updated the apt (almost plain text) plugin to use my patched version of
  APTConvert which provides support for a header row in tables.  Previous
  versions of APTConvert did not support any concept of a row header.
  My patches have been sent to the author, but it seems that APTConvert is
  no longer actively maintained according to the author.
  
  In due time, this will be replaced with restructured text which is much
  more active and is superior to APTConvert:
  
      http://docutils.sourceforge.net/rst.html
  
  James is spearheading the switch, until then, this is a slight
  improvement on what we already have.
  
  Revision  Changes    Path
  1.7       +1 -1      jakarta-turbine-maven/src/plugins-build/aptdoc/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/aptdoc/project.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- project.xml	7 Jan 2003 13:22:00 -0000	1.6
  +++ project.xml	14 Jan 2003 21:42:53 -0000	1.7
  @@ -51,7 +51,7 @@
   
       <dependency>
         <id>aptconvert</id>
  -      <version>020903</version>
  +      <version>020903-patch</version>
         <properties>
           <classloader>root.maven</classloader>
         </properties>
  
  
  
  1.4       +23 -3     jakarta-turbine-maven/src/plugins-build/aptdoc/src/java/org/apache/maven/aptdoc/XdocSink.java
  
  Index: XdocSink.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/aptdoc/src/java/org/apache/maven/aptdoc/XdocSink.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XdocSink.java	18 Oct 2002 00:44:49 -0000	1.3
  +++ XdocSink.java	14 Jan 2003 21:42:53 -0000	1.4
  @@ -398,6 +398,16 @@
   
       public void tableCell() throws ParseException
       {
  +        tableCell(false);
  +    }
  +
  +    public void tableHeaderCell() throws ParseException
  +    {
  +        tableCell(true);
  +    }
  +
  +    public void tableCell(boolean headerRow) throws ParseException
  +    {
           String justif;
           switch ( cellJustif[ cellCount ] )
           {
  @@ -412,12 +422,22 @@
                   justif = "center";
                   break;
           }
  -        markup( "<td align=\"" + justif + "\">" );
  +        markup( "<t" + (headerRow ? 'h' : 'd') + " align=\"" + justif + "\">" );
       }
   
       public void tableCell_() throws ParseException
       {
  -        markup( "</td>\n" );
  +        tableCell_(false);
  +    }
  +
  +    public void tableHeaderCell_() throws ParseException
  +    {
  +        tableCell_(true);
  +    }
  +
  +    public void tableCell_(boolean headerRow) throws ParseException
  +    {
  +        markup( "</t" + (headerRow ? 'h' : 'd') +">\n" );
           ++cellCount;
       }