[genius] Tue Dec 15 17:08:36 2015 Jiri (George) Lebl <jirka 5z com>

[George Lebl <jirka src gnome org>]

commit d5474ec4a6ddf01b44cbfe4980c2709e6835481b
Author: Jiri (George) Lebl <jiri lebl gmail com>
Date:   Tue Dec 15 17:08:43 2015 -0600

    Tue Dec 15 17:08:36 2015  Jiri (George) Lebl <jirka 5z com>
    
        * src/calc.c: in pretty print if results as floats is on, then do not
          try to do pretty print of fractions obviously.

 ChangeLog  |    5 +++++
 po/eo.po   |   30 +++++++++++++++---------------
 src/calc.c |    3 ++-
 3 files changed, 22 insertions(+), 16 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9484e6e..b580af6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec 15 17:08:36 2015  Jiri (George) Lebl <jirka 5z com>
+
+       * src/calc.c: in pretty print if results as floats is on, then do not
+         try to do pretty print of fractions obviously.
+
 Mon May 04 17:34:29 2015  Jiri (George) Lebl <jirka 5z com>
 
        * src/mpwrap.c: Fix output of chopped imaginary numbers, chopped
diff --git a/po/eo.po b/po/eo.po
index 6ce8df6..1997094 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -3106,7 +3106,7 @@ msgstr "Tro da eraroj! (%d sekvis)\n"
 
 #: ../src/genius.c:157
 msgid "Cannot locate the manual"
-msgstr "Mi ne povas trovi la manlibron"
+msgstr "Ne eblas trovi la manlibron"
 
 #: ../src/genius.c:222
 #, c-format
@@ -3197,7 +3197,7 @@ msgstr ""
 
 #: ../src/genius.c:625 ../src/genius.c:696
 msgid "Can't open file"
-msgstr "Mi ne povas malfermi la dosieron"
+msgstr "Ne eblas malfermi la dosieron"
 
 #: ../src/genius.lang.h:1
 msgid "Scripts"
@@ -3756,11 +3756,11 @@ msgstr ""
 
 #: ../src/gnome-genius.c:2479
 msgid "Display errors in a dialog"
-msgstr ""
+msgstr "Montri erarojn en dialogujo"
 
 #: ../src/gnome-genius.c:2487
 msgid "Display information messages in a dialog"
-msgstr ""
+msgstr "Montri informajn mesaĝojn en dialogujo"
 
 #: ../src/gnome-genius.c:2498
 msgid "Maximum errors to display (0=unlimited)"
@@ -3849,7 +3849,7 @@ msgstr "Ĉiuj dosieroj"
 
 #: ../src/gnome-genius.c:2774 ../src/gnome-genius.c:3793
 msgid "Cannot open file!"
-msgstr "Mi ne povas malfermi la dosieron!"
+msgstr "Ne eblas malfermi la dosieron!"
 
 #: ../src/gnome-genius.c:2784 ../src/gnome-genius.c:4279
 msgid "Output from "
@@ -3869,7 +3869,7 @@ msgstr "Ŝ_arĝi"
 
 #: ../src/gnome-genius.c:3373
 msgid "Cannot open file"
-msgstr "Mi ne povas malfermi dosieron"
+msgstr "Ne eblas malfermi dosieron"
 
 #. context
 #: ../src/gnome-genius.c:3408 ../src/gnome-genius.c:4970
@@ -3896,7 +3896,7 @@ msgstr "Programo %d"
 #: ../src/gnome-genius.c:3721
 #, c-format
 msgid "Cannot open %s"
-msgstr "Mi ne povas malfermi %s"
+msgstr "Ne eblas malfermi %s"
 
 #: ../src/gnome-genius.c:3815
 msgid "Open..."
@@ -3911,13 +3911,13 @@ msgstr "Programo estas nurlegebla"
 msgid ""
 "<b>Cannot save file %s</b>\n"
 "Details: %s"
-msgstr "<b>Mi ne povas konservi dosieron %s</b>\n"
+msgstr "<b>Ne eblas konservi dosieron %s</b>\n"
 "Detaloj: %s"
 
 #: ../src/gnome-genius.c:3911 ../src/gnome-genius.c:3952
 #, c-format
 msgid "<b>Cannot save file %s</b>"
-msgstr "<b>Mi ne povas konservi dosieron %s</b>"
+msgstr "<b>Ne eblas konservi dosieron %s</b>"
 
 #: ../src/gnome-genius.c:3962
 msgid "Save new programs by \"Save As..\" first!"
@@ -3935,12 +3935,12 @@ msgid ""
 "<b>Cannot save file</b>\n"
 "Details: %s"
 msgstr ""
-"<b>Mi ne povas konservi dosieron</b>\n"
+"<b>Ne eblas konservi dosieron</b>\n"
 "Detaloj: %s"
 
 #: ../src/gnome-genius.c:4013 ../src/gnome-genius.c:4149
 msgid "<b>Cannot save file</b>"
-msgstr "<b>Mi ne povas konservi dosieron</b>"
+msgstr "<b>Ne eblas konservi dosieron</b>"
 
 #: ../src/gnome-genius.c:4048
 msgid "Save As..."
@@ -4444,12 +4444,12 @@ msgstr "_Vektora kampo"
 #. draw legend?
 #: ../src/graphing.c:6118 ../src/graphing.c:6248
 msgid "_Draw legend"
-msgstr ""
+msgstr "_Desegni klarigeto"
 
 #. draw axis labels?
 #: ../src/graphing.c:6127
 msgid "Draw axis labels"
-msgstr ""
+msgstr "Desegni etikedo de aksoj"
 
 #. change varnames
 #: ../src/graphing.c:6136 ../src/graphing.c:6258
@@ -4545,12 +4545,12 @@ msgstr ""
 #: ../src/graphing.c:7272 ../src/graphing.c:7805
 #, c-format
 msgid "%s: argument not a function"
-msgstr ""
+msgstr "%s: argumento ne estas funkcio"
 
 #: ../src/graphing.c:7282
 #, c-format
 msgid "%s: only one function supported"
-msgstr ""
+msgstr "%s: nur unu funkcio estas subtenanta"
 
 #: ../src/graphing.c:7305
 msgid "Graph limits not given as a 4-vector or a 6-vector"
diff --git a/src/calc.c b/src/calc.c
index 2846f9b..75c3a5d 100644
--- a/src/calc.c
+++ b/src/calc.c
@@ -1553,7 +1553,8 @@ pretty_print_value_normal (GelOutput *gelo, GelETree *n)
 
        /* FIXME: what about mixed_fractions, what about rational
           complex values, etc... */
-       if ( ! mpw_is_complex (n->val.value) &&
+       if ( ! gel_calcstate.results_as_floats &&
+            ! mpw_is_complex (n->val.value) &&
            mpw_is_rational (n->val.value)) {
                int lend, lenn, lenw;
                mpw_t num, den, whole;