From 23df5ec1902b5bfe1b552a9fca013316244beae5 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sun, 22 Nov 2009 13:49:19 +0000
Subject: [PATCH] Show canonical strings in printable form

---
 yarrg/web/check_lossperleague |  4 ++--
 yarrg/web/qtextstring         | 35 +++++++++++++++++++----------------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/yarrg/web/check_lossperleague b/yarrg/web/check_lossperleague
index a37382e..3198d41 100644
--- a/yarrg/web/check_lossperleague
+++ b/yarrg/web/check_lossperleague
@@ -46,7 +46,7 @@ s/^\s+//; s/\s+$//;
 my ($pct,$str);
 
 if (!m/\S/) {
-	$str= '';
+	return ('[no losses]', undef);
 } elsif (m/^(\d{1,2}(?:\.\d{0,5})?)\%$/) {
 	$pct= $1 * 1.0;
 	$str= sprintf("%g%%", $1);
@@ -57,7 +57,7 @@ if (!m/\S/) {
 	expected_error("Cannot understand loss per league ".escerrq($_).".");
 }
 
-return ("$str per league", $pct);
+return ("$str [per league]", $pct);
 
 </%perl>
 </%method>
diff --git a/yarrg/web/qtextstring b/yarrg/web/qtextstring
index ebf344d..6872e7e 100644
--- a/yarrg/web/qtextstring
+++ b/yarrg/web/qtextstring
@@ -100,24 +100,12 @@ function <%$p%>Ready() {
 register_onload(<%$p%>Needed);
 </&script>
 
-% if (!printable($m)) {
-<input type="text" <% $boxopts %>
- id="<% $thingstring %>" name="<% $thingstring %>"
- onchange="<%$p%>Needed();" onkeyup="<%$p%>Later();"
- value="<% $stringval |h %>"
- ><% defined($helpref) ? "<a href=\"docs#$helpref\">[?]</a>" : '' %><%
-     $m->content %>
-<br>
-<div id="<%$p%>results">&nbsp;</div><br>
-% } else {
-<kbd><strong><% $stringval |h %></strong></kbd>
-<br>
-<br>
-% }
-
 <%perl>
+my ($canonstring);
+
 if ($significant_nonempty || length $thingstring) {
-	my ($emsg,$canonstring,@results)= $m->comp('qtextstringcheck',
+	my ($emsg,@results);
+	($emsg,$canonstring,@results)= $m->comp('qtextstringcheck',
 		what => $checkkind,
 		ocean => $qa->{Ocean},
 		string => $stringval,
@@ -130,3 +118,18 @@ if ($significant_nonempty || length $thingstring) {
 	$onresults->(@results);
 }
 </%perl>
+
+% if (!printable($m)) {
+<input type="text" <% $boxopts %>
+ id="<% $thingstring %>" name="<% $thingstring %>"
+ onchange="<%$p%>Needed();" onkeyup="<%$p%>Later();"
+ value="<% $stringval |h %>"
+ ><% defined($helpref) ? "<a href=\"docs#$helpref\">[?]</a>" : '' %><%
+     $m->content %>
+<br>
+<div id="<%$p%>results">&nbsp;</div><br>
+% } else {
+<kbd><strong><% $canonstring |h %></strong></kbd>
+<br>
+<br>
+% }
-- 
2.30.2