diff --git a/languages/fr.lua b/languages/fr.lua
index f09edfa67..510c1bac9 100644
--- a/languages/fr.lua
+++ b/languages/fr.lua
@@ -195,21 +195,18 @@ SILE.nodeMakers.fr = pl.class({
       if self:handleSpaceBefore(item) then return end
       if self:handleSpaceAfter(item) then return end
 
-      -- Honor explicit hard line breaks, but ignore the soft ones, as we do
-      -- the paragraphing and have hyphenation patterns. Moreover ICU seems to
-      -- return soft breaks where it shouldn't !?
-      self:makeToken()
-      if (subtype == "hard") then
-        self:makePenalty(-1000)
-      end
-      self:addToken(item.text, item)
+      self._base.handleLineBreak(self, item, subtype)
     end,
 
     iterator = function (self, items)
       -- We start by cleaning up the input once for all.
       local cleanItems = {}
+      local removed = 0
       for k = 1, #items do
-        if not self:mustRemove(k, items) then
+        if self:mustRemove(k, items) then
+          removed = removed + 1
+        else
+          items[k].index = items[k].index - removed -- index has changed due to removals
           table.insert(cleanItems, items[k])
         end
       end
diff --git a/tests/bug-621.expected b/tests/bug-621.expected
index e340ec8ca..d6a5ccb49 100644
--- a/tests/bug-621.expected
+++ b/tests/bug-621.expected
@@ -36,261 +36,121 @@ Mx 	562.0768
 T	30 w=3.4351	(;)
 Mx 	29.7638
 My 	71.4470
-T	86 68 81 w=20.9546	(san)
-Mx 	50.7184
-T	86 w=5.7935	(s)
-Mx 	59.9972
-T	72 79 79 w=15.0586	(ell)
-Mx 	75.0558
-T	72 w=6.9287	(e)
-Mx 	85.4698
-T	76 w=4.0649	(i)
-Mx 	89.5348
-T	79 w=4.0649	(l)
-Mx 	97.0851
-T	81 183 72 86 w=24.4336	(n’es)
-Mx 	121.5187
-T	87 w=5.1636	(t)
-Mx 	130.1676
-T	83 82 76 81 w=27.8320	(poin)
-Mx 	157.9996
-T	87 w=5.1636	(t)
-Mx 	166.6485
-T	71 w=7.8003	(d)
-Mx 	174.4488
-T	72 w=6.9287	(e)
-Mx 	184.8629
-T	73 85 72 76 w=21.5991	(frei)
-Mx 	206.4620
-T	81 w=8.2764	(n)
-Mx 	218.2237
-T	68 86 86 72 w=25.4004	(asse)
-Mx 	243.6241
-T	93 w=6.3647	(z)
-Mx 	253.4742
-T	83 88 76 86 86 68 81 w=46.7065	(puissan)
-Mx 	300.1808
-T	87 w=5.1636	(t)
-Mx 	308.8297
-T	83 82 88 w=23.4375	(pou)
-Mx 	332.2672
-T	85 w=5.9399	(r)
-Mx 	341.6925
-T	79 w=4.0649	(l)
-Mx 	345.7574
-T	72 w=6.9287	(e)
-Mx 	356.1715
-T	70 85 76 80 w=28.6084	(crim)
-Mx 	384.7799
-T	72 w=6.9287	(e)
-Mx 	391.7086
+T	86 68 81 86 w=26.7480	(sans)
+Mx 	61.7898
+T	72 79 79 72 w=21.9873	(elle)
+Mx 	89.0550
+T	76 79 w=8.1299	(il)
+Mx 	102.4629
+T	81 183 72 86 87 w=29.5972	(n’est)
+Mx 	137.3380
+T	83 82 76 81 87 w=32.9956	(point)
+Mx 	175.6116
+T	71 72 w=14.7290	(de)
+Mx 	195.6185
+T	73 85 72 76 81 w=29.8755	(frein)
+Mx 	230.7720
+T	68 86 86 72 93 w=31.7651	(assez)
+Mx 	267.8150
+T	83 88 76 86 86 68 81 87 w=51.8701	(puissant)
+Mx 	324.9631
+T	83 82 88 85 w=29.3774	(pour)
+Mx 	359.6185
+T	79 72 w=10.9937	(le)
+Mx 	375.8901
+T	70 85 76 80 72 w=35.5371	(crime)
+Mx 	411.4272
 T	17 w=3.4351	(.)
-Mx 	398.6290
-T	52 88 w=16.9482	(Qu)
-Mx 	415.5772
-T	76 w=4.0649	(i)
-Mx 	423.1275
-T	89 82 88 w=22.8882	(vou)
-Mx 	446.0157
-T	86 w=5.7935	(s)
-Mx 	455.2945
-T	79 183 w=7.5000	(l’)
-Mx 	462.7945
-T	68 w=6.8848	(a)
-Mx 	473.1646
-T	71 76 w=11.8652	(di)
-Mx 	485.0299
-T	87 w=5.1636	(t)
-Mx 	492.1754
+Mx 	420.1402
+T	52 88 76 w=21.0132	(Qui)
+Mx 	446.4314
+T	89 82 88 86 w=28.6816	(vous)
+Mx 	480.3910
+T	79 183 68 w=14.3848	(l’a)
+Mx 	500.0537
+T	71 76 87 w=17.0288	(dit)
+Mx 	519.0644
 T	34 w=6.4966	(?)
-Mx 	502.1573
-T	36 89 w=16.3257	(Av)
-Mx 	518.4830
-T	72 w=6.9287	(e)
-Mx 	525.4117
-T	93 16 89 82 w=26.3599	(z-vo)
-Mx 	551.7716
-T	88 w=7.9468	(u)
-Mx 	559.7184
-T	86 w=5.7935	(s)
-Mx 	29.7638
-My 	89.4470
-T	70 68 79 70 88 79 w=36.0718	(calcul)
-Mx 	65.8356
-T	112 w=6.9287	(é)
-Mx 	76.7682
-T	87 82 w=12.7075	(to)
-Mx 	89.4758
-T	88 w=7.9468	(u)
-Mx 	97.4225
-T	86 w=5.7935	(s)
-Mx 	107.2200
-T	79 w=4.0649	(l)
-Mx 	111.2849
-T	72 w=6.9287	(e)
-Mx 	118.2136
-T	86 w=5.7935	(s)
-Mx 	128.0111
-T	85 72 86 86 82 85 w=37.9395	(ressor)
-Mx 	165.9505
-T	87 w=5.1636	(t)
-Mx 	171.1141
-T	86 w=5.7935	(s)
-Mx 	180.9115
-T	83 w=7.9468	(p)
-Mx 	188.8583
-T	68 w=6.8848	(a)
-Mx 	195.7431
-T	85 w=5.9399	(r)
-Mx 	205.6870
-T	79 72 86 84 88 72 w=39.3896	(lesque)
-Mx 	245.0766
-T	79 w=4.0649	(l)
-Mx 	249.1416
-T	86 w=5.7935	(s)
-Mx 	258.9390
-T	79 w=4.0649	(l)
-Mx 	263.0039
-T	72 w=6.9287	(e)
-Mx 	269.9327
-T	86 w=5.7935	(s)
-Mx 	279.7301
-T	79 82 w=11.6089	(lo)
-Mx 	291.3390
-T	76 w=4.0649	(i)
-Mx 	295.4039
-T	86 w=5.7935	(s)
-Mx 	305.2013
-T	83 112 81 68 79 w=34.1016	(pénal)
-Mx 	339.3029
-T	72 w=6.9287	(e)
-Mx 	346.2316
-T	86 w=5.7935	(s)
-Mx 	356.0290
-T	83 72 88 89 72 w=37.1484	(peuve)
-Mx 	393.1775
-T	81 w=8.2764	(n)
-Mx 	401.4539
-T	87 w=5.1636	(t)
-Mx 	410.6214
-T	68 74 w=14.2017	(ag)
-Mx 	424.8231
-T	76 w=4.0649	(i)
-Mx 	428.8880
-T	85 w=5.9399	(r)
-Mx 	438.8319
-T	86 w=5.7935	(s)
-Mx 	444.6254
-T	88 w=7.9468	(u)
-Mx 	452.5722
-T	85 w=5.9399	(r)
-Mx 	462.5161
-T	79 w=4.0649	(l)
-Mx 	466.5810
-T	68 w=6.8848	(a)
-Mx 	477.4698
-T	86 72 81 86 76 69 76 79 76 87 w=55.8325	(sensibilit)
-Mx 	533.3023
-T	112 w=6.9287	(é)
-Mx 	544.2350
-T	75 88 w=16.2231	(hu)
+Mx 	530.8390
+T	36 89 72 93 w=29.6191	(Avez)
 Mx 	560.4581
 T	16 w=5.0537	(-)
 Mx 	29.7638
+My 	89.4470
+T	89 82 88 86 w=28.6816	(vous)
+Mx 	61.9205
+T	70 68 79 70 88 79 112 w=43.0005	(calculé)
+Mx 	108.3960
+T	87 82 88 86 w=26.4478	(tous)
+Mx 	138.3188
+T	79 72 86 w=16.7871	(les)
+Mx 	158.5810
+T	85 72 86 86 82 85 87 86 w=48.8965	(ressorts)
+Mx 	210.9526
+T	83 68 85 w=20.7715	(par)
+Mx 	235.1991
+T	79 72 86 84 88 72 79 86 w=49.2480	(lesquels)
+Mx 	287.9222
+T	79 72 86 w=16.7871	(les)
+Mx 	308.1844
+T	79 82 76 86 w=21.4673	(lois)
+Mx 	333.1267
+T	83 112 81 68 79 72 86 w=46.8237	(pénales)
+Mx 	383.4255
+T	83 72 88 89 72 81 87 w=50.5884	(peuvent)
+Mx 	437.4890
+T	68 74 76 85 w=24.2065	(agir)
+Mx 	465.1706
+T	86 88 85 w=19.6802	(sur)
+Mx 	488.3258
+T	79 68 w=10.9497	(la)
+Mx 	502.7506
+T	86 72 81 86 76 69 76 79 76 87 112 w=62.7612	(sensibilité)
+Mx 	29.7638
 My 	107.4470
-T	80 68 76 w=22.9980	(mai)
-Mx 	52.7618
-T	81 w=8.2764	(n)
-Mx 	61.0382
-T	72 w=6.9287	(e)
-Mx 	69.9488
+T	75 88 80 68 76 81 72 w=54.4263	(humaine)
+Mx 	86.1720
 T	34 w=6.4966	(?)
-Mx 	81.0611
-T	43 112 w=16.7358	(Hé)
-Mx 	97.7969
-T	79 w=4.0649	(l)
-Mx 	101.8618
-T	68 w=6.8848	(a)
-Mx 	108.7466
-T	86 w=5.7935	(s)
-Mx 	116.5220
+Mx 	97.6113
+T	43 112 79 68 86 w=33.4790	(Hélas)
+Mx 	133.0722
 T	4 w=4.0796	(!)
-Mx 	125.2172
-T	68 w=6.8848	(a)
-Mx 	132.1020
-T	89 w=7.3975	(v)
-Mx 	139.4995
-T	68 81 w=15.1611	(an)
-Mx 	154.6606
-T	87 w=5.1636	(t)
-Mx 	164.4398
+Mx 	142.0945
+T	68 89 68 81 87 w=34.6069	(avant)
+Mx 	181.6441
 T	79 68 w=10.9497	(la)
-Mx 	180.0052
-T	80 w=12.0483	(m)
-Mx 	192.0535
-T	82 w=7.5439	(o)
-Mx 	199.5974
-T	85 87 15 w=14.5386	(rt,)
-Mx 	218.7517
-T	70 82 80 w=26.1475	(com)
-Mx 	244.8991
-T	69 w=7.6172	(b)
-Mx 	252.5163
-T	76 72 w=10.9937	(ie)
-Mx 	263.5100
-T	81 w=8.2764	(n)
-Mx 	276.4020
+Mx 	197.5365
+T	80 82 85 87 w=30.6958	(mort)
+Mx 	228.2323
+T	15 w=3.4351	(,)
+Mx 	236.6101
+T	70 82 80 69 76 72 81 w=53.0347	(combien)
+Mx 	294.5874
 T	71 72 w=14.7290	(de)
-Mx 	295.7466
-T	71 82 88 79 w=27.3560	(doul)
-Mx 	323.1026
-T	72 w=6.9287	(e)
-Mx 	330.0313
-T	88 85 86 w=19.6802	(urs)
-Mx 	354.3271
-T	83 75 92 86 76 w=33.4790	(physi)
-Mx 	387.8061
-T	84 w=7.7271	(q)
-Mx 	395.5331
-T	88 72 w=14.8755	(ue)
-Mx 	410.4086
-T	86 w=5.7935	(s)
-Mx 	420.8177
+Mx 	314.2591
+T	71 82 88 79 72 88 85 86 w=53.9648	(douleurs)
+Mx 	373.1666
+T	83 75 92 86 76 84 88 72 86 w=61.8750	(physiques)
+Mx 	439.9843
 T	72 87 w=12.0923	(et)
-Mx 	437.5257
-T	80 82 85 w=25.5322	(mor)
-Mx 	463.0579
-T	68 w=6.8848	(a)
-Mx 	469.9426
-T	79 72 86 w=16.7871	(les)
-Mx 	491.3454
-T	79 183 75 w=15.7764	(l’h)
-Mx 	507.1218
-T	82 w=7.5439	(o)
-Mx 	514.6657
-T	80 80 w=24.0967	(mm)
-Mx 	538.7624
-T	72 w=6.9287	(e)
-Mx 	550.3067
-T	81 72 w=15.2051	(ne)
+Mx 	457.0193
+T	80 82 85 68 79 72 86 w=49.2041	(morales)
+Mx 	511.1661
+T	79 183 75 82 80 80 72 w=54.3457	(l’homme)
 Mx 	29.7638
 My 	125.4470
-T	83 w=7.9468	(p)
-Mx 	37.7106
-T	72 88 w=14.8755	(eu)
-Mx 	52.5860
-T	87 w=5.1636	(t)
-Mx 	57.7496
-T	16 76 79 w=13.1836	(-il)
-Mx 	74.9648
+T	81 72 w=15.2051	(ne)
+Mx 	48.9973
+T	83 72 88 87 w=27.9858	(peut)
+Mx 	76.9831
+T	16 w=5.0537	(-)
+Mx 	82.0368
+T	76 79 w=8.1299	(il)
+Mx 	94.1951
 T	83 68 86 w=20.6250	(pas)
-Mx 	99.6214
-T	72 81 71 w=23.0054	(end)
-Mx 	122.6268
-T	88 w=7.9468	(u)
-Mx 	130.5736
-T	85 72 85 w=18.8086	(rer)
-Mx 	151.3641
+Mx 	118.8485
+T	72 81 71 88 85 72 85 w=49.7607	(endurer)
+Mx 	170.5912
 T	4 w=4.0796	(!)
 Mx 	49.7638
 My 	143.4470
@@ -300,23 +160,15 @@ T	88 81 72 w=23.1519	(une)
 Mx 	112.9117
 T	169 w=7.2803	(«)
 Mx 	123.3767
-T	70 76 87 68 87 76 82 w=39.4409	(citatio)
-Mx 	162.8176
-T	81 w=8.2764	(n)
+T	70 76 87 68 87 76 82 81 w=47.7173	(citation)
 Mx 	174.2787
 T	170 w=7.2803	(»)
 Mx 	185.5683
-T	72 81 87 w=20.3687	(ent)
-Mx 	205.9369
-T	85 w=5.9399	(r)
-Mx 	211.8769
-T	72 w=6.9287	(e)
+T	72 81 87 85 72 w=33.2373	(entre)
 Mx 	222.8149
-T	74 88 76 79 79 72 80 72 w=53.3643	(guilleme)
-Mx 	276.1791
-T	87 w=5.1636	(t)
-Mx 	281.3427
-T	86 17 w=9.2285	(s.)
+T	74 88 76 79 79 72 80 72 87 86 w=64.3213	(guillemets)
+Mx 	287.1361
+T	17 w=3.4351	(.)
 Mx 	49.7638
 My 	161.4470
 T	47 68 w=14.0259	(La)
@@ -353,124 +205,120 @@ T	30 w=3.4351	(;)
 Mx 	29.7638
 My 	179.4470
 T	86 68 81 86 w=26.7480	(sans)
-Mx 	59.9972
+Mx 	61.7898
 T	72 79 79 72 w=21.9873	(elle)
-Mx 	85.4698
+Mx 	89.0550
 T	76 79 w=8.1299	(il)
-Mx 	97.0851
+Mx 	102.4629
 T	81 183 72 86 87 w=29.5972	(n’est)
-Mx 	130.1676
+Mx 	137.3380
 T	83 82 76 81 87 w=32.9956	(point)
-Mx 	166.6485
+Mx 	175.6116
 T	71 72 w=14.7290	(de)
-Mx 	184.8629
+Mx 	195.6185
 T	73 85 72 76 81 w=29.8755	(frein)
-Mx 	218.2237
+Mx 	230.7720
 T	68 86 86 72 93 w=31.7651	(assez)
-Mx 	253.4742
+Mx 	267.8150
 T	83 88 76 86 86 68 81 87 w=51.8701	(puissant)
-Mx 	308.8297
+Mx 	324.9631
 T	83 82 88 85 w=29.3774	(pour)
-Mx 	341.6925
+Mx 	359.6185
 T	79 72 w=10.9937	(le)
-Mx 	356.1715
+Mx 	375.8901
 T	70 85 76 80 72 w=35.5371	(crime)
-Mx 	391.7086
+Mx 	411.4272
 T	17 w=3.4351	(.)
-Mx 	398.6290
+Mx 	420.1402
 T	52 88 76 w=21.0132	(Qui)
-Mx 	423.1275
+Mx 	446.4314
 T	89 82 88 86 w=28.6816	(vous)
-Mx 	455.2945
+Mx 	480.3910
 T	79 183 68 w=14.3848	(l’a)
-Mx 	473.1646
+Mx 	500.0537
 T	71 76 87 w=17.0288	(dit)
-Mx 	492.1754
+Mx 	519.0644
 T	34 w=6.4966	(?)
-Mx 	502.1573
+Mx 	530.8390
 T	36 89 72 93 w=29.6191	(Avez)
-Mx 	531.7765
+Mx 	560.4581
 T	16 w=5.0537	(-)
-Mx 	536.8302
-T	89 82 88 86 w=28.6816	(vous)
 Mx 	29.7638
 My 	197.4470
+T	89 82 88 86 w=28.6816	(vous)
+Mx 	61.9205
 T	70 68 79 70 88 79 112 w=43.0005	(calculé)
-Mx 	76.7682
+Mx 	108.3960
 T	87 82 88 86 w=26.4478	(tous)
-Mx 	107.2200
+Mx 	138.3188
 T	79 72 86 w=16.7871	(les)
-Mx 	128.0111
+Mx 	158.5810
 T	85 72 86 86 82 85 87 86 w=48.8965	(ressorts)
-Mx 	180.9115
+Mx 	210.9526
 T	83 68 85 w=20.7715	(par)
-Mx 	205.6870
+Mx 	235.1991
 T	79 72 86 84 88 72 79 86 w=49.2480	(lesquels)
-Mx 	258.9390
+Mx 	287.9222
 T	79 72 86 w=16.7871	(les)
-Mx 	279.7301
+Mx 	308.1844
 T	79 82 76 86 w=21.4673	(lois)
-Mx 	305.2013
+Mx 	333.1267
 T	83 112 81 68 79 72 86 w=46.8237	(pénales)
-Mx 	356.0290
+Mx 	383.4255
 T	83 72 88 89 72 81 87 w=50.5884	(peuvent)
-Mx 	410.6214
+Mx 	437.4890
 T	68 74 76 85 w=24.2065	(agir)
-Mx 	438.8319
+Mx 	465.1706
 T	86 88 85 w=19.6802	(sur)
-Mx 	462.5161
+Mx 	488.3258
 T	79 68 w=10.9497	(la)
-Mx 	477.4698
+Mx 	502.7506
 T	86 72 81 86 76 69 76 79 76 87 112 w=62.7612	(sensibilité)
-Mx 	544.2350
-T	75 88 w=16.2231	(hu)
-Mx 	560.4581
-T	16 w=5.0537	(-)
 Mx 	29.7638
 My 	215.4470
-T	80 68 76 81 72 w=38.2031	(maine)
-Mx 	69.9488
+T	75 88 80 68 76 81 72 w=54.4263	(humaine)
+Mx 	86.1720
 T	34 w=6.4966	(?)
-Mx 	81.0611
+Mx 	97.6113
 T	43 112 79 68 86 w=33.4790	(Hélas)
-Mx 	116.5220
+Mx 	133.0722
 T	4 w=4.0796	(!)
-Mx 	125.2172
+Mx 	142.0945
 T	68 89 68 81 87 w=34.6069	(avant)
-Mx 	164.4398
+Mx 	181.6441
 T	79 68 w=10.9497	(la)
-Mx 	180.0052
+Mx 	197.5365
 T	80 82 85 87 w=30.6958	(mort)
-Mx 	210.7010
+Mx 	228.2323
 T	15 w=3.4351	(,)
-Mx 	218.7517
+Mx 	236.6101
 T	70 82 80 69 76 72 81 w=53.0347	(combien)
-Mx 	276.4020
+Mx 	294.5874
 T	71 72 w=14.7290	(de)
-Mx 	295.7466
+Mx 	314.2591
 T	71 82 88 79 72 88 85 86 w=53.9648	(douleurs)
-Mx 	354.3271
+Mx 	373.1666
 T	83 75 92 86 76 84 88 72 86 w=61.8750	(physiques)
-Mx 	420.8177
+Mx 	439.9843
 T	72 87 w=12.0923	(et)
-Mx 	437.5257
+Mx 	457.0193
 T	80 82 85 68 79 72 86 w=49.2041	(morales)
-Mx 	491.3454
+Mx 	511.1661
 T	79 183 75 82 80 80 72 w=54.3457	(l’homme)
-Mx 	550.3067
-T	81 72 w=15.2051	(ne)
 Mx 	29.7638
 My 	233.4470
+T	81 72 w=15.2051	(ne)
+Mx 	48.9973
 T	83 72 88 87 w=27.9858	(peut)
-Mx 	57.7496
+Mx 	76.9831
 T	16 w=5.0537	(-)
-Mx 	62.8033
+Mx 	82.0368
 T	76 79 w=8.1299	(il)
-Mx 	74.9648
+Mx 	94.1951
 T	83 68 86 w=20.6250	(pas)
-Mx 	99.6214
+Mx 	118.8485
 T	72 81 71 88 85 72 85 w=49.7607	(endurer)
-Mx 	151.3641
+Mx 	170.5912
 T	4 w=4.0796	(!)
 Mx 	49.7638
 My 	251.4470
diff --git a/tests/bug-702.expected b/tests/bug-702.expected
index c8c3c75ad..7fc57c20e 100644
--- a/tests/bug-702.expected
+++ b/tests/bug-702.expected
@@ -75,31 +75,21 @@ T	86 68 76 87 w=14.6045	(sait)
 Mx 	32.1394
 T	169 w=4.8535	(«)
 Mx 	39.1101
-T	53 76 72 w=12.9395	(Rie)
-Mx 	52.0496
-T	81 w=5.5176	(n)
+T	53 76 72 81 w=18.4570	(Rien)
 Mx 	60.2202
-T	71 183 76 80 83 82 85 87 68 81 w=46.0693	(d’importan)
-Mx 	106.2895
-T	87 w=3.4424	(t)
+T	71 183 76 80 83 82 85 87 68 81 87 w=49.5117	(d’important)
 Mx 	111.0532
 T	4 w=2.7197	(!)
 Mx 	115.8901
 T	170 w=4.8535	(»)
 Mx 	123.3967
-T	36 w=5.9521	(A)
-Mx 	129.3488
-T	86 16 w=7.2314	(s-)
+T	36 86 w=9.8145	(As)
+Mx 	133.2111
+T	16 w=3.3691	(-)
 Mx 	136.5803
-T	87 w=3.4424	(t)
-Mx 	140.0226
-T	88 w=5.2979	(u)
+T	87 88 w=8.7402	(tu)
 Mx 	147.9735
-T	72 81 87 72 81 w=23.7158	(enten)
-Mx 	171.6893
-T	71 w=5.2002	(d)
-Mx 	176.8895
-T	88 w=5.2979	(u)
+T	72 81 87 72 81 71 88 w=34.2139	(entendu)
 Mx 	183.5087
 T	34 w=4.3311	(?)
 Mx 	146.4727
diff --git a/tests/bug-704.expected b/tests/bug-704.expected
index 03e729794..b214e9e06 100644
--- a/tests/bug-704.expected
+++ b/tests/bug-704.expected
@@ -7,59 +7,45 @@ T	56 81 w=12.0557	(Un)
 Mx 	54.9770
 T	4 w=2.7197	(!)
 Mx 	60.3669
-T	39 72 88 w=15.8447	(Deu)
-Mx 	76.2117
-T	91 w=5.0293	(x)
+T	39 72 88 91 w=20.8740	(Deux)
 Mx 	82.5622
 T	34 w=4.3311	(?)
 Mx 	89.5636
-T	55 85 82 w=14.4971	(Tro)
-Mx 	104.0606
-T	76 w=2.7100	(i)
-Mx 	106.7706
-T	86 w=3.8623	(s)
+T	55 85 82 76 86 w=21.0693	(Trois)
 Mx 	111.9542
-T	4 34 w=7.0508	(!?)
+T	4 w=2.7197	(!)
+Mx 	114.6739
+T	34 w=4.3311	(?)
 Mx 	121.6752
-T	52 88 68 w=15.8887	(Qua)
-Mx 	137.5639
-T	87 w=3.4424	(t)
-Mx 	141.0063
-T	85 w=3.9600	(r)
-Mx 	144.9662
-T	72 w=4.6191	(e)
+T	52 88 68 87 85 72 w=27.9102	(Quatre)
 Mx 	150.9067
-T	4 4 4 w=8.1592	(!!!)
+T	4 w=2.7197	(!)
+Mx 	153.6264
+T	4 w=2.7197	(!)
+Mx 	156.3461
+T	4 w=2.7197	(!)
 Mx 	41.6000
 My 	51.6266
 T	38 76 81 84 w=18.7402	(Cinq)
-Mx 	63.0114
+Mx 	63.0111
 T	29 w=2.2900	(:)
-Mx 	67.9726
+Mx 	67.9720
 T	169 w=4.8535	(«)
-Mx 	74.9488
-T	54 w=4.7607	(S)
-Mx 	79.7095
-T	76 w=2.7100	(i)
-Mx 	82.4195
-T	91 w=5.0293	(x)
-Mx 	90.1199
+Mx 	74.9481
+T	54 76 91 w=12.5000	(Six)
+Mx 	90.1190
 T	190 w=3.0469	(‹)
-Mx 	95.2894
-T	54 w=4.7607	(S)
-Mx 	100.0502
-T	72 83 87 w=13.3594	(ept)
-Mx 	115.5322
-T	191 67 w=6.2354	(›`)
-Mx 	121.7675
-T	43 88 w=11.8359	(Hu)
-Mx 	133.6035
-T	76 w=2.7100	(i)
-Mx 	136.3134
-T	87 w=3.4424	(t)
-Mx 	141.8785
+Mx 	95.2884
+T	54 72 83 87 w=18.1201	(Sept)
+Mx 	115.5310
+T	191 w=3.0469	(›)
+Mx 	121.2488
+T	67 w=3.1885	(`)
+Mx 	124.4373
+T	43 88 76 87 w=17.9883	(Huit)
+Mx 	144.5481
 T	170 w=4.8535	(»)
-Mx 	148.0533
+Mx 	150.7229
 T	4 w=2.7197	(!)
 Mx 	41.6000
 My 	63.6266
@@ -71,9 +57,9 @@ T	64 w=3.0762	(])
 Mx 	69.9385
 T	29 w=2.2900	(:)
 Mx 	74.8980
-T	11 39 76 w=11.8066	((Di)
-Mx 	86.7047
-T	91 w=5.0293	(x)
+T	11 w=3.1689	(()
+Mx 	78.0670
+T	39 76 91 w=13.6670	(Dix)
 Mx 	91.7340
 T	12 w=3.1689	())
 Mx 	96.2242
@@ -88,9 +74,7 @@ Mx 	126.4343
 Set font 	Gentium Plus;10;400;Italic;normal;;LTR
 T	169 w=4.3066	(«)
 Mx 	132.8631
-T	39 82 88 93 w=18.4570	(Douz)
-Mx 	151.3201
-T	72 w=3.9307	(e)
+T	39 82 88 93 72 w=22.3877	(Douze)
 Mx 	157.3730
 T	170 w=4.3066	(»)
 Mx 	163.0009
@@ -101,13 +85,11 @@ My 	75.6266
 T	55 85 72 76 93 72 w=25.6592	(Treize)
 Mx 	68.5805
 T	30 w=2.2900	(;)
-Mx 	73.5448
-T	52 88 68 87 82 85 93 w=32.5635	(Quatorz)
-Mx 	106.1082
-T	72 w=4.6191	(e)
-Mx 	113.4016
+Mx 	73.5450
+T	52 88 68 87 82 85 93 72 w=37.1826	(Quatorze)
+Mx 	110.7277
 T	171 w=6.6895	(…)
-Mx 	120.0911
+Mx 	117.4171
 T	4 w=2.7197	(!)
 Mx 	41.6000
 My 	87.6266
@@ -139,9 +121,7 @@ T	171 w=6.6895	(…)
 Mx 	119.4780
 T	34 w=4.3311	(?)
 Mx 	126.4813
-T	72 87 w=8.0615	(et)
-Mx 	134.5428
-T	70 w=4.3701	(c)
+T	72 87 70 w=12.4316	(etc)
 Mx 	138.9129
 T	17 w=2.2900	(.)
 Mx 	41.6000
@@ -170,25 +150,25 @@ T	4 w=2.7197	(!)
 Mx 	41.6000
 My 	111.6266
 T	38 76 81 84 w=18.7402	(Cinq)
-Mx 	63.0114
+Mx 	63.0111
 T	29 w=2.2900	(:)
-Mx 	67.9726
+Mx 	67.9720
 T	169 w=4.8535	(«)
-Mx 	74.9488
+Mx 	74.9481
 T	54 76 91 w=12.5000	(Six)
-Mx 	90.1199
+Mx 	90.1190
 T	190 w=3.0469	(‹)
-Mx 	95.2894
+Mx 	95.2884
 T	54 72 83 87 w=18.1201	(Sept)
-Mx 	115.5322
+Mx 	115.5310
 T	191 w=3.0469	(›)
-Mx 	118.5791
+Mx 	121.2488
 T	67 w=3.1885	(`)
-Mx 	121.7675
+Mx 	124.4373
 T	43 88 76 87 w=17.9883	(Huit)
-Mx 	141.8785
+Mx 	144.5481
 T	170 w=4.8535	(»)
-Mx 	148.0533
+Mx 	150.7229
 T	4 w=2.7197	(!)
 Mx 	41.6000
 My 	123.6266
@@ -217,9 +197,9 @@ Mx 	126.4343
 Set font 	Gentium Plus;10;400;Italic;normal;;LTR
 T	169 w=4.3066	(«)
 Mx 	132.8631
-T	39 82 88 93 w=18.4570	(Douz)
-Mx 	151.3201
-T	72 w=3.9307	(e)
+T	39 w=5.4590	(D)
+Mx 	138.3221
+T	82 88 93 72 w=16.9287	(ouze)
 Mx 	157.3730
 T	170 w=4.3066	(»)
 Mx 	163.0009
@@ -256,7 +236,9 @@ T	15 w=2.2900	(,)
 Mx 	98.9542
 T	62 w=3.0762	([)
 Mx 	102.0304
-T	4 64 w=5.7959	(!])
+T	4 w=2.7197	(!)
+Mx 	104.7501
+T	64 w=3.0762	(])
 Mx 	107.8263
 T	15 w=2.2900	(,)
 Mx 	112.7885
@@ -264,9 +246,8 @@ T	171 w=6.6895	(…)
 Mx 	119.4780
 T	34 w=4.3311	(?)
 Mx 	126.4813
-T	72 87 70 17 w=14.7217	(etc.)
-Mx 	213.6538
-My 	602.2391
-T	20 w=4.6924	(1)
+T	72 87 70 w=12.4316	(etc)
+Mx 	138.9129
+T	17 w=2.2900	(.)
 End page
 Finish
diff --git a/tests/bug-704.sil b/tests/bug-704.sil
index b1a688acf..2205eba4f 100644
--- a/tests/bug-704.sil
+++ b/tests/bug-704.sil
@@ -1,21 +1,21 @@
 \begin[papersize=6in x 9in]{document}
-
+\nofolios
 \language[main=fr]
 
 Un ! Deux ? Trois !? Quatre !!!
 
-Cinq : « Six ‹ Sept ›`Huit » !
+Cinq : « Six ‹ Sept › `Huit » !
 
 [Neuf] : (Dix) ! \em{Onze} ! \em{« Douze »} !
 
-Treize ; Quatorze … !
+Treize ; Quatorze… !
 
 Quinze (?), ?!, [!], …? etc. 
 
 
 Un! Deux? Trois!? Quatre!!!
 
-Cinq: «Six ‹Sept›`Huit»!
+Cinq: «Six ‹Sept› `Huit»!
 
 [Neuf]: (Dix)! \em{Onze}! \em{« Douze »}!