From b3bed86071e20f323b9952095b303c18ae623f8d Mon Sep 17 00:00:00 2001
From: George Datseris <datseris.george@gmail.com>
Date: Mon, 13 Nov 2017 11:14:21 +0100
Subject: [PATCH 1/5] add Requires for Juno printing fix

---
 REQUIRE | 1 +
 1 file changed, 1 insertion(+)

diff --git a/REQUIRE b/REQUIRE
index 684661f0..fb50a721 100644
--- a/REQUIRE
+++ b/REQUIRE
@@ -3,3 +3,4 @@ Calculus 0.1.5
 SpecialFunctions 0.1.0
 QuadGK 0.1.1
 RecipesBase 0.2.0
+Requires

From d182b7d30a5564eaa8e63ade4ae967005af8629e Mon Sep 17 00:00:00 2001
From: George Datseris <datseris.george@gmail.com>
Date: Mon, 13 Nov 2017 11:18:08 +0100
Subject: [PATCH 2/5] add Juno render

---
 src/Measurements.jl | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Measurements.jl b/src/Measurements.jl
index be476577..7f43d978 100644
--- a/src/Measurements.jl
+++ b/src/Measurements.jl
@@ -90,6 +90,13 @@ The binary operator `±` is equivalent to `measurement`, so you can construct a
 """
 measurement
 
+using Requires
+@require Juno begin
+    Juno.render(i::Juno.Inline, measure::Measurement) = 
+    Juno.render(i, Text("$(measure.val) ± $(measure.err)")
+end
+    
+
 # Type representation
 Base.show(io::IO, measure::Measurement) =
     print(io, measure.val, get(io, :compact, false) ? "±" : " ± ", measure.err)

From 837a59dd70af4d90f7c626791a0e119447009016 Mon Sep 17 00:00:00 2001
From: George Datseris <datseris.george@gmail.com>
Date: Mon, 13 Nov 2017 11:37:12 +0100
Subject: [PATCH 3/5] expandable numbers prettyprint

---
 src/Measurements.jl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Measurements.jl b/src/Measurements.jl
index 7f43d978..11a2dbab 100644
--- a/src/Measurements.jl
+++ b/src/Measurements.jl
@@ -92,10 +92,11 @@ measurement
 
 using Requires
 @require Juno begin
-    Juno.render(i::Juno.Inline, measure::Measurement) = 
-    Juno.render(i, Text("$(measure.val) ± $(measure.err)")
+    Juno.render(i::Juno.Inline, measure::Measurement) =
+    Juno.render(i, Juno.span([Juno.render(i, measure.val),
+    " ± ", Juno.render(i, measure.err)]))
 end
-    
+
 
 # Type representation
 Base.show(io::IO, measure::Measurement) =

From beb3f7632ebe32ea1dd4060447498642f6cd58da Mon Sep 17 00:00:00 2001
From: George Datseris <datseris.george@gmail.com>
Date: Mon, 13 Nov 2017 13:52:33 +0100
Subject: [PATCH 4/5] complex number printing

---
 src/Measurements.jl | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/Measurements.jl b/src/Measurements.jl
index 11a2dbab..17f121cf 100644
--- a/src/Measurements.jl
+++ b/src/Measurements.jl
@@ -90,12 +90,6 @@ The binary operator `±` is equivalent to `measurement`, so you can construct a
 """
 measurement
 
-using Requires
-@require Juno begin
-    Juno.render(i::Juno.Inline, measure::Measurement) =
-    Juno.render(i, Juno.span([Juno.render(i, measure.val),
-    " ± ", Juno.render(i, measure.err)]))
-end
 
 
 # Type representation
@@ -127,6 +121,27 @@ function Base.alignment(io::IO, measure::Measurement)
         (length(m.captures[1]), length(m.captures[2]))
 end
 
+### Juno pretty printing
+using Requires
+@require Juno begin
+    Juno.render(i::Juno.Inline, measure::Measurement) =
+    Juno.render(i, Juno.span([Juno.render(i, measure.val),
+    " ± ", Juno.render(i, measure.err)]))
+
+    function Juno.render(ji::Juno.Inline, cm::Complex{<:Measurement})
+        r, i = reim(cm)
+        if signbit(i) && !isnan(i)
+            i = -i
+            sss = " - "
+        else
+            sss = " + "
+        end
+        Juno.render(ji, Juno.span(["(", Juno.render(ji, r), ")", sss,
+        "(", Juno.render(ji, i), ")im"]))
+    end
+end
+
+
 include("conversions.jl")
 include("comparisons-tests.jl")
 include("utils.jl")

From c3fa6a186a4e3c76d051deec7e17a539c3d273c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mos=C3=A8=20Giordano?= <mose@gnu.org>
Date: Mon, 13 Nov 2017 19:51:57 +0100
Subject: [PATCH 5/5] Cleanup whitespaces

---
 src/Measurements.jl | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Measurements.jl b/src/Measurements.jl
index 17f121cf..2c2735ba 100644
--- a/src/Measurements.jl
+++ b/src/Measurements.jl
@@ -90,8 +90,6 @@ The binary operator `±` is equivalent to `measurement`, so you can construct a
 """
 measurement
 
-
-
 # Type representation
 Base.show(io::IO, measure::Measurement) =
     print(io, measure.val, get(io, :compact, false) ? "±" : " ± ", measure.err)
@@ -141,7 +139,6 @@ using Requires
     end
 end
 
-
 include("conversions.jl")
 include("comparisons-tests.jl")
 include("utils.jl")