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

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

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

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


Index: Mathcal.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2mml/reflection/convert/Mathcal.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Mathcal.java	15 Feb 2004 14:31:00 -0000	1.1
--- Mathcal.java	19 Mar 2004 20:19:03 -0000	1.2
***************
*** 1,5 ****
  package org.hartmath.tex2mml.reflection.convert;
  
! import org.hartmath.tex2mml.IRowConverter;
  import org.hartmath.tex2mml.Identifier;
  import org.hartmath.tex2mml.Node;
--- 1,5 ----
  package org.hartmath.tex2mml.reflection.convert;
  
! import org.hartmath.tex2mml.IRowMMLConverter;
  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 IRowMMLConverter {
    public final static int[] MATHCAL_CODES =
      {

Index: Hat.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2mml/reflection/convert/Hat.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Hat.java	12 Mar 2004 20:47:11 -0000	1.2
--- Hat.java	19 Mar 2004 20:19:03 -0000	1.3
***************
*** 1,9 ****
  package org.hartmath.tex2mml.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.tex2mml.reflection.convert;
  
! import org.hartmath.tex2mml.IRowMMLConverter;
  import org.hartmath.tex2mml.Row;
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Hat implements IRowMMLConverter {
       
    /*

Index: Bar.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2mml/reflection/convert/Bar.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Bar.java	12 Mar 2004 20:47:11 -0000	1.2
--- Bar.java	19 Mar 2004 20:19:03 -0000	1.3
***************
*** 1,9 ****
  package org.hartmath.tex2mml.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.tex2mml.reflection.convert;
  
! import org.hartmath.tex2mml.IRowMMLConverter;
  import org.hartmath.tex2mml.Row;
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Bar implements IRowMMLConverter {
       
    /*

Index: Text.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2mml/reflection/convert/Text.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Text.java	15 Feb 2004 14:31:00 -0000	1.1
--- Text.java	19 Mar 2004 20:19:03 -0000	1.2
***************
*** 1,9 ****
  package org.hartmath.tex2mml.reflection.convert;
  
! import org.hartmath.tex2mml.IRowConverter;
  import org.hartmath.tex2mml.Row;
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Text implements IRowConverter {
       
    /*
--- 1,9 ----
  package org.hartmath.tex2mml.reflection.convert;
  
! import org.hartmath.tex2mml.IRowMMLConverter;
  import org.hartmath.tex2mml.Row;
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Text implements IRowMMLConverter {
       
    /*

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

import org.hartmath.tex2mml.IRowMMLConverter;
import org.hartmath.tex2mml.Node;
import org.hartmath.tex2mml.Row;
import org.hartmath.tex2mml.TeX2MathMLFactory;

public class Matrix implements IRowMMLConverter {

  /*
   * (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, TeX2MathMLFactory f) {
//    f.tagStart(buf, "mrow");
//    f.tag(buf, "mo", "(");
    f.tagStart(buf, "mtable");

    Row oneRow;
    Node temp;
    for (int i = 0; i < row.size(); i++) {
      oneRow = (Row) row.get(i);
      f.tagStart(buf, "mtr");
      for (int j = 0; j < oneRow.size(); j++) {
        f.tagStart(buf, "mtd");
        temp = (Node) oneRow.get(j);
        temp.convert2MML(f, buf);
        f.tagEnd(buf, "mtd");
      }
      f.tagEnd(buf, "mtr");
    }

    f.tagEnd(buf, "mtable");
//    f.tag(buf, "mo", ")");
//    f.tagEnd(buf, "mrow");
    
    return true;
  }

}

Index: Mathtt.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2mml/reflection/convert/Mathtt.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Mathtt.java	12 Mar 2004 20:47:11 -0000	1.2
--- Mathtt.java	19 Mar 2004 20:19:03 -0000	1.3
***************
*** 1,9 ****
  package org.hartmath.tex2mml.reflection.convert;
  
! import org.hartmath.tex2mml.IRowConverter;
  import org.hartmath.tex2mml.Row;
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Mathtt implements IRowConverter {
    
    /*
--- 1,9 ----
  package org.hartmath.tex2mml.reflection.convert;
  
! import org.hartmath.tex2mml.IRowMMLConverter;
  import org.hartmath.tex2mml.Row;
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Mathtt implements IRowMMLConverter {
    
    /*

Index: Vec.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2mml/reflection/convert/Vec.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Vec.java	12 Mar 2004 20:47:11 -0000	1.2
--- Vec.java	19 Mar 2004 20:19:03 -0000	1.3
***************
*** 1,9 ****
  package org.hartmath.tex2mml.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.tex2mml.reflection.convert;
  
! import org.hartmath.tex2mml.IRowMMLConverter;
  import org.hartmath.tex2mml.Row;
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Vec implements IRowMMLConverter {
       
    /*

Index: Sup.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2mml/reflection/convert/Sup.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Sup.java	12 Mar 2004 20:47:11 -0000	1.2
--- Sup.java	19 Mar 2004 20:19:03 -0000	1.3
***************
*** 1,10 ****
  package org.hartmath.tex2mml.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.tex2mml.reflection.convert;
  
! import org.hartmath.tex2mml.IRowMMLConverter;
  import org.hartmath.tex2mml.Node;
  import org.hartmath.tex2mml.Row;
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Sup implements IRowMMLConverter {
  
    /*

Index: Mbox.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2mml/reflection/convert/Mbox.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Mbox.java	12 Mar 2004 20:47:11 -0000	1.2
--- Mbox.java	19 Mar 2004 20:19:03 -0000	1.3
***************
*** 1,9 ****
  package org.hartmath.tex2mml.reflection.convert;
  
! import org.hartmath.tex2mml.IRowConverter;
  import org.hartmath.tex2mml.Row;
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Mbox implements IRowConverter {
       
    /*
--- 1,9 ----
  package org.hartmath.tex2mml.reflection.convert;
  
! import org.hartmath.tex2mml.IRowMMLConverter;
  import org.hartmath.tex2mml.Row;
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Mbox implements IRowMMLConverter {
       
    /*

Index: Ul.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2mml/reflection/convert/Ul.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Ul.java	12 Mar 2004 20:47:11 -0000	1.2
--- Ul.java	19 Mar 2004 20:19:03 -0000	1.3
***************
*** 1,9 ****
  package org.hartmath.tex2mml.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.tex2mml.reflection.convert;
  
! import org.hartmath.tex2mml.IRowMMLConverter;
  import org.hartmath.tex2mml.Row;
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Ul implements IRowMMLConverter {
       
    /*

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

import org.hartmath.tex2mml.IRowMMLConverter;
import org.hartmath.tex2mml.Node;
import org.hartmath.tex2mml.Row;
import org.hartmath.tex2mml.TeX2MathMLFactory;

public class Vector implements IRowMMLConverter {

  /*
   * (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, TeX2MathMLFactory f) {
//    f.tagStart(buf, "mrow");
//    f.tag(buf, "mo", "(");
    f.tagStart(buf, "mtable");

    Row oneRow;
    Node temp;
    for (int i = 0; i < row.size(); i++) {
      oneRow = (Row) row.get(i);
      f.tagStart(buf, "mtr");
      for (int j = 0; j < oneRow.size(); j++) {
        f.tagStart(buf, "mtd");
        temp = (Node) oneRow.get(j);
        temp.convert2MML(f, buf);
        f.tagEnd(buf, "mtd");
      }
      f.tagEnd(buf, "mtr");
    }

    f.tagEnd(buf, "mtable");
//    f.tag(buf, "mo", ")");
//    f.tagEnd(buf, "mrow");
    
    return true;
  }

}

Index: Mathbf.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2mml/reflection/convert/Mathbf.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Mathbf.java	12 Mar 2004 20:47:11 -0000	1.2
--- Mathbf.java	19 Mar 2004 20:19:03 -0000	1.3
***************
*** 1,9 ****
  package org.hartmath.tex2mml.reflection.convert;
  
! import org.hartmath.tex2mml.IRowConverter;
  import org.hartmath.tex2mml.Row;
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Mathbf implements IRowConverter {
  
    /*
--- 1,9 ----
  package org.hartmath.tex2mml.reflection.convert;
  
! import org.hartmath.tex2mml.IRowMMLConverter;
  import org.hartmath.tex2mml.Row;
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Mathbf implements IRowMMLConverter {
  
    /*

Index: Dot.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2mml/reflection/convert/Dot.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Dot.java	12 Mar 2004 20:47:11 -0000	1.2
--- Dot.java	19 Mar 2004 20:19:03 -0000	1.3
***************
*** 1,9 ****
  package org.hartmath.tex2mml.reflection.convert;
  
! import org.hartmath.tex2mml.IRowConverter;
  import org.hartmath.tex2mml.Row;
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Dot implements IRowConverter {
       
    /*
--- 1,9 ----
  package org.hartmath.tex2mml.reflection.convert;
  
! import org.hartmath.tex2mml.IRowMMLConverter;
  import org.hartmath.tex2mml.Row;
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Dot implements IRowMMLConverter {
       
    /*

Index: Mathsf.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2mml/reflection/convert/Mathsf.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Mathsf.java	12 Mar 2004 20:47:11 -0000	1.2
--- Mathsf.java	19 Mar 2004 20:19:03 -0000	1.3
***************
*** 1,9 ****
  package org.hartmath.tex2mml.reflection.convert;
  
! import org.hartmath.tex2mml.IRowConverter;
  import org.hartmath.tex2mml.Row;
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Mathsf implements IRowConverter {
       
    /*
--- 1,9 ----
  package org.hartmath.tex2mml.reflection.convert;
  
! import org.hartmath.tex2mml.IRowMMLConverter;
  import org.hartmath.tex2mml.Row;
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Mathsf implements IRowMMLConverter {
       
    /*

Index: Mathfrak.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2mml/reflection/convert/Mathfrak.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Mathfrak.java	15 Feb 2004 14:31:00 -0000	1.1
--- Mathfrak.java	19 Mar 2004 20:19:03 -0000	1.2
***************
*** 1,5 ****
  package org.hartmath.tex2mml.reflection.convert;
  
! import org.hartmath.tex2mml.IRowConverter;
  import org.hartmath.tex2mml.Identifier;
  import org.hartmath.tex2mml.Node;
--- 1,5 ----
  package org.hartmath.tex2mml.reflection.convert;
  
! import org.hartmath.tex2mml.IRowMMLConverter;
  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 IRowMMLConverter {
    public final static int[] MATHFRAK_CODES =
      {

--- NEW FILE: Sqrt.java ---
package org.hartmath.tex2mml.reflection.convert;

import org.hartmath.tex2mml.IRowMMLConverter;
import org.hartmath.tex2mml.Row;
import org.hartmath.tex2mml.TeX2MathMLFactory;

public class Sqrt implements IRowMMLConverter {
     
  /*
   * (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, TeX2MathMLFactory f) {
    if (row.size() == 1) {
      f.tagStart(buf, "msqrt");
      row.get(0).convert2MML(f, buf);
      f.tagEnd(buf, "msqrt");
      return true;
    }
    return false;
  }

}

Index: Ddot.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2mml/reflection/convert/Ddot.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Ddot.java	12 Mar 2004 20:47:11 -0000	1.2
--- Ddot.java	19 Mar 2004 20:19:03 -0000	1.3
***************
*** 1,9 ****
  package org.hartmath.tex2mml.reflection.convert;
  
! import org.hartmath.tex2mml.IRowConverter;
  import org.hartmath.tex2mml.Row;
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Ddot implements IRowConverter {
       
    /*
--- 1,9 ----
  package org.hartmath.tex2mml.reflection.convert;
  
! import org.hartmath.tex2mml.IRowMMLConverter;
  import org.hartmath.tex2mml.Row;
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Ddot implements IRowMMLConverter {
       
    /*

--- NEW FILE: Root.java ---
package org.hartmath.tex2mml.reflection.convert;

import org.hartmath.tex2mml.IRowMMLConverter;
import org.hartmath.tex2mml.Row;
import org.hartmath.tex2mml.TeX2MathMLFactory;

public class Root implements IRowMMLConverter {
     
  /*
   * (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, TeX2MathMLFactory f) {
    if (row.size() == 2) {
      f.tagStart(buf, "mroot");
      row.get(0).convert2MML(f, buf);
      row.get(1).convert2MML(f, buf);
      f.tagEnd(buf, "mroot");
      return true;
    }
    return false;
  }

}

Index: Sub.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2mml/reflection/convert/Sub.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Sub.java	12 Mar 2004 20:47:11 -0000	1.2
--- Sub.java	19 Mar 2004 20:19:03 -0000	1.3
***************
*** 1,10 ****
  package org.hartmath.tex2mml.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.tex2mml.reflection.convert;
  
! import org.hartmath.tex2mml.IRowMMLConverter;
  import org.hartmath.tex2mml.Node;
  import org.hartmath.tex2mml.Row;
  import org.hartmath.tex2mml.TeX2MathMLFactory;
  
! public class Sub implements IRowMMLConverter {
  
    /*

Index: Mathbb.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2mml/reflection/convert/Mathbb.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Mathbb.java	15 Feb 2004 12:58:34 -0000	1.1
--- Mathbb.java	19 Mar 2004 20:19:03 -0000	1.2
***************
*** 1,5 ****
  package org.hartmath.tex2mml.reflection.convert;
  
! import org.hartmath.tex2mml.IRowConverter;
  import org.hartmath.tex2mml.Identifier;
  import org.hartmath.tex2mml.Node;
--- 1,5 ----
  package org.hartmath.tex2mml.reflection.convert;
  
! import org.hartmath.tex2mml.IRowMMLConverter;
  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 IRowMMLConverter {
      public final static int[] bbb =
        {