[5239] | 1 | diff -up asymptote-2.00/settings.cc.orig asymptote-2.00/settings.cc |
---|
| 2 | --- asymptote-2.00/settings.cc.orig 2010-06-24 02:57:58.000000000 -0400 |
---|
| 3 | +++ asymptote-2.00/settings.cc 2010-06-28 10:07:44.747973803 -0400 |
---|
| 4 | @@ -89,11 +89,11 @@ bool msdos=false; |
---|
| 5 | string HOME="HOME"; |
---|
| 6 | string docdir=ASYMPTOTE_DOCDIR; |
---|
| 7 | const char pathSeparator=':'; |
---|
| 8 | -string defaultPSViewer="gv"; |
---|
| 9 | +string defaultPSViewer="evince"; |
---|
| 10 | #ifdef __APPLE__ |
---|
| 11 | string defaultPDFViewer="open"; |
---|
| 12 | #else |
---|
| 13 | -string defaultPDFViewer="acroread"; |
---|
| 14 | +string defaultPDFViewer="evince"; |
---|
| 15 | #endif |
---|
| 16 | string defaultGhostscript="gs"; |
---|
| 17 | string defaultDisplay="display"; |
---|
| 18 | diff -up asymptote-2.10/settings.cc\~ asymptote-2.10/settings.cc |
---|
| 19 | --- asymptote-2.10/settings.cc~ 2011-06-04 15:35:00.435593642 +0900 |
---|
| 20 | +++ asymptote-2.10/settings.cc 2011-06-04 15:54:16.059823589 +0900 |
---|
| 21 | @@ -695,7 +695,8 @@ struct engineSetting : public argumentSe |
---|
| 22 | bool getOption() { |
---|
| 23 | string str=optarg; |
---|
| 24 | |
---|
| 25 | - if(str == "latex" || str == "pdflatex" || str == "xelatex" || |
---|
| 26 | + if(str == "eplatex" || str == "platex" || |
---|
| 27 | + str == "latex" || str == "pdflatex" || str == "xelatex" || |
---|
| 28 | str == "tex" || str == "pdftex" || str == "context" || str == "none") { |
---|
| 29 | value=str; |
---|
| 30 | return true; |
---|
| 31 | @@ -1131,7 +1132,7 @@ void initSettings() { |
---|
| 32 | addOption(new boolSetting("keepaux", 0, |
---|
| 33 | "Keep intermediate LaTeX .aux files")); |
---|
| 34 | addOption(new engineSetting("tex", 0, "engine", |
---|
| 35 | - "latex|pdflatex|xelatex|tex|pdftex|context|none", |
---|
| 36 | + "eplatex|platex|latex|pdflatex|xelatex|tex|pdftex|context|none", |
---|
| 37 | "latex")); |
---|
| 38 | |
---|
| 39 | addOption(new boolSetting("twice", 0, |
---|
| 40 | @@ -1269,7 +1270,7 @@ void initSettings() { |
---|
| 41 | addOption(new envSetting("gs", defaultGhostscript)); |
---|
| 42 | addOption(new envSetting("texpath", "")); |
---|
| 43 | addOption(new envSetting("texcommand", "")); |
---|
| 44 | - addOption(new envSetting("dvips", "dvips")); |
---|
| 45 | + addOption(new envSetting("dvips", "pdvips")); |
---|
| 46 | addOption(new envSetting("dvisvgm", "dvisvgm")); |
---|
| 47 | addOption(new envSetting("convert", "convert")); |
---|
| 48 | addOption(new envSetting("display", defaultDisplay)); |
---|
| 49 | @@ -1423,7 +1424,8 @@ bool pdf(const string& texengine) { |
---|
| 50 | } |
---|
| 51 | |
---|
| 52 | bool latex(const string& texengine) { |
---|
| 53 | - return texengine == "latex" || texengine == "pdflatex" || |
---|
| 54 | + return texengine == "eplatex" || texengine == "platex" || |
---|
| 55 | + texengine == "latex" || texengine == "pdflatex" || |
---|
| 56 | texengine == "xelatex"; |
---|
| 57 | } |
---|
| 58 | |
---|
| 59 | |
---|
| 60 | Diff finished. Sat Jun 4 15:54:23 2011 |
---|