[hmath-commits] org.hartmath.tex2mml/src/org/hartmath/tex2css/reflection/convert Matrix.java,NONE,1.1 Vector.java,NONE,1.1 Mathbb.java,1.1,1.2 Mathbf.java,1.1,1.2 Mbox.java,1.1,1.2 Bar.java,1.1,1.2 Mathtt.java,1.1,1.2 Dot.java,1.1,1.2 Sub.java,1.1,1.2 Ddot.java,1.1,1.2 Hat.java,1.1,1.2 Frac.java,1.1,1.2 Sup.java,1.1,1.2 Mathfrak.java,1.1,1.2 Text.java,1.1,1.2 Vec.java,1.1,1.2 Mathcal.java,1.1,1.2 Ul.java,1.1,1.2 Mathsf.java,1.1,1.2

[Klaus H. <js...@us...>]

Update of /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2css/reflection/convert
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23782/src/org/hartmath/tex2css/reflection/convert

Modified Files:
	Mathbb.java Mathbf.java Mbox.java Bar.java Mathtt.java 
	Dot.java Sub.java Ddot.java Hat.java Frac.java Sup.java 
	Mathfrak.java Text.java Vec.java Mathcal.java Ul.java 
	Mathsf.java 
Added Files:
	Matrix.java Vector.java 
Log Message:
misc changes


Index: Mathcal.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2css/reflection/convert/Mathcal.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Mathcal.java	12 Mar 2004 20:47:11 -0000	1.1
--- Mathcal.java	19 Mar 2004 20:19:03 -0000	1.2
***************
*** 1,5 ****
  package org.hartmath.tex2css.reflection.convert;
  
! import org.hartmath.tex2mml.IRowConverter;
  import org.hartmath.tex2mml.Identifier;
  import org.hartmath.tex2mml.Node;
--- 1,5 ----
  package org.hartmath.tex2css.reflection.convert;
  
! import org.hartmath.tex2mml.IRowCSSConverter;
  import org.hartmath.tex2mml.Identifier;
  import org.hartmath.tex2mml.Node;
***************
*** 7,11 ****
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Mathcal implements IRowConverter {
    public final static int[] MATHCAL_CODES =
      {
--- 7,11 ----
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Mathcal implements IRowCSSConverter {
    public final static int[] MATHCAL_CODES =
      {
***************
*** 43,47 ****
     *      org.hartmath.tex2mml.TeX2MathMLFactory)
     */
!   public boolean convert(StringBuffer buf, Row row, TeX2MathMLFactory f) {
      if (row.size() == 1) {
        Node temp = row.get(0);
--- 43,47 ----
     *      org.hartmath.tex2mml.TeX2MathMLFactory)
     */
!   public boolean convert(StringBuffer buf, Row row) {
      if (row.size() == 1) {
        Node temp = row.get(0);

Index: Hat.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2css/reflection/convert/Hat.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Hat.java	12 Mar 2004 20:47:11 -0000	1.1
--- Hat.java	19 Mar 2004 20:19:03 -0000	1.2
***************
*** 1,9 ****
  package org.hartmath.tex2css.reflection.convert;
  
! import org.hartmath.tex2mml.IRowConverter;
  import org.hartmath.tex2mml.Row;
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Hat implements IRowConverter {
       
    /*
--- 1,9 ----
  package org.hartmath.tex2css.reflection.convert;
  
! import org.hartmath.tex2mml.IRowCSSConverter;
  import org.hartmath.tex2mml.Row;
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Hat implements IRowCSSConverter {
       
    /*
***************
*** 13,24 ****
     *      org.hartmath.tex2mml.TeX2MathMLFactory)
     */
!   public boolean convert(StringBuffer buf, Row row, TeX2MathMLFactory f) {
      if (row.size() == 1) {
! //      f.tagStart(buf, "mover");
!       row.get(0).convert2CSS(f, buf);
! //      f.tagStart(buf, "mo");
!       buf.append(TeX2MathMLFactory.toEntity('\u005E'));  // '^'
! //      f.tagEnd(buf, "mo");
! //      f.tagEnd(buf, "mover");
        return true;
      }
--- 13,28 ----
     *      org.hartmath.tex2mml.TeX2MathMLFactory)
     */
!   public boolean convert(StringBuffer buf, Row row) {
      if (row.size() == 1) {
! // <O>
! // <x>overscript</x>
! // <g>Operator</g>
! // </O>
! 
!       buf.append("<O><x>");
!       row.get(0).convert2CSS(buf, false);
!       buf.append("</x><g>");
!       buf.append(TeX2MathMLFactory.toEntity('\u005E')); 
!       buf.append("</g></O>");
        return true;
      }

Index: Text.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2css/reflection/convert/Text.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Text.java	12 Mar 2004 20:47:11 -0000	1.1
--- Text.java	19 Mar 2004 20:19:03 -0000	1.2
***************
*** 1,9 ****
  package org.hartmath.tex2css.reflection.convert;
  
! import org.hartmath.tex2mml.IRowConverter;
  import org.hartmath.tex2mml.Row;
- import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Text implements IRowConverter {
       
    /*
--- 1,8 ----
  package org.hartmath.tex2css.reflection.convert;
  
! import org.hartmath.tex2mml.IRowCSSConverter;
  import org.hartmath.tex2mml.Row;
  
! public class Text implements IRowCSSConverter {
       
    /*
***************
*** 13,17 ****
     *      org.hartmath.tex2mml.TeX2MathMLFactory)
     */
!   public boolean convert(StringBuffer buf, Row row, TeX2MathMLFactory f) {
      if (row.size() == 1) {
  //      f.tagStart(buf, "mtext");
--- 12,16 ----
     *      org.hartmath.tex2mml.TeX2MathMLFactory)
     */
!   public boolean convert(StringBuffer buf, Row row) {
      if (row.size() == 1) {
  //      f.tagStart(buf, "mtext");

Index: Mathfrak.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2css/reflection/convert/Mathfrak.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Mathfrak.java	12 Mar 2004 20:47:11 -0000	1.1
--- Mathfrak.java	19 Mar 2004 20:19:03 -0000	1.2
***************
*** 1,5 ****
  package org.hartmath.tex2css.reflection.convert;
  
! import org.hartmath.tex2mml.IRowConverter;
  import org.hartmath.tex2mml.Identifier;
  import org.hartmath.tex2mml.Node;
--- 1,5 ----
  package org.hartmath.tex2css.reflection.convert;
  
! import org.hartmath.tex2mml.IRowCSSConverter;
  import org.hartmath.tex2mml.Identifier;
  import org.hartmath.tex2mml.Node;
***************
*** 7,11 ****
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Mathfrak implements IRowConverter {
    public final static int[] MATHFRAK_CODES =
      {
--- 7,11 ----
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Mathfrak implements IRowCSSConverter {
    public final static int[] MATHFRAK_CODES =
      {
***************
*** 43,47 ****
     *      org.hartmath.tex2mml.TeX2MathMLFactory)
     */
!   public boolean convert(StringBuffer buf, Row row, TeX2MathMLFactory f) {
      if (row.size() == 1) {
        Node temp = row.get(0);
--- 43,47 ----
     *      org.hartmath.tex2mml.TeX2MathMLFactory)
     */
!   public boolean convert(StringBuffer buf, Row row) {
      if (row.size() == 1) {
        Node temp = row.get(0);

Index: Mathtt.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2css/reflection/convert/Mathtt.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Mathtt.java	12 Mar 2004 20:47:11 -0000	1.1
--- Mathtt.java	19 Mar 2004 20:19:03 -0000	1.2
***************
*** 1,9 ****
  package org.hartmath.tex2css.reflection.convert;
  
! import org.hartmath.tex2mml.IRowConverter;
  import org.hartmath.tex2mml.Row;
- import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Mathtt implements IRowConverter {
    
    /*
--- 1,8 ----
  package org.hartmath.tex2css.reflection.convert;
  
! import org.hartmath.tex2mml.IRowCSSConverter;
  import org.hartmath.tex2mml.Row;
  
! public class Mathtt implements IRowCSSConverter {
    
    /*
***************
*** 13,20 ****
     *      org.hartmath.tex2mml.TeX2MathMLFactory)
     */
!   public boolean convert(StringBuffer buf, Row row, TeX2MathMLFactory f) {
      if (row.size() == 1) {
     //   f.tagStart(buf, "mstyle", "fontfamily=\"monospace\"");
!       row.get(0).convert2CSS(f, buf);
    //    f.tagEnd(buf, "mstyle");
        return true;
--- 12,19 ----
     *      org.hartmath.tex2mml.TeX2MathMLFactory)
     */
!   public boolean convert(StringBuffer buf, Row row) {
      if (row.size() == 1) {
     //   f.tagStart(buf, "mstyle", "fontfamily=\"monospace\"");
!       row.get(0).convert2CSS(buf, false);
    //    f.tagEnd(buf, "mstyle");
        return true;

Index: Vec.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2css/reflection/convert/Vec.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Vec.java	12 Mar 2004 20:47:11 -0000	1.1
--- Vec.java	19 Mar 2004 20:19:03 -0000	1.2
***************
*** 1,9 ****
  package org.hartmath.tex2css.reflection.convert;
  
! import org.hartmath.tex2mml.IRowConverter;
  import org.hartmath.tex2mml.Row;
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Vec implements IRowConverter {
       
    /*
--- 1,9 ----
  package org.hartmath.tex2css.reflection.convert;
  
! import org.hartmath.tex2mml.IRowCSSConverter;
  import org.hartmath.tex2mml.Row;
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Vec implements IRowCSSConverter {
       
    /*
***************
*** 13,24 ****
     *      org.hartmath.tex2mml.TeX2MathMLFactory)
     */
!   public boolean convert(StringBuffer buf, Row row, TeX2MathMLFactory f) {
      if (row.size() == 1) {
! //      f.tagStart(buf, "mover");
!       row.get(0).convert2CSS(f, buf);
! //      f.tagStart(buf, "mo");
        buf.append(TeX2MathMLFactory.toEntity('\u2192'));  // '^'
! //      f.tagEnd(buf, "mo");
! //      f.tagEnd(buf, "mover");
        return true;
      }
--- 13,28 ----
     *      org.hartmath.tex2mml.TeX2MathMLFactory)
     */
!   public boolean convert(StringBuffer buf, Row row) {
      if (row.size() == 1) {
! // <O>
! // <x>overscript</x>
! // <g>Operator</g>
! // </O>
! 
!       buf.append("<O><x>");
!       row.get(0).convert2CSS(buf, false);
!       buf.append("</x><g>");
        buf.append(TeX2MathMLFactory.toEntity('\u2192'));  // '^'
!       buf.append("</g></O>");
        return true;
      }

Index: Sup.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2css/reflection/convert/Sup.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Sup.java	12 Mar 2004 20:47:11 -0000	1.1
--- Sup.java	19 Mar 2004 20:19:03 -0000	1.2
***************
*** 1,10 ****
  package org.hartmath.tex2css.reflection.convert;
  
! import org.hartmath.tex2mml.IRowConverter;
  import org.hartmath.tex2mml.Node;
  import org.hartmath.tex2mml.Row;
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Sup implements IRowConverter {
  
    /*
--- 1,10 ----
  package org.hartmath.tex2css.reflection.convert;
  
! import org.hartmath.tex2mml.IRowCSSConverter;
  import org.hartmath.tex2mml.Node;
  import org.hartmath.tex2mml.Row;
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Sup implements IRowCSSConverter {
  
    /*
***************
*** 14,18 ****
     *      org.hartmath.tex2mml.TeX2MathMLFactory)
     */
!   public boolean convert(StringBuffer buf, Row row, TeX2MathMLFactory f) {
      if (row.getTeXSymbol() == "sup" && row.size() == 2) {
        Node nSup0 = row.get(0);
--- 14,18 ----
     *      org.hartmath.tex2mml.TeX2MathMLFactory)
     */
!   public boolean convert(StringBuffer buf, Row row) {
      if (row.getTeXSymbol() == "sup" && row.size() == 2) {
        Node nSup0 = row.get(0);
***************
*** 23,31 ****
            Node nSub0 = rowSub0.get(0);
            if (nSub0.containsAttribute(TeX2MathMLFactory.UNDEROVER)) {
! //            f.tagStart(buf, "munderover");
!             nSub0.convert2CSS(f, buf);
!             rowSub0.get(1).convert2CSS(f, buf);
!             row.get(1).convert2CSS(f, buf);
! //            f.tagEnd(buf, "munderover");
              return true;
            }
--- 23,50 ----
            Node nSub0 = rowSub0.get(0);
            if (nSub0.containsAttribute(TeX2MathMLFactory.UNDEROVER)) {
!             String cssOpen = nSub0.getAttribute(TeX2MathMLFactory.CSS_OPEN);
!             String cssClose = nSub0.getAttribute(TeX2MathMLFactory.CSS_CLOSE);
!             if (cssOpen!=null&&cssClose!=null) {
!               buf.append(cssOpen);
!               buf.append("<x>");
!               row.get(1).convert2CSS(buf, true);
!               buf.append("</x><x>");
!               rowSub0.get(1).convert2CSS(buf, true);
!               buf.append("</x>");
!               buf.append(cssClose);
!               return true;
!             }
! //            <D>
! //            <x>overscript</x>
! //            <g>Operator</g>
! //            <x>underscript</x>
! //            </D>
!             buf.append("<D><x>");
!             row.get(1).convert2CSS(buf, true);
!             buf.append("</x><g>");
!             buf.append(nSub0.toString());
!             buf.append("</g><x>");
!             rowSub0.get(1).convert2CSS(buf, true);
!             buf.append("</x></D>");
              return true;
            }
***************
*** 33,40 ****
        } else {
          if (nSup0.containsAttribute(TeX2MathMLFactory.UNDEROVER)) {
! //          f.tagStart(buf, "mover");
!           nSup0.convert2CSS(f, buf);
!           row.get(1).convert2CSS(f, buf);
! //          f.tagEnd(buf, "mover");
            return true;
          }
--- 52,64 ----
        } else {
          if (nSup0.containsAttribute(TeX2MathMLFactory.UNDEROVER)) {
! //          <O>
! //          <x>overscript</x>
! //          <g>Operator</g>
! //          </O>
!           buf.append("<O><x>");
!           row.get(1).convert2CSS(buf, false);
!           buf.append("</x><g>");
!           buf.append(nSup0.toString());
!           buf.append("</g></O>");
            return true;
          }
***************
*** 42,48 ****
      }
      if (row.size() == 2) {
!       row.get(0).convert2CSS(f, buf);
        buf.append("<t>");
!       row.get(1).convert2CSS(f, buf);
        buf.append("</t>");
        return true;
--- 66,72 ----
      }
      if (row.size() == 2) {
!       row.get(0).convert2CSS(buf, false);
        buf.append("<t>");
!       row.get(1).convert2CSS(buf, false);
        buf.append("</t>");
        return true;

Index: Mbox.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2css/reflection/convert/Mbox.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Mbox.java	12 Mar 2004 20:47:11 -0000	1.1
--- Mbox.java	19 Mar 2004 20:19:03 -0000	1.2
***************
*** 1,9 ****
  package org.hartmath.tex2css.reflection.convert;
  
! import org.hartmath.tex2mml.IRowConverter;
  import org.hartmath.tex2mml.Row;
- import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Mbox implements IRowConverter {
       
    /*
--- 1,8 ----
  package org.hartmath.tex2css.reflection.convert;
  
! import org.hartmath.tex2mml.IRowCSSConverter;
  import org.hartmath.tex2mml.Row;
  
! public class Mbox implements IRowCSSConverter {
       
    /*
***************
*** 13,20 ****
     *      org.hartmath.tex2mml.TeX2MathMLFactory)
     */
!   public boolean convert(StringBuffer buf, Row row, TeX2MathMLFactory f) {
      if (row.size() == 1) {
  //      f.tagStart(buf, "mbox");
!       row.get(0).convert2CSS(f, buf);
  //      f.tagEnd(buf, "mbox");
        return true;
--- 12,19 ----
     *      org.hartmath.tex2mml.TeX2MathMLFactory)
     */
!   public boolean convert(StringBuffer buf, Row row) {
      if (row.size() == 1) {
  //      f.tagStart(buf, "mbox");
!       row.get(0).convert2CSS(buf, false);
  //      f.tagEnd(buf, "mbox");
        return true;

Index: Ul.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2css/reflection/convert/Ul.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Ul.java	12 Mar 2004 20:47:11 -0000	1.1
--- Ul.java	19 Mar 2004 20:19:03 -0000	1.2
***************
*** 1,9 ****
  package org.hartmath.tex2css.reflection.convert;
  
! import org.hartmath.tex2mml.IRowConverter;
  import org.hartmath.tex2mml.Row;
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Ul implements IRowConverter {
       
    /*
--- 1,9 ----
  package org.hartmath.tex2css.reflection.convert;
  
! import org.hartmath.tex2mml.IRowCSSConverter;
  import org.hartmath.tex2mml.Row;
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Ul implements IRowCSSConverter {
       
    /*
***************
*** 13,24 ****
     *      org.hartmath.tex2mml.TeX2MathMLFactory)
     */
!   public boolean convert(StringBuffer buf, Row row, TeX2MathMLFactory f) {
      if (row.size() == 1) {
! //      f.tagStart(buf, "munder");
!       row.get(0).convert2CSS(f, buf);
! //      f.tagStart(buf, "mo");
!       buf.append(TeX2MathMLFactory.toEntity('\u0332'));  // '^'
! //      f.tagEnd(buf, "mo");
! //      f.tagEnd(buf, "munder");
        return true;
      }
--- 13,27 ----
     *      org.hartmath.tex2mml.TeX2MathMLFactory)
     */
!   public boolean convert(StringBuffer buf, Row row) {
      if (row.size() == 1) {
! // <U>
! // <g>Operator</g>
! // <x>underscript</x>
! // </U>
!       buf.append("<U><g>");
!       buf.append(TeX2MathMLFactory.toEntity('\u0332'));
!       buf.append("</g><x>");
!       row.get(0).convert2CSS(buf, false);
!       buf.append("</x></U>");
        return true;
      }

--- NEW FILE: Vector.java ---
package org.hartmath.tex2css.reflection.convert;

import org.hartmath.tex2mml.IRowCSSConverter;
import org.hartmath.tex2mml.Node;
import org.hartmath.tex2mml.Row;

public class Vector implements IRowCSSConverter {

  /*
   * (non-Javadoc)
   * 
   * @see org.hartmath.tex2mml.IRowConverter#convert(java.lang.StringBuffer, org.hartmath.tex2mml.Row,
   *      org.hartmath.tex2mml.TeX2MathMLFactory)
   */
  public boolean convert(StringBuffer buf, Row row) {
// <V>
// <r>a</r>
// <r>c</r>
// </V>
    Row oneRow;
    Node temp;
    buf.append("<V>");
    for (int i=0;i<row.size();i++) {
      buf.append("<r>");
      oneRow = (Row) row.get(i);
      for (int j=0;j<oneRow.size();j++) {
        temp = (Node) oneRow.get(j);
        temp.convert2CSS(buf, false);
      }
      buf.append("</r>");
    }
    buf.append("</V>");
    return true;
  }

}

Index: Mathbf.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2css/reflection/convert/Mathbf.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Mathbf.java	12 Mar 2004 20:47:11 -0000	1.1
--- Mathbf.java	19 Mar 2004 20:19:03 -0000	1.2
***************
*** 1,9 ****
  package org.hartmath.tex2css.reflection.convert;
  
! import org.hartmath.tex2mml.IRowConverter;
  import org.hartmath.tex2mml.Row;
- import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Mathbf implements IRowConverter {
  
    /*
--- 1,8 ----
  package org.hartmath.tex2css.reflection.convert;
  
! import org.hartmath.tex2mml.IRowCSSConverter;
  import org.hartmath.tex2mml.Row;
  
! public class Mathbf implements IRowCSSConverter {
  
    /*
***************
*** 13,20 ****
     *      org.hartmath.tex2mml.TeX2MathMLFactory)
     */
!   public boolean convert(StringBuffer buf, Row row, TeX2MathMLFactory f) {
      if (row.size() == 1) {
  //      f.tagStart(buf, "mstyle", "fontweight=\"bold\"");
!       row.get(0).convert2CSS(f, buf);
  //      f.tagEnd(buf, "mstyle");
        return true;
--- 12,19 ----
     *      org.hartmath.tex2mml.TeX2MathMLFactory)
     */
!   public boolean convert(StringBuffer buf, Row row) {
      if (row.size() == 1) {
  //      f.tagStart(buf, "mstyle", "fontweight=\"bold\"");
!       row.get(0).convert2CSS(buf, false);
  //      f.tagEnd(buf, "mstyle");
        return true;

Index: Ddot.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2css/reflection/convert/Ddot.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Ddot.java	12 Mar 2004 20:47:11 -0000	1.1
--- Ddot.java	19 Mar 2004 20:19:03 -0000	1.2
***************
*** 1,9 ****
  package org.hartmath.tex2css.reflection.convert;
  
! import org.hartmath.tex2mml.IRowConverter;
  import org.hartmath.tex2mml.Row;
- import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Ddot implements IRowConverter {
       
    /*
--- 1,8 ----
  package org.hartmath.tex2css.reflection.convert;
  
! import org.hartmath.tex2mml.IRowCSSConverter;
  import org.hartmath.tex2mml.Row;
  
! public class Ddot implements IRowCSSConverter {
       
    /*
***************
*** 13,24 ****
     *      org.hartmath.tex2mml.TeX2MathMLFactory)
     */
!   public boolean convert(StringBuffer buf, Row row, TeX2MathMLFactory f) {
      if (row.size() == 1) {
!    //   f.tagStart(buf, "mover");
!       row.get(0).convert2CSS(f, buf);
! //      f.tagStart(buf, "mo");
!       buf.append("..");  // '^'
! //      f.tagEnd(buf, "mo");
! //      f.tagEnd(buf, "mover");
        return true;
      }
--- 12,26 ----
     *      org.hartmath.tex2mml.TeX2MathMLFactory)
     */
!   public boolean convert(StringBuffer buf, Row row) {
      if (row.size() == 1) {
! // <O>
! // <x>overscript</x>
! // <g>Operator</g>
! // </O>
!       buf.append("<O><x>");
!       row.get(0).convert2CSS(buf, false);
!       buf.append("</x><g>");
!       buf.append("..");
!       buf.append("</g></O>");
        return true;
      }

Index: Mathsf.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2css/reflection/convert/Mathsf.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Mathsf.java	12 Mar 2004 20:47:11 -0000	1.1
--- Mathsf.java	19 Mar 2004 20:19:03 -0000	1.2
***************
*** 1,9 ****
  package org.hartmath.tex2css.reflection.convert;
  
! import org.hartmath.tex2mml.IRowConverter;
  import org.hartmath.tex2mml.Row;
- import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Mathsf implements IRowConverter {
       
    /*
--- 1,8 ----
  package org.hartmath.tex2css.reflection.convert;
  
! import org.hartmath.tex2mml.IRowCSSConverter;
  import org.hartmath.tex2mml.Row;
  
! public class Mathsf implements IRowCSSConverter {
       
    /*
***************
*** 13,20 ****
     *      org.hartmath.tex2mml.TeX2MathMLFactory)
     */
!   public boolean convert(StringBuffer buf, Row row, TeX2MathMLFactory f) {
      if (row.size() == 1) {
   //     f.tagStart(buf, "mstyle", "fontfamily=\"sans-serif\"");
!       row.get(0).convert2CSS(f, buf);
     //   f.tagEnd(buf, "mstyle");
        return true;
--- 12,19 ----
     *      org.hartmath.tex2mml.TeX2MathMLFactory)
     */
!   public boolean convert(StringBuffer buf, Row row) {
      if (row.size() == 1) {
   //     f.tagStart(buf, "mstyle", "fontfamily=\"sans-serif\"");
!       row.get(0).convert2CSS(buf, false);
     //   f.tagEnd(buf, "mstyle");
        return true;

Index: Frac.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2css/reflection/convert/Frac.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Frac.java	12 Mar 2004 20:47:11 -0000	1.1
--- Frac.java	19 Mar 2004 20:19:03 -0000	1.2
***************
*** 1,9 ****
  package org.hartmath.tex2css.reflection.convert;
  
! import org.hartmath.tex2mml.IRowConverter;
  import org.hartmath.tex2mml.Row;
- import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Frac implements IRowConverter {
  
    /*
--- 1,8 ----
  package org.hartmath.tex2css.reflection.convert;
  
! import org.hartmath.tex2mml.IRowCSSConverter;
  import org.hartmath.tex2mml.Row;
  
! public class Frac implements IRowCSSConverter {
  
    /*
***************
*** 13,22 ****
     *      org.hartmath.tex2mml.TeX2MathMLFactory)
     */
!   public boolean convert(StringBuffer buf, Row row, TeX2MathMLFactory f) {
      if (row.size() == 2) {
        buf.append("<f><r>");
!       row.get(0).convert2CSS(f, buf);
        buf.append("</r><r>");
!       row.get(1).convert2CSS(f, buf);
        buf.append("</r></f>");
        return true;
--- 12,21 ----
     *      org.hartmath.tex2mml.TeX2MathMLFactory)
     */
!   public boolean convert(StringBuffer buf, Row row) {
      if (row.size() == 2) {
        buf.append("<f><r>");
!       row.get(0).convert2CSS(buf, false);
        buf.append("</r><r>");
!       row.get(1).convert2CSS(buf, false);
        buf.append("</r></f>");
        return true;

Index: Dot.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2css/reflection/convert/Dot.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Dot.java	12 Mar 2004 20:47:11 -0000	1.1
--- Dot.java	19 Mar 2004 20:19:03 -0000	1.2
***************
*** 1,9 ****
  package org.hartmath.tex2css.reflection.convert;
  
! import org.hartmath.tex2mml.IRowConverter;
  import org.hartmath.tex2mml.Row;
- import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Dot implements IRowConverter {
       
    /*
--- 1,8 ----
  package org.hartmath.tex2css.reflection.convert;
  
! import org.hartmath.tex2mml.IRowCSSConverter;
  import org.hartmath.tex2mml.Row;
  
! public class Dot implements IRowCSSConverter {
       
    /*
***************
*** 13,24 ****
     *      org.hartmath.tex2mml.TeX2MathMLFactory)
     */
!   public boolean convert(StringBuffer buf, Row row, TeX2MathMLFactory f) {
      if (row.size() == 1) {
!   //    f.tagStart(buf, "mover");
!       row.get(0).convert2CSS(f, buf);
!    //   f.tagStart(buf, "mo");
!       buf.append(".");  
!     //  f.tagEnd(buf, "mo");
!      // f.tagEnd(buf, "mover");
        return true;
      }
--- 12,26 ----
     *      org.hartmath.tex2mml.TeX2MathMLFactory)
     */
!   public boolean convert(StringBuffer buf, Row row) {
      if (row.size() == 1) {
! // <O>
! // <x>overscript</x>
! // <g>Operator</g>
! // </O>
!       buf.append("<O><x>");
!       row.get(0).convert2CSS(buf, false);
!       buf.append("</x><g>");
!       buf.append(".");
!       buf.append("</g></O>");
        return true;
      }

Index: Bar.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2css/reflection/convert/Bar.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Bar.java	12 Mar 2004 20:47:11 -0000	1.1
--- Bar.java	19 Mar 2004 20:19:03 -0000	1.2
***************
*** 1,9 ****
  package org.hartmath.tex2css.reflection.convert;
  
! import org.hartmath.tex2mml.IRowConverter;
  import org.hartmath.tex2mml.Row;
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Bar implements IRowConverter {
       
    /*
--- 1,9 ----
  package org.hartmath.tex2css.reflection.convert;
  
! import org.hartmath.tex2mml.IRowCSSConverter;
  import org.hartmath.tex2mml.Row;
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Bar implements IRowCSSConverter {
       
    /*
***************
*** 13,24 ****
     *      org.hartmath.tex2mml.TeX2MathMLFactory)
     */
!   public boolean convert(StringBuffer buf, Row row, TeX2MathMLFactory f) {
      if (row.size() == 1) {
! //      f.tagStart(buf, "mover");
!       row.get(0).convert2CSS(f, buf);
! //      f.tagStart(buf, "mo");
!       buf.append(TeX2MathMLFactory.toEntity('\u00AF'));  //
! //      f.tagEnd(buf, "mo");
! //      f.tagEnd(buf, "mover");
        return true;
      }
--- 13,28 ----
     *      org.hartmath.tex2mml.TeX2MathMLFactory)
     */
!   public boolean convert(StringBuffer buf, Row row) {
      if (row.size() == 1) {
! // <O>
! // <x>overscript</x>
! // <g>Operator</g>
! // </O>
! 
!       buf.append("<O><x>");
!       row.get(0).convert2CSS(buf, false);
!       buf.append("</x><g>");
!       buf.append(TeX2MathMLFactory.toEntity('\u00AF'));
!       buf.append("</g></O>");
        return true;
      }

Index: Sub.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2css/reflection/convert/Sub.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Sub.java	12 Mar 2004 20:47:11 -0000	1.1
--- Sub.java	19 Mar 2004 20:19:03 -0000	1.2
***************
*** 1,10 ****
  package org.hartmath.tex2css.reflection.convert;
  
! import org.hartmath.tex2mml.IRowConverter;
  import org.hartmath.tex2mml.Node;
  import org.hartmath.tex2mml.Row;
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Sub implements IRowConverter {
  
    /*
--- 1,10 ----
  package org.hartmath.tex2css.reflection.convert;
  
! import org.hartmath.tex2mml.IRowCSSConverter;
  import org.hartmath.tex2mml.Node;
  import org.hartmath.tex2mml.Row;
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Sub implements IRowCSSConverter {
  
    /*
***************
*** 14,18 ****
     *      org.hartmath.tex2mml.TeX2MathMLFactory)
     */
!   public boolean convert(StringBuffer buf, Row row, TeX2MathMLFactory f) {
      if (row.getTeXSymbol() == "sub" && row.size() == 2) {
        Node nSub0 = row.get(0);
--- 14,18 ----
     *      org.hartmath.tex2mml.TeX2MathMLFactory)
     */
!   public boolean convert(StringBuffer buf, Row row) {
      if (row.getTeXSymbol() == "sub" && row.size() == 2) {
        Node nSub0 = row.get(0);
***************
*** 22,30 ****
            Node nSup0 = rowSup0.get(0);
            if (nSup0.containsAttribute(TeX2MathMLFactory.UNDEROVER)) {
!             //            f.tagStart(buf, "munderover");
!             nSup0.convert2CSS(f, buf);
!             row.get(1).convert2CSS(f, buf);
!             rowSup0.get(1).convert2CSS(f, buf);
!             //            f.tagEnd(buf, "munderover");
              return true;
            }
--- 22,49 ----
            Node nSup0 = rowSup0.get(0);
            if (nSup0.containsAttribute(TeX2MathMLFactory.UNDEROVER)) {
!             String cssOpen = nSup0.getAttribute(TeX2MathMLFactory.CSS_OPEN);
!             String cssClose = nSup0.getAttribute(TeX2MathMLFactory.CSS_CLOSE);
!             if (cssOpen!=null&&cssClose!=null) {
!               buf.append(cssOpen);
!               buf.append("<x>");
!               rowSup0.get(1).convert2CSS(buf, true);
!               buf.append("</x><x>");
!               row.get(1).convert2CSS(buf, true);
!               buf.append("</x>");
!               buf.append(cssClose);
!               return true;
!             }
! //            <D>
! //            <x>overscript</x>
! //            <g>Operator</g>
! //            <x>underscript</x>
! //            </D>
!             buf.append("<D><x>");
!             rowSup0.get(1).convert2CSS(buf, true);
!             buf.append("</x><g>");
!             buf.append(nSup0.toString());
!             buf.append("</g><x>");
!             row.get(1).convert2CSS(buf, true);
!             buf.append("</x></D>");
              return true;
            }
***************
*** 33,44 ****
          if (nSub0.containsAttribute(TeX2MathMLFactory.UNDEROVER)) {
            if (!nSub0.getCSSOperator().equals("")) {
!             buf.append('<');
!             buf.append(nSub0.getCSSOperator());
!             buf.append('>');
! 
!             row.get(1).convert2CSS(f, buf);
!             buf.append("</");
!             buf.append(nSub0.getCSSOperator());
!             buf.append('>');
              return true;
            }
--- 52,65 ----
          if (nSub0.containsAttribute(TeX2MathMLFactory.UNDEROVER)) {
            if (!nSub0.getCSSOperator().equals("")) {
! //            <U>
! //            <g>Operator</g>
! //            <x>underscript</x>
! //            </U>
!             buf.append("<U><g>");
!             buf.append(nSub0.toString());
!             buf.append("</g><x>");
!              
!             row.get(1).convert2CSS(buf, false);
!             buf.append("</x></U>");
              return true;
            }
***************
*** 47,53 ****
      }
      if (row.size() == 2) {
!       row.get(0).convert2CSS(f, buf);
        buf.append("<l>");
!       row.get(1).convert2CSS(f, buf);
        buf.append("</l>");
        return true;
--- 68,74 ----
      }
      if (row.size() == 2) {
!       row.get(0).convert2CSS(buf, false);
        buf.append("<l>");
!       row.get(1).convert2CSS(buf, false);
        buf.append("</l>");
        return true;

--- NEW FILE: Matrix.java ---
package org.hartmath.tex2css.reflection.convert;

import org.hartmath.tex2mml.IRowCSSConverter;
import org.hartmath.tex2mml.Node;
import org.hartmath.tex2mml.Row;

public class Matrix implements IRowCSSConverter {

  /*
   * (non-Javadoc)
   * 
   * @see org.hartmath.tex2mml.IRowConverter#convert(java.lang.StringBuffer, org.hartmath.tex2mml.Row,
   *      org.hartmath.tex2mml.TeX2MathMLFactory)
   */
  public boolean convert(StringBuffer buf, Row row) {
// <M>
// <r><n>a</n><n>b</n></r>
// <r><n>c</n><n>d</n></r>
// </M>
    Row oneRow;
    Node temp;
    buf.append("<M>");
    for (int i=0;i<row.size();i++) {
      buf.append("<r>");
      oneRow = (Row) row.get(i);
      for (int j=0;j<oneRow.size();j++) {
        buf.append("<n>");
        temp = (Node) oneRow.get(j);
        temp.convert2CSS(buf, false);
        buf.append("</n>");
      }
      buf.append("</r>");
    }
    buf.append("</M>");
    return true;
  }

}

Index: Mathbb.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2css/reflection/convert/Mathbb.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Mathbb.java	12 Mar 2004 20:47:11 -0000	1.1
--- Mathbb.java	19 Mar 2004 20:19:03 -0000	1.2
***************
*** 1,5 ****
  package org.hartmath.tex2css.reflection.convert;
  
! import org.hartmath.tex2mml.IRowConverter;
  import org.hartmath.tex2mml.Identifier;
  import org.hartmath.tex2mml.Node;
--- 1,5 ----
  package org.hartmath.tex2css.reflection.convert;
  
! import org.hartmath.tex2mml.IRowCSSConverter;
  import org.hartmath.tex2mml.Identifier;
  import org.hartmath.tex2mml.Node;
***************
*** 7,11 ****
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Mathbb implements IRowConverter {
      public final static int[] bbb =
        {
--- 7,11 ----
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Mathbb implements IRowCSSConverter {
      public final static int[] bbb =
        {
***************
*** 43,47 ****
     *      org.hartmath.tex2mml.TeX2MathMLFactory)
     */
!   public boolean convert(StringBuffer buf, Row row, TeX2MathMLFactory f) {
      if (row.size() == 1) {
        Node temp = row.get(0);
--- 43,47 ----
     *      org.hartmath.tex2mml.TeX2MathMLFactory)
     */
!   public boolean convert(StringBuffer buf, Row row) {
      if (row.size() == 1) {
        Node temp = row.get(0);