Changeset b430ca in git

Timestamp:

Sep 9, 2015, 8:07:04 PM (9 years ago)

Author:

Stephan Oberfranz <oberfran@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

d8946a4d5d5abc81d1b71aeddf7fedbadca56fb7

Parents:

b075f54919258c76495ed117b0f095df1f2ef63536b81ac0b97d2f019093a024dc770731cfabfe17

Message:

Merge branch 'spielwiese' of github.com:oberfran/Sources into spielwiese

Conflicts:
	Singular/walk.cc

Files:

• Singular/LIB/latex.lib (modified) (4 diffs)
• Singular/LIB/mathml.lib (added)
• Singular/walk.cc (deleted)
• misc/README (added)
• misc/build_partition (added)
• misc/build_std_demo (added)
• misc/partition.cc (added)
• misc/std_demo.cc (added)

Singular/LIB/latex.lib

@@ -1 +1 @@
 //////////////////////////////////////////////////////////////////////////////
-version="version latex.lib 4.0.0.0 Jun_2013 "; // $Id$
+version="version latex.lib 4.0.2.0 Sep_2015 "; // $Id$
 category="Visualization";
 info="
@@ -1471 +1471 @@
      if (galT) { monomt,msz = parsg(cfmt);}
      b = find(cfmt,"/(");                     // look if fraction  // 31.5.07
+     if (b==0) { b = -find(cfmt,")/"); }  // 1.9.15
      b2 = find(cfmt,"/");
      // if (b) {b++;}                         // 31.5.07
@@ -1558 +1559 @@
   f;
   texpoly("",f);
-  texpoly("",1/(a2+2)*x+2/b);
+  texpoly("",1/(a2+2)*x2+2/b*x+(a+1)/3);
 }
 ///////////////////////////////////////////////////////////////////////////////
@@ -1571 +1572 @@
   }
   else
-  { nom,fl1 = parst(cfmt[1,b-1],1);
-    denom,fl2 = parst(cfmt[b+1,size(cfmt)-b],1);
+  {
+    if (b>0) {
+     nom,fl1 = parst(cfmt[1,b-1],1);
+     denom,fl2 = parst(cfmt[b+1,size(cfmt)-b],1);
+    }
+    else {
+     b = -b;
+     nom,fl1 = parst(cfmt[1,b],1);
+     denom,fl2 = parst(cfmt[b+2,size(cfmt)-b-1],1);
+    }
     if (defined(TeXnofrac))
     { if(fl1) { nom = "(" + nom + ")"; sz1++;}