Changeset a5bbb5 in git for Singular/LIB/tropical.lib

Timestamp:

Jan 9, 2017, 2:02:30 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

b8b76ef3092b3162aa763b4c5b7705ceab2203fa

Parents:

a418d9fffbccc54b2388850e64bfc084cd0e61dcd29e550951bb89f260d4afb0da084c6a1a83e101

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2017-01-09 14:02:30+01:00

git-committer:

GitHub <noreply@github.com>2017-01-09 14:02:30+01:00

Message:

Merge pull request #810 from YueRen/tropicallib

chg: kghostview -> xdg-open + line breaks after commata in tex file

File:

• Singular/LIB/tropical.lib (modified) (14 diffs)

Singular/LIB/tropical.lib

@@ -14 +14 @@
 - tropicalLifting will only work with LINUX and if in addition gfan is installed.
 @*- drawTropicalCurve and drawTropicalNewtonSubdivision will only display the
-@*  tropical curve with LINUX and if in addition latex and kghostview
+@*  tropical curve with LINUX and if in addition latex and xdg-open
 @*  are installed.
 @*- For tropicalLifting in the definition of the basering the parameter t
@@ -1678 +1678 @@
                /tmp/tropicalcurveNUMBER.ps, where NUMBER is a random four
                digit integer;
-               moreover it displays the tropical curve via kghostview;
+               moreover it displays the tropical curve via xdg-open;
                if you wish to remove all these files from /tmp,
                call the procedure cleanTmp
@@ -1685 +1685 @@
                if #[1] is the string 'max', then it is computed w.r.t. maximum
 @*           - if the last optional argument is 'onlytexfile' then only the
-               latex file is produced; this option should be used if kghostview
+               latex file is produced; this option should be used if xdg-utils
                is not installed on your system
 @*           - note that lattice points in the Newton subdivision which are
@@ -1778 +1778 @@
 \\setlength{\\textwidth}{170mm}
 
+\\makeatletter
+\\def\\old@comma{,}
+\\catcode`\\,=13
+\\def,{%
+  \\ifmmode%
+    \\old@comma\\discretionary{}{}{}%
+  \\else%
+    \\old@comma%
+  \\fi%
+\}
+\\makeatother
+
 \\begin{document}
    \\parindent0cm
@@ -1814 +1826 @@
     int rdnum=random(1000,9999);
     write(":w /tmp/tropicalcurve"+string(rdnum)+".tex",TEXBILD);
-    system("sh","cd /tmp; latex /tmp/tropicalcurve"+string(rdnum)+".tex; dvips /tmp/tropicalcurve"+string(rdnum)+".dvi -o; command rm tropicalcurve"+string(rdnum)+".log;  command rm tropicalcurve"+string(rdnum)+".aux;  command rm tropicalcurve"+string(rdnum)+".ps?;  command rm tropicalcurve"+string(rdnum)+".dvi; kghostview tropicalcurve"+string(rdnum)+".ps &");
+    system("sh","cd /tmp; latex /tmp/tropicalcurve"+string(rdnum)+".tex; dvips /tmp/tropicalcurve"+string(rdnum)+".dvi -o; command rm tropicalcurve"+string(rdnum)+".log;  command rm tropicalcurve"+string(rdnum)+".aux;  command rm tropicalcurve"+string(rdnum)+".ps?;  command rm tropicalcurve"+string(rdnum)+".dvi; xdg-open tropicalcurve"+string(rdnum)+".ps &");
   }
   else
@@ -1828 +1840 @@
    poly f=t*(x3+y3+1)+1/t*(x2+y2+x+y+x2y+xy2)+1/t2*xy;
 // the command drawTropicalCurve(f) computes the graph of the tropical curve
-// given by f and displays a post script image, provided you have kghostview
+// given by f and displays a post script image, provided you have xdg-open
    drawTropicalCurve(f);
 // we can instead apply the procedure to a tropical polynomial and use "maximum"
@@ -1852 +1864 @@
             and /tmp/newtonsubdivisionNUMBER.ps, where NUMBER is a random
             four digit integer;
-            moreover it desplays the tropical curve defined by f via kghostview;
+            moreover it desplays the tropical curve defined by f via xdg-open;
             if you wish to remove all these files from /tmp, call the procedure
             cleanTmp;
@@ -1912 +1924 @@
   int rdnum=random(1000,9999);
   write(":w /tmp/newtonsubdivision"+string(rdnum)+".tex",TEXBILD);
-  system("sh","cd /tmp; latex /tmp/newtonsubdivision"+string(rdnum)+".tex; dvips /tmp/newtonsubdivision"+string(rdnum)+".dvi -o; command rm newtonsubdivision"+string(rdnum)+".log;  command rm newtonsubdivision"+string(rdnum)+".aux;  command rm newtonsubdivision"+string(rdnum)+".ps?;  command rm newtonsubdivision"+string(rdnum)+".dvi; kghostview newtonsubdivision"+string(rdnum)+".ps &");
+  system("sh","cd /tmp; latex /tmp/newtonsubdivision"+string(rdnum)+".tex; dvips /tmp/newtonsubdivision"+string(rdnum)+".dvi -o; command rm newtonsubdivision"+string(rdnum)+".log;  command rm newtonsubdivision"+string(rdnum)+".aux;  command rm newtonsubdivision"+string(rdnum)+".ps?;  command rm newtonsubdivision"+string(rdnum)+".dvi; xdg-open newtonsubdivision"+string(rdnum)+".ps &");
 //  return(TEXBILD);
 }
@@ -1922 +1934 @@
    poly f=t*(x3+y3+1)+1/t*(x2+y2+x+y+x2y+xy2)+1/t2*xy;
 // the command drawTropicalCurve(f) computes the graph of the tropical curve
-// given by f and displays a post script image, provided you have kghostview
+// given by f and displays a post script image, provided you have xdg-open
    drawNewtonSubdivision(f);
 // we can instead apply the procedure to a tropical polynomial
@@ -2479 +2491 @@
 // conic[8] contains the latex code to draw the tropical conic and
 //          its tropicalised tangents; it can written in a file, processed and
-//          displayed via kghostview
+//          displayed via xdg-open
    write(":w /tmp/conic.tex",conic[8]);
    system("sh","cd /tmp; latex /tmp/conic.tex; dvips /tmp/conic.dvi -o;
-            kghostview conic.ps &");
+            xdg-open conic.ps &");
 // with an optional argument the same information for the dual conic is computed
 //         and saved in conic[9]
@@ -8191 +8203 @@
                /tmp/tropicalcurveNUMBER.ps, where NUMBER is a random four
                digit integer;
-               moreover it displays the tropical curve via kghostview;
+               moreover it displays the tropical curve via xdg-open;
                if you wish to remove all these files from /tmp,
                call the procedure cleanTmp
@@ -8198 +8210 @@
                if #[1] is the string 'max', then it is computed w.r.t. maximum
 @*           - if the last optional argument is 'onlytexfile' then only the
-               latex file is produced; this option should be used if kghostview
+               latex file is produced; this option should be used if xdg-open
                is not installed on your system
 @*           - note that lattice points in the Newton subdivision which are
@@ -8430 +8442 @@
     int rdnum=random(1000,9999);
     write(":w /tmp/tropicalcurve"+string(rdnum)+".tex",TEXBILD);
-    system("sh","cd /tmp; latex /tmp/tropicalcurve"+string(rdnum)+".tex; dvips /tmp/tropicalcurve"+string(rdnum)+".dvi -o; command rm tropicalcurve"+string(rdnum)+".log;  command rm tropicalcurve"+string(rdnum)+".aux;  command rm tropicalcurve"+string(rdnum)+".ps?;  command rm tropicalcurve"+string(rdnum)+".dvi; kghostview tropicalcurve"+string(rdnum)+".ps &");
+    system("sh","cd /tmp; latex /tmp/tropicalcurve"+string(rdnum)+".tex; dvips /tmp/tropicalcurve"+string(rdnum)+".dvi -o; command rm tropicalcurve"+string(rdnum)+".log;  command rm tropicalcurve"+string(rdnum)+".aux;  command rm tropicalcurve"+string(rdnum)+".ps?;  command rm tropicalcurve"+string(rdnum)+".dvi; xdg-open tropicalcurve"+string(rdnum)+".ps &");
   }
   else
@@ -8445 +8457 @@
    poly f=x+y+1;
 // the command drawTropicalCurve(f) computes the graph of the tropical curve
-// given by f and displays a post script image, provided you have kghostview
+// given by f and displays a post script image, provided you have xdg-open
 // we can instead apply the procedure to a tropical polynomial and use "maximum"
    poly g=t3*(x7+y7+1)+1/t3*(x4+y4+x2+y2+x3y+xy3)+1/t21*x2y2;