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

[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-serv20065/src/org/hartmath/tex2mml/reflection/convert

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


Index: Hat.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2mml/reflection/convert/Hat.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Hat.java	19 Mar 2004 20:19:03 -0000	1.3
--- Hat.java	14 Apr 2004 19:53:12 -0000	1.4
***************
*** 16,20 ****
      if (row.size() == 1) {
        f.tagStart(buf, "mover");
!       row.get(0).convert2MML(f, buf);
        f.tagStart(buf, "mo");
        buf.append(TeX2MathMLFactory.toEntity('\u005E'));  // '^'
--- 16,20 ----
      if (row.size() == 1) {
        f.tagStart(buf, "mover");
!       row.get(0).convert2MML(f, buf, false);
        f.tagStart(buf, "mo");
        buf.append(TeX2MathMLFactory.toEntity('\u005E'));  // '^'

Index: Bar.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2mml/reflection/convert/Bar.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Bar.java	19 Mar 2004 20:19:03 -0000	1.3
--- Bar.java	14 Apr 2004 19:53:12 -0000	1.4
***************
*** 16,20 ****
      if (row.size() == 1) {
        f.tagStart(buf, "mover");
!       row.get(0).convert2MML(f, buf);
        f.tagStart(buf, "mo");
        buf.append(TeX2MathMLFactory.toEntity('\u00AF'));  //
--- 16,20 ----
      if (row.size() == 1) {
        f.tagStart(buf, "mover");
!       row.get(0).convert2MML(f, buf, false);
        f.tagStart(buf, "mo");
        buf.append(TeX2MathMLFactory.toEntity('\u00AF'));  //

Index: Matrix.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2mml/reflection/convert/Matrix.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Matrix.java	19 Mar 2004 20:19:03 -0000	1.1
--- Matrix.java	14 Apr 2004 19:53:12 -0000	1.2
***************
*** 27,31 ****
          f.tagStart(buf, "mtd");
          temp = (Node) oneRow.get(j);
!         temp.convert2MML(f, buf);
          f.tagEnd(buf, "mtd");
        }
--- 27,31 ----
          f.tagStart(buf, "mtd");
          temp = (Node) oneRow.get(j);
!         temp.convert2MML(f, buf, false);
          f.tagEnd(buf, "mtd");
        }

Index: Mathtt.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2mml/reflection/convert/Mathtt.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Mathtt.java	19 Mar 2004 20:19:03 -0000	1.3
--- Mathtt.java	14 Apr 2004 19:53:12 -0000	1.4
***************
*** 16,20 ****
      if (row.size() == 1) {
        f.tagStart(buf, "mstyle", "fontfamily=\"monospace\"");
!       row.get(0).convert2MML(f, buf);
        f.tagEnd(buf, "mstyle");
        return true;
--- 16,20 ----
      if (row.size() == 1) {
        f.tagStart(buf, "mstyle", "fontfamily=\"monospace\"");
!       row.get(0).convert2MML(f, buf, false);
        f.tagEnd(buf, "mstyle");
        return true;

Index: Vec.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2mml/reflection/convert/Vec.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Vec.java	19 Mar 2004 20:19:03 -0000	1.3
--- Vec.java	14 Apr 2004 19:53:12 -0000	1.4
***************
*** 16,20 ****
      if (row.size() == 1) {
        f.tagStart(buf, "mover");
!       row.get(0).convert2MML(f, buf);
        f.tagStart(buf, "mo");
        buf.append(TeX2MathMLFactory.toEntity('\u2192'));  // '^'
--- 16,20 ----
      if (row.size() == 1) {
        f.tagStart(buf, "mover");
!       row.get(0).convert2MML(f, buf, false);
        f.tagStart(buf, "mo");
        buf.append(TeX2MathMLFactory.toEntity('\u2192'));  // '^'

Index: Sup.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2mml/reflection/convert/Sup.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Sup.java	19 Mar 2004 20:19:03 -0000	1.3
--- Sup.java	14 Apr 2004 19:53:12 -0000	1.4
***************
*** 24,30 ****
            if (nSub0.containsAttribute(TeX2MathMLFactory.UNDEROVER)) {
              f.tagStart(buf, "munderover");
!             nSub0.convert2MML(f, buf);
!             rowSub0.get(1).convert2MML(f, buf);
!             row.get(1).convert2MML(f, buf);
              f.tagEnd(buf, "munderover");
              return true;
--- 24,30 ----
            if (nSub0.containsAttribute(TeX2MathMLFactory.UNDEROVER)) {
              f.tagStart(buf, "munderover");
!             nSub0.convert2MML(f, buf, false);
!             rowSub0.get(1).convert2MML(f, buf, false);
!             row.get(1).convert2MML(f, buf, false);
              f.tagEnd(buf, "munderover");
              return true;
***************
*** 34,39 ****
          if (nSup0.containsAttribute(TeX2MathMLFactory.UNDEROVER)) {
            f.tagStart(buf, "mover");
!           nSup0.convert2MML(f, buf);
!           row.get(1).convert2MML(f, buf);
            f.tagEnd(buf, "mover");
            return true;
--- 34,39 ----
          if (nSup0.containsAttribute(TeX2MathMLFactory.UNDEROVER)) {
            f.tagStart(buf, "mover");
!           nSup0.convert2MML(f, buf, false);
!           row.get(1).convert2MML(f, buf, false);
            f.tagEnd(buf, "mover");
            return true;

Index: Mbox.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2mml/reflection/convert/Mbox.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Mbox.java	19 Mar 2004 20:19:03 -0000	1.3
--- Mbox.java	14 Apr 2004 19:53:12 -0000	1.4
***************
*** 6,10 ****
  
  public class Mbox implements IRowMMLConverter {
!      
    /*
     * (non-Javadoc)
--- 6,10 ----
  
  public class Mbox implements IRowMMLConverter {
! 
    /*
     * (non-Javadoc)
***************
*** 15,21 ****
    public boolean convert(StringBuffer buf, Row row, TeX2MathMLFactory f) {
      if (row.size() == 1) {
!       f.tagStart(buf, "mbox");
!       row.get(0).convert2MML(f, buf);
!       f.tagEnd(buf, "mbox");
        return true;
      }
--- 15,21 ----
    public boolean convert(StringBuffer buf, Row row, TeX2MathMLFactory f) {
      if (row.size() == 1) {
!       f.tagStart(buf, "mtext");
!       buf.append(row.get(0).getOutput());
!       f.tagEnd(buf, "mtext");
        return true;
      }

Index: Ul.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2mml/reflection/convert/Ul.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Ul.java	19 Mar 2004 20:19:03 -0000	1.3
--- Ul.java	14 Apr 2004 19:53:12 -0000	1.4
***************
*** 16,20 ****
      if (row.size() == 1) {
        f.tagStart(buf, "munder");
!       row.get(0).convert2MML(f, buf);
        f.tagStart(buf, "mo");
        buf.append(TeX2MathMLFactory.toEntity('\u0332'));  // '^'
--- 16,20 ----
      if (row.size() == 1) {
        f.tagStart(buf, "munder");
!       row.get(0).convert2MML(f, buf, false);
        f.tagStart(buf, "mo");
        buf.append(TeX2MathMLFactory.toEntity('\u0332'));  // '^'

Index: Vector.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2mml/reflection/convert/Vector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Vector.java	19 Mar 2004 20:19:03 -0000	1.1
--- Vector.java	14 Apr 2004 19:53:12 -0000	1.2
***************
*** 27,31 ****
          f.tagStart(buf, "mtd");
          temp = (Node) oneRow.get(j);
!         temp.convert2MML(f, buf);
          f.tagEnd(buf, "mtd");
        }
--- 27,31 ----
          f.tagStart(buf, "mtd");
          temp = (Node) oneRow.get(j);
!         temp.convert2MML(f, buf, false);
          f.tagEnd(buf, "mtd");
        }

Index: Mathbf.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2mml/reflection/convert/Mathbf.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Mathbf.java	19 Mar 2004 20:19:03 -0000	1.3
--- Mathbf.java	14 Apr 2004 19:53:12 -0000	1.4
***************
*** 16,20 ****
      if (row.size() == 1) {
        f.tagStart(buf, "mstyle", "fontweight=\"bold\"");
!       row.get(0).convert2MML(f, buf);
        f.tagEnd(buf, "mstyle");
        return true;
--- 16,20 ----
      if (row.size() == 1) {
        f.tagStart(buf, "mstyle", "fontweight=\"bold\"");
!       row.get(0).convert2MML(f, buf, false);
        f.tagEnd(buf, "mstyle");
        return true;

Index: Ddot.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2mml/reflection/convert/Ddot.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Ddot.java	19 Mar 2004 20:19:03 -0000	1.3
--- Ddot.java	14 Apr 2004 19:53:12 -0000	1.4
***************
*** 16,20 ****
      if (row.size() == 1) {
        f.tagStart(buf, "mover");
!       row.get(0).convert2MML(f, buf);
        f.tagStart(buf, "mo");
        buf.append("..");  // '^'
--- 16,20 ----
      if (row.size() == 1) {
        f.tagStart(buf, "mover");
!       row.get(0).convert2MML(f, buf, false);
        f.tagStart(buf, "mo");
        buf.append("..");  // '^'

Index: Mathsf.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2mml/reflection/convert/Mathsf.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Mathsf.java	19 Mar 2004 20:19:03 -0000	1.3
--- Mathsf.java	14 Apr 2004 19:53:12 -0000	1.4
***************
*** 16,20 ****
      if (row.size() == 1) {
        f.tagStart(buf, "mstyle", "fontfamily=\"sans-serif\"");
!       row.get(0).convert2MML(f, buf);
        f.tagEnd(buf, "mstyle");
        return true;
--- 16,20 ----
      if (row.size() == 1) {
        f.tagStart(buf, "mstyle", "fontfamily=\"sans-serif\"");
!       row.get(0).convert2MML(f, buf, false);
        f.tagEnd(buf, "mstyle");
        return true;

Index: Dot.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2mml/reflection/convert/Dot.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Dot.java	19 Mar 2004 20:19:03 -0000	1.3
--- Dot.java	14 Apr 2004 19:53:12 -0000	1.4
***************
*** 16,20 ****
      if (row.size() == 1) {
        f.tagStart(buf, "mover");
!       row.get(0).convert2MML(f, buf);
        f.tagStart(buf, "mo");
        buf.append(".");  // '^'
--- 16,20 ----
      if (row.size() == 1) {
        f.tagStart(buf, "mover");
!       row.get(0).convert2MML(f, buf, false);
        f.tagStart(buf, "mo");
        buf.append(".");  // '^'

Index: Sqrt.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2mml/reflection/convert/Sqrt.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Sqrt.java	28 Mar 2004 19:16:07 -0000	1.2
--- Sqrt.java	14 Apr 2004 19:53:12 -0000	1.3
***************
*** 21,31 ****
        if (args != null && args.size() > 0) {
          f.tagStart(buf, "mroot");
!         row.get(0).convert2MML(f, buf);
!         ((Node) args.get(0)).convert2MML(f, buf); // nth root
          f.tagEnd(buf, "mroot");
          return true;
        } else {
          f.tagStart(buf, "msqrt");
!         row.get(0).convert2MML(f, buf);
          f.tagEnd(buf, "msqrt");
          return true;
--- 21,31 ----
        if (args != null && args.size() > 0) {
          f.tagStart(buf, "mroot");
!         row.get(0).convert2MML(f, buf, false);
!         ((Node) args.get(0)).convert2MML(f, buf, false); // nth root
          f.tagEnd(buf, "mroot");
          return true;
        } else {
          f.tagStart(buf, "msqrt");
!         row.get(0).convert2MML(f, buf, false);
          f.tagEnd(buf, "msqrt");
          return true;

Index: Root.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2mml/reflection/convert/Root.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Root.java	19 Mar 2004 20:19:03 -0000	1.1
--- Root.java	14 Apr 2004 19:53:12 -0000	1.2
***************
*** 16,21 ****
      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;
--- 16,21 ----
      if (row.size() == 2) {
        f.tagStart(buf, "mroot");
!       row.get(0).convert2MML(f, buf, false);
!       row.get(1).convert2MML(f, buf, false);
        f.tagEnd(buf, "mroot");
        return true;

Index: Sub.java
===================================================================
RCS file: /cvsroot/hmath/org.hartmath.tex2mml/src/org/hartmath/tex2mml/reflection/convert/Sub.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Sub.java	19 Mar 2004 20:19:03 -0000	1.3
--- Sub.java	14 Apr 2004 19:53:12 -0000	1.4
***************
*** 23,29 ****
            if (nSup0.containsAttribute(TeX2MathMLFactory.UNDEROVER)) {
              f.tagStart(buf, "munderover");
!             nSup0.convert2MML(f, buf);
!             row.get(1).convert2MML(f, buf);
!             rowSup0.get(1).convert2MML(f, buf);
              f.tagEnd(buf, "munderover");
              return true;
--- 23,29 ----
            if (nSup0.containsAttribute(TeX2MathMLFactory.UNDEROVER)) {
              f.tagStart(buf, "munderover");
!             nSup0.convert2MML(f, buf, false);
!             row.get(1).convert2MML(f, buf, false);
!             rowSup0.get(1).convert2MML(f, buf, false);
              f.tagEnd(buf, "munderover");
              return true;
***************
*** 33,38 ****
          if (nSub0.containsAttribute(TeX2MathMLFactory.UNDEROVER)) {
            f.tagStart(buf, "munder");
!           nSub0.convert2MML(f, buf);
!           row.get(1).convert2MML(f, buf);
            f.tagEnd(buf, "munder");
            return true;
--- 33,38 ----
          if (nSub0.containsAttribute(TeX2MathMLFactory.UNDEROVER)) {
            f.tagStart(buf, "munder");
!           nSub0.convert2MML(f, buf, false);
!           row.get(1).convert2MML(f, buf, false);
            f.tagEnd(buf, "munder");
            return true;