summaryrefslogtreecommitdiff
path: root/patches/Fix-a-g_ascii_formatd-call.patch
blob: 3855fe8c71870622a913029599a23b2ede14b354 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 18 Jan 2022 12:30:38 -0500
Subject: Fix a g_ascii_formatd call

We were passing a format specifier that starts
with ' ', which some implementations of that API
don't like.

This change removes an extraneous space from the
output. Update affected tests.

Fixes: #659
(cherry picked from commit 54794dc9becb0d67fb1bcfd1a980d2bfafda1e77)
---
 pango/pango-attributes.c        |  2 +-
 tests/markups/valid-1.expected  |  2 +-
 tests/markups/valid-16.expected | 10 +++++-----
 tests/markups/valid-2.expected  |  2 +-
 tests/markups/valid-23.expected |  2 +-
 tests/markups/valid-4.expected  |  4 ++--
 tests/markups/valid-8.expected  | 18 +++++++++---------
 7 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/pango/pango-attributes.c b/pango/pango-attributes.c
index cafe0df..ac6545b 100644
--- a/pango/pango-attributes.c
+++ b/pango/pango-attributes.c
@@ -2632,7 +2632,7 @@ attr_print (GString        *str,
   else if ((flt = pango_attribute_as_float (attr)) != NULL)
     {
       char buf[20];
-      g_ascii_formatd (buf, 20, " %f", flt->value);
+      g_ascii_formatd (buf, 20, "%f", flt->value);
       g_string_append_printf (str, " %s", buf);
     }
   else if ((font = pango_attribute_as_font_desc (attr)) != NULL)
diff --git a/tests/markups/valid-1.expected b/tests/markups/valid-1.expected
index be01bfa..92e2383 100644
--- a/tests/markups/valid-1.expected
+++ b/tests/markups/valid-1.expected
@@ -4,7 +4,7 @@ Blue text is cool!
 ---
 
 range 0 9
-0 9 scale  1.440000
+0 9 scale 1.440000
 0 9 foreground #00000000ffff
 range 9 13
 range 13 17
diff --git a/tests/markups/valid-16.expected b/tests/markups/valid-16.expected
index a8a0dcd..556c4db 100644
--- a/tests/markups/valid-16.expected
+++ b/tests/markups/valid-16.expected
@@ -4,15 +4,15 @@ larger and smaller and smaller now with base
 ---
 
 range 0 11
-0 44 scale  1.200000
+0 44 scale 1.200000
 range 11 19
-11 30 scale  1.000000
+11 30 scale 1.000000
 range 19 30
-19 30 scale  0.833333
+19 30 scale 0.833333
 range 30 31
-0 44 scale  1.200000
+0 44 scale 1.200000
 range 31 44
-0 44 scale  1.200000
+0 44 scale 1.200000
 31 44 size 15360
 range 44 2147483647
 
diff --git a/tests/markups/valid-2.expected b/tests/markups/valid-2.expected
index 63da62d..378d49b 100644
--- a/tests/markups/valid-2.expected
+++ b/tests/markups/valid-2.expected
@@ -4,7 +4,7 @@ Blue text is cool!
 ---
 
 range 0 9
-0 9 scale  1.728000
+0 9 scale 1.728000
 0 9 foreground #00000000ffff
 range 9 13
 range 13 17
diff --git a/tests/markups/valid-23.expected b/tests/markups/valid-23.expected
index 296faf0..59db863 100644
--- a/tests/markups/valid-23.expected
+++ b/tests/markups/valid-23.expected
@@ -7,7 +7,7 @@ range 0 5
 0 9 font-desc "Cantarell 11"
 range 5 9
 0 9 font-desc "Cantarell 11"
-5 9 scale  2.000000
+5 9 scale 2.000000
 range 9 2147483647
 
 
diff --git a/tests/markups/valid-4.expected b/tests/markups/valid-4.expected
index 615e2ad..345e869 100644
--- a/tests/markups/valid-4.expected
+++ b/tests/markups/valid-4.expected
@@ -7,7 +7,7 @@ range 0 5
 0 15 weight bold
 range 5 8
 0 15 weight bold
-5 8 scale  1.200000
+5 8 scale 1.200000
 range 8 9
 0 15 weight bold
 range 9 15
@@ -24,7 +24,7 @@ range 32 33
 16 41 strikethrough true
 range 33 38
 16 41 strikethrough true
-33 38 scale  0.833333
+33 38 scale 0.833333
 range 38 41
 16 41 strikethrough true
 38 41 font-scale superscript
diff --git a/tests/markups/valid-8.expected b/tests/markups/valid-8.expected
index 89310b7..a4fac19 100644
--- a/tests/markups/valid-8.expected
+++ b/tests/markups/valid-8.expected
@@ -12,53 +12,53 @@ Text
 ---
 
 range 0 4
-0 4 scale  0.578704
+0 4 scale 0.578704
 0 4 variant normal
 0 4 stretch ultra-condensed
 0 4 foreground #00000000ffff
 0 4 foreground-alpha 65535
 range 4 5
 range 5 9
-5 9 scale  0.694444
+5 9 scale 0.694444
 5 9 variant small-caps
 5 9 stretch extra-condensed
 5 9 foreground #00000000ffff
 5 9 foreground-alpha 32767
 range 9 10
 range 10 14
-10 14 scale  0.833333
+10 14 scale 0.833333
 10 14 stretch condensed
 10 14 background #00000000ffff
 10 14 background-alpha 1
 range 14 15
 range 15 19
-15 19 scale  1.000000
+15 19 scale 1.000000
 15 19 stretch semi-condensed
 15 19 background #00000000ffff
 15 19 background-alpha 21626
 range 19 20
 range 20 24
-20 24 scale  1.200000
+20 24 scale 1.200000
 20 24 stretch normal
 20 24 background #00000000ffff
 20 24 background-alpha 21626
 range 24 25
 range 25 29
-25 29 scale  1.440000
+25 29 scale 1.440000
 25 29 stretch semi-expanded
 25 29 background #00000000ffff
 25 29 background-alpha 43690
 range 29 30
 range 30 34
-30 34 scale  1.728000
+30 34 scale 1.728000
 30 34 stretch expanded
 range 34 35
 range 35 39
-35 39 scale  1.728000
+35 39 scale 1.728000
 35 39 stretch extra-expanded
 range 39 40
 range 40 44
-40 44 scale  1.728000
+40 44 scale 1.728000
 40 44 stretch ultra-expanded
 range 44 2147483647