summaryrefslogtreecommitdiff
path: root/external/libepubgen/libepubgen-epub3.patch.1
blob: 28f9c3771708f0d8a8e8446d33e9cfbf577d497c (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
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
2232
2233
2234
2235
2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
2289
2290
2291
2292
2293
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
2320
2321
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
2352
2353
2354
2355
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
2378
2379
2380
2381
2382
2383
2384
2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
2395
2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
2406
2407
2408
2409
2410
2411
2412
2413
2414
2415
2416
2417
2418
2419
2420
2421
2422
2423
2424
2425
2426
2427
2428
2429
2430
2431
2432
2433
2434
2435
2436
2437
2438
2439
2440
2441
2442
2443
2444
2445
2446
2447
2448
2449
2450
2451
2452
2453
2454
2455
2456
2457
2458
2459
2460
2461
2462
2463
2464
2465
2466
2467
2468
2469
2470
2471
2472
2473
2474
2475
2476
2477
2478
2479
2480
2481
2482
2483
2484
2485
2486
2487
2488
2489
2490
2491
2492
2493
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
2505
2506
2507
2508
2509
2510
2511
2512
2513
2514
2515
2516
2517
2518
2519
2520
2521
2522
2523
2524
2525
2526
2527
2528
2529
2530
2531
2532
2533
2534
2535
2536
2537
2538
2539
2540
2541
2542
2543
2544
2545
2546
2547
2548
2549
2550
2551
2552
2553
2554
2555
2556
2557
2558
2559
2560
2561
2562
2563
2564
2565
2566
2567
2568
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
2579
2580
2581
2582
2583
2584
2585
2586
2587
2588
2589
2590
2591
2592
2593
2594
2595
2596
2597
2598
2599
2600
2601
2602
2603
2604
2605
2606
2607
2608
2609
2610
2611
2612
2613
2614
2615
2616
2617
2618
2619
2620
2621
2622
2623
2624
2625
2626
2627
2628
2629
2630
2631
2632
2633
2634
2635
2636
2637
2638
2639
2640
2641
2642
2643
2644
2645
2646
2647
2648
2649
2650
2651
2652
2653
2654
2655
2656
2657
2658
2659
2660
2661
2662
2663
2664
2665
2666
2667
2668
2669
2670
2671
2672
2673
2674
2675
2676
2677
2678
2679
2680
2681
2682
2683
2684
2685
2686
2687
2688
2689
2690
2691
2692
2693
2694
2695
2696
2697
2698
2699
2700
2701
2702
2703
2704
2705
2706
2707
2708
2709
2710
2711
2712
2713
2714
2715
2716
2717
2718
2719
2720
2721
2722
2723
2724
2725
2726
2727
2728
2729
2730
2731
2732
2733
2734
2735
2736
2737
2738
2739
2740
2741
2742
2743
2744
2745
2746
2747
2748
2749
2750
2751
2752
2753
2754
2755
2756
2757
2758
2759
2760
2761
2762
2763
2764
2765
2766
2767
2768
2769
2770
2771
2772
2773
2774
2775
2776
2777
2778
2779
2780
2781
2782
2783
2784
2785
2786
2787
2788
2789
2790
2791
2792
2793
2794
2795
2796
2797
2798
2799
2800
2801
2802
2803
2804
2805
2806
2807
2808
2809
2810
2811
2812
2813
2814
2815
2816
2817
2818
2819
2820
2821
2822
2823
2824
2825
2826
2827
2828
2829
2830
2831
2832
2833
2834
2835
2836
2837
2838
2839
2840
2841
2842
2843
2844
2845
2846
2847
2848
2849
2850
2851
2852
2853
2854
2855
2856
2857
2858
2859
2860
2861
2862
2863
2864
2865
2866
2867
2868
2869
2870
2871
2872
2873
2874
2875
2876
2877
2878
2879
2880
2881
2882
2883
2884
2885
2886
2887
2888
2889
2890
2891
2892
2893
2894
2895
2896
2897
2898
2899
2900
2901
2902
2903
2904
2905
2906
2907
2908
2909
2910
2911
2912
2913
2914
2915
2916
2917
2918
2919
2920
2921
2922
2923
2924
2925
2926
2927
2928
2929
2930
2931
2932
2933
2934
2935
2936
2937
2938
2939
2940
2941
2942
2943
2944
2945
2946
2947
2948
2949
2950
2951
2952
2953
2954
2955
2956
2957
2958
2959
2960
2961
2962
2963
2964
2965
2966
2967
2968
2969
2970
2971
2972
2973
2974
2975
2976
2977
2978
2979
2980
2981
2982
2983
2984
2985
2986
2987
2988
2989
2990
2991
2992
2993
2994
2995
2996
2997
2998
2999
3000
3001
3002
3003
3004
3005
3006
3007
3008
3009
3010
3011
3012
3013
3014
3015
3016
3017
3018
3019
3020
3021
3022
3023
3024
3025
3026
3027
3028
3029
3030
3031
3032
3033
3034
3035
3036
3037
3038
3039
3040
3041
3042
3043
3044
3045
3046
3047
3048
3049
3050
3051
3052
3053
3054
3055
3056
3057
3058
3059
3060
3061
3062
3063
3064
3065
3066
3067
3068
3069
3070
3071
3072
3073
3074
3075
3076
3077
3078
3079
3080
3081
3082
3083
3084
3085
3086
3087
3088
3089
3090
3091
3092
3093
3094
3095
3096
3097
3098
3099
3100
3101
3102
3103
3104
3105
3106
3107
3108
3109
3110
3111
3112
3113
3114
3115
3116
3117
3118
3119
3120
3121
3122
3123
3124
3125
3126
3127
3128
3129
3130
3131
3132
3133
3134
3135
3136
3137
3138
3139
3140
3141
3142
3143
3144
3145
3146
3147
3148
3149
3150
3151
3152
3153
3154
3155
3156
3157
3158
3159
3160
3161
3162
3163
3164
3165
3166
3167
3168
3169
3170
3171
3172
3173
3174
3175
3176
3177
3178
3179
3180
3181
3182
3183
3184
3185
3186
3187
3188
3189
3190
3191
3192
3193
3194
3195
3196
3197
3198
3199
3200
3201
3202
3203
3204
3205
3206
3207
3208
3209
3210
3211
3212
3213
3214
3215
3216
3217
3218
3219
3220
3221
3222
3223
3224
3225
3226
3227
3228
3229
3230
3231
3232
3233
3234
3235
3236
3237
3238
3239
3240
3241
3242
3243
3244
3245
3246
3247
3248
3249
3250
3251
3252
3253
3254
3255
3256
3257
3258
3259
3260
3261
3262
3263
3264
3265
3266
3267
3268
3269
3270
3271
3272
3273
3274
3275
3276
3277
3278
3279
3280
3281
3282
3283
3284
3285
3286
3287
3288
3289
3290
3291
3292
3293
3294
3295
3296
3297
3298
3299
3300
3301
3302
3303
3304
3305
3306
3307
3308
3309
3310
3311
3312
3313
3314
3315
3316
3317
3318
3319
3320
3321
3322
3323
3324
3325
3326
3327
3328
3329
3330
3331
3332
3333
3334
3335
3336
3337
3338
3339
3340
3341
3342
3343
3344
3345
3346
3347
3348
3349
3350
3351
3352
3353
3354
3355
3356
3357
3358
3359
3360
3361
3362
3363
3364
3365
3366
3367
3368
3369
3370
3371
3372
3373
3374
3375
3376
3377
3378
3379
3380
3381
3382
3383
3384
3385
3386
3387
3388
3389
3390
3391
3392
3393
3394
3395
3396
3397
3398
3399
3400
3401
3402
3403
3404
3405
3406
3407
3408
3409
3410
3411
3412
3413
3414
3415
3416
3417
3418
3419
3420
3421
3422
3423
3424
3425
3426
3427
3428
3429
3430
3431
3432
3433
3434
3435
3436
3437
3438
3439
3440
3441
3442
3443
3444
3445
3446
3447
3448
3449
3450
3451
3452
3453
3454
3455
3456
3457
3458
3459
3460
3461
3462
3463
3464
3465
3466
3467
3468
3469
3470
3471
3472
3473
3474
3475
3476
3477
3478
3479
3480
3481
3482
3483
3484
3485
3486
3487
3488
3489
3490
3491
3492
3493
3494
3495
3496
3497
3498
3499
3500
3501
3502
3503
3504
3505
3506
3507
3508
3509
3510
3511
3512
3513
3514
3515
3516
3517
3518
3519
3520
3521
3522
3523
3524
3525
3526
3527
3528
3529
3530
3531
3532
3533
3534
3535
3536
3537
3538
3539
3540
3541
3542
3543
3544
3545
3546
3547
3548
3549
3550
3551
3552
3553
3554
3555
3556
3557
3558
3559
3560
3561
3562
3563
3564
3565
3566
3567
3568
3569
3570
3571
3572
3573
3574
3575
3576
3577
3578
3579
3580
3581
3582
3583
3584
3585
3586
3587
3588
3589
3590
3591
3592
3593
3594
3595
3596
3597
3598
3599
3600
3601
3602
3603
3604
3605
3606
3607
3608
3609
3610
3611
3612
3613
3614
3615
3616
3617
3618
3619
3620
3621
3622
3623
3624
3625
3626
3627
3628
3629
3630
3631
3632
3633
3634
3635
3636
3637
3638
3639
3640
3641
3642
3643
3644
3645
3646
3647
3648
3649
3650
3651
3652
3653
3654
3655
3656
3657
3658
3659
3660
3661
3662
3663
3664
3665
3666
3667
3668
3669
3670
3671
3672
3673
3674
3675
3676
3677
3678
3679
3680
3681
3682
3683
3684
3685
3686
3687
3688
3689
3690
3691
3692
3693
3694
3695
3696
3697
3698
3699
3700
3701
3702
3703
3704
3705
3706
3707
3708
3709
3710
3711
3712
3713
3714
3715
3716
3717
3718
3719
3720
3721
3722
3723
3724
3725
3726
3727
3728
3729
3730
3731
3732
3733
3734
3735
3736
3737
3738
3739
3740
3741
3742
3743
3744
3745
3746
3747
3748
3749
3750
3751
3752
3753
3754
3755
3756
3757
3758
3759
3760
3761
3762
3763
3764
3765
3766
3767
3768
3769
3770
3771
3772
3773
3774
3775
3776
3777
3778
3779
3780
3781
3782
3783
3784
3785
3786
3787
3788
3789
3790
3791
3792
3793
3794
3795
3796
3797
3798
3799
3800
3801
3802
3803
3804
3805
3806
3807
3808
3809
3810
3811
3812
3813
3814
3815
3816
3817
3818
3819
3820
3821
3822
3823
3824
3825
3826
3827
3828
3829
3830
3831
3832
3833
3834
3835
3836
3837
3838
3839
3840
3841
3842
3843
3844
3845
3846
3847
3848
3849
3850
3851
3852
3853
3854
3855
3856
3857
3858
3859
3860
3861
3862
3863
3864
3865
3866
3867
3868
3869
3870
3871
3872
3873
3874
3875
3876
3877
3878
3879
3880
3881
3882
3883
3884
3885
3886
3887
3888
3889
3890
3891
3892
3893
3894
3895
3896
3897
3898
3899
3900
3901
3902
3903
3904
3905
3906
3907
3908
3909
3910
3911
3912
3913
3914
3915
3916
3917
3918
3919
3920
3921
3922
3923
3924
3925
3926
3927
3928
3929
3930
3931
3932
3933
3934
3935
3936
3937
3938
3939
3940
3941
3942
3943
3944
3945
3946
3947
3948
3949
3950
3951
3952
3953
3954
3955
3956
3957
3958
3959
3960
3961
3962
3963
3964
3965
3966
3967
3968
3969
3970
3971
3972
3973
3974
3975
3976
3977
3978
3979
3980
3981
3982
3983
3984
3985
3986
3987
3988
3989
3990
3991
3992
3993
3994
3995
3996
3997
3998
3999
4000
4001
4002
4003
4004
4005
4006
4007
4008
4009
4010
4011
4012
4013
4014
4015
4016
4017
4018
4019
4020
4021
4022
4023
4024
4025
4026
4027
4028
4029
4030
4031
4032
4033
4034
4035
4036
4037
4038
4039
4040
4041
4042
4043
4044
4045
4046
4047
4048
4049
4050
4051
4052
4053
4054
4055
4056
4057
4058
4059
4060
4061
4062
4063
4064
4065
4066
4067
4068
4069
4070
4071
4072
4073
4074
4075
4076
4077
4078
4079
4080
4081
4082
4083
4084
4085
4086
4087
4088
4089
4090
4091
4092
4093
4094
4095
4096
4097
4098
4099
4100
4101
4102
4103
4104
4105
4106
4107
4108
4109
4110
4111
4112
4113
4114
4115
4116
4117
4118
4119
4120
4121
4122
4123
4124
4125
4126
4127
4128
4129
4130
4131
4132
4133
4134
4135
4136
4137
4138
4139
4140
4141
4142
4143
4144
4145
4146
4147
4148
4149
4150
4151
4152
4153
4154
4155
4156
4157
4158
4159
4160
4161
4162
4163
4164
4165
4166
4167
4168
4169
4170
4171
4172
4173
4174
4175
4176
4177
4178
4179
4180
4181
4182
4183
4184
4185
4186
4187
4188
4189
4190
4191
4192
4193
4194
4195
4196
4197
4198
4199
4200
4201
4202
4203
4204
4205
4206
4207
4208
4209
4210
4211
4212
4213
4214
4215
4216
4217
4218
4219
4220
4221
4222
4223
4224
4225
4226
4227
4228
4229
4230
4231
4232
4233
4234
4235
4236
4237
4238
4239
4240
4241
4242
4243
4244
4245
4246
4247
4248
4249
4250
4251
4252
4253
4254
4255
4256
4257
4258
4259
4260
4261
4262
4263
4264
4265
4266
4267
4268
4269
4270
4271
4272
4273
4274
4275
4276
4277
4278
4279
4280
4281
4282
4283
4284
4285
4286
4287
4288
4289
4290
4291
4292
4293
4294
4295
4296
4297
4298
4299
4300
4301
4302
4303
4304
4305
4306
4307
4308
4309
4310
4311
4312
4313
4314
4315
4316
4317
4318
4319
4320
4321
4322
4323
4324
4325
4326
4327
4328
4329
4330
4331
4332
4333
4334
4335
4336
4337
4338
4339
4340
4341
4342
4343
4344
4345
4346
4347
4348
4349
4350
4351
4352
4353
4354
4355
4356
4357
4358
4359
4360
4361
4362
4363
4364
4365
4366
4367
4368
4369
4370
4371
4372
4373
4374
4375
4376
4377
4378
4379
4380
4381
4382
4383
4384
4385
4386
4387
4388
4389
4390
4391
4392
4393
4394
4395
4396
4397
4398
4399
4400
4401
4402
4403
4404
4405
4406
4407
4408
4409
4410
4411
4412
4413
4414
4415
4416
4417
4418
4419
4420
4421
4422
4423
4424
4425
4426
4427
4428
4429
4430
4431
4432
4433
4434
4435
4436
4437
4438
4439
4440
4441
4442
4443
4444
4445
4446
4447
4448
4449
4450
4451
4452
4453
4454
4455
4456
4457
4458
4459
4460
4461
4462
4463
4464
4465
4466
4467
4468
4469
4470
4471
4472
4473
4474
4475
4476
4477
4478
4479
4480
4481
4482
4483
4484
4485
4486
4487
4488
4489
4490
4491
4492
4493
4494
4495
4496
4497
4498
4499
4500
4501
4502
4503
4504
4505
4506
4507
4508
4509
4510
4511
4512
4513
4514
4515
4516
4517
4518
4519
4520
4521
4522
4523
4524
4525
4526
4527
4528
4529
4530
4531
4532
4533
4534
4535
4536
4537
4538
4539
4540
4541
4542
4543
4544
4545
4546
4547
4548
4549
4550
4551
4552
4553
4554
4555
4556
4557
4558
4559
4560
4561
4562
4563
4564
4565
4566
4567
4568
4569
4570
4571
4572
4573
4574
4575
4576
4577
4578
4579
4580
4581
4582
4583
4584
4585
4586
4587
4588
4589
4590
4591
4592
4593
4594
4595
4596
4597
4598
4599
4600
4601
4602
4603
4604
4605
4606
4607
4608
4609
4610
4611
4612
4613
4614
4615
4616
4617
4618
4619
4620
4621
4622
4623
4624
4625
4626
4627
4628
4629
4630
4631
4632
4633
4634
4635
4636
4637
4638
4639
4640
4641
4642
4643
4644
4645
4646
4647
4648
4649
4650
4651
4652
4653
4654
4655
4656
4657
4658
4659
4660
4661
4662
4663
4664
4665
4666
4667
4668
4669
4670
4671
4672
4673
4674
4675
4676
4677
4678
4679
4680
4681
4682
4683
4684
4685
4686
4687
4688
4689
4690
4691
4692
4693
4694
4695
4696
4697
4698
4699
4700
4701
4702
4703
4704
4705
4706
4707
4708
4709
4710
4711
4712
4713
4714
4715
4716
4717
4718
4719
4720
4721
4722
4723
4724
4725
4726
4727
4728
4729
4730
4731
4732
4733
4734
4735
4736
4737
4738
4739
4740
4741
4742
4743
4744
4745
4746
4747
4748
4749
4750
4751
4752
4753
4754
4755
4756
4757
4758
4759
4760
4761
4762
4763
4764
4765
4766
4767
4768
4769
4770
4771
4772
4773
4774
4775
4776
4777
4778
4779
4780
4781
4782
4783
4784
4785
4786
4787
4788
4789
4790
4791
4792
4793
4794
4795
4796
4797
4798
4799
4800
4801
4802
4803
4804
4805
4806
4807
4808
4809
4810
4811
4812
4813
4814
4815
4816
4817
4818
4819
4820
4821
4822
4823
4824
4825
4826
4827
4828
4829
4830
4831
4832
4833
4834
4835
4836
4837
4838
4839
4840
4841
4842
4843
4844
4845
4846
4847
4848
4849
4850
4851
4852
4853
4854
4855
4856
4857
4858
4859
4860
4861
4862
4863
4864
4865
4866
4867
4868
4869
4870
4871
4872
4873
4874
4875
4876
4877
4878
4879
4880
4881
4882
4883
4884
4885
4886
4887
4888
4889
4890
4891
4892
4893
4894
4895
4896
4897
4898
4899
4900
4901
4902
4903
4904
4905
4906
4907
4908
4909
4910
4911
4912
4913
4914
4915
4916
4917
4918
4919
4920
4921
4922
4923
4924
4925
4926
4927
4928
4929
4930
4931
4932
4933
4934
4935
4936
4937
4938
4939
4940
4941
4942
4943
4944
4945
4946
4947
4948
4949
4950
4951
4952
4953
4954
4955
4956
4957
4958
4959
4960
4961
4962
4963
4964
4965
4966
4967
4968
4969
4970
4971
4972
4973
4974
4975
4976
4977
4978
4979
4980
4981
4982
4983
4984
4985
4986
4987
4988
4989
4990
4991
4992
4993
4994
4995
4996
4997
4998
4999
5000
5001
5002
5003
5004
5005
5006
5007
5008
5009
5010
5011
5012
5013
5014
5015
5016
5017
5018
5019
5020
5021
5022
5023
5024
5025
5026
5027
5028
5029
5030
5031
5032
5033
5034
5035
5036
5037
5038
5039
5040
5041
5042
5043
5044
5045
5046
5047
5048
5049
5050
5051
5052
5053
5054
5055
From 17b4d0a2b595d1504f3d957268e2085ae0f80db7 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Wed, 9 Aug 2017 15:53:02 +0200
Subject: [PATCH 1/9] EPUBGenerator: avoid container version roundtrip to
 double

This will be an error for EPUB3:

ERROR(RSC-005): test.epub/META-INF/container.xml(2,85): Error while parsing file: value of attribute "version" is invalid; must be equal to "1.0"

But it does not hurt for EPUB2, either.
---
 src/lib/EPUBGenerator.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/EPUBGenerator.cpp b/src/lib/EPUBGenerator.cpp
index 3357cf2..1033c0f 100644
--- a/src/lib/EPUBGenerator.cpp
+++ b/src/lib/EPUBGenerator.cpp
@@ -117,7 +117,7 @@ void EPUBGenerator::writeContainer()
   EPUBXMLSink sink;
 
   RVNGPropertyList containerAttrs;
-  containerAttrs.insert("version", "1.0");
+  containerAttrs.insert("version", RVNGPropertyFactory::newStringProp("1.0"));
   containerAttrs.insert("xmlns", "urn:oasis:names:tc:opendocument:xmlns:container");
 
   sink.openElement("container", containerAttrs);
-- 
2.12.3

From 8ca1fe2b9db9bacd6e868e69a0909a441fb6a7f8 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Wed, 9 Aug 2017 16:00:05 +0200
Subject: [PATCH 2/9] EPUBGenerator: avoid opf:scheme attribute when writing
 the UUID

This will be an error for EPUB3:

ERROR(RSC-005): test.epub/OEBPS/content.opf(2,292): Error while parsing file: found attribute "opf:scheme", but no attributes allowed here

But it's optional for EPUB2 already.
---
 src/lib/EPUBGenerator.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/lib/EPUBGenerator.cpp b/src/lib/EPUBGenerator.cpp
index 1033c0f..14e3c58 100644
--- a/src/lib/EPUBGenerator.cpp
+++ b/src/lib/EPUBGenerator.cpp
@@ -199,7 +199,6 @@ void EPUBGenerator::writeRoot()
 
   RVNGPropertyList identifierAttrs;
   identifierAttrs.insert("id", uniqueId);
-  identifierAttrs.insert("opf:scheme", "UUID");
   sink.openElement("dc:identifier", identifierAttrs);
   // The identifier element is required to have a unique character content.
   std::stringstream identifierStream("urn:uuid:");
-- 
2.12.3

From aa71784fcee0404c2f136f035887ca4c52d0e756 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Wed, 9 Aug 2017 16:11:13 +0200
Subject: [PATCH 3/9] EPUBGenerator: avoid empty dc:title element

This is a warning for EPUB2, but it'll be an error for EPUB3:

ERROR(RSC-005): test.epub/OEBPS/content.opf(2,337): Error while parsing file: character content of element "dc:title" invalid; must be a string with length at least 1 (actual length was 0)

The problem is that for ODF/librevenge this element is optional, so work
it around by adding a zero-width space.

A later commit should read the optional title of declared with a
librevenge API call, though.
---
 src/lib/EPUBGenerator.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/lib/EPUBGenerator.cpp b/src/lib/EPUBGenerator.cpp
index 14e3c58..75ccb5a 100644
--- a/src/lib/EPUBGenerator.cpp
+++ b/src/lib/EPUBGenerator.cpp
@@ -208,8 +208,12 @@ void EPUBGenerator::writeRoot()
   sink.insertCharacters(identifierCharactrs.c_str());
   sink.closeElement("dc:identifier");
 
+  // Zero-width space as it must be at least one character in length after
+  // white space has been trimmed.
   sink.openElement("dc:title");
+  sink.insertCharacters("\u200b");
   sink.closeElement("dc:title");
+
   sink.openElement("dc:language");
   sink.closeElement("dc:language");
 
-- 
2.12.3

From a4585b8f35c76472eb91688c9177b9f532c290d8 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Wed, 9 Aug 2017 16:15:12 +0200
Subject: [PATCH 4/9] EPUBGenerator: avoid empty dc:language element

Same story as with dc:title:

ERROR(RSC-005): test.epub/OEBPS/content.opf(2,362): Error while parsing file: character content of element "dc:language" invalid; must be an RFC 3066 language identifier

(This is a warning for EPUB2, but it'll be an error for EPUB3; this is optional
for ODF; later commit should read the this info, though.)
---
 src/lib/EPUBGenerator.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lib/EPUBGenerator.cpp b/src/lib/EPUBGenerator.cpp
index 75ccb5a..40ae0cc 100644
--- a/src/lib/EPUBGenerator.cpp
+++ b/src/lib/EPUBGenerator.cpp
@@ -215,6 +215,7 @@ void EPUBGenerator::writeRoot()
   sink.closeElement("dc:title");
 
   sink.openElement("dc:language");
+  sink.insertCharacters("en");
   sink.closeElement("dc:language");
 
   sink.closeElement("metadata");
-- 
2.12.3

From 862ec6735c25760edadf05d83717daaf65f39f99 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Wed, 9 Aug 2017 16:47:12 +0200
Subject: [PATCH 5/9] [ABI CHANGE] optionally support generating EPUB3 output

Versions are 20 and 30 to be consistent with
<https://github.com/idpf/epubcheck/tree/master/src/main/resources/com/adobe/epubcheck/schema/>.
---
 inc/libepubgen/EPUBDrawingGenerator.h      |  6 +++++-
 inc/libepubgen/EPUBPresentationGenerator.h |  6 +++++-
 inc/libepubgen/EPUBTextGenerator.h         |  6 +++++-
 src/lib/EPUBDrawingGenerator.cpp           | 10 +++++-----
 src/lib/EPUBGenerator.cpp                  |  8 ++++++--
 src/lib/EPUBGenerator.h                    |  4 +++-
 src/lib/EPUBPagedGenerator.cpp             | 10 +++++-----
 src/lib/EPUBPagedGenerator.h               |  2 +-
 src/lib/EPUBPresentationGenerator.cpp      | 10 +++++-----
 src/lib/EPUBTextGenerator.cpp              | 10 +++++-----
 10 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/inc/libepubgen/EPUBDrawingGenerator.h b/inc/libepubgen/EPUBDrawingGenerator.h
index 48bfc99..963e3b8 100644
--- a/inc/libepubgen/EPUBDrawingGenerator.h
+++ b/inc/libepubgen/EPUBDrawingGenerator.h
@@ -32,7 +32,11 @@ class EPUBGENAPI EPUBDrawingGenerator : public librevenge::RVNGDrawingInterface
   class Impl;
 
 public:
-  explicit EPUBDrawingGenerator(EPUBPackage *package, EPUBSplitMethod split = EPUB_SPLIT_METHOD_PAGE_BREAK);
+  /** Constructor.
+    *
+    * @param[in] version possible values: 20, 30.
+    */
+  explicit EPUBDrawingGenerator(EPUBPackage *package, EPUBSplitMethod split = EPUB_SPLIT_METHOD_PAGE_BREAK, int version = 20);
   EPUBDrawingGenerator(EPUBEmbeddingContact &contact, EPUBPackage *package);
   ~EPUBDrawingGenerator() override;
 
diff --git a/inc/libepubgen/EPUBPresentationGenerator.h b/inc/libepubgen/EPUBPresentationGenerator.h
index 0a8152a..512c52d 100644
--- a/inc/libepubgen/EPUBPresentationGenerator.h
+++ b/inc/libepubgen/EPUBPresentationGenerator.h
@@ -32,7 +32,11 @@ class EPUBGENAPI EPUBPresentationGenerator: public librevenge::RVNGPresentationI
   class Impl;
 
 public:
-  explicit EPUBPresentationGenerator(EPUBPackage *package, EPUBSplitMethod split = EPUB_SPLIT_METHOD_PAGE_BREAK);
+  /** Constructor.
+    *
+    * @param[in] version possible values: 20, 30.
+    */
+  explicit EPUBPresentationGenerator(EPUBPackage *package, EPUBSplitMethod split = EPUB_SPLIT_METHOD_PAGE_BREAK, int version = 20);
   EPUBPresentationGenerator(EPUBEmbeddingContact &contact, EPUBPackage *package);
   ~EPUBPresentationGenerator() override;
 
diff --git a/inc/libepubgen/EPUBTextGenerator.h b/inc/libepubgen/EPUBTextGenerator.h
index abf9e7f..664f673 100644
--- a/inc/libepubgen/EPUBTextGenerator.h
+++ b/inc/libepubgen/EPUBTextGenerator.h
@@ -32,7 +32,11 @@ class EPUBGENAPI EPUBTextGenerator : public librevenge::RVNGTextInterface
   struct Impl;
 
 public:
-  explicit EPUBTextGenerator(EPUBPackage *package, EPUBSplitMethod split = EPUB_SPLIT_METHOD_PAGE_BREAK);
+  /** Constructor.
+    *
+    * @param[in] version possible values: 20, 30.
+    */
+  explicit EPUBTextGenerator(EPUBPackage *package, EPUBSplitMethod split = EPUB_SPLIT_METHOD_PAGE_BREAK, int version = 20);
   EPUBTextGenerator(EPUBEmbeddingContact &contact, EPUBPackage *package);
   ~EPUBTextGenerator() override;
 
diff --git a/src/lib/EPUBDrawingGenerator.cpp b/src/lib/EPUBDrawingGenerator.cpp
index e25a377..bcb4994 100644
--- a/src/lib/EPUBDrawingGenerator.cpp
+++ b/src/lib/EPUBDrawingGenerator.cpp
@@ -20,16 +20,16 @@ using librevenge::RVNGString;
 class EPUBDrawingGenerator::Impl : public EPUBPagedGenerator
 {
 public:
-  Impl(EPUBPackage *const package, const EPUBSplitMethod method);
+  Impl(EPUBPackage *const package, const EPUBSplitMethod method, int version);
 };
 
-EPUBDrawingGenerator::Impl::Impl(EPUBPackage *const package, const EPUBSplitMethod method)
-  : EPUBPagedGenerator(package, method)
+EPUBDrawingGenerator::Impl::Impl(EPUBPackage *const package, const EPUBSplitMethod method, int version)
+  : EPUBPagedGenerator(package, method, version)
 {
 }
 
-EPUBDrawingGenerator::EPUBDrawingGenerator(EPUBPackage *const package, EPUBSplitMethod split)
-  : m_impl(new Impl(package, split))
+EPUBDrawingGenerator::EPUBDrawingGenerator(EPUBPackage *const package, EPUBSplitMethod split, int version)
+  : m_impl(new Impl(package, split, version))
 {
 }
 
diff --git a/src/lib/EPUBGenerator.cpp b/src/lib/EPUBGenerator.cpp
index 40ae0cc..4888677 100644
--- a/src/lib/EPUBGenerator.cpp
+++ b/src/lib/EPUBGenerator.cpp
@@ -25,7 +25,7 @@ using librevenge::RVNGPropertyFactory;
 using librevenge::RVNGPropertyList;
 using librevenge::RVNGString;
 
-EPUBGenerator::EPUBGenerator(EPUBPackage *const package, const EPUBSplitMethod split)
+EPUBGenerator::EPUBGenerator(EPUBPackage *const package, const EPUBSplitMethod split, int version)
   : m_package(package)
   , m_manifest()
   , m_htmlManager(m_manifest)
@@ -39,6 +39,7 @@ EPUBGenerator::EPUBGenerator(EPUBPackage *const package, const EPUBSplitMethod s
   , m_metadata()
   , m_currentHtml()
   , m_splitGuard(split)
+  , m_version(version)
 {
 }
 
@@ -190,7 +191,10 @@ void EPUBGenerator::writeRoot()
   packageAttrs.insert("xmlns:dc", "http://purl.org/dc/elements/1.1/");
   packageAttrs.insert("xmlns:dcterms", "http://purl.org/dc/terms/");
   packageAttrs.insert("xmlns:opf", "http://www.idpf.org/2007/opf");
-  packageAttrs.insert("version", RVNGPropertyFactory::newStringProp("2.0"));
+  if (m_version == 30)
+    packageAttrs.insert("version", RVNGPropertyFactory::newStringProp("3.0"));
+  else
+    packageAttrs.insert("version", RVNGPropertyFactory::newStringProp("2.0"));
   packageAttrs.insert("unique-identifier", uniqueId);
 
   sink.openElement("package", packageAttrs);
diff --git a/src/lib/EPUBGenerator.h b/src/lib/EPUBGenerator.h
index 51dd911..a0ef8ac 100644
--- a/src/lib/EPUBGenerator.h
+++ b/src/lib/EPUBGenerator.h
@@ -33,7 +33,7 @@ class EPUBGenerator
   EPUBGenerator &operator=(const EPUBGenerator &);
 
 public:
-  EPUBGenerator(EPUBPackage *package, EPUBSplitMethod method);
+  EPUBGenerator(EPUBPackage *package, EPUBSplitMethod method, int version);
   virtual ~EPUBGenerator();
 
   void startDocument(const librevenge::RVNGPropertyList &props);
@@ -75,6 +75,8 @@ private:
   EPUBHTMLGeneratorPtr_t m_currentHtml;
 
   EPUBSplitGuard m_splitGuard;
+
+  int m_version;
 };
 
 }
diff --git a/src/lib/EPUBPagedGenerator.cpp b/src/lib/EPUBPagedGenerator.cpp
index 913a592..6a3bff0 100644
--- a/src/lib/EPUBPagedGenerator.cpp
+++ b/src/lib/EPUBPagedGenerator.cpp
@@ -25,7 +25,7 @@ class EPUBPagedGenerator::Impl : public EPUBGenerator
   Impl &operator=(const Impl &);
 
 public:
-  Impl(EPUBPackage *const package, EPUBSplitMethod method);
+  Impl(EPUBPackage *const package, EPUBSplitMethod method, int version);
 
 private:
   void startHtmlFile() override;
@@ -35,8 +35,8 @@ public:
   bool m_firstPage;
 };
 
-EPUBPagedGenerator::Impl::Impl(EPUBPackage *const package, const EPUBSplitMethod method)
-  : EPUBGenerator(package, method)
+EPUBPagedGenerator::Impl::Impl(EPUBPackage *const package, const EPUBSplitMethod method, int version)
+  : EPUBGenerator(package, method, version)
   , m_firstPage(true)
 {
 }
@@ -59,8 +59,8 @@ void EPUBPagedGenerator::Impl::endHtmlFile()
 {
 }
 
-EPUBPagedGenerator::EPUBPagedGenerator(EPUBPackage *const package, const EPUBSplitMethod method)
-  : m_impl(new Impl(package, method))
+EPUBPagedGenerator::EPUBPagedGenerator(EPUBPackage *const package, const EPUBSplitMethod method, int version)
+  : m_impl(new Impl(package, method, version))
 {
 }
 
diff --git a/src/lib/EPUBPagedGenerator.h b/src/lib/EPUBPagedGenerator.h
index f1d124f..74d70da 100644
--- a/src/lib/EPUBPagedGenerator.h
+++ b/src/lib/EPUBPagedGenerator.h
@@ -26,7 +26,7 @@ class EPUBPagedGenerator: public librevenge::RVNGPresentationInterface
   class Impl;
 
 public:
-  EPUBPagedGenerator(EPUBPackage *package, EPUBSplitMethod method);
+  EPUBPagedGenerator(EPUBPackage *package, EPUBSplitMethod method, int version);
 
   void setSplitHeadingLevel(unsigned level);
   void setSplitSize(unsigned size);
diff --git a/src/lib/EPUBPresentationGenerator.cpp b/src/lib/EPUBPresentationGenerator.cpp
index 5b2a2e9..80b5ac2 100644
--- a/src/lib/EPUBPresentationGenerator.cpp
+++ b/src/lib/EPUBPresentationGenerator.cpp
@@ -20,16 +20,16 @@ using librevenge::RVNGString;
 class EPUBPresentationGenerator::Impl : public EPUBPagedGenerator
 {
 public:
-  Impl(EPUBPackage *const package, EPUBSplitMethod method);
+  Impl(EPUBPackage *const package, EPUBSplitMethod method, int version);
 };
 
-EPUBPresentationGenerator::Impl::Impl(EPUBPackage *const package, const EPUBSplitMethod method)
-  : EPUBPagedGenerator(package, method)
+EPUBPresentationGenerator::Impl::Impl(EPUBPackage *const package, const EPUBSplitMethod method, int version)
+  : EPUBPagedGenerator(package, method, version)
 {
 }
 
-EPUBPresentationGenerator::EPUBPresentationGenerator(EPUBPackage *const package, EPUBSplitMethod method)
-  : m_impl(new Impl(package, method))
+EPUBPresentationGenerator::EPUBPresentationGenerator(EPUBPackage *const package, EPUBSplitMethod method, int version)
+  : m_impl(new Impl(package, method, version))
 {
   (void) method;
 }
diff --git a/src/lib/EPUBTextGenerator.cpp b/src/lib/EPUBTextGenerator.cpp
index b3ca626..e8f785e 100644
--- a/src/lib/EPUBTextGenerator.cpp
+++ b/src/lib/EPUBTextGenerator.cpp
@@ -57,7 +57,7 @@ bool operator!=(const char *const left, const RVNGString &right)
 
 struct EPUBTextGenerator::Impl : public EPUBGenerator
 {
-  Impl(EPUBPackage *package, EPUBSplitMethod method);
+  Impl(EPUBPackage *package, EPUBSplitMethod method, int version);
 
 private:
   void startHtmlFile() override;
@@ -83,8 +83,8 @@ private:
   Impl &operator=(const Impl &);
 };
 
-EPUBTextGenerator::Impl::Impl(EPUBPackage *const package, const EPUBSplitMethod method)
-  : EPUBGenerator(package, method)
+EPUBTextGenerator::Impl::Impl(EPUBPackage *const package, const EPUBSplitMethod method, int version)
+  : EPUBGenerator(package, method, version)
   , m_inPageSpan(false)
   , m_inHeader(false)
   , m_inFooter(false)
@@ -113,8 +113,8 @@ void EPUBTextGenerator::Impl::endHtmlFile()
     m_currentFooter->write(getHtml().get());
 }
 
-EPUBTextGenerator::EPUBTextGenerator(EPUBPackage *const package, const EPUBSplitMethod method)
-  : m_impl(new Impl(package, method))
+EPUBTextGenerator::EPUBTextGenerator(EPUBPackage *const package, const EPUBSplitMethod method, int version)
+  : m_impl(new Impl(package, method, version))
 {
   (void) method;
 }
-- 
2.12.3

From cfd57f50c9d33781f90018d40902ccce68a13a5c Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Wed, 9 Aug 2017 17:19:06 +0200
Subject: [PATCH 6/9] EPUB3: write missing modification date

ERROR(RSC-005): test.epub/OEBPS/content.opf(2,236): Error while parsing file: package dcterms:modified meta element must occur exactly once

But not for EPUB2, which doesn't allow so.

(Similar story as with dc:title: later commit should read the this
optional info from librevenge.)
---
 src/lib/EPUBGenerator.cpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/lib/EPUBGenerator.cpp b/src/lib/EPUBGenerator.cpp
index 4888677..1628a2b 100644
--- a/src/lib/EPUBGenerator.cpp
+++ b/src/lib/EPUBGenerator.cpp
@@ -7,6 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <ctime>
 #include <sstream>
 
 #include <boost/uuid/uuid.hpp>
@@ -222,6 +223,23 @@ void EPUBGenerator::writeRoot()
   sink.insertCharacters("en");
   sink.closeElement("dc:language");
 
+  time_t now = 0;
+  time(&now);
+  const struct tm *local = localtime(&now);
+  if (m_version == 30 && local)
+  {
+    RVNGPropertyList metaAttrs;
+    metaAttrs.insert("property", "dcterms:modified");
+    sink.openElement("meta", metaAttrs);
+    const int MAX_BUFFER = 1024;
+    char buffer[MAX_BUFFER];
+    strftime(&buffer[0], MAX_BUFFER-1, "%Y-%m-%dT%H:%M:%SZ", local);
+    RVNGString result;
+    result.append(buffer);
+    sink.insertCharacters(result);
+    sink.closeElement("meta");
+  }
+
   sink.closeElement("metadata");
 
   sink.openElement("manifest");
-- 
2.12.3

From 575a09f637b5afe4d61387c7be3c8b2b67039ccb Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Wed, 9 Aug 2017 17:39:51 +0200
Subject: [PATCH 7/9] EPUB3: add missing nav property on first HTML stream

ERROR(RSC-005): test30.epub/OEBPS/content.opf(2,459): Error while parsing file: Exactly one manifest item must declare the 'nav' property (number of 'nav' items: 0).

This is the last error in OEBPS/content.opf in case of EPUB3.
---
 src/lib/EPUBGenerator.cpp    | 11 ++++++++---
 src/lib/EPUBGenerator.h      |  1 +
 src/lib/EPUBHTMLManager.cpp  |  9 +++++++--
 src/lib/EPUBHTMLManager.h    |  3 ++-
 src/lib/EPUBImageManager.cpp |  2 +-
 src/lib/EPUBManifest.cpp     | 11 +++++++----
 src/lib/EPUBManifest.h       |  5 +++--
 7 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/src/lib/EPUBGenerator.cpp b/src/lib/EPUBGenerator.cpp
index 1628a2b..f77aa6c 100644
--- a/src/lib/EPUBGenerator.cpp
+++ b/src/lib/EPUBGenerator.cpp
@@ -54,8 +54,8 @@ void EPUBGenerator::startDocument(const RVNGPropertyList &props)
 
   startNewHtmlFile();
 
-  m_manifest.insert(EPUBPath("OEBPS/toc.ncx"), "application/x-dtbncx+xml", "toc.ncx");
-  m_manifest.insert(m_stylesheetPath, "text/css", "stylesheet.css");
+  m_manifest.insert(EPUBPath("OEBPS/toc.ncx"), "application/x-dtbncx+xml", "toc.ncx", "");
+  m_manifest.insert(m_stylesheetPath, "text/css", "stylesheet.css", "");
 }
 
 void EPUBGenerator::endDocument()
@@ -90,7 +90,7 @@ void EPUBGenerator::startNewHtmlFile()
 
   m_splitGuard.onSplit();
 
-  m_currentHtml = m_htmlManager.create(m_imageManager, m_listStyleManager, m_paragraphStyleManager, m_spanStyleManager, m_tableStyleManager, m_stylesheetPath);
+  m_currentHtml = m_htmlManager.create(m_imageManager, m_listStyleManager, m_paragraphStyleManager, m_spanStyleManager, m_tableStyleManager, m_stylesheetPath, *this);
 
   // restore state in the new file
   m_currentHtml->startDocument(m_documentProps);
@@ -114,6 +114,11 @@ EPUBSplitGuard &EPUBGenerator::getSplitGuard()
   return m_splitGuard;
 }
 
+int EPUBGenerator::getVersion() const
+{
+  return m_version;
+}
+
 void EPUBGenerator::writeContainer()
 {
   EPUBXMLSink sink;
diff --git a/src/lib/EPUBGenerator.h b/src/lib/EPUBGenerator.h
index a0ef8ac..1a67a88 100644
--- a/src/lib/EPUBGenerator.h
+++ b/src/lib/EPUBGenerator.h
@@ -47,6 +47,7 @@ public:
 
   const EPUBSplitGuard &getSplitGuard() const;
   EPUBSplitGuard &getSplitGuard();
+  int getVersion() const;
 
 private:
   virtual void startHtmlFile() = 0;
diff --git a/src/lib/EPUBHTMLManager.cpp b/src/lib/EPUBHTMLManager.cpp
index 03dbf21..57636b9 100644
--- a/src/lib/EPUBHTMLManager.cpp
+++ b/src/lib/EPUBHTMLManager.cpp
@@ -13,6 +13,7 @@
 
 #include "EPUBHTMLManager.h"
 #include "EPUBManifest.h"
+#include "EPUBGenerator.h"
 
 namespace libepubgen
 {
@@ -26,7 +27,7 @@ EPUBHTMLManager::EPUBHTMLManager(EPUBManifest &manifest)
 {
 }
 
-const EPUBHTMLGeneratorPtr_t EPUBHTMLManager::create(EPUBImageManager &imageManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &stylesheetPath)
+const EPUBHTMLGeneratorPtr_t EPUBHTMLManager::create(EPUBImageManager &imageManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &stylesheetPath, const EPUBGenerator &generator)
 {
   std::ostringstream nameBuf;
   nameBuf << "section" << std::setw(4) << std::setfill('0') << m_number.next();
@@ -35,7 +36,11 @@ const EPUBHTMLGeneratorPtr_t EPUBHTMLManager::create(EPUBImageManager &imageMana
   nameBuf << ".html";
   m_paths.push_back(EPUBPath("OEBPS/sections") / nameBuf.str());
 
-  m_manifest.insert(m_paths.back(), "application/xhtml+xml", m_ids.back());
+  std::string properties;
+  if (m_number.current() == 1 && generator.getVersion() == 30)
+    // Only for the first HTML file.
+    properties = "nav";
+  m_manifest.insert(m_paths.back(), "application/xhtml+xml", m_ids.back(), properties);
 
   m_contents.push_back(EPUBXMLSink());
 
diff --git a/src/lib/EPUBHTMLManager.h b/src/lib/EPUBHTMLManager.h
index 84ecd2d..7dab33b 100644
--- a/src/lib/EPUBHTMLManager.h
+++ b/src/lib/EPUBHTMLManager.h
@@ -30,6 +30,7 @@ class EPUBSpanStyleManager;
 class EPUBTableStyleManager;
 class EPUBManifest;
 class EPUBPackage;
+class EPUBGenerator;
 
 class EPUBHTMLManager
 {
@@ -40,7 +41,7 @@ class EPUBHTMLManager
 public:
   explicit EPUBHTMLManager(EPUBManifest &manifest);
 
-  const EPUBHTMLGeneratorPtr_t create(EPUBImageManager &imageManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &stylesheetPath);
+  const EPUBHTMLGeneratorPtr_t create(EPUBImageManager &imageManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &stylesheetPath, const EPUBGenerator &generator);
 
   void writeTo(EPUBPackage &package);
 
diff --git a/src/lib/EPUBImageManager.cpp b/src/lib/EPUBImageManager.cpp
index 1b043d7..0179cad 100644
--- a/src/lib/EPUBImageManager.cpp
+++ b/src/lib/EPUBImageManager.cpp
@@ -86,7 +86,7 @@ const EPUBPath &EPUBImageManager::insert(const librevenge::RVNGBinaryData &data,
 
     const EPUBPath path(EPUBPath("OEBPS/images") / nameBuf.str());
 
-    m_manifest.insert(path, mime, id);
+    m_manifest.insert(path, mime, id, "");
     it = m_map.insert(MapType_t::value_type(data, path)).first;
   }
 
diff --git a/src/lib/EPUBManifest.cpp b/src/lib/EPUBManifest.cpp
index dcffdcc..813a097 100644
--- a/src/lib/EPUBManifest.cpp
+++ b/src/lib/EPUBManifest.cpp
@@ -21,9 +21,9 @@ EPUBManifest::EPUBManifest()
 {
 }
 
-void EPUBManifest::insert(const EPUBPath &path, const std::string &mimetype, const std::string &id)
+void EPUBManifest::insert(const EPUBPath &path, const std::string &mimetype, const std::string &id, const std::string &properties)
 {
-  if (!m_map.insert(MapType_t::value_type(path.relativeTo(EPUBPath("OEBPS/content.opf")).str(), ValueType_t(mimetype, id))).second)
+  if (!m_map.insert(MapType_t::value_type(path.relativeTo(EPUBPath("OEBPS/content.opf")).str(), ValueType_t(mimetype, id, properties))).second)
   {
     assert(!"duplicate entry!");
   }
@@ -35,8 +35,11 @@ void EPUBManifest::writeTo(EPUBXMLSink &sink)
   {
     librevenge::RVNGPropertyList attrs;
     attrs.insert("href", it->first.c_str());
-    attrs.insert("media-type", it->second.first.c_str());
-    attrs.insert("id", it->second.second.c_str());
+    attrs.insert("media-type", std::get<0>(it->second).c_str());
+    attrs.insert("id", std::get<1>(it->second).c_str());
+    const std::string &properties = std::get<2>(it->second);
+    if (!properties.empty())
+      attrs.insert("properties", properties.c_str());
     sink.insertEmptyElement("item", attrs);
   }
 }
diff --git a/src/lib/EPUBManifest.h b/src/lib/EPUBManifest.h
index f2379cf..c4c9031 100644
--- a/src/lib/EPUBManifest.h
+++ b/src/lib/EPUBManifest.h
@@ -26,13 +26,14 @@ class EPUBManifest
   EPUBManifest(const EPUBManifest &);
   EPUBManifest &operator=(const EPUBManifest &);
 
-  typedef std::pair<std::string, std::string> ValueType_t;
+  // media-type, id, properties
+  typedef std::tuple<std::string, std::string, std::string> ValueType_t;
   typedef std::unordered_map<std::string, ValueType_t> MapType_t;
 
 public:
   EPUBManifest();
 
-  void insert(const EPUBPath &path, const std::string &mimetype, const std::string &id);
+  void insert(const EPUBPath &path, const std::string &mimetype, const std::string &id, const std::string &properties);
 
   void writeTo(EPUBXMLSink &sink);
 
-- 
2.12.3

From 28090aa5d57162302122686cb020d4bf2231cab4 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Thu, 10 Aug 2017 15:05:46 +0200
Subject: [PATCH 8/9] EPUB3: implement navigation document

As
<http://www.idpf.org/epub/30/spec/epub30-changes.html#sec-new-changed-nav>
says, EPUB 3 defines a new grammar for navigation based on XHTML, which
replaces the old NCX grammar -- so use that in EPUB3 mode.

With this, a hello world input in EPUB3 mode results in 0 errors in the
validator.
---
 src/lib/EPUBGenerator.cpp   | 43 ++++++++++++++++++++++++++++++++++++++-----
 src/lib/EPUBHTMLManager.cpp | 28 +++++++++++++++++++++-------
 src/lib/EPUBHTMLManager.h   |  4 ++--
 3 files changed, 61 insertions(+), 14 deletions(-)

diff --git a/src/lib/EPUBGenerator.cpp b/src/lib/EPUBGenerator.cpp
index f77aa6c..7ec2a2b 100644
--- a/src/lib/EPUBGenerator.cpp
+++ b/src/lib/EPUBGenerator.cpp
@@ -54,7 +54,10 @@ void EPUBGenerator::startDocument(const RVNGPropertyList &props)
 
   startNewHtmlFile();
 
-  m_manifest.insert(EPUBPath("OEBPS/toc.ncx"), "application/x-dtbncx+xml", "toc.ncx", "");
+  if (m_version == 30)
+    m_manifest.insert(EPUBPath("OEBPS/toc.html"), "application/xhtml+xml", "toc.html", "nav");
+  else
+    m_manifest.insert(EPUBPath("OEBPS/toc.ncx"), "application/x-dtbncx+xml", "toc.ncx", "");
   m_manifest.insert(m_stylesheetPath, "text/css", "stylesheet.css", "");
 }
 
@@ -90,7 +93,7 @@ void EPUBGenerator::startNewHtmlFile()
 
   m_splitGuard.onSplit();
 
-  m_currentHtml = m_htmlManager.create(m_imageManager, m_listStyleManager, m_paragraphStyleManager, m_spanStyleManager, m_tableStyleManager, m_stylesheetPath, *this);
+  m_currentHtml = m_htmlManager.create(m_imageManager, m_listStyleManager, m_paragraphStyleManager, m_spanStyleManager, m_tableStyleManager, m_stylesheetPath);
 
   // restore state in the new file
   m_currentHtml->startDocument(m_documentProps);
@@ -144,9 +147,38 @@ void EPUBGenerator::writeContainer()
 
 void EPUBGenerator::writeNavigation()
 {
-  const EPUBPath path("OEBPS/toc.ncx");
   EPUBXMLSink sink;
 
+  if (m_version == 30)
+  {
+    const EPUBPath path("OEBPS/toc.html");
+    RVNGPropertyList htmlAttrs;
+    htmlAttrs.insert("xmlns", "http://www.w3.org/1999/xhtml");
+    htmlAttrs.insert("xmlns:epub", "http://www.idpf.org/2007/ops");
+    sink.openElement("html", htmlAttrs);
+
+    sink.openElement("head");
+    sink.closeElement("head");
+    sink.openElement("body");
+
+    RVNGPropertyList navAttrs;
+    navAttrs.insert("epub:type", "toc");
+    sink.openElement("nav", navAttrs);
+
+    sink.openElement("ol");
+    m_htmlManager.writeTocTo(sink, path, m_version);
+    sink.closeElement("ol");
+
+    sink.closeElement("nav");
+    sink.closeElement("body");
+    sink.closeElement("html");
+
+    sink.writeTo(*m_package, path.str().c_str());
+
+    return;
+  }
+
+  const EPUBPath path("OEBPS/toc.ncx");
   RVNGPropertyList ncxAttrs;
   ncxAttrs.insert("xmlns", "http://www.daisy.org/z3986/2005/ncx/");
   ncxAttrs.insert("version", "2005-1");
@@ -166,7 +198,7 @@ void EPUBGenerator::writeNavigation()
   sink.closeElement("docTitle");
 
   sink.openElement("navMap");
-  m_htmlManager.writeTocTo(sink, path);
+  m_htmlManager.writeTocTo(sink, path, m_version);
   sink.closeElement("navMap");
 
   sink.closeElement("ncx");
@@ -252,7 +284,8 @@ void EPUBGenerator::writeRoot()
   sink.closeElement("manifest");
 
   RVNGPropertyList spineAttrs;
-  spineAttrs.insert("toc", "toc.ncx");
+  if (m_version == 20)
+    spineAttrs.insert("toc", "toc.ncx");
 
   sink.openElement("spine", spineAttrs);
   m_htmlManager.writeSpineTo(sink);
diff --git a/src/lib/EPUBHTMLManager.cpp b/src/lib/EPUBHTMLManager.cpp
index 57636b9..7b17304 100644
--- a/src/lib/EPUBHTMLManager.cpp
+++ b/src/lib/EPUBHTMLManager.cpp
@@ -27,7 +27,7 @@ EPUBHTMLManager::EPUBHTMLManager(EPUBManifest &manifest)
 {
 }
 
-const EPUBHTMLGeneratorPtr_t EPUBHTMLManager::create(EPUBImageManager &imageManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &stylesheetPath, const EPUBGenerator &generator)
+const EPUBHTMLGeneratorPtr_t EPUBHTMLManager::create(EPUBImageManager &imageManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &stylesheetPath)
 {
   std::ostringstream nameBuf;
   nameBuf << "section" << std::setw(4) << std::setfill('0') << m_number.next();
@@ -36,11 +36,7 @@ const EPUBHTMLGeneratorPtr_t EPUBHTMLManager::create(EPUBImageManager &imageMana
   nameBuf << ".html";
   m_paths.push_back(EPUBPath("OEBPS/sections") / nameBuf.str());
 
-  std::string properties;
-  if (m_number.current() == 1 && generator.getVersion() == 30)
-    // Only for the first HTML file.
-    properties = "nav";
-  m_manifest.insert(m_paths.back(), "application/xhtml+xml", m_ids.back(), properties);
+  m_manifest.insert(m_paths.back(), "application/xhtml+xml", m_ids.back(), "");
 
   m_contents.push_back(EPUBXMLSink());
 
@@ -71,8 +67,26 @@ void EPUBHTMLManager::writeSpineTo(EPUBXMLSink &sink)
   }
 }
 
-void EPUBHTMLManager::writeTocTo(EPUBXMLSink &sink, const EPUBPath &tocPath)
+void EPUBHTMLManager::writeTocTo(EPUBXMLSink &sink, const EPUBPath &tocPath, int version)
 {
+  if (version == 30)
+  {
+    for (std::vector<EPUBPath>::size_type i = 0; m_paths.size() != i; ++i)
+    {
+      sink.openElement("li");
+      librevenge::RVNGPropertyList anchorAttrs;
+      anchorAttrs.insert("href", m_paths[i].relativeTo(tocPath).str().c_str());
+      sink.openElement("a", anchorAttrs);
+      std::ostringstream label;
+      label << "Section " << (i + 1);
+      sink.insertCharacters(label.str().c_str());
+      sink.closeElement("a");
+      sink.closeElement("li");
+    }
+
+    return;
+  }
+
   librevenge::RVNGPropertyList navPointAttrs;
   for (std::vector<EPUBPath>::size_type i = 0; m_paths.size() != i; ++i)
   {
diff --git a/src/lib/EPUBHTMLManager.h b/src/lib/EPUBHTMLManager.h
index 7dab33b..2ec7bb7 100644
--- a/src/lib/EPUBHTMLManager.h
+++ b/src/lib/EPUBHTMLManager.h
@@ -41,12 +41,12 @@ class EPUBHTMLManager
 public:
   explicit EPUBHTMLManager(EPUBManifest &manifest);
 
-  const EPUBHTMLGeneratorPtr_t create(EPUBImageManager &imageManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &stylesheetPath, const EPUBGenerator &generator);
+  const EPUBHTMLGeneratorPtr_t create(EPUBImageManager &imageManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &stylesheetPath);
 
   void writeTo(EPUBPackage &package);
 
   void writeSpineTo(EPUBXMLSink &sink);
-  void writeTocTo(EPUBXMLSink &sink, const EPUBPath &tocPath);
+  void writeTocTo(EPUBXMLSink &sink, const EPUBPath &tocPath, int version);
 
 private:
   EPUBManifest &m_manifest;
-- 
2.12.3

From 2e9e9af9f49a78cca75d3c862c8dd4b5f7cc7eb2 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Thu, 10 Aug 2017 15:11:49 +0200
Subject: [PATCH 9/9] Use .xhtml for XHTML content

The EPUB3 validator warns:

WARNING(HTM-014a): test30.epub/OEBPS/content.opf(2,718): XHTML Content Document file name 'OEBPS/sections/section0001.html' should have the extension '.xhtml'.

And it does not hurt for EPUB2, either.
---
 src/lib/EPUBGenerator.cpp   | 4 ++--
 src/lib/EPUBHTMLManager.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/EPUBGenerator.cpp b/src/lib/EPUBGenerator.cpp
index 7ec2a2b..ca05ea7 100644
--- a/src/lib/EPUBGenerator.cpp
+++ b/src/lib/EPUBGenerator.cpp
@@ -55,7 +55,7 @@ void EPUBGenerator::startDocument(const RVNGPropertyList &props)
   startNewHtmlFile();
 
   if (m_version == 30)
-    m_manifest.insert(EPUBPath("OEBPS/toc.html"), "application/xhtml+xml", "toc.html", "nav");
+    m_manifest.insert(EPUBPath("OEBPS/toc.xhtml"), "application/xhtml+xml", "toc.xhtml", "nav");
   else
     m_manifest.insert(EPUBPath("OEBPS/toc.ncx"), "application/x-dtbncx+xml", "toc.ncx", "");
   m_manifest.insert(m_stylesheetPath, "text/css", "stylesheet.css", "");
@@ -151,7 +151,7 @@ void EPUBGenerator::writeNavigation()
 
   if (m_version == 30)
   {
-    const EPUBPath path("OEBPS/toc.html");
+    const EPUBPath path("OEBPS/toc.xhtml");
     RVNGPropertyList htmlAttrs;
     htmlAttrs.insert("xmlns", "http://www.w3.org/1999/xhtml");
     htmlAttrs.insert("xmlns:epub", "http://www.idpf.org/2007/ops");
diff --git a/src/lib/EPUBHTMLManager.cpp b/src/lib/EPUBHTMLManager.cpp
index 7b17304..be56cc7 100644
--- a/src/lib/EPUBHTMLManager.cpp
+++ b/src/lib/EPUBHTMLManager.cpp
@@ -33,7 +33,7 @@ const EPUBHTMLGeneratorPtr_t EPUBHTMLManager::create(EPUBImageManager &imageMana
   nameBuf << "section" << std::setw(4) << std::setfill('0') << m_number.next();
   m_ids.push_back(nameBuf.str());
 
-  nameBuf << ".html";
+  nameBuf << ".xhtml";
   m_paths.push_back(EPUBPath("OEBPS/sections") / nameBuf.str());
 
   m_manifest.insert(m_paths.back(), "application/xhtml+xml", m_ids.back(), "");
-- 
2.12.3

From c30bc184c18837203e9f249386711e9cd616c9f0 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Fri, 11 Aug 2017 10:50:47 +0200
Subject: [PATCH] EPUB3: write the deprecated NCX navication as well

<http://www.idpf.org/epub/30/spec/epub30-changes.html#sec-new-changed-nav>
"3.2 Navigation" says:

	EPUB 3 Publications may include the EPUB 2 NCX for EPUB 2 Reading System
	forward compatibility purposes.
---
 src/lib/EPUBGenerator.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/lib/EPUBGenerator.cpp b/src/lib/EPUBGenerator.cpp
index ca05ea7..8017ffe 100644
--- a/src/lib/EPUBGenerator.cpp
+++ b/src/lib/EPUBGenerator.cpp
@@ -56,8 +56,7 @@ void EPUBGenerator::startDocument(const RVNGPropertyList &props)
 
   if (m_version == 30)
     m_manifest.insert(EPUBPath("OEBPS/toc.xhtml"), "application/xhtml+xml", "toc.xhtml", "nav");
-  else
-    m_manifest.insert(EPUBPath("OEBPS/toc.ncx"), "application/x-dtbncx+xml", "toc.ncx", "");
+  m_manifest.insert(EPUBPath("OEBPS/toc.ncx"), "application/x-dtbncx+xml", "toc.ncx", "");
   m_manifest.insert(m_stylesheetPath, "text/css", "stylesheet.css", "");
 }
 
@@ -147,10 +146,10 @@ void EPUBGenerator::writeContainer()
 
 void EPUBGenerator::writeNavigation()
 {
-  EPUBXMLSink sink;
-
   if (m_version == 30)
   {
+    EPUBXMLSink sink;
+
     const EPUBPath path("OEBPS/toc.xhtml");
     RVNGPropertyList htmlAttrs;
     htmlAttrs.insert("xmlns", "http://www.w3.org/1999/xhtml");
@@ -174,10 +173,10 @@ void EPUBGenerator::writeNavigation()
     sink.closeElement("html");
 
     sink.writeTo(*m_package, path.str().c_str());
-
-    return;
   }
 
+  EPUBXMLSink sink;
+
   const EPUBPath path("OEBPS/toc.ncx");
   RVNGPropertyList ncxAttrs;
   ncxAttrs.insert("xmlns", "http://www.daisy.org/z3986/2005/ncx/");
@@ -198,7 +197,9 @@ void EPUBGenerator::writeNavigation()
   sink.closeElement("docTitle");
 
   sink.openElement("navMap");
-  m_htmlManager.writeTocTo(sink, path, m_version);
+  // In case of EPUB3 the (deprecated, but valid) EPUB2 markup is wanted, so
+  // the version is unconditional here.
+  m_htmlManager.writeTocTo(sink, path, /*version=*/20);
   sink.closeElement("navMap");
 
   sink.closeElement("ncx");
@@ -284,8 +285,7 @@ void EPUBGenerator::writeRoot()
   sink.closeElement("manifest");
 
   RVNGPropertyList spineAttrs;
-  if (m_version == 20)
-    spineAttrs.insert("toc", "toc.ncx");
+  spineAttrs.insert("toc", "toc.ncx");
 
   sink.openElement("spine", spineAttrs);
   m_htmlManager.writeSpineTo(sink);
-- 
2.12.3

From d855721de6b4e55fb0b2a02a6a1132802dba5f63 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Fri, 11 Aug 2017 15:40:49 +0200
Subject: [PATCH] EPUBGenerator: write title into content.opf

---
 src/lib/EPUBGenerator.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/lib/EPUBGenerator.cpp b/src/lib/EPUBGenerator.cpp
index 8017ffe..056c48c 100644
--- a/src/lib/EPUBGenerator.cpp
+++ b/src/lib/EPUBGenerator.cpp
@@ -253,8 +253,11 @@ void EPUBGenerator::writeRoot()
 
   // Zero-width space as it must be at least one character in length after
   // white space has been trimmed.
+  RVNGString title("\u200b");
+  if (m_metadata["dc:title"] && !m_metadata["dc:title"]->getStr().empty())
+    title = m_metadata["dc:title"]->getStr();
   sink.openElement("dc:title");
-  sink.insertCharacters("\u200b");
+  sink.insertCharacters(title);
   sink.closeElement("dc:title");
 
   sink.openElement("dc:language");
-- 
2.12.3

From 14da42819f1f96b87b2337da395e5ad6639dcebe Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Fri, 11 Aug 2017 16:43:10 +0200
Subject: [PATCH] EPUBGenerator: write language and modification date into
 content.opf

With this, all metadata which had a hardcoded value is now parsed and
the old values are just defaults.
---
 src/lib/EPUBGenerator.cpp | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/lib/EPUBGenerator.cpp b/src/lib/EPUBGenerator.cpp
index 056c48c..fc6c848 100644
--- a/src/lib/EPUBGenerator.cpp
+++ b/src/lib/EPUBGenerator.cpp
@@ -260,24 +260,34 @@ void EPUBGenerator::writeRoot()
   sink.insertCharacters(title);
   sink.closeElement("dc:title");
 
+  RVNGString language("en");
+  if (m_metadata["dc:language"] && !m_metadata["dc:language"]->getStr().empty())
+    language = m_metadata["dc:language"]->getStr();
   sink.openElement("dc:language");
-  sink.insertCharacters("en");
+  sink.insertCharacters(language);
   sink.closeElement("dc:language");
 
-  time_t now = 0;
-  time(&now);
-  const struct tm *local = localtime(&now);
-  if (m_version == 30 && local)
+  if (m_version == 30)
   {
+    RVNGString date;
+    time_t now = 0;
+    time(&now);
+    const struct tm *local = localtime(&now);
+    if (local)
+    {
+      const int MAX_BUFFER = 1024;
+      char buffer[MAX_BUFFER];
+      strftime(&buffer[0], MAX_BUFFER-1, "%Y-%m-%dT%H:%M:%SZ", local);
+      date.append(buffer);
+    }
+
+    if (m_metadata["dc:date"] && !m_metadata["dc:date"]->getStr().empty())
+      date = m_metadata["dc:date"]->getStr();
+
     RVNGPropertyList metaAttrs;
     metaAttrs.insert("property", "dcterms:modified");
     sink.openElement("meta", metaAttrs);
-    const int MAX_BUFFER = 1024;
-    char buffer[MAX_BUFFER];
-    strftime(&buffer[0], MAX_BUFFER-1, "%Y-%m-%dT%H:%M:%SZ", local);
-    RVNGString result;
-    result.append(buffer);
-    sink.insertCharacters(result);
+    sink.insertCharacters(date);
     sink.closeElement("meta");
   }
 
-- 
2.12.3
From c8cba54a7025ee0f1129233912f6e9ceda254c64 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Fri, 11 Aug 2017 17:40:10 +0200
Subject: [PATCH] EPUB3: fix validation error with doc modified date format

ERROR(RSC-005): test.epub/OEBPS/content.opf(2,420): Error while parsing file: dcterms:modified illegal syntax (expecting: 'CCYY-MM-DDThh:mm:ssZ')

Both of them looked like XML date formats, but actually librevenge is
more precise, so truncate it.
---
 src/lib/EPUBGenerator.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/lib/EPUBGenerator.cpp b/src/lib/EPUBGenerator.cpp
index fc6c848..4bffb8b 100644
--- a/src/lib/EPUBGenerator.cpp
+++ b/src/lib/EPUBGenerator.cpp
@@ -282,7 +282,11 @@ void EPUBGenerator::writeRoot()
     }
 
     if (m_metadata["dc:date"] && !m_metadata["dc:date"]->getStr().empty())
-      date = m_metadata["dc:date"]->getStr();
+    {
+      // Expecting CCYY-MM-DDThh:mm:ssZ, librevenge provides CCYY-MM-DDThh:mm:ss.sssssssss
+      date = std::string(m_metadata["dc:date"]->getStr().cstr()).substr(0, 19).c_str();
+      date.append("Z");
+    }
 
     RVNGPropertyList metaAttrs;
     metaAttrs.insert("property", "dcterms:modified");
-- 
2.12.3

From c28f02f21a6d80ad258cf8f052705508567e2418 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Fri, 11 Aug 2017 18:19:15 +0200
Subject: [PATCH 1/3] Fix image mime-type key

libepubgen expected librevenge:mimetype, but:

1) LO's ODF output has loext:mime-type
2) libabw generates librevenge:mime-type
3) libodfgen expects librevenge:mime-type

So probably this one has to be adjusted.
---
 src/lib/EPUBHTMLGenerator.cpp | 2 +-
 src/lib/EPUBTextGenerator.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/EPUBHTMLGenerator.cpp b/src/lib/EPUBHTMLGenerator.cpp
index 5ef5e14..40c507e 100644
--- a/src/lib/EPUBHTMLGenerator.cpp
+++ b/src/lib/EPUBHTMLGenerator.cpp
@@ -866,7 +866,7 @@ void EPUBHTMLGenerator::insertBinaryObject(const RVNGPropertyList &propList)
 
   const EPUBPath &path = m_impl->m_imageManager.insert(
                            RVNGBinaryData(propList["office:binary-data"]->getStr()),
-                           propList["librevenge:mimetype"]->getStr());
+                           propList["librevenge:mime-type"]->getStr());
 
   RVNGPropertyList attrs;
   attrs.insert("src", path.relativeTo(m_impl->m_path).str().c_str());
diff --git a/src/lib/EPUBTextGenerator.cpp b/src/lib/EPUBTextGenerator.cpp
index e8f785e..cb557b2 100644
--- a/src/lib/EPUBTextGenerator.cpp
+++ b/src/lib/EPUBTextGenerator.cpp
@@ -596,7 +596,7 @@ void EPUBTextGenerator::insertBinaryObject(const librevenge::RVNGPropertyList &p
 
   for (RVNGPropertyList::Iter iter(propList); !iter.last(); iter.next())
   {
-    if (RVNGString("librevenge:mimetype") == iter.key())
+    if (RVNGString("librevenge:mime-type") == iter.key())
       mimetype.reset(iter()->clone());
     else if (RVNGString("office:binary-data") == iter.key())
       data.reset(iter()->clone());
@@ -627,7 +627,7 @@ void EPUBTextGenerator::insertBinaryObject(const librevenge::RVNGPropertyList &p
     }
   }
 
-  newPropList.insert("librevenge:mimetype", mimetype->clone());
+  newPropList.insert("librevenge:mime-type", mimetype->clone());
   newPropList.insert("office:binary-data", data->clone());
 
   if (m_impl->m_inHeader || m_impl->m_inFooter)
-- 
2.12.3

From 39470cf360cfc67f2dd078646162a63168a84c05 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Tue, 15 Aug 2017 12:12:12 +0200
Subject: [PATCH 2/3] EPUBSplitGuard: fix tracking current size

In case incrementing size and split affects the reference size, the
current size won't be ever greather than zero in
EPUBSplitGuard::canSplit(), and it will always return false.

With this, EPUB_SPLIT_METHOD_PAGE_BREAK works again.
---
 src/lib/EPUBSplitGuard.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/EPUBSplitGuard.cpp b/src/lib/EPUBSplitGuard.cpp
index 8c279c8..15ba20f 100644
--- a/src/lib/EPUBSplitGuard.cpp
+++ b/src/lib/EPUBSplitGuard.cpp
@@ -46,7 +46,7 @@ void EPUBSplitGuard::closeLevel()
 
 void EPUBSplitGuard::incrementSize(const unsigned size)
 {
-  m_size += size;
+  m_currentSize += size;
 }
 
 bool EPUBSplitGuard::splitOnPageBreak() const
@@ -66,7 +66,7 @@ bool EPUBSplitGuard::splitOnSize() const
 
 void EPUBSplitGuard::onSplit()
 {
-  m_size = 0;
+  m_currentSize = 0;
 }
 
 bool EPUBSplitGuard::canSplit(const EPUBSplitMethod method) const
-- 
2.12.3

From 3155cb6164f04fa8170dd9912c579ad90586c8a8 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Tue, 15 Aug 2017 13:53:16 +0200
Subject: [PATCH 3/3] EPUBTextGenerator: handle EPUB_SPLIT_METHOD_HEADING

It seems to me this was unimplemented so far.
---
 src/lib/EPUBTextGenerator.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/lib/EPUBTextGenerator.cpp b/src/lib/EPUBTextGenerator.cpp
index cb557b2..aba8827 100644
--- a/src/lib/EPUBTextGenerator.cpp
+++ b/src/lib/EPUBTextGenerator.cpp
@@ -255,6 +255,12 @@ void EPUBTextGenerator::openParagraph(const librevenge::RVNGPropertyList &propLi
   m_impl->m_breakAfterPara = breakAfter && ("column" != breakAfter->getStr());
   if (m_impl->getSplitGuard().splitOnSize())
     m_impl->startNewHtmlFile();
+
+  // Handle split by chapters.
+  const RVNGProperty *const outlineLevel = propList["text:outline-level"];
+  if (outlineLevel && m_impl->getSplitGuard().splitOnHeading(outlineLevel->getInt()))
+    m_impl->startNewHtmlFile();
+
   m_impl->getSplitGuard().openLevel();
 
   if (m_impl->m_inHeader || m_impl->m_inFooter)
-- 
2.12.3

From 576c2472e384ea1a71739b15f42561cd34de5bba Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Wed, 16 Aug 2017 17:52:37 +0200
Subject: [PATCH] EPUB_SPLIT_METHOD_HEADING: try to use real chapter names, not
 Section N

What users call "chapter title" is the text of a paragraph with an
outline level set.

To keep this simple just handle the text after opening such a paragraph,
but no other paragraph is opened, i.e. assume that in:

<para outline=y>A<para outline=n>B</para>C</para>

only A is interesting, but not B, neither C. (Which could happen with an
at-character anchored frame inside a heading text e.g.)
---
 src/lib/EPUBGenerator.cpp     |  5 +++++
 src/lib/EPUBGenerator.h       |  2 ++
 src/lib/EPUBHTMLManager.cpp   | 26 ++++++++++++++++++++++++--
 src/lib/EPUBHTMLManager.h     |  3 +++
 src/lib/EPUBPath.cpp          | 11 +++++++++++
 src/lib/EPUBPath.h            |  4 ++++
 src/lib/EPUBTextGenerator.cpp |  6 ++++++
 7 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/src/lib/EPUBGenerator.cpp b/src/lib/EPUBGenerator.cpp
index 4bffb8b..4ce2964 100644
--- a/src/lib/EPUBGenerator.cpp
+++ b/src/lib/EPUBGenerator.cpp
@@ -106,6 +106,11 @@ const EPUBHTMLGeneratorPtr_t &EPUBGenerator::getHtml() const
   return m_currentHtml;
 }
 
+EPUBHTMLManager &EPUBGenerator::getHtmlManager()
+{
+  return m_htmlManager;
+}
+
 const EPUBSplitGuard &EPUBGenerator::getSplitGuard() const
 {
   return m_splitGuard;
diff --git a/src/lib/EPUBGenerator.h b/src/lib/EPUBGenerator.h
index 1a67a88..f98c80f 100644
--- a/src/lib/EPUBGenerator.h
+++ b/src/lib/EPUBGenerator.h
@@ -45,6 +45,8 @@ public:
 
   const EPUBHTMLGeneratorPtr_t &getHtml() const;
 
+  EPUBHTMLManager &getHtmlManager();
+
   const EPUBSplitGuard &getSplitGuard() const;
   EPUBSplitGuard &getSplitGuard();
   int getVersion() const;
diff --git a/src/lib/EPUBHTMLManager.cpp b/src/lib/EPUBHTMLManager.cpp
index be56cc7..5141f31 100644
--- a/src/lib/EPUBHTMLManager.cpp
+++ b/src/lib/EPUBHTMLManager.cpp
@@ -18,6 +18,20 @@
 namespace libepubgen
 {
 
+namespace
+{
+
+/// Extracts a title string from a path and provides a fallback if it would be empty.
+void getPathTitle(std::ostringstream &label, const EPUBPath &path, std::vector<EPUBPath>::size_type index)
+{
+  if (path.getTitle().empty())
+    label << "Section " << (index + 1);
+  else
+    label << path.getTitle();
+}
+
+}
+
 EPUBHTMLManager::EPUBHTMLManager(EPUBManifest &manifest)
   : m_manifest(manifest)
   , m_paths()
@@ -78,7 +92,7 @@ void EPUBHTMLManager::writeTocTo(EPUBXMLSink &sink, const EPUBPath &tocPath, int
       anchorAttrs.insert("href", m_paths[i].relativeTo(tocPath).str().c_str());
       sink.openElement("a", anchorAttrs);
       std::ostringstream label;
-      label << "Section " << (i + 1);
+      getPathTitle(label, m_paths[i], i);
       sink.insertCharacters(label.str().c_str());
       sink.closeElement("a");
       sink.closeElement("li");
@@ -101,7 +115,7 @@ void EPUBHTMLManager::writeTocTo(EPUBXMLSink &sink, const EPUBPath &tocPath, int
     sink.openElement("navLabel");
     sink.openElement("text");
     std::ostringstream label;
-    label << "Section " << (i + 1);
+    getPathTitle(label, m_paths[i], i);
     sink.insertCharacters(label.str().c_str());
     sink.closeElement("text");
     sink.closeElement("navLabel");
@@ -112,6 +126,14 @@ void EPUBHTMLManager::writeTocTo(EPUBXMLSink &sink, const EPUBPath &tocPath, int
   }
 }
 
+void EPUBHTMLManager::insertHeadingText(const std::string &text)
+{
+  if (m_paths.empty())
+    return;
+
+  m_paths.back().appendTitle(text);
+}
+
 }
 
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/EPUBHTMLManager.h b/src/lib/EPUBHTMLManager.h
index 2ec7bb7..6b480c4 100644
--- a/src/lib/EPUBHTMLManager.h
+++ b/src/lib/EPUBHTMLManager.h
@@ -48,6 +48,9 @@ public:
   void writeSpineTo(EPUBXMLSink &sink);
   void writeTocTo(EPUBXMLSink &sink, const EPUBPath &tocPath, int version);
 
+  /// Appends text to the title of the current heading.
+  void insertHeadingText(const std::string &text);
+
 private:
   EPUBManifest &m_manifest;
   std::vector<EPUBPath> m_paths;
diff --git a/src/lib/EPUBPath.cpp b/src/lib/EPUBPath.cpp
index 9def6f6..e1c05ed 100644
--- a/src/lib/EPUBPath.cpp
+++ b/src/lib/EPUBPath.cpp
@@ -53,6 +53,7 @@ EPUBPath::Relative::Relative(const std::vector<std::string> &components)
 
 EPUBPath::EPUBPath(const std::string &path)
   : m_components()
+  , m_title()
 {
   const std::string trimmed(algorithm::trim_left_copy_if(path, algorithm::is_any_of("/")));
   algorithm::split(m_components, trimmed, algorithm::is_any_of("/"), algorithm::token_compress_on);
@@ -110,6 +111,16 @@ const EPUBPath::Relative EPUBPath::relativeTo(const EPUBPath &base) const
   return Relative(components);
 }
 
+void EPUBPath::appendTitle(const std::string &title)
+{
+  m_title += title;
+}
+
+std::string EPUBPath::getTitle() const
+{
+  return m_title;
+}
+
 bool operator==(const EPUBPath &left, const EPUBPath &right)
 {
   return left.m_components == right.m_components;
diff --git a/src/lib/EPUBPath.h b/src/lib/EPUBPath.h
index 18bf058..12b8f25 100644
--- a/src/lib/EPUBPath.h
+++ b/src/lib/EPUBPath.h
@@ -48,8 +48,12 @@ public:
 
   const Relative relativeTo(const EPUBPath &base) const;
 
+  void appendTitle(const std::string &title);
+  std::string getTitle() const;
+
 private:
   std::vector<std::string> m_components;
+  std::string m_title;
 };
 
 bool operator==(const EPUBPath &left, const EPUBPath &right);
diff --git a/src/lib/EPUBTextGenerator.cpp b/src/lib/EPUBTextGenerator.cpp
index aba8827..b1e33f8 100644
--- a/src/lib/EPUBTextGenerator.cpp
+++ b/src/lib/EPUBTextGenerator.cpp
@@ -67,6 +67,7 @@ public:
   bool m_inPageSpan;
   bool m_inHeader;
   bool m_inFooter;
+  bool m_inHeading;
 
   RVNGPropertyList m_pageSpanProps;
   shared_ptr<EPUBTextElements> m_currentHeader;
@@ -88,6 +89,7 @@ EPUBTextGenerator::Impl::Impl(EPUBPackage *const package, const EPUBSplitMethod
   , m_inPageSpan(false)
   , m_inHeader(false)
   , m_inFooter(false)
+  , m_inHeading(false)
   , m_pageSpanProps()
   , m_currentHeader()
   , m_currentFooter()
@@ -260,6 +262,7 @@ void EPUBTextGenerator::openParagraph(const librevenge::RVNGPropertyList &propLi
   const RVNGProperty *const outlineLevel = propList["text:outline-level"];
   if (outlineLevel && m_impl->getSplitGuard().splitOnHeading(outlineLevel->getInt()))
     m_impl->startNewHtmlFile();
+  m_impl->m_inHeading = outlineLevel != nullptr;
 
   m_impl->getSplitGuard().openLevel();
 
@@ -366,6 +369,9 @@ void EPUBTextGenerator::insertText(const librevenge::RVNGString &text)
   if (m_impl->m_inHeader || m_impl->m_inFooter)
     m_impl->m_currentHeaderOrFooter->addInsertText(text);
 
+  if (m_impl->m_inHeading)
+    m_impl->getHtmlManager().insertHeadingText(text.cstr());
+
   m_impl->getSplitGuard().incrementSize(text.len());
 
   m_impl->getHtml()->insertText(text);
-- 
2.12.3

From 8a3cc9733f567864ad0658cf1a25c60d5e7205a6 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Thu, 17 Aug 2017 12:01:44 +0200
Subject: [PATCH] EPUB_SPLIT_METHOD_HEADING: fix unexpected text in chapter
 names

We used to add text for all headings for the chapter name, but if we
split on heading 1, then text of heading2+ should not be included.
---
 src/lib/EPUBSplitGuard.cpp    | 14 ++++++++++++++
 src/lib/EPUBSplitGuard.h      |  3 +++
 src/lib/EPUBTextGenerator.cpp |  6 ++----
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/lib/EPUBSplitGuard.cpp b/src/lib/EPUBSplitGuard.cpp
index 15ba20f..25eae87 100644
--- a/src/lib/EPUBSplitGuard.cpp
+++ b/src/lib/EPUBSplitGuard.cpp
@@ -18,6 +18,7 @@ static const unsigned DEFAULT_SPLIT_SIZE = 1 << 16;
 EPUBSplitGuard::EPUBSplitGuard(const EPUBSplitMethod method)
   : m_method(method)
   , m_headingLevel(DEFAULT_SPLIT_HEADING_LEVEL)
+  , m_currentHeadingLevel(0)
   , m_size(DEFAULT_SPLIT_SIZE)
   , m_currentSize(0)
   , m_nestingLevel(0)
@@ -29,6 +30,11 @@ void EPUBSplitGuard::setSplitHeadingLevel(const unsigned level)
   m_headingLevel = level;
 }
 
+void EPUBSplitGuard::setCurrentHeadingLevel(const unsigned level)
+{
+  m_currentHeadingLevel = level;
+}
+
 void EPUBSplitGuard::setSplitSize(const unsigned size)
 {
   m_size = size;
@@ -59,6 +65,14 @@ bool EPUBSplitGuard::splitOnHeading(const unsigned level) const
   return canSplit(EPUB_SPLIT_METHOD_HEADING) && (m_headingLevel >= level);
 }
 
+bool EPUBSplitGuard::inHeading() const
+{
+  if (!m_currentHeadingLevel)
+    return false;
+
+  return m_headingLevel >= m_currentHeadingLevel;
+}
+
 bool EPUBSplitGuard::splitOnSize() const
 {
   return canSplit(EPUB_SPLIT_METHOD_SIZE) && (m_size <= m_currentSize);
diff --git a/src/lib/EPUBSplitGuard.h b/src/lib/EPUBSplitGuard.h
index 17613ac..7bc53ce 100644
--- a/src/lib/EPUBSplitGuard.h
+++ b/src/lib/EPUBSplitGuard.h
@@ -21,6 +21,7 @@ public:
   explicit EPUBSplitGuard(EPUBSplitMethod method);
 
   void setSplitHeadingLevel(unsigned level);
+  void setCurrentHeadingLevel(unsigned level);
   void setSplitSize(unsigned size);
 
   void openLevel();
@@ -29,6 +30,7 @@ public:
 
   bool splitOnPageBreak() const;
   bool splitOnHeading(unsigned level) const;
+  bool inHeading() const;
   bool splitOnSize() const;
 
   void onSplit();
@@ -39,6 +41,7 @@ private:
 private:
   const EPUBSplitMethod m_method;
   unsigned m_headingLevel;
+  unsigned m_currentHeadingLevel;
   unsigned m_size;
   unsigned m_currentSize;
   unsigned m_nestingLevel;
diff --git a/src/lib/EPUBTextGenerator.cpp b/src/lib/EPUBTextGenerator.cpp
index b1e33f8..5206b37 100644
--- a/src/lib/EPUBTextGenerator.cpp
+++ b/src/lib/EPUBTextGenerator.cpp
@@ -67,7 +67,6 @@ public:
   bool m_inPageSpan;
   bool m_inHeader;
   bool m_inFooter;
-  bool m_inHeading;
 
   RVNGPropertyList m_pageSpanProps;
   shared_ptr<EPUBTextElements> m_currentHeader;
@@ -89,7 +88,6 @@ EPUBTextGenerator::Impl::Impl(EPUBPackage *const package, const EPUBSplitMethod
   , m_inPageSpan(false)
   , m_inHeader(false)
   , m_inFooter(false)
-  , m_inHeading(false)
   , m_pageSpanProps()
   , m_currentHeader()
   , m_currentFooter()
@@ -262,7 +260,7 @@ void EPUBTextGenerator::openParagraph(const librevenge::RVNGPropertyList &propLi
   const RVNGProperty *const outlineLevel = propList["text:outline-level"];
   if (outlineLevel && m_impl->getSplitGuard().splitOnHeading(outlineLevel->getInt()))
     m_impl->startNewHtmlFile();
-  m_impl->m_inHeading = outlineLevel != nullptr;
+  m_impl->getSplitGuard().setCurrentHeadingLevel(outlineLevel ? outlineLevel->getInt() : 0);
 
   m_impl->getSplitGuard().openLevel();
 
@@ -369,7 +367,7 @@ void EPUBTextGenerator::insertText(const librevenge::RVNGString &text)
   if (m_impl->m_inHeader || m_impl->m_inFooter)
     m_impl->m_currentHeaderOrFooter->addInsertText(text);
 
-  if (m_impl->m_inHeading)
+  if (m_impl->getSplitGuard().inHeading())
     m_impl->getHtmlManager().insertHeadingText(text.cstr());
 
   m_impl->getSplitGuard().incrementSize(text.len());
-- 
2.12.3

From a4e85e191813e7c8f4e6b5bcf2458504f9d06aeb Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Tue, 22 Aug 2017 12:05:28 +0200
Subject: [PATCH] EPUB_SPLIT_METHOD_HEADING: fix unexpected first chapter name

If the structure of the document is like this:

 Heading 2
Heading 1
 Heading 2
Heading 1
 Heading 2

Then this resulted in 3 chapters: Section 1, Heading 1 and Heading 1.
The first one is unexpected; so in case we don't have a heading 1
paragraph for the first section, then fall back to any other heading.
---
 src/lib/EPUBHTMLManager.cpp   | 8 ++++++++
 src/lib/EPUBHTMLManager.h     | 3 +++
 src/lib/EPUBSplitGuard.cpp    | 5 ++++-
 src/lib/EPUBSplitGuard.h      | 2 +-
 src/lib/EPUBTextGenerator.cpp | 2 +-
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/lib/EPUBHTMLManager.cpp b/src/lib/EPUBHTMLManager.cpp
index 5141f31..7753160 100644
--- a/src/lib/EPUBHTMLManager.cpp
+++ b/src/lib/EPUBHTMLManager.cpp
@@ -134,6 +134,14 @@ void EPUBHTMLManager::insertHeadingText(const std::string &text)
   m_paths.back().appendTitle(text);
 }
 
+bool EPUBHTMLManager::hasHeadingText() const
+{
+  if (m_paths.empty())
+    return false;
+
+  return !m_paths.back().getTitle().empty();
+}
+
 }
 
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/EPUBHTMLManager.h b/src/lib/EPUBHTMLManager.h
index 6b480c4..158b466 100644
--- a/src/lib/EPUBHTMLManager.h
+++ b/src/lib/EPUBHTMLManager.h
@@ -51,6 +51,9 @@ public:
   /// Appends text to the title of the current heading.
   void insertHeadingText(const std::string &text);
 
+  /// If the current heading has a title.
+  bool hasHeadingText() const;
+
 private:
   EPUBManifest &m_manifest;
   std::vector<EPUBPath> m_paths;
diff --git a/src/lib/EPUBSplitGuard.cpp b/src/lib/EPUBSplitGuard.cpp
index 25eae87..890500b 100644
--- a/src/lib/EPUBSplitGuard.cpp
+++ b/src/lib/EPUBSplitGuard.cpp
@@ -65,11 +65,14 @@ bool EPUBSplitGuard::splitOnHeading(const unsigned level) const
   return canSplit(EPUB_SPLIT_METHOD_HEADING) && (m_headingLevel >= level);
 }
 
-bool EPUBSplitGuard::inHeading() const
+bool EPUBSplitGuard::inHeading(bool any) const
 {
   if (!m_currentHeadingLevel)
     return false;
 
+  if (any)
+    return true;
+
   return m_headingLevel >= m_currentHeadingLevel;
 }
 
diff --git a/src/lib/EPUBSplitGuard.h b/src/lib/EPUBSplitGuard.h
index 7bc53ce..1a74079 100644
--- a/src/lib/EPUBSplitGuard.h
+++ b/src/lib/EPUBSplitGuard.h
@@ -30,7 +30,7 @@ public:
 
   bool splitOnPageBreak() const;
   bool splitOnHeading(unsigned level) const;
-  bool inHeading() const;
+  bool inHeading(bool any) const;
   bool splitOnSize() const;
 
   void onSplit();
diff --git a/src/lib/EPUBTextGenerator.cpp b/src/lib/EPUBTextGenerator.cpp
index 5206b37..a39f266 100644
--- a/src/lib/EPUBTextGenerator.cpp
+++ b/src/lib/EPUBTextGenerator.cpp
@@ -367,7 +367,7 @@ void EPUBTextGenerator::insertText(const librevenge::RVNGString &text)
   if (m_impl->m_inHeader || m_impl->m_inFooter)
     m_impl->m_currentHeaderOrFooter->addInsertText(text);
 
-  if (m_impl->getSplitGuard().inHeading())
+  if (m_impl->getSplitGuard().inHeading(!m_impl->getHtmlManager().hasHeadingText()))
     m_impl->getHtmlManager().insertHeadingText(text.cstr());
 
   m_impl->getSplitGuard().incrementSize(text.len());
-- 
2.12.3

From 1376b91046ad50f3a443b6fd4887252c1922870c Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Tue, 22 Aug 2017 16:23:55 +0200
Subject: [PATCH] EPUBHTMLGenerator: fix validation problem with non-page
 anchored images

In most cases (except for at-page anchored images) there is a paragraph
already opened, and writing <p> inside <span> results in a validation
error.

So just write <p> in case we're not in paragraph already.
---
 src/lib/EPUBHTMLGenerator.cpp | 35 +++++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/lib/EPUBHTMLGenerator.cpp b/src/lib/EPUBHTMLGenerator.cpp
index 40c507e..019404f 100644
--- a/src/lib/EPUBHTMLGenerator.cpp
+++ b/src/lib/EPUBHTMLGenerator.cpp
@@ -360,6 +360,7 @@ struct EPUBHTMLGeneratorImpl
     , m_stylesheetPath(stylesheetPath)
     , m_actualPage(0)
     , m_ignore(false)
+    , m_frameAnchorTypes()
     , m_actualSink()
     , m_sinkStack()
   {
@@ -446,6 +447,8 @@ struct EPUBHTMLGeneratorImpl
   int m_actualPage;
   bool m_ignore;
 
+  std::stack<std::string> m_frameAnchorTypes;
+
 protected:
   std::unique_ptr<TextZoneSink> m_actualSink;
   std::stack<std::unique_ptr<TextZoneSink>> m_sinkStack;
@@ -846,8 +849,32 @@ void EPUBHTMLGenerator::closeTable()
   m_impl->m_tableManager.closeTable();
 }
 
-void EPUBHTMLGenerator::openFrame(const RVNGPropertyList & /* propList */) {}
-void EPUBHTMLGenerator::closeFrame() {}
+void EPUBHTMLGenerator::openFrame(const RVNGPropertyList &propList)
+{
+  librevenge::RVNGPropertyList::Iter i(propList);
+  std::string anchorType;
+  for (i.rewind(); i.next();)
+  {
+    if (std::string("text:anchor-type") == i.key())
+      anchorType = i()->getStr().cstr();
+  }
+
+  if (anchorType == "page")
+    // Other anchor types are already inside a paragraph.
+    m_impl->output().openElement("p", RVNGPropertyList());
+  m_impl->m_frameAnchorTypes.push(anchorType);
+}
+
+void EPUBHTMLGenerator::closeFrame()
+{
+  if (m_impl->m_frameAnchorTypes.empty())
+    return;
+
+  if (m_impl->m_frameAnchorTypes.top() == "page")
+    m_impl->output().closeElement("p");
+
+  m_impl->m_frameAnchorTypes.pop();
+}
 
 void EPUBHTMLGenerator::openGroup(const librevenge::RVNGPropertyList & /* propList */) {}
 void EPUBHTMLGenerator::closeGroup() {}
@@ -862,8 +889,6 @@ void EPUBHTMLGenerator::drawConnector(const librevenge::RVNGPropertyList & /* pr
 
 void EPUBHTMLGenerator::insertBinaryObject(const RVNGPropertyList &propList)
 {
-  m_impl->output().openElement("p", RVNGPropertyList());
-
   const EPUBPath &path = m_impl->m_imageManager.insert(
                            RVNGBinaryData(propList["office:binary-data"]->getStr()),
                            propList["librevenge:mime-type"]->getStr());
@@ -873,8 +898,6 @@ void EPUBHTMLGenerator::insertBinaryObject(const RVNGPropertyList &propList)
   // FIXME: use alternative repr. if available
   attrs.insert("alt", path.str().c_str());
   m_impl->output().insertEmptyElement("img", attrs);
-
-  m_impl->output().closeElement("p");
 }
 
 void EPUBHTMLGenerator::insertEquation(const RVNGPropertyList & /* propList */) {}
-- 
2.12.3

From 89ae3e392890b9360d271f1c1796cb27e36be26f Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Thu, 24 Aug 2017 17:11:17 +0200
Subject: [PATCH] EPUBTextGenerator: empty mime type is the same as no mime
 type

epubcheck says:

	ERROR(RSC-005): image.epub/OEBPS/content.opf(11,69): Error while parsing file: value of attribute "media-type" is invalid; must be a string matching the regular expression "[a-zA-Z0-9!#$&+\-\^_]+/[a-zA-Z0-9!#$&+\-\^_]+.*"
---
 src/lib/EPUBTextGenerator.cpp      |  2 +-
 src/test/EPUBTextGeneratorTest.cpp | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/lib/EPUBTextGenerator.cpp b/src/lib/EPUBTextGenerator.cpp
index a39f266..0f7f1e0 100644
--- a/src/lib/EPUBTextGenerator.cpp
+++ b/src/lib/EPUBTextGenerator.cpp
@@ -614,7 +614,7 @@ void EPUBTextGenerator::insertBinaryObject(const librevenge::RVNGPropertyList &p
       newPropList.insert(iter.key(), iter()->clone());
   }
 
-  if (!mimetype || !data)
+  if (!mimetype || mimetype->getStr().empty() || !data)
   {
     EPUBGEN_DEBUG_MSG(("invalid binary object dropped"));
     return;
-- 
2.12.3

From 28e5e30c20aba54dff6505df4c03d6a3da0ee0f3 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Thu, 24 Aug 2017 17:41:49 +0200
Subject: [PATCH] EPUBHTMLGenerator: sanitize URLs a bit in openLink()

epubcheck warns on this:

	WARNING(RSC-023): large.epub/OEBPS/sections/section0018.xhtml(2,5171): The URL 'https:///www.fsf.org' is missing 1 slash(es) '/' after the protocol 'https:'
---
 configure.ac                       |  1 +
 src/lib/EPUBHTMLGenerator.cpp      | 12 +++++++++++-
 src/test/EPUBTextGeneratorTest.cpp | 40 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/src/lib/EPUBHTMLGenerator.cpp b/src/lib/EPUBHTMLGenerator.cpp
index 019404f..aa09332 100644
--- a/src/lib/EPUBHTMLGenerator.cpp
+++ b/src/lib/EPUBHTMLGenerator.cpp
@@ -12,6 +12,8 @@
 #include <stack>
 #include <string>
 
+#include <boost/algorithm/string/replace.hpp>
+
 #include "EPUBHTMLGenerator.h"
 #include "EPUBImageManager.h"
 #include "EPUBListStyleManager.h"
@@ -625,7 +627,15 @@ void EPUBHTMLGenerator::openLink(const RVNGPropertyList &propList)
   }
   RVNGPropertyList attrs;
   if (propList["xlink:href"])
-    attrs.insert("href", propList["xlink:href"]->getStr().cstr());
+  {
+    std::string href(propList["xlink:href"]->getStr().cstr());
+
+    // Basic URL sanitization.
+    boost::replace_all(href, "http:///", "http://");
+    boost::replace_all(href, "https:///", "https://");
+
+    attrs.insert("href", href.c_str());
+  }
   m_impl->output(false).openElement("a", attrs);
 }
 
-- 
2.12.3

From 143a470f190aaf2f420d2f84b5f08e9b01b40473 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Fri, 25 Aug 2017 17:44:38 +0200
Subject: [PATCH] Export generator

---
 src/lib/EPUBGenerator.cpp          | 28 ++++++++++++++++++++++++++++
 src/test/EPUBTextGeneratorTest.cpp | 17 +++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/src/lib/EPUBGenerator.cpp b/src/lib/EPUBGenerator.cpp
index 4ce2964..1661064 100644
--- a/src/lib/EPUBGenerator.cpp
+++ b/src/lib/EPUBGenerator.cpp
@@ -7,6 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <ctime>
 #include <sstream>
 
@@ -298,6 +302,30 @@ void EPUBGenerator::writeRoot()
     sink.openElement("meta", metaAttrs);
     sink.insertCharacters(date);
     sink.closeElement("meta");
+
+#ifdef VERSION
+    const std::string version(VERSION);
+#else
+    const std::string version("unknown");
+#endif
+    std::string generator;
+    if (m_metadata["meta:generator"])
+      generator = m_metadata["meta:generator"]->getStr().cstr();
+
+    if (generator.empty())
+      generator = "libepubgen/" + version;
+    else
+    {
+      generator += " (";
+      generator += "libepubgen/" + version;
+      generator += ")";
+    }
+
+    metaAttrs.clear();
+    metaAttrs.insert("name", "generator");
+    metaAttrs.insert("content", generator.c_str());
+    sink.openElement("meta", metaAttrs);
+    sink.closeElement("meta");
   }
 
   sink.closeElement("metadata");
-- 
2.12.3

From 7e3b5186616326534b1ae95c6d2d188c5e522c7f Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Mon, 4 Sep 2017 17:18:49 +0200
Subject: [PATCH] EPUBGenerator: always write author and title

Some EPUB3 readers categorize books by author and then title, so if
these are empty, then it's next to impossible to reach the export result
there.
---
 src/lib/EPUBGenerator.cpp          | 11 ++++++++---
 src/test/EPUBTextGeneratorTest.cpp | 11 +++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/lib/EPUBGenerator.cpp b/src/lib/EPUBGenerator.cpp
index 1661064..3340643 100644
--- a/src/lib/EPUBGenerator.cpp
+++ b/src/lib/EPUBGenerator.cpp
@@ -260,15 +260,20 @@ void EPUBGenerator::writeRoot()
   sink.insertCharacters(identifierCharactrs.c_str());
   sink.closeElement("dc:identifier");
 
-  // Zero-width space as it must be at least one character in length after
-  // white space has been trimmed.
-  RVNGString title("\u200b");
+  RVNGString title("Unknown Title");
   if (m_metadata["dc:title"] && !m_metadata["dc:title"]->getStr().empty())
     title = m_metadata["dc:title"]->getStr();
   sink.openElement("dc:title");
   sink.insertCharacters(title);
   sink.closeElement("dc:title");
 
+  RVNGString creator("Unknown Author");
+  if (m_metadata["meta:initial-creator"] && !m_metadata["meta:initial-creator"]->getStr().empty())
+    creator = m_metadata["meta:initial-creator"]->getStr();
+  sink.openElement("dc:creator");
+  sink.insertCharacters(creator);
+  sink.closeElement("dc:creator");
+
   RVNGString language("en");
   if (m_metadata["dc:language"] && !m_metadata["dc:language"]->getStr().empty())
     language = m_metadata["dc:language"]->getStr();
-- 
2.12.3

From bce7c05a18a4c5089d5ac77bc61b9f6978e7224b Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Fri, 8 Sep 2017 11:21:32 +0200
Subject: [PATCH] EPUBHTMLGenerator: write un-escaped NBSP

Package implementations are supposed to take care of escaping, like it
was already a requirement for normal text.
---
 src/lib/EPUBHTMLGenerator.cpp      |  3 ++-
 src/test/EPUBTextGeneratorTest.cpp | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/lib/EPUBHTMLGenerator.cpp b/src/lib/EPUBHTMLGenerator.cpp
index aa09332..ed968bf 100644
--- a/src/lib/EPUBHTMLGenerator.cpp
+++ b/src/lib/EPUBHTMLGenerator.cpp
@@ -681,7 +681,8 @@ void EPUBHTMLGenerator::insertSpace()
 {
   if (m_impl->m_ignore)
     return;
-  m_impl->output().insertCharacters("&nbsp;");
+  // NBSP.
+  m_impl->output().insertCharacters("\xc2\xa0");
 }
 
 void EPUBHTMLGenerator::openOrderedListLevel(const RVNGPropertyList &propList)
-- 
2.12.3

From 7cf3c6541a61f9d74cd51fb2a01344df783cb26d Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Fri, 8 Sep 2017 16:25:36 +0200
Subject: [PATCH] EPUBTextGenerator: ignore invalid media types

This assumes there is no image type that is valid in EPUB2, but not in
EPUB3.
---
 src/lib/EPUBTextGenerator.cpp      | 26 +++++++++++++++++++++++++-
 src/test/EPUBTextGeneratorTest.cpp | 23 +++++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/src/lib/EPUBTextGenerator.cpp b/src/lib/EPUBTextGenerator.cpp
index 0f7f1e0..1bd1e16 100644
--- a/src/lib/EPUBTextGenerator.cpp
+++ b/src/lib/EPUBTextGenerator.cpp
@@ -595,6 +595,27 @@ void EPUBTextGenerator::closeFrame()
   m_impl->getHtml()->closeFrame();
 }
 
+/// Checks if the media type is an EPUB 3 Core Media Type or not.
+static bool isValidMimeType(const RVNGString& mediaType)
+{
+  // Defined at <https://idpf.github.io/epub-cmt/v3/#sec-cmt-supported>.
+  static char const *(types[])=
+  {
+    "image/gif",
+    "image/png",
+    "image/jpeg",
+    "image/svg+xml"
+  };
+
+  for (const auto& i : types)
+  {
+    if (mediaType == i)
+      return true;
+  }
+
+  return false;
+}
+
 void EPUBTextGenerator::insertBinaryObject(const librevenge::RVNGPropertyList &propList)
 {
   if (m_impl->getSplitGuard().splitOnSize())
@@ -607,7 +628,10 @@ void EPUBTextGenerator::insertBinaryObject(const librevenge::RVNGPropertyList &p
   for (RVNGPropertyList::Iter iter(propList); !iter.last(); iter.next())
   {
     if (RVNGString("librevenge:mime-type") == iter.key())
-      mimetype.reset(iter()->clone());
+    {
+      if (isValidMimeType(iter()->getStr()))
+        mimetype.reset(iter()->clone());
+    }
     else if (RVNGString("office:binary-data") == iter.key())
       data.reset(iter()->clone());
     else
-- 
2.12.3

From 7be89d1881e175182039ca93a1546d79933cab85 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Mon, 11 Sep 2017 11:03:03 +0200
Subject: [PATCH] EPUBSpanStyleManager: ignore line though type/style 'none'

In CSS this is a boolean property, but in ODF it's an enum, so map none
to false and everything else to true.
---
 src/lib/EPUBSpanStyleManager.cpp   | 11 +++++++-
 src/lib/EPUBTextGenerator.cpp      |  4 +--
 src/test/EPUBTextGeneratorTest.cpp | 58 ++++++++++++++++++++++++++++++++++++--
 3 files changed, 68 insertions(+), 5 deletions(-)

diff --git a/src/lib/EPUBSpanStyleManager.cpp b/src/lib/EPUBSpanStyleManager.cpp
index 4887858..211946c 100644
--- a/src/lib/EPUBSpanStyleManager.cpp
+++ b/src/lib/EPUBSpanStyleManager.cpp
@@ -137,8 +137,17 @@ void EPUBSpanStyleManager::extractDecorations(RVNGPropertyList const &pList, EPU
   // replaceme by text-decoration-line when its implementation will appear in browser
   std::stringstream s;
 
-  if (pList["style:text-line-through-style"] || pList["style:text-line-through-type"])
+  // line-though style or type 'none' is not line-though, everything else is.
+  const librevenge::RVNGProperty *textLineThoughStyle = pList["style:text-line-through-style"];
+  bool lineThough = textLineThoughStyle && textLineThoughStyle->getStr() != "none";
+  if (!lineThough)
+  {
+    const librevenge::RVNGProperty *textLineThoughType = pList["style:text-line-through-type"];
+    lineThough = textLineThoughType && textLineThoughType->getStr() != "none";
+  }
+  if (lineThough)
     s << " line-through";
+
   if (pList["style:text-overline-style"] || pList["style:text-overline-type"])
     s << " overline";
   if (pList["style:text-underline-style"] || pList["style:text-underline-type"])
diff --git a/src/lib/EPUBTextGenerator.cpp b/src/lib/EPUBTextGenerator.cpp
index 1bd1e16..07aa50d 100644
--- a/src/lib/EPUBTextGenerator.cpp
+++ b/src/lib/EPUBTextGenerator.cpp
@@ -596,7 +596,7 @@ void EPUBTextGenerator::closeFrame()
 }
 
 /// Checks if the media type is an EPUB 3 Core Media Type or not.
-static bool isValidMimeType(const RVNGString& mediaType)
+static bool isValidMimeType(const RVNGString &mediaType)
 {
   // Defined at <https://idpf.github.io/epub-cmt/v3/#sec-cmt-supported>.
   static char const *(types[])=
@@ -607,7 +607,7 @@ static bool isValidMimeType(const RVNGString& mediaType)
     "image/svg+xml"
   };
 
-  for (const auto& i : types)
+  for (const auto &i : types)
   {
     if (mediaType == i)
       return true;
-- 
2.12.3

From d8ee84ff50a6113f49105a70f946b23acfa2566f Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Mon, 18 Sep 2017 17:49:13 +0200
Subject: [PATCH] [ABI CHANGE] optionally support not writing formatting to CSS
 files

This should help a number of poor readers, which don't support the old
method. Examples:

- Sigil
- Readium
- Moon+ reader
- Calibre
- MS Edge
---
 inc/libepubgen/EPUBTextGenerator.h    |  1 +
 inc/libepubgen/libepubgen-decls.h     |  8 ++++++++
 src/lib/EPUBGenerator.cpp             |  8 +++++++-
 src/lib/EPUBGenerator.h               |  3 +++
 src/lib/EPUBHTMLGenerator.cpp         | 29 ++++++++++++++++++++++++-----
 src/lib/EPUBHTMLGenerator.h           |  2 +-
 src/lib/EPUBHTMLManager.cpp           |  4 ++--
 src/lib/EPUBHTMLManager.h             |  2 +-
 src/lib/EPUBParagraphStyleManager.cpp | 11 +++++++++++
 src/lib/EPUBParagraphStyleManager.h   |  2 ++
 src/lib/EPUBSpanStyleManager.cpp      | 11 +++++++++++
 src/lib/EPUBSpanStyleManager.h        |  2 ++
 src/lib/EPUBTextGenerator.cpp         |  5 +++++
 src/test/EPUBTextGeneratorTest.cpp    | 26 ++++++++++++++++++++++++++
 14 files changed, 104 insertions(+), 10 deletions(-)

diff --git a/inc/libepubgen/EPUBTextGenerator.h b/inc/libepubgen/EPUBTextGenerator.h
index 664f673..cb2d9a6 100644
--- a/inc/libepubgen/EPUBTextGenerator.h
+++ b/inc/libepubgen/EPUBTextGenerator.h
@@ -42,6 +42,7 @@ public:
 
   void setSplitHeadingLevel(unsigned level);
   void setSplitSize(unsigned size);
+  void setStylesMethod(EPUBStylesMethod styles);
 
   /** Register a handler for embedded images.
     *
diff --git a/inc/libepubgen/libepubgen-decls.h b/inc/libepubgen/libepubgen-decls.h
index 3fb0220..2657a2d 100644
--- a/inc/libepubgen/libepubgen-decls.h
+++ b/inc/libepubgen/libepubgen-decls.h
@@ -61,6 +61,14 @@ typedef bool (*EPUBEmbeddedImage)(const librevenge::RVNGBinaryData &input, libre
   */
 typedef bool (*EPUBEmbeddedObject)(const librevenge::RVNGBinaryData &data, const EPUBEmbeddingContact &contact);
 
+/** The possible ways to represent styles in CSS/HTML files.
+  */
+enum EPUBStylesMethod
+{
+  EPUB_STYLES_METHOD_CSS, //< The styles will be described in a seprarate CSS file.
+  EPUB_STYLES_METHOD_INLINE, //< The styles will be described inline.
+};
+
 }
 
 #endif // INCLUDED_LIBEPUBGEN_LIBEPUBGEN_DECLS_H
diff --git a/src/lib/EPUBGenerator.cpp b/src/lib/EPUBGenerator.cpp
index 3340643..75c3076 100644
--- a/src/lib/EPUBGenerator.cpp
+++ b/src/lib/EPUBGenerator.cpp
@@ -45,6 +45,7 @@ EPUBGenerator::EPUBGenerator(EPUBPackage *const package, const EPUBSplitMethod s
   , m_currentHtml()
   , m_splitGuard(split)
   , m_version(version)
+  , m_stylesMethod(EPUB_STYLES_METHOD_CSS)
 {
 }
 
@@ -96,7 +97,7 @@ void EPUBGenerator::startNewHtmlFile()
 
   m_splitGuard.onSplit();
 
-  m_currentHtml = m_htmlManager.create(m_imageManager, m_listStyleManager, m_paragraphStyleManager, m_spanStyleManager, m_tableStyleManager, m_stylesheetPath);
+  m_currentHtml = m_htmlManager.create(m_imageManager, m_listStyleManager, m_paragraphStyleManager, m_spanStyleManager, m_tableStyleManager, m_stylesheetPath, m_stylesMethod);
 
   // restore state in the new file
   m_currentHtml->startDocument(m_documentProps);
@@ -130,6 +131,11 @@ int EPUBGenerator::getVersion() const
   return m_version;
 }
 
+void EPUBGenerator::setStylesMethod(EPUBStylesMethod styles)
+{
+  m_stylesMethod = styles;
+}
+
 void EPUBGenerator::writeContainer()
 {
   EPUBXMLSink sink;
diff --git a/src/lib/EPUBGenerator.h b/src/lib/EPUBGenerator.h
index f98c80f..099eb4a 100644
--- a/src/lib/EPUBGenerator.h
+++ b/src/lib/EPUBGenerator.h
@@ -51,6 +51,8 @@ public:
   EPUBSplitGuard &getSplitGuard();
   int getVersion() const;
 
+  void setStylesMethod(EPUBStylesMethod stylesMethod);
+
 private:
   virtual void startHtmlFile() = 0;
   virtual void endHtmlFile() = 0;
@@ -80,6 +82,7 @@ private:
   EPUBSplitGuard m_splitGuard;
 
   int m_version;
+  EPUBStylesMethod m_stylesMethod;
 };
 
 }
diff --git a/src/lib/EPUBHTMLGenerator.cpp b/src/lib/EPUBHTMLGenerator.cpp
index ed968bf..f3b30a6 100644
--- a/src/lib/EPUBHTMLGenerator.cpp
+++ b/src/lib/EPUBHTMLGenerator.cpp
@@ -351,7 +351,7 @@ std::string EPUBHTMLTextZone::label(int id) const
 struct EPUBHTMLGeneratorImpl
 {
   //! constructor
-  EPUBHTMLGeneratorImpl(EPUBXMLSink &document, EPUBImageManager &imageManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &path, const EPUBPath &stylesheetPath)
+  EPUBHTMLGeneratorImpl(EPUBXMLSink &document, EPUBImageManager &imageManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &path, const EPUBPath &stylesheetPath, EPUBStylesMethod stylesMethod)
     : m_document(document)
     , m_imageManager(imageManager)
     , m_listManager(listStyleManager)
@@ -363,6 +363,7 @@ struct EPUBHTMLGeneratorImpl
     , m_actualPage(0)
     , m_ignore(false)
     , m_frameAnchorTypes()
+    , m_stylesMethod(stylesMethod)
     , m_actualSink()
     , m_sinkStack()
   {
@@ -451,6 +452,8 @@ struct EPUBHTMLGeneratorImpl
 
   std::stack<std::string> m_frameAnchorTypes;
 
+  EPUBStylesMethod m_stylesMethod;
+
 protected:
   std::unique_ptr<TextZoneSink> m_actualSink;
   std::stack<std::unique_ptr<TextZoneSink>> m_sinkStack;
@@ -461,8 +464,8 @@ private:
   EPUBHTMLGeneratorImpl operator=(EPUBHTMLGeneratorImpl const &orig);
 };
 
-EPUBHTMLGenerator::EPUBHTMLGenerator(EPUBXMLSink &document, EPUBImageManager &imageManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &path, const EPUBPath &stylesheetPath)
-  : m_impl(new EPUBHTMLGeneratorImpl(document, imageManager, listStyleManager, paragraphStyleManager, spanStyleManager, tableStyleManager, path, stylesheetPath))
+EPUBHTMLGenerator::EPUBHTMLGenerator(EPUBXMLSink &document, EPUBImageManager &imageManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &path, const EPUBPath &stylesheetPath, EPUBStylesMethod stylesMethod)
+  : m_impl(new EPUBHTMLGeneratorImpl(document, imageManager, listStyleManager, paragraphStyleManager, spanStyleManager, tableStyleManager, path, stylesheetPath, stylesMethod))
 {
 }
 
@@ -582,7 +585,15 @@ void EPUBHTMLGenerator::openParagraph(const RVNGPropertyList &propList)
     return;
 
   RVNGPropertyList attrs;
-  attrs.insert("class", m_impl->m_paragraphManager.getClass(propList).c_str());
+  switch (m_impl->m_stylesMethod)
+  {
+  case EPUB_STYLES_METHOD_CSS:
+    attrs.insert("class", m_impl->m_paragraphManager.getClass(propList).c_str());
+    break;
+  case EPUB_STYLES_METHOD_INLINE:
+    attrs.insert("style", m_impl->m_paragraphManager.getStyle(propList).c_str());
+    break;
+  }
   m_impl->output(false).openElement("p", attrs);
 }
 
@@ -605,7 +616,15 @@ void EPUBHTMLGenerator::openSpan(const RVNGPropertyList &propList)
     return;
 
   RVNGPropertyList attrs;
-  attrs.insert("class", m_impl->m_spanManager.getClass(propList).c_str());
+  switch (m_impl->m_stylesMethod)
+  {
+  case EPUB_STYLES_METHOD_CSS:
+    attrs.insert("class", m_impl->m_spanManager.getClass(propList).c_str());
+    break;
+  case EPUB_STYLES_METHOD_INLINE:
+    attrs.insert("style", m_impl->m_spanManager.getStyle(propList).c_str());
+    break;
+  }
   m_impl->output(false).openElement("span", attrs);
 }
 
diff --git a/src/lib/EPUBHTMLGenerator.h b/src/lib/EPUBHTMLGenerator.h
index 88059ec..d8783ed 100644
--- a/src/lib/EPUBHTMLGenerator.h
+++ b/src/lib/EPUBHTMLGenerator.h
@@ -30,7 +30,7 @@ class EPUBPath;
 class EPUBHTMLGenerator : public librevenge::RVNGTextInterface
 {
 public:
-  EPUBHTMLGenerator(EPUBXMLSink &document, EPUBImageManager &imageManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &path, const EPUBPath &stylesheetPath);
+  EPUBHTMLGenerator(EPUBXMLSink &document, EPUBImageManager &imageManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &path, const EPUBPath &stylesheetPath, EPUBStylesMethod stylesMethod);
   ~EPUBHTMLGenerator() override;
 
   void setDocumentMetaData(const librevenge::RVNGPropertyList &propList) override;
diff --git a/src/lib/EPUBHTMLManager.cpp b/src/lib/EPUBHTMLManager.cpp
index 7753160..2dedb7f 100644
--- a/src/lib/EPUBHTMLManager.cpp
+++ b/src/lib/EPUBHTMLManager.cpp
@@ -41,7 +41,7 @@ EPUBHTMLManager::EPUBHTMLManager(EPUBManifest &manifest)
 {
 }
 
-const EPUBHTMLGeneratorPtr_t EPUBHTMLManager::create(EPUBImageManager &imageManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &stylesheetPath)
+const EPUBHTMLGeneratorPtr_t EPUBHTMLManager::create(EPUBImageManager &imageManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &stylesheetPath, EPUBStylesMethod stylesMethod)
 {
   std::ostringstream nameBuf;
   nameBuf << "section" << std::setw(4) << std::setfill('0') << m_number.next();
@@ -55,7 +55,7 @@ const EPUBHTMLGeneratorPtr_t EPUBHTMLManager::create(EPUBImageManager &imageMana
   m_contents.push_back(EPUBXMLSink());
 
   const EPUBHTMLGeneratorPtr_t gen(
-    new EPUBHTMLGenerator(m_contents.back(), imageManager, listStyleManager, paragraphStyleManager, spanStyleManager, tableStyleManager, m_paths.back(), stylesheetPath));
+    new EPUBHTMLGenerator(m_contents.back(), imageManager, listStyleManager, paragraphStyleManager, spanStyleManager, tableStyleManager, m_paths.back(), stylesheetPath, stylesMethod));
 
   return gen;
 }
diff --git a/src/lib/EPUBHTMLManager.h b/src/lib/EPUBHTMLManager.h
index 158b466..f034657 100644
--- a/src/lib/EPUBHTMLManager.h
+++ b/src/lib/EPUBHTMLManager.h
@@ -41,7 +41,7 @@ class EPUBHTMLManager
 public:
   explicit EPUBHTMLManager(EPUBManifest &manifest);
 
-  const EPUBHTMLGeneratorPtr_t create(EPUBImageManager &imageManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &stylesheetPath);
+  const EPUBHTMLGeneratorPtr_t create(EPUBImageManager &imageManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &stylesheetPath, EPUBStylesMethod stylesMethod);
 
   void writeTo(EPUBPackage &package);
 
diff --git a/src/lib/EPUBParagraphStyleManager.cpp b/src/lib/EPUBParagraphStyleManager.cpp
index b03f185..836e678 100644
--- a/src/lib/EPUBParagraphStyleManager.cpp
+++ b/src/lib/EPUBParagraphStyleManager.cpp
@@ -41,6 +41,17 @@ std::string EPUBParagraphStyleManager::getClass(RVNGPropertyList const &pList)
   return s.str();
 }
 
+std::string EPUBParagraphStyleManager::getStyle(RVNGPropertyList const &pList)
+{
+  EPUBCSSProperties content;
+  extractProperties(pList, false, content);
+
+  std::stringstream s;
+  for (const auto &property : content)
+    s << property.first << ": " << property.second << "; ";
+  return s.str();
+}
+
 void EPUBParagraphStyleManager::defineParagraph(RVNGPropertyList const &propList)
 {
   if (!propList["librevenge:paragraph-id"])
diff --git a/src/lib/EPUBParagraphStyleManager.h b/src/lib/EPUBParagraphStyleManager.h
index 2fdfff4..433f0e9 100644
--- a/src/lib/EPUBParagraphStyleManager.h
+++ b/src/lib/EPUBParagraphStyleManager.h
@@ -43,6 +43,8 @@ public:
   void defineParagraph(librevenge::RVNGPropertyList const &pList);
   //! returns the class name corresponding to a propertylist
   std::string getClass(librevenge::RVNGPropertyList const &pList);
+  //! returns the style string corresponding to a propertylist
+  std::string getStyle(librevenge::RVNGPropertyList const &pList);
   //! send the data to the sink
   void send(EPUBCSSSink &out);
 protected:
diff --git a/src/lib/EPUBSpanStyleManager.cpp b/src/lib/EPUBSpanStyleManager.cpp
index 211946c..5e53ee2 100644
--- a/src/lib/EPUBSpanStyleManager.cpp
+++ b/src/lib/EPUBSpanStyleManager.cpp
@@ -41,6 +41,17 @@ std::string EPUBSpanStyleManager::getClass(RVNGPropertyList const &pList)
   return s.str();
 }
 
+std::string EPUBSpanStyleManager::getStyle(RVNGPropertyList const &pList)
+{
+  EPUBCSSProperties content;
+  extractProperties(pList, content);
+
+  std::stringstream s;
+  for (const auto &property : content)
+    s << property.first << ": " << property.second << "; ";
+  return s.str();
+}
+
 void EPUBSpanStyleManager::defineSpan(RVNGPropertyList const &propList)
 {
   if (!propList["librevenge:span-id"])
diff --git a/src/lib/EPUBSpanStyleManager.h b/src/lib/EPUBSpanStyleManager.h
index 263ab3a..ec9d0e5 100644
--- a/src/lib/EPUBSpanStyleManager.h
+++ b/src/lib/EPUBSpanStyleManager.h
@@ -43,6 +43,8 @@ public:
   void defineSpan(librevenge::RVNGPropertyList const &pList);
   //! returns the class name corresponding to a propertylist
   std::string getClass(librevenge::RVNGPropertyList const &pList);
+  //! returns the style string corresponding to a propertylist
+  std::string getStyle(librevenge::RVNGPropertyList const &pList);
   //! send the data to the sink
   void send(EPUBCSSSink &out);
 protected:
diff --git a/src/lib/EPUBTextGenerator.cpp b/src/lib/EPUBTextGenerator.cpp
index 07aa50d..26675af 100644
--- a/src/lib/EPUBTextGenerator.cpp
+++ b/src/lib/EPUBTextGenerator.cpp
@@ -142,6 +142,11 @@ void EPUBTextGenerator::setSplitSize(const unsigned size)
   m_impl->getSplitGuard().setSplitSize(size);
 }
 
+void EPUBTextGenerator::setStylesMethod(EPUBStylesMethod styles)
+{
+  m_impl->setStylesMethod(styles);
+}
+
 void EPUBTextGenerator::registerEmbeddedImageHandler(const librevenge::RVNGString &mimeType, EPUBEmbeddedImage imageHandler)
 {
   if (!mimeType.empty() && imageHandler)
-- 
2.12.3

From 4f46bc715a5fc8a0e13bb1596f6f5dbb55ca0632 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Tue, 17 Oct 2017 10:22:35 +0200
Subject: [PATCH] EPUBSpanStyleManager: ignore underline type/style 'none'

This is similar to commit 7be89d1881e175182039ca93a1546d79933cab85
(EPUBSpanStyleManager: ignore line though type/style 'none',
2017-09-11).
---
 src/lib/EPUBSpanStyleManager.cpp   |  9 ++++++++-
 src/test/EPUBTextGeneratorTest.cpp | 22 ++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/lib/EPUBSpanStyleManager.cpp b/src/lib/EPUBSpanStyleManager.cpp
index 5e53ee2..e25fa26 100644
--- a/src/lib/EPUBSpanStyleManager.cpp
+++ b/src/lib/EPUBSpanStyleManager.cpp
@@ -161,7 +161,14 @@ void EPUBSpanStyleManager::extractDecorations(RVNGPropertyList const &pList, EPU
 
   if (pList["style:text-overline-style"] || pList["style:text-overline-type"])
     s << " overline";
-  if (pList["style:text-underline-style"] || pList["style:text-underline-type"])
+  const librevenge::RVNGProperty *textUnderlineStyle = pList["style:text-underline-style"];
+  bool underline = textUnderlineStyle && textUnderlineStyle->getStr() != "none";
+  if (!underline)
+  {
+    const librevenge::RVNGProperty *textUnderlineType = pList["style:text-underline-type"];
+    underline = textUnderlineType && textUnderlineType->getStr() != "none";
+  }
+  if (underline)
     s << " underline";
   if (s.str().length())
     cssProps["text-decoration"] = s.str();
-- 
2.12.3

From 383f315b067e9fc1aa840913c581e7451949c2db Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Tue, 17 Oct 2017 12:21:26 +0200
Subject: [PATCH] EPUBHTMLGenerator: better handling of empty paragraphs

The ODF/librevenge concept is that empty paragraphs still take their
vertical space, i.e. inserting lots of them is a (poor) equivalent of a
page break.

HTML collapses empty paragraphs by default, so empty paragraphs need
some content to preserve this effect. Do the same trick what LibreOffice
Writer does: if the text has no content, add a <br/> element inside the
paragraph.
---
 src/lib/EPUBHTMLGenerator.cpp      |  8 ++++++++
 src/test/EPUBTextGeneratorTest.cpp | 15 +++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/src/lib/EPUBHTMLGenerator.cpp b/src/lib/EPUBHTMLGenerator.cpp
index f3b30a6..d822571 100644
--- a/src/lib/EPUBHTMLGenerator.cpp
+++ b/src/lib/EPUBHTMLGenerator.cpp
@@ -362,6 +362,7 @@ struct EPUBHTMLGeneratorImpl
     , m_stylesheetPath(stylesheetPath)
     , m_actualPage(0)
     , m_ignore(false)
+    , m_hasText(false)
     , m_frameAnchorTypes()
     , m_stylesMethod(stylesMethod)
     , m_actualSink()
@@ -449,6 +450,8 @@ struct EPUBHTMLGeneratorImpl
 
   int m_actualPage;
   bool m_ignore;
+  /// Does the currently opened paragraph have some text?
+  bool m_hasText;
 
   std::stack<std::string> m_frameAnchorTypes;
 
@@ -595,6 +598,7 @@ void EPUBHTMLGenerator::openParagraph(const RVNGPropertyList &propList)
     break;
   }
   m_impl->output(false).openElement("p", attrs);
+  m_impl->m_hasText = false;
 }
 
 void EPUBHTMLGenerator::closeParagraph()
@@ -602,6 +606,9 @@ void EPUBHTMLGenerator::closeParagraph()
   if (m_impl->m_ignore)
     return;
 
+  if (!m_impl->m_hasText)
+    insertLineBreak();
+
   m_impl->output().closeElement("p");
 }
 
@@ -694,6 +701,7 @@ void EPUBHTMLGenerator::insertText(const RVNGString &text)
   if (m_impl->m_ignore)
     return;
   m_impl->output().insertCharacters(text);
+  m_impl->m_hasText = true;
 }
 
 void EPUBHTMLGenerator::insertSpace()
-- 
2.12.3

From 8166fc972e3d4b930ad0baab164f99b3c717252e Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Wed, 18 Oct 2017 10:04:32 +0200
Subject: [PATCH] EPUBTextGenerator: handle headings inside sections

On one hand, we don't want to split inside a section as there might be
elements we need to close/open at split boundary, OTOH this is currently
not a problem as we don't produce any output for sections.

So remove the level management for sections (this way allowing headings
to split inside sections), let's get back to this when there is a
concept how e.g. multiple columns would be represented in EPUB.

Use case is when sections are used to just group paragraph together and
mark all of them read-only: in this case it's unexpected that headings
are handled differently to not-in-section ones.
---
 src/lib/EPUBHTMLGenerator.cpp      | 14 ++++++++++++--
 src/lib/EPUBTextGenerator.cpp      |  3 ---
 src/test/EPUBTextGeneratorTest.cpp | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/src/lib/EPUBHTMLGenerator.cpp b/src/lib/EPUBHTMLGenerator.cpp
index d822571..11bf7de 100644
--- a/src/lib/EPUBHTMLGenerator.cpp
+++ b/src/lib/EPUBHTMLGenerator.cpp
@@ -574,8 +574,18 @@ void EPUBHTMLGenerator::closeFooter()
 }
 
 void EPUBHTMLGenerator::defineSectionStyle(const RVNGPropertyList &) {}
-void EPUBHTMLGenerator::openSection(const RVNGPropertyList & /* propList */) {}
-void EPUBHTMLGenerator::closeSection() {}
+
+void EPUBHTMLGenerator::openSection(const RVNGPropertyList & /* propList */)
+{
+  // Once output is produced here, EPUBTextGenerator::openSection() will need
+  // to call EPUBSplitGuard::openLevel().
+}
+
+void EPUBHTMLGenerator::closeSection()
+{
+  // Once output is produced here, EPUBTextGenerator::closeSection() will need
+  // to call EPUBSplitGuard::closeLevel().
+}
 
 void EPUBHTMLGenerator::defineParagraphStyle(const RVNGPropertyList &propList)
 {
diff --git a/src/lib/EPUBTextGenerator.cpp b/src/lib/EPUBTextGenerator.cpp
index 26675af..5d4e8f2 100644
--- a/src/lib/EPUBTextGenerator.cpp
+++ b/src/lib/EPUBTextGenerator.cpp
@@ -335,15 +335,12 @@ void EPUBTextGenerator::openSection(const librevenge::RVNGPropertyList &propList
 {
   if (m_impl->getSplitGuard().splitOnSize())
     m_impl->startNewHtmlFile();
-  m_impl->getSplitGuard().openLevel();
 
   m_impl->getHtml()->openSection(propList);
 }
 
 void EPUBTextGenerator::closeSection()
 {
-  m_impl->getSplitGuard().closeLevel();
-
   m_impl->getHtml()->closeSection();
 }
 
-- 
2.12.3

From c5bb9ad8922c9f537f0d613d42c33487717455c3 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Wed, 18 Oct 2017 10:52:01 +0200
Subject: [PATCH] EPUBHTMLGenerator: better handling of tabs

Mapping ODF/librevenge tab to \t in HTML is not a great idea, as it's
ignorable whitespace. Go with NBSPs and a breakable space instead, that
is much closer visually (15 is just an arbitrary number, it's what MS
Word uses in its HTML export, LO Writer HTML export doesn't handle
this).

Adapt the empty paragraph case to also use NBSP for consistency.
---
 src/lib/EPUBHTMLGenerator.cpp      | 10 +++++++---
 src/test/EPUBTextGeneratorTest.cpp | 18 +++++++++++++++++-
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/lib/EPUBHTMLGenerator.cpp b/src/lib/EPUBHTMLGenerator.cpp
index 11bf7de..25294c6 100644
--- a/src/lib/EPUBHTMLGenerator.cpp
+++ b/src/lib/EPUBHTMLGenerator.cpp
@@ -617,7 +617,7 @@ void EPUBHTMLGenerator::closeParagraph()
     return;
 
   if (!m_impl->m_hasText)
-    insertLineBreak();
+    insertSpace();
 
   m_impl->output().closeElement("p");
 }
@@ -687,8 +687,12 @@ void EPUBHTMLGenerator::insertTab()
   if (m_impl->m_ignore)
     return;
 
-  // Does not have a lot of effect since tabs in html are ignorable white-space
-  m_impl->output().insertCharacters("\t");
+  // \t would not have a lot of effect since tabs in html are ignorable
+  // white-space. Write NBSPs and a breakable space instead.
+  for (int i = 0; i < 15; ++i)
+    m_impl->output().insertCharacters("\xc2\xa0");
+  m_impl->output().insertCharacters(" ");
+  m_impl->m_hasText = true;
 }
 
 void EPUBHTMLGenerator::insertLineBreak()
-- 
2.12.3

From f3a04df200d818b4aaa9d54910b670cd6cf3149f Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Tue, 31 Oct 2017 15:50:50 +0100
Subject: [PATCH] EPUBHTMLGenerator: librevenge:type -> xlink:type

That's what libetonyek and LO's librevenge producer generates, also
matches librevenge documentation. This isn't really a behavior change,
just makes the warning go away in the xlink case.
---
 src/lib/EPUBHTMLGenerator.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/EPUBHTMLGenerator.cpp b/src/lib/EPUBHTMLGenerator.cpp
index 25294c6..0d39c00 100644
--- a/src/lib/EPUBHTMLGenerator.cpp
+++ b/src/lib/EPUBHTMLGenerator.cpp
@@ -657,9 +657,9 @@ void EPUBHTMLGenerator::openLink(const RVNGPropertyList &propList)
   if (m_impl->m_ignore)
     return;
 
-  if (!propList["librevenge:type"])
+  if (!propList["xlink:type"])
   {
-    EPUBGEN_DEBUG_MSG(("EPUBHTMLGenerator::openLink: librevenge:type: not filled, suppose link\n"));
+    EPUBGEN_DEBUG_MSG(("EPUBHTMLGenerator::openLink: xlink:type: not filled, suppose link\n"));
   }
   RVNGPropertyList attrs;
   if (propList["xlink:href"])
-- 
2.12.3

From c5e32608ecea8410b11760284d49e1f1958c6f75 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Tue, 31 Oct 2017 16:50:50 +0100
Subject: [PATCH] EPUBTableStyleManager: handle EPUB_STYLES_METHOD_INLINE for
 rows

This was working for paragraphs and spans only previously.
---
 src/lib/EPUBHTMLGenerator.cpp      | 10 +++++++++-
 src/lib/EPUBTableStyleManager.cpp  | 11 +++++++++++
 src/lib/EPUBTableStyleManager.h    |  2 ++
 src/test/EPUBTextGeneratorTest.cpp | 28 ++++++++++++++++++++++++++++
 4 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/src/lib/EPUBHTMLGenerator.cpp b/src/lib/EPUBHTMLGenerator.cpp
index 0d39c00..42e8e3e 100644
--- a/src/lib/EPUBHTMLGenerator.cpp
+++ b/src/lib/EPUBHTMLGenerator.cpp
@@ -858,7 +858,15 @@ void EPUBHTMLGenerator::openTableRow(const RVNGPropertyList &propList)
   if (m_impl->m_ignore)
     return;
   RVNGPropertyList attrs;
-  attrs.insert("class", m_impl->m_tableManager.getRowClass(propList).c_str());
+  switch (m_impl->m_stylesMethod)
+  {
+  case EPUB_STYLES_METHOD_CSS:
+    attrs.insert("class", m_impl->m_tableManager.getRowClass(propList).c_str());
+    break;
+  case EPUB_STYLES_METHOD_INLINE:
+    attrs.insert("style", m_impl->m_tableManager.getRowStyle(propList).c_str());
+    break;
+  }
   m_impl->output().openElement("tr", attrs);
 }
 
diff --git a/src/lib/EPUBTableStyleManager.cpp b/src/lib/EPUBTableStyleManager.cpp
index 52b6959..ead9170 100644
--- a/src/lib/EPUBTableStyleManager.cpp
+++ b/src/lib/EPUBTableStyleManager.cpp
@@ -111,6 +111,17 @@ std::string EPUBTableStyleManager::getRowClass(RVNGPropertyList const &pList)
   return s.str();
 }
 
+std::string EPUBTableStyleManager::getRowStyle(RVNGPropertyList const &pList)
+{
+  EPUBCSSProperties content;
+  extractRowProperties(pList, content);
+
+  std::stringstream s;
+  for (const auto &property : content)
+    s << property.first << ": " << property.second << "; ";
+  return s.str();
+}
+
 void EPUBTableStyleManager::send(EPUBCSSSink &out)
 {
   for (ContentNameMap_t::const_iterator it=m_cellContentNameMap.begin(); m_cellContentNameMap.end() != it; ++it)
diff --git a/src/lib/EPUBTableStyleManager.h b/src/lib/EPUBTableStyleManager.h
index e6d09bc..20056ad 100644
--- a/src/lib/EPUBTableStyleManager.h
+++ b/src/lib/EPUBTableStyleManager.h
@@ -47,6 +47,8 @@ public:
   std::string getCellClass(librevenge::RVNGPropertyList const &pList);
   //! returns the class name corresponding to a propertylist
   std::string getRowClass(librevenge::RVNGPropertyList const &pList);
+  //! returns the style string corresponding to a propertylist
+  std::string getRowStyle(librevenge::RVNGPropertyList const &pList);
   //! send the data to the sink
   void send(EPUBCSSSink &out);
 private:
-- 
2.12.3

From 258dcc4a98405238f4e32f89d122a7ccbb9a1357 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Tue, 31 Oct 2017 17:45:22 +0100
Subject: [PATCH] EPUBTableStyleManager: handle EPUB_STYLES_METHOD_INLINE for
 cells

So that a typical table has an empty CSS when requested.
---
 src/lib/EPUBHTMLGenerator.cpp      | 10 +++++++++-
 src/lib/EPUBTableStyleManager.cpp  | 11 +++++++++++
 src/lib/EPUBTableStyleManager.h    |  2 ++
 src/test/EPUBTextGeneratorTest.cpp | 13 +++++++++----
 4 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/lib/EPUBHTMLGenerator.cpp b/src/lib/EPUBHTMLGenerator.cpp
index 42e8e3e..86b3ac2 100644
--- a/src/lib/EPUBHTMLGenerator.cpp
+++ b/src/lib/EPUBHTMLGenerator.cpp
@@ -882,7 +882,15 @@ void EPUBHTMLGenerator::openTableCell(const RVNGPropertyList &propList)
   if (m_impl->m_ignore)
     return;
   RVNGPropertyList attrs;
-  attrs.insert("class", m_impl->m_tableManager.getCellClass(propList).c_str());
+  switch (m_impl->m_stylesMethod)
+  {
+  case EPUB_STYLES_METHOD_CSS:
+    attrs.insert("class", m_impl->m_tableManager.getCellClass(propList).c_str());
+    break;
+  case EPUB_STYLES_METHOD_INLINE:
+    attrs.insert("style", m_impl->m_tableManager.getCellStyle(propList).c_str());
+    break;
+  }
   if (propList["table:number-columns-spanned"])
     attrs.insert("colspan", propList["table:number-columns-spanned"]->getInt());
   if (propList["table:number-rows-spanned"])
diff --git a/src/lib/EPUBTableStyleManager.cpp b/src/lib/EPUBTableStyleManager.cpp
index ead9170..4e24611 100644
--- a/src/lib/EPUBTableStyleManager.cpp
+++ b/src/lib/EPUBTableStyleManager.cpp
@@ -98,6 +98,17 @@ std::string EPUBTableStyleManager::getCellClass(RVNGPropertyList const &pList)
   return s.str();
 }
 
+std::string EPUBTableStyleManager::getCellStyle(RVNGPropertyList const &pList)
+{
+  EPUBCSSProperties content;
+  extractCellProperties(pList, content);
+
+  std::stringstream s;
+  for (const auto &property : content)
+    s << property.first << ": " << property.second << "; ";
+  return s.str();
+}
+
 std::string EPUBTableStyleManager::getRowClass(RVNGPropertyList const &pList)
 {
   EPUBCSSProperties content;
diff --git a/src/lib/EPUBTableStyleManager.h b/src/lib/EPUBTableStyleManager.h
index 20056ad..135a144 100644
--- a/src/lib/EPUBTableStyleManager.h
+++ b/src/lib/EPUBTableStyleManager.h
@@ -45,6 +45,8 @@ public:
   void closeTable();
   //! returns the class name corresponding to a propertylist
   std::string getCellClass(librevenge::RVNGPropertyList const &pList);
+  //! returns the style string corresponding to a propertylist
+  std::string getCellStyle(librevenge::RVNGPropertyList const &pList);
   //! returns the class name corresponding to a propertylist
   std::string getRowClass(librevenge::RVNGPropertyList const &pList);
   //! returns the style string corresponding to a propertylist
-- 
2.12.3

From 6c8e86ccebb11df7ece32d10da2894c6698c5515 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Thu, 2 Nov 2017 12:07:02 +0100
Subject: [PATCH 1/4] EPUBTableStyleManager: witdh -> width

---
 src/lib/EPUBTableStyleManager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/EPUBTableStyleManager.cpp b/src/lib/EPUBTableStyleManager.cpp
index 4e24611..5795524 100644
--- a/src/lib/EPUBTableStyleManager.cpp
+++ b/src/lib/EPUBTableStyleManager.cpp
@@ -48,7 +48,7 @@ void EPUBTableStyleManager::closeTable()
 {
   if (!m_columWitdhsStack.size())
   {
-    EPUBGEN_DEBUG_MSG(("EPUBTableStyleManager::closeTable: can not find the columns witdh\n"));
+    EPUBGEN_DEBUG_MSG(("EPUBTableStyleManager::closeTable: can not find the columns width\n"));
     return;
   }
   m_columWitdhsStack.pop_back();
@@ -61,7 +61,7 @@ bool EPUBTableStyleManager::getColumnsWidth(int col, int numSpanned, double &w)
   std::vector<double> const &widths=m_columWitdhsStack.back();
   if (col < 0 || size_t(col+numSpanned-1) >= widths.size())
   {
-    EPUBGEN_DEBUG_MSG(("EPUBTableStyleManager::getColumnsWidth: can not compute the columns witdh\n"));
+    EPUBGEN_DEBUG_MSG(("EPUBTableStyleManager::getColumnsWidth: can not compute the columns width\n"));
     return false;
   }
   bool fixed = true;
-- 
2.13.6

From 45bf16a8b384010814148538d86ee584b9295c7a Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Fri, 3 Nov 2017 12:30:13 +0100
Subject: [PATCH 2/4] Witdh -> Width

---
 src/lib/EPUBTableStyleManager.cpp | 10 +++++-----
 src/lib/EPUBTableStyleManager.h   |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/lib/EPUBTableStyleManager.cpp b/src/lib/EPUBTableStyleManager.cpp
index 5795524..6f8b2af 100644
--- a/src/lib/EPUBTableStyleManager.cpp
+++ b/src/lib/EPUBTableStyleManager.cpp
@@ -41,24 +41,24 @@ void EPUBTableStyleManager::openTable(RVNGPropertyListVector const &colList)
     }
     colWidths.push_back(width);
   }
-  m_columWitdhsStack.push_back(colWidths);
+  m_columWidthsStack.push_back(colWidths);
 }
 
 void EPUBTableStyleManager::closeTable()
 {
-  if (!m_columWitdhsStack.size())
+  if (!m_columWidthsStack.size())
   {
     EPUBGEN_DEBUG_MSG(("EPUBTableStyleManager::closeTable: can not find the columns width\n"));
     return;
   }
-  m_columWitdhsStack.pop_back();
+  m_columWidthsStack.pop_back();
 }
 
 bool EPUBTableStyleManager::getColumnsWidth(int col, int numSpanned, double &w) const
 {
-  if (!m_columWitdhsStack.size())
+  if (!m_columWidthsStack.size())
     return false;
-  std::vector<double> const &widths=m_columWitdhsStack.back();
+  std::vector<double> const &widths=m_columWidthsStack.back();
   if (col < 0 || size_t(col+numSpanned-1) >= widths.size())
   {
     EPUBGEN_DEBUG_MSG(("EPUBTableStyleManager::getColumnsWidth: can not compute the columns width\n"));
diff --git a/src/lib/EPUBTableStyleManager.h b/src/lib/EPUBTableStyleManager.h
index 135a144..5f704a1 100644
--- a/src/lib/EPUBTableStyleManager.h
+++ b/src/lib/EPUBTableStyleManager.h
@@ -32,7 +32,7 @@ class EPUBTableStyleManager
 
 public:
   //! constructor
-  EPUBTableStyleManager() : m_cellContentNameMap(), m_rowContentNameMap(), m_columWitdhsStack()
+  EPUBTableStyleManager() : m_cellContentNameMap(), m_rowContentNameMap(), m_columWidthsStack()
   {
   }
   //! destructor
@@ -65,7 +65,7 @@ private:
   //! a map row content -> name
   ContentNameMap_t m_rowContentNameMap;
   //! a stack of column width (in inches )
-  std::vector<std::vector<double> > m_columWitdhsStack;
+  std::vector<std::vector<double> > m_columWidthsStack;
 
   EPUBTableStyleManager(EPUBTableStyleManager const &orig);
   EPUBTableStyleManager operator=(EPUBTableStyleManager const &orig);
-- 
2.13.6

From 85fe982b2ad158f6e050c15e4a59d51d863cc28d Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Fri, 3 Nov 2017 15:33:35 +0100
Subject: [PATCH 3/4] columWidths -> columnWidths

---
 src/lib/EPUBTableStyleManager.cpp | 10 +++++-----
 src/lib/EPUBTableStyleManager.h   |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/lib/EPUBTableStyleManager.cpp b/src/lib/EPUBTableStyleManager.cpp
index 6f8b2af..b610c20 100644
--- a/src/lib/EPUBTableStyleManager.cpp
+++ b/src/lib/EPUBTableStyleManager.cpp
@@ -41,24 +41,24 @@ void EPUBTableStyleManager::openTable(RVNGPropertyListVector const &colList)
     }
     colWidths.push_back(width);
   }
-  m_columWidthsStack.push_back(colWidths);
+  m_columnWidthsStack.push_back(colWidths);
 }
 
 void EPUBTableStyleManager::closeTable()
 {
-  if (!m_columWidthsStack.size())
+  if (!m_columnWidthsStack.size())
   {
     EPUBGEN_DEBUG_MSG(("EPUBTableStyleManager::closeTable: can not find the columns width\n"));
     return;
   }
-  m_columWidthsStack.pop_back();
+  m_columnWidthsStack.pop_back();
 }
 
 bool EPUBTableStyleManager::getColumnsWidth(int col, int numSpanned, double &w) const
 {
-  if (!m_columWidthsStack.size())
+  if (!m_columnWidthsStack.size())
     return false;
-  std::vector<double> const &widths=m_columWidthsStack.back();
+  std::vector<double> const &widths=m_columnWidthsStack.back();
   if (col < 0 || size_t(col+numSpanned-1) >= widths.size())
   {
     EPUBGEN_DEBUG_MSG(("EPUBTableStyleManager::getColumnsWidth: can not compute the columns width\n"));
diff --git a/src/lib/EPUBTableStyleManager.h b/src/lib/EPUBTableStyleManager.h
index 5f704a1..4de70e3 100644
--- a/src/lib/EPUBTableStyleManager.h
+++ b/src/lib/EPUBTableStyleManager.h
@@ -32,7 +32,7 @@ class EPUBTableStyleManager
 
 public:
   //! constructor
-  EPUBTableStyleManager() : m_cellContentNameMap(), m_rowContentNameMap(), m_columWidthsStack()
+  EPUBTableStyleManager() : m_cellContentNameMap(), m_rowContentNameMap(), m_columnWidthsStack()
   {
   }
   //! destructor
@@ -65,7 +65,7 @@ private:
   //! a map row content -> name
   ContentNameMap_t m_rowContentNameMap;
   //! a stack of column width (in inches )
-  std::vector<std::vector<double> > m_columWidthsStack;
+  std::vector<std::vector<double> > m_columnWidthsStack;
 
   EPUBTableStyleManager(EPUBTableStyleManager const &orig);
   EPUBTableStyleManager operator=(EPUBTableStyleManager const &orig);
-- 
2.13.6

From 20930e2d8151fd2ec44feb9cdb8ca502df99365f Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Fri, 3 Nov 2017 17:00:12 +0100
Subject: [PATCH 4/4] EPUBTableStyleManager: handle style:rel-column-width col
 prop

Previously only fixed width was supported, but relative width works
better for reflowable formats and ODF has markup to express this.
---
 src/lib/EPUBTableStyleManager.cpp  | 42 ++++++++++++++++++++++++++++++++----
 src/lib/EPUBTableStyleManager.h    |  6 +++++-
 src/test/EPUBTextGeneratorTest.cpp | 44 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 87 insertions(+), 5 deletions(-)

diff --git a/src/lib/EPUBTableStyleManager.cpp b/src/lib/EPUBTableStyleManager.cpp
index b610c20..92078a2 100644
--- a/src/lib/EPUBTableStyleManager.cpp
+++ b/src/lib/EPUBTableStyleManager.cpp
@@ -7,6 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <numeric>
 #include <sstream>
 
 #include <librevenge/librevenge.h>
@@ -25,6 +26,7 @@ using librevenge::RVNGString;
 void EPUBTableStyleManager::openTable(RVNGPropertyListVector const &colList)
 {
   std::vector<double> colWidths;
+  std::vector<double> relColWidths;
   for (unsigned long i = 0; i < colList.count(); i++)
   {
     RVNGPropertyList const &prop=colList[i];
@@ -40,8 +42,15 @@ void EPUBTableStyleManager::openTable(RVNGPropertyListVector const &colList)
         width=prop["style:column-width"]->getDouble()/1440.;
     }
     colWidths.push_back(width);
+
+    if (prop["style:rel-column-width"])
+    {
+      width = prop["style:rel-column-width"]->getDouble();
+      relColWidths.push_back(width);
+    }
   }
   m_columnWidthsStack.push_back(colWidths);
+  m_relColumnWidthsStack.push_back(relColWidths);
 }
 
 void EPUBTableStyleManager::closeTable()
@@ -54,14 +63,18 @@ void EPUBTableStyleManager::closeTable()
   m_columnWidthsStack.pop_back();
 }
 
-bool EPUBTableStyleManager::getColumnsWidth(int col, int numSpanned, double &w) const
+namespace
 {
-  if (!m_columnWidthsStack.size())
+bool extractColumnsWidth(const std::vector< std::vector<double> > &columnWidthsStack, int col, int numSpanned, bool relative, double &w)
+{
+  if (!columnWidthsStack.size())
     return false;
-  std::vector<double> const &widths=m_columnWidthsStack.back();
+  std::vector<double> const &widths=columnWidthsStack.back();
+  double total = std::accumulate(widths.begin(), widths.end(), static_cast<double>(0));
   if (col < 0 || size_t(col+numSpanned-1) >= widths.size())
   {
-    EPUBGEN_DEBUG_MSG(("EPUBTableStyleManager::getColumnsWidth: can not compute the columns width\n"));
+    if (!relative)
+      EPUBGEN_DEBUG_MSG(("EPUBTableStyleManager::getColumnsWidth: can not compute the columns width\n"));
     return false;
   }
   bool fixed = true;
@@ -82,8 +95,22 @@ bool EPUBTableStyleManager::getColumnsWidth(int col, int numSpanned, double &w)
     }
   }
   if (!fixed) w = -w;
+  if (relative)
+    // Expected unit is percents.
+    w = w * 100 / total;
   return true;
 }
+}
+
+bool EPUBTableStyleManager::getColumnsWidth(int col, int numSpanned, double &w) const
+{
+  return extractColumnsWidth(m_columnWidthsStack, col, numSpanned, false, w);
+}
+
+bool EPUBTableStyleManager::getRelColumnsWidth(int col, int numSpanned, double &w) const
+{
+  return extractColumnsWidth(m_relColumnWidthsStack, col, numSpanned, true, w);
+}
 
 std::string EPUBTableStyleManager::getCellClass(RVNGPropertyList const &pList)
 {
@@ -176,6 +203,13 @@ void EPUBTableStyleManager::extractCellProperties(RVNGPropertyList const &pList,
       width << -w << "in";
       cssProps["min-width"] = width.str();
     }
+
+    if (getRelColumnsWidth(c, span, w))
+    {
+      std::ostringstream width;
+      width << w << "%";
+      cssProps["width"] = width.str();
+    }
   }
   if (pList["fo:text-align"])
   {
diff --git a/src/lib/EPUBTableStyleManager.h b/src/lib/EPUBTableStyleManager.h
index 4de70e3..24ae1a5 100644
--- a/src/lib/EPUBTableStyleManager.h
+++ b/src/lib/EPUBTableStyleManager.h
@@ -32,7 +32,7 @@ class EPUBTableStyleManager
 
 public:
   //! constructor
-  EPUBTableStyleManager() : m_cellContentNameMap(), m_rowContentNameMap(), m_columnWidthsStack()
+  EPUBTableStyleManager() : m_cellContentNameMap(), m_rowContentNameMap(), m_columnWidthsStack(), m_relColumnWidthsStack()
   {
   }
   //! destructor
@@ -60,12 +60,16 @@ private:
   void extractRowProperties(librevenge::RVNGPropertyList const &pList, EPUBCSSProperties &cssProps) const;
   //! try to return the col width
   bool getColumnsWidth(int i, int numSpanned, double &w) const;
+  //! try to return the relative col width
+  bool getRelColumnsWidth(int i, int numSpanned, double &w) const;
   //! a map cell content -> name
   ContentNameMap_t m_cellContentNameMap;
   //! a map row content -> name
   ContentNameMap_t m_rowContentNameMap;
   //! a stack of column width (in inches )
   std::vector<std::vector<double> > m_columnWidthsStack;
+  //! a stack of relative column width (in percents )
+  std::vector<std::vector<double> > m_relColumnWidthsStack;
 
   EPUBTableStyleManager(EPUBTableStyleManager const &orig);
   EPUBTableStyleManager operator=(EPUBTableStyleManager const &orig);
-- 
2.13.6

From d5bd8c9078eeb63769ff1807be1a9571430eaed1 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Mon, 6 Nov 2017 10:19:32 +0100
Subject: [PATCH] EPUBTableStyleManager: handle table props

Other than column properties. Only width and relative width for now.
---
 src/lib/EPUBHTMLGenerator.cpp      | 16 +++++--
 src/lib/EPUBTableStyleManager.cpp  | 87 ++++++++++++++++++++++++++++----------
 src/lib/EPUBTableStyleManager.h    | 12 +++++-
 src/test/EPUBTextGeneratorTest.cpp | 27 ++++++++++++
 4 files changed, 114 insertions(+), 28 deletions(-)

diff --git a/src/lib/EPUBHTMLGenerator.cpp b/src/lib/EPUBHTMLGenerator.cpp
index 86b3ac2..e00bea8 100644
--- a/src/lib/EPUBHTMLGenerator.cpp
+++ b/src/lib/EPUBHTMLGenerator.cpp
@@ -846,10 +846,18 @@ void EPUBHTMLGenerator::openTable(const RVNGPropertyList &propList)
   if (m_impl->m_ignore)
     return;
 
-  const librevenge::RVNGPropertyListVector *columns = propList.child("librevenge:table-columns");
-  if (columns)
-    m_impl->m_tableManager.openTable(*columns);
-  m_impl->output().openElement("table", RVNGPropertyList());
+  m_impl->m_tableManager.openTable(propList);
+  RVNGPropertyList attrs;
+  switch (m_impl->m_stylesMethod)
+  {
+  case EPUB_STYLES_METHOD_CSS:
+    attrs.insert("class", m_impl->m_tableManager.getTableClass(propList).c_str());
+    break;
+  case EPUB_STYLES_METHOD_INLINE:
+    attrs.insert("style", m_impl->m_tableManager.getTableStyle(propList).c_str());
+    break;
+  }
+  m_impl->output().openElement("table", attrs);
   m_impl->output().openElement("tbody", RVNGPropertyList());
 }
 
diff --git a/src/lib/EPUBTableStyleManager.cpp b/src/lib/EPUBTableStyleManager.cpp
index 92078a2..d5e650c 100644
--- a/src/lib/EPUBTableStyleManager.cpp
+++ b/src/lib/EPUBTableStyleManager.cpp
@@ -23,34 +23,38 @@ using librevenge::RVNGPropertyList;
 using librevenge::RVNGPropertyListVector;
 using librevenge::RVNGString;
 
-void EPUBTableStyleManager::openTable(RVNGPropertyListVector const &colList)
+void EPUBTableStyleManager::openTable(RVNGPropertyList const &propList)
 {
-  std::vector<double> colWidths;
-  std::vector<double> relColWidths;
-  for (unsigned long i = 0; i < colList.count(); i++)
+  const librevenge::RVNGPropertyListVector *columns = propList.child("librevenge:table-columns");
+  if (columns)
   {
-    RVNGPropertyList const &prop=colList[i];
-    double width=0;
-    if (prop["style:column-width"])
+    std::vector<double> colWidths;
+    std::vector<double> relColWidths;
+    for (unsigned long i = 0; i < columns->count(); i++)
     {
-      librevenge::RVNGUnit unit=prop["style:column-width"]->getUnit();
-      if (unit==librevenge::RVNG_POINT)
-        width=prop["style:column-width"]->getDouble()/72.;
-      else if (unit==librevenge::RVNG_INCH)
-        width=prop["style:column-width"]->getDouble();
-      else if (unit==librevenge::RVNG_TWIP)
-        width=prop["style:column-width"]->getDouble()/1440.;
-    }
-    colWidths.push_back(width);
+      RVNGPropertyList const &prop=(*columns)[i];
+      double width=0;
+      if (prop["style:column-width"])
+      {
+        librevenge::RVNGUnit unit=prop["style:column-width"]->getUnit();
+        if (unit==librevenge::RVNG_POINT)
+          width=prop["style:column-width"]->getDouble()/72.;
+        else if (unit==librevenge::RVNG_INCH)
+          width=prop["style:column-width"]->getDouble();
+        else if (unit==librevenge::RVNG_TWIP)
+          width=prop["style:column-width"]->getDouble()/1440.;
+      }
+      colWidths.push_back(width);
 
-    if (prop["style:rel-column-width"])
-    {
-      width = prop["style:rel-column-width"]->getDouble();
-      relColWidths.push_back(width);
+      if (prop["style:rel-column-width"])
+      {
+        width = prop["style:rel-column-width"]->getDouble();
+        relColWidths.push_back(width);
+      }
     }
+    m_columnWidthsStack.push_back(colWidths);
+    m_relColumnWidthsStack.push_back(relColWidths);
   }
-  m_columnWidthsStack.push_back(colWidths);
-  m_relColumnWidthsStack.push_back(relColWidths);
 }
 
 void EPUBTableStyleManager::closeTable()
@@ -160,6 +164,30 @@ std::string EPUBTableStyleManager::getRowStyle(RVNGPropertyList const &pList)
   return s.str();
 }
 
+std::string EPUBTableStyleManager::getTableClass(RVNGPropertyList const &pList)
+{
+  EPUBCSSProperties content;
+  extractTableProperties(pList, content);
+  ContentNameMap_t::const_iterator it=m_tableContentNameMap.find(content);
+  if (it != m_tableContentNameMap.end())
+    return it->second;
+  std::stringstream s;
+  s << "table" << m_tableContentNameMap.size();
+  m_tableContentNameMap[content]=s.str();
+  return s.str();
+}
+
+std::string EPUBTableStyleManager::getTableStyle(RVNGPropertyList const &pList)
+{
+  EPUBCSSProperties content;
+  extractTableProperties(pList, content);
+
+  std::stringstream s;
+  for (const auto &property : content)
+    s << property.first << ": " << property.second << "; ";
+  return s.str();
+}
+
 void EPUBTableStyleManager::send(EPUBCSSSink &out)
 {
   for (ContentNameMap_t::const_iterator it=m_cellContentNameMap.begin(); m_cellContentNameMap.end() != it; ++it)
@@ -175,6 +203,13 @@ void EPUBTableStyleManager::send(EPUBCSSSink &out)
     fillPropertyList(it->first, props);
     out.insertRule(("." + it->second).c_str(), props);
   }
+
+  for (ContentNameMap_t::const_iterator it=m_tableContentNameMap.begin(); m_tableContentNameMap.end() != it; ++it)
+  {
+    RVNGPropertyList props;
+    fillPropertyList(it->first, props);
+    out.insertRule(("." + it->second).c_str(), props);
+  }
 }
 
 void EPUBTableStyleManager::extractCellProperties(RVNGPropertyList const &pList, EPUBCSSProperties &cssProps) const
@@ -244,6 +279,14 @@ void EPUBTableStyleManager::extractRowProperties(RVNGPropertyList const &pList,
     cssProps["height"] = pList["style:row-height"]->getStr().cstr();
 }
 
+void EPUBTableStyleManager::extractTableProperties(RVNGPropertyList const &pList, EPUBCSSProperties &cssProps) const
+{
+  if (pList["style:rel-width"])
+    cssProps["width"] = pList["style:rel-width"]->getStr().cstr();
+  else if (pList["style:width"])
+    cssProps["width"] = pList["style:width"]->getStr().cstr();
+}
+
 }
 
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/EPUBTableStyleManager.h b/src/lib/EPUBTableStyleManager.h
index 24ae1a5..ab1f9e6 100644
--- a/src/lib/EPUBTableStyleManager.h
+++ b/src/lib/EPUBTableStyleManager.h
@@ -32,7 +32,7 @@ class EPUBTableStyleManager
 
 public:
   //! constructor
-  EPUBTableStyleManager() : m_cellContentNameMap(), m_rowContentNameMap(), m_columnWidthsStack(), m_relColumnWidthsStack()
+  EPUBTableStyleManager() : m_cellContentNameMap(), m_rowContentNameMap(), m_tableContentNameMap(), m_columnWidthsStack(), m_relColumnWidthsStack()
   {
   }
   //! destructor
@@ -40,7 +40,7 @@ public:
   {
   }
   //! open a table
-  void openTable(librevenge::RVNGPropertyListVector const &colList);
+  void openTable(librevenge::RVNGPropertyList const &propList);
   //! close a table
   void closeTable();
   //! returns the class name corresponding to a propertylist
@@ -51,6 +51,10 @@ public:
   std::string getRowClass(librevenge::RVNGPropertyList const &pList);
   //! returns the style string corresponding to a propertylist
   std::string getRowStyle(librevenge::RVNGPropertyList const &pList);
+  //! returns the class name corresponding to a propertylist
+  std::string getTableClass(librevenge::RVNGPropertyList const &pList);
+  //! returns the style string corresponding to a propertylist
+  std::string getTableStyle(librevenge::RVNGPropertyList const &pList);
   //! send the data to the sink
   void send(EPUBCSSSink &out);
 private:
@@ -58,6 +62,8 @@ private:
   void extractCellProperties(librevenge::RVNGPropertyList const &pList, EPUBCSSProperties &cssProps) const;
   //! convert a property list into a CSS property map
   void extractRowProperties(librevenge::RVNGPropertyList const &pList, EPUBCSSProperties &cssProps) const;
+  //! convert a property list into a CSS property map
+  void extractTableProperties(librevenge::RVNGPropertyList const &pList, EPUBCSSProperties &cssProps) const;
   //! try to return the col width
   bool getColumnsWidth(int i, int numSpanned, double &w) const;
   //! try to return the relative col width
@@ -66,6 +72,8 @@ private:
   ContentNameMap_t m_cellContentNameMap;
   //! a map row content -> name
   ContentNameMap_t m_rowContentNameMap;
+  //! a map table content -> name
+  ContentNameMap_t m_tableContentNameMap;
   //! a stack of column width (in inches )
   std::vector<std::vector<double> > m_columnWidthsStack;
   //! a stack of relative column width (in percents )
-- 
2.13.6

From 801367ee905aa70bb2ba2ad5b8257cd2a25bed9b Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Wed, 8 Nov 2017 10:50:11 +0100
Subject: [PATCH] EPUBImageManager: add support for borders

The properties are on the frame, but the inner binary object emits the
"img" element that has the properties in XHTML. Solve this by
maintaining a stack of currently opened frames, with their properties.
---
 src/lib/EPUBGenerator.cpp          |  1 +
 src/lib/EPUBHTMLGenerator.cpp      | 26 ++++++++++++++++++++
 src/lib/EPUBImageManager.cpp       | 50 ++++++++++++++++++++++++++++++++++++++
 src/lib/EPUBImageManager.h         | 16 ++++++++++++
 src/test/EPUBTextGeneratorTest.cpp | 26 ++++++++++++++++++++
 5 files changed, 119 insertions(+)

diff --git a/src/lib/EPUBGenerator.cpp b/src/lib/EPUBGenerator.cpp
index 75c3076..38c3188 100644
--- a/src/lib/EPUBGenerator.cpp
+++ b/src/lib/EPUBGenerator.cpp
@@ -230,6 +230,7 @@ void EPUBGenerator::writeStylesheet()
   m_paragraphStyleManager.send(sink);
   m_spanStyleManager.send(sink);
   m_tableStyleManager.send(sink);
+  m_imageManager.send(sink);
 
   sink.writeTo(*m_package, m_stylesheetPath.str().c_str());
 }
diff --git a/src/lib/EPUBHTMLGenerator.cpp b/src/lib/EPUBHTMLGenerator.cpp
index e00bea8..4ffa55d 100644
--- a/src/lib/EPUBHTMLGenerator.cpp
+++ b/src/lib/EPUBHTMLGenerator.cpp
@@ -364,6 +364,7 @@ struct EPUBHTMLGeneratorImpl
     , m_ignore(false)
     , m_hasText(false)
     , m_frameAnchorTypes()
+    , m_framePropertiesStack()
     , m_stylesMethod(stylesMethod)
     , m_actualSink()
     , m_sinkStack()
@@ -454,6 +455,7 @@ struct EPUBHTMLGeneratorImpl
   bool m_hasText;
 
   std::stack<std::string> m_frameAnchorTypes;
+  std::stack<RVNGPropertyList> m_framePropertiesStack;
 
   EPUBStylesMethod m_stylesMethod;
 
@@ -929,20 +931,29 @@ void EPUBHTMLGenerator::openFrame(const RVNGPropertyList &propList)
 {
   librevenge::RVNGPropertyList::Iter i(propList);
   std::string anchorType;
+  RVNGPropertyList frameProperties;
   for (i.rewind(); i.next();)
   {
     if (std::string("text:anchor-type") == i.key())
       anchorType = i()->getStr().cstr();
+
+    // Remember the property for binary object purposes.
+    frameProperties.insert(i.key(), i()->clone());
   }
 
   if (anchorType == "page")
     // Other anchor types are already inside a paragraph.
     m_impl->output().openElement("p", RVNGPropertyList());
   m_impl->m_frameAnchorTypes.push(anchorType);
+
+  m_impl->m_framePropertiesStack.push(frameProperties);
 }
 
 void EPUBHTMLGenerator::closeFrame()
 {
+  if (!m_impl->m_framePropertiesStack.empty())
+    m_impl->m_framePropertiesStack.pop();
+
   if (m_impl->m_frameAnchorTypes.empty())
     return;
 
@@ -970,6 +981,21 @@ void EPUBHTMLGenerator::insertBinaryObject(const RVNGPropertyList &propList)
                            propList["librevenge:mime-type"]->getStr());
 
   RVNGPropertyList attrs;
+
+  if (!m_impl->m_framePropertiesStack.empty())
+  {
+    RVNGPropertyList &frameProperties = m_impl->m_framePropertiesStack.top();
+    switch (m_impl->m_stylesMethod)
+    {
+    case EPUB_STYLES_METHOD_CSS:
+      attrs.insert("class", m_impl->m_imageManager.getImageClass(frameProperties).c_str());
+      break;
+    case EPUB_STYLES_METHOD_INLINE:
+      attrs.insert("style", m_impl->m_imageManager.getImageStyle(frameProperties).c_str());
+      break;
+    }
+  }
+
   attrs.insert("src", path.relativeTo(m_impl->m_path).str().c_str());
   // FIXME: use alternative repr. if available
   attrs.insert("alt", path.str().c_str());
diff --git a/src/lib/EPUBImageManager.cpp b/src/lib/EPUBImageManager.cpp
index 0179cad..2311e76 100644
--- a/src/lib/EPUBImageManager.cpp
+++ b/src/lib/EPUBImageManager.cpp
@@ -16,6 +16,7 @@
 #include "EPUBBinarySink.h"
 #include "EPUBImageManager.h"
 #include "EPUBManifest.h"
+#include "EPUBCSSSink.h"
 
 namespace libepubgen
 {
@@ -68,6 +69,7 @@ EPUBImageManager::EPUBImageManager(EPUBManifest &manifest)
   : m_manifest(manifest)
   , m_map()
   , m_number()
+  , m_imageContentNameMap()
 {
 }
 
@@ -105,6 +107,54 @@ void EPUBImageManager::writeTo(EPUBPackage &package)
   }
 }
 
+std::string EPUBImageManager::getImageClass(librevenge::RVNGPropertyList const &pList)
+{
+  EPUBCSSProperties content;
+  extractImageProperties(pList, content);
+  ContentNameMap_t::const_iterator it=m_imageContentNameMap.find(content);
+  if (it != m_imageContentNameMap.end())
+    return it->second;
+  std::stringstream s;
+  s << "image" << m_imageContentNameMap.size();
+  m_imageContentNameMap[content]=s.str();
+  return s.str();
+}
+
+std::string EPUBImageManager::getImageStyle(librevenge::RVNGPropertyList const &pList)
+{
+  EPUBCSSProperties content;
+  extractImageProperties(pList, content);
+
+  std::stringstream s;
+  for (const auto &property : content)
+    s << property.first << ": " << property.second << "; ";
+  return s.str();
+}
+
+void EPUBImageManager::extractImageProperties(librevenge::RVNGPropertyList const &pList, EPUBCSSProperties &cssProps) const
+{
+  // Extract borders.
+  static char const *(type[]) = {"border", "border-left", "border-top", "border-right", "border-bottom" };
+  for (int i = 0; i < 5; i++)
+  {
+    std::string field("fo:");
+    field+=type[i];
+    if (!pList[field.c_str()])
+      continue;
+    cssProps[type[i]] =  pList[field.c_str()]->getStr().cstr();
+  }
+}
+
+void EPUBImageManager::send(EPUBCSSSink &out)
+{
+  for (auto it = m_imageContentNameMap.begin(); m_imageContentNameMap.end() != it; ++it)
+  {
+    librevenge::RVNGPropertyList props;
+    fillPropertyList(it->first, props);
+    out.insertRule(("." + it->second).c_str(), props);
+  }
+}
+
 }
 
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/EPUBImageManager.h b/src/lib/EPUBImageManager.h
index 21a1b37..c9f4236 100644
--- a/src/lib/EPUBImageManager.h
+++ b/src/lib/EPUBImageManager.h
@@ -12,8 +12,10 @@
 
 #include <unordered_map>
 
+#include <boost/functional/hash.hpp>
 #include <librevenge/librevenge.h>
 
+#include "EPUBCSSProperties.h"
 #include "EPUBCounter.h"
 #include "EPUBPath.h"
 
@@ -22,6 +24,7 @@ namespace libepubgen
 
 class EPUBManifest;
 class EPUBPackage;
+class EPUBCSSSink;
 
 class EPUBImageManager
 {
@@ -40,6 +43,7 @@ class EPUBImageManager
   };
 
   typedef std::unordered_map<librevenge::RVNGBinaryData, EPUBPath, BinaryDataHash, BinaryDataEqual> MapType_t;
+  typedef std::unordered_map<EPUBCSSProperties, std::string, boost::hash<EPUBCSSProperties>> ContentNameMap_t;
 
 public:
   explicit EPUBImageManager(EPUBManifest &manifest);
@@ -48,10 +52,22 @@ public:
 
   void writeTo(EPUBPackage &package);
 
+  //! returns the class name corresponding to a propertylist
+  std::string getImageClass(librevenge::RVNGPropertyList const &pList);
+  //! returns the style string corresponding to a propertylist
+  std::string getImageStyle(librevenge::RVNGPropertyList const &pList);
+  //! send the data to the sink
+  void send(EPUBCSSSink &out);
+
 private:
+  //! convert a property list into a CSS property map
+  void extractImageProperties(librevenge::RVNGPropertyList const &pList, EPUBCSSProperties &cssProps) const;
+
   EPUBManifest &m_manifest;
   MapType_t m_map;
   EPUBCounter m_number;
+  //! a map image content -> name
+  ContentNameMap_t m_imageContentNameMap;
 };
 
 }
-- 
2.13.6

From 094db625e36b91b57e152296a1f7db1bdcc682c5 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Wed, 8 Nov 2017 14:10:26 +0100
Subject: [PATCH] EPUBHTMLGenerator: add missing rel attribute for CSS
 reference

Turns out a number of readers (checked Calibre and Aldiko on Android) do
support taking formatting from an external CSS, but only in case this
attribute is present.
---
 src/lib/EPUBHTMLGenerator.cpp      |  1 +
 src/test/EPUBTextGeneratorTest.cpp | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/src/lib/EPUBHTMLGenerator.cpp b/src/lib/EPUBHTMLGenerator.cpp
index 4ffa55d..d81a905 100644
--- a/src/lib/EPUBHTMLGenerator.cpp
+++ b/src/lib/EPUBHTMLGenerator.cpp
@@ -531,6 +531,7 @@ void EPUBHTMLGenerator::endDocument()
   RVNGPropertyList linkAttrs;
   linkAttrs.insert("href", m_impl->m_stylesheetPath.relativeTo(m_impl->m_path).str().c_str());
   linkAttrs.insert("type", "text/css");
+  linkAttrs.insert("rel", "stylesheet");
   m_impl->m_document.insertEmptyElement("link", linkAttrs);
   m_impl->m_document.closeElement("head");
   m_impl->m_document.openElement("body", RVNGPropertyList());
-- 
2.13.6

From 0f5073481b094562f2c78481475a660fb6826cdb Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Thu, 9 Nov 2017 11:32:27 +0100
Subject: [PATCH] EPUBImageManager: initial horizontal positioning

For now position everything to the left, except for explicit "right".
---
 src/lib/EPUBImageManager.cpp       | 17 ++++++++++
 src/test/EPUBTextGeneratorTest.cpp | 66 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+)

diff --git a/src/lib/EPUBImageManager.cpp b/src/lib/EPUBImageManager.cpp
index 2311e76..8414da5 100644
--- a/src/lib/EPUBImageManager.cpp
+++ b/src/lib/EPUBImageManager.cpp
@@ -133,6 +133,23 @@ std::string EPUBImageManager::getImageStyle(librevenge::RVNGPropertyList const &
 
 void EPUBImageManager::extractImageProperties(librevenge::RVNGPropertyList const &pList, EPUBCSSProperties &cssProps) const
 {
+  // Positioning.
+  librevenge::RVNGString anchorType;
+  if (pList["text:anchor-type"])
+    anchorType = pList["text:anchor-type"]->getStr();
+  if (anchorType != "as-char")
+  {
+    // Horizontal position.
+    librevenge::RVNGString horizontalPos;
+    if (pList["style:horizontal-pos"])
+      horizontalPos = pList["style:horizontal-pos"]->getStr();
+
+    if (horizontalPos == "right")
+      cssProps["float"] = "right";
+    else
+      cssProps["float"] = "left";
+  }
+
   // Extract borders.
   static char const *(type[]) = {"border", "border-left", "border-top", "border-right", "border-bottom" };
   for (int i = 0; i < 5; i++)
-- 
2.13.6

From 3d47458738729c86992a1ed0002726cba5ec315c Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Fri, 10 Nov 2017 12:27:35 +0100
Subject: [PATCH] EPUBImageManager: initial wrap type handling

You could assume that the wrap is the opposide of clear, but given it's
an attribute on the next element, they are the same at the end in case
of left and right.
---
 src/lib/EPUBHTMLGenerator.cpp      | 24 ++++++++++++++++++++++++
 src/test/EPUBTextGeneratorTest.cpp | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)

diff --git a/src/lib/EPUBHTMLGenerator.cpp b/src/lib/EPUBHTMLGenerator.cpp
index d81a905..a90ac68 100644
--- a/src/lib/EPUBHTMLGenerator.cpp
+++ b/src/lib/EPUBHTMLGenerator.cpp
@@ -982,6 +982,7 @@ void EPUBHTMLGenerator::insertBinaryObject(const RVNGPropertyList &propList)
                            propList["librevenge:mime-type"]->getStr());
 
   RVNGPropertyList attrs;
+  RVNGString wrap;
 
   if (!m_impl->m_framePropertiesStack.empty())
   {
@@ -995,12 +996,35 @@ void EPUBHTMLGenerator::insertBinaryObject(const RVNGPropertyList &propList)
       attrs.insert("style", m_impl->m_imageManager.getImageStyle(frameProperties).c_str());
       break;
     }
+
+    if (frameProperties["style:wrap"])
+      wrap = frameProperties["style:wrap"]->getStr();
   }
 
   attrs.insert("src", path.relativeTo(m_impl->m_path).str().c_str());
   // FIXME: use alternative repr. if available
   attrs.insert("alt", path.str().c_str());
   m_impl->output().insertEmptyElement("img", attrs);
+
+  // Emulate wrap type with a break after the image.
+  RVNGString brStyle;
+  if (wrap == "none")
+    brStyle = "clear: both;";
+  else if (wrap == "left")
+    // We want content on the left side, space on the right side, so the next
+    // element should clear on its left.
+    brStyle = "clear: left;";
+  else if (wrap == "right")
+    // Same here.
+    brStyle = "clear: right;";
+  else if (wrap == "parallel")
+    brStyle = "clear: none;";
+  if (!brStyle.empty())
+  {
+    attrs.clear();
+    attrs.insert("style", brStyle);
+    m_impl->output().insertEmptyElement("br", attrs);
+  }
 }
 
 void EPUBHTMLGenerator::insertEquation(const RVNGPropertyList & /* propList */) {}
-- 
2.13.6

From 40111db25a92537c922a768dd04916cb5edd0239 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Fri, 10 Nov 2017 14:13:29 +0100
Subject: [PATCH] EPUBHTMLGenerator: map TextBox to <div>

This way e.g. image with caption is no longer lost from the text
generator. This generalizes image and textbox styles as "frame" styles.
---
 src/lib/EPUBHTMLGenerator.cpp      | 27 ++++++++++++++++++----
 src/lib/EPUBImageManager.cpp       |  6 ++---
 src/lib/EPUBImageManager.h         |  4 ++--
 src/test/EPUBTextGeneratorTest.cpp | 47 +++++++++++++++++++++++++++++++++-----
 4 files changed, 68 insertions(+), 16 deletions(-)

diff --git a/src/lib/EPUBHTMLGenerator.cpp b/src/lib/EPUBHTMLGenerator.cpp
index a90ac68..5f10902 100644
--- a/src/lib/EPUBHTMLGenerator.cpp
+++ b/src/lib/EPUBHTMLGenerator.cpp
@@ -833,15 +833,32 @@ void EPUBHTMLGenerator::openTextBox(const RVNGPropertyList & /*propList*/)
 {
   if (m_impl->m_ignore)
     return;
-  m_impl->push(EPUBHTMLTextZone::Z_TextBox);
-  m_impl->getSink().addLabel(m_impl->output());
+
+  RVNGPropertyList attrs;
+
+  if (!m_impl->m_framePropertiesStack.empty())
+  {
+    RVNGPropertyList &frameProperties = m_impl->m_framePropertiesStack.top();
+    switch (m_impl->m_stylesMethod)
+    {
+    case EPUB_STYLES_METHOD_CSS:
+      attrs.insert("class", m_impl->m_imageManager.getFrameClass(frameProperties).c_str());
+      break;
+    case EPUB_STYLES_METHOD_INLINE:
+      attrs.insert("style", m_impl->m_imageManager.getFrameStyle(frameProperties).c_str());
+      break;
+    }
+  }
+
+  m_impl->output().openElement("div", attrs);
 }
 
 void EPUBHTMLGenerator::closeTextBox()
 {
   if (m_impl->m_ignore)
     return;
-  m_impl->pop();
+
+  m_impl->output().closeElement("div");
 }
 
 void EPUBHTMLGenerator::openTable(const RVNGPropertyList &propList)
@@ -990,10 +1007,10 @@ void EPUBHTMLGenerator::insertBinaryObject(const RVNGPropertyList &propList)
     switch (m_impl->m_stylesMethod)
     {
     case EPUB_STYLES_METHOD_CSS:
-      attrs.insert("class", m_impl->m_imageManager.getImageClass(frameProperties).c_str());
+      attrs.insert("class", m_impl->m_imageManager.getFrameClass(frameProperties).c_str());
       break;
     case EPUB_STYLES_METHOD_INLINE:
-      attrs.insert("style", m_impl->m_imageManager.getImageStyle(frameProperties).c_str());
+      attrs.insert("style", m_impl->m_imageManager.getFrameStyle(frameProperties).c_str());
       break;
     }
 
diff --git a/src/lib/EPUBImageManager.cpp b/src/lib/EPUBImageManager.cpp
index 8414da5..dfa0cb7 100644
--- a/src/lib/EPUBImageManager.cpp
+++ b/src/lib/EPUBImageManager.cpp
@@ -107,7 +107,7 @@ void EPUBImageManager::writeTo(EPUBPackage &package)
   }
 }
 
-std::string EPUBImageManager::getImageClass(librevenge::RVNGPropertyList const &pList)
+std::string EPUBImageManager::getFrameClass(librevenge::RVNGPropertyList const &pList)
 {
   EPUBCSSProperties content;
   extractImageProperties(pList, content);
@@ -115,12 +115,12 @@ std::string EPUBImageManager::getImageClass(librevenge::RVNGPropertyList const &
   if (it != m_imageContentNameMap.end())
     return it->second;
   std::stringstream s;
-  s << "image" << m_imageContentNameMap.size();
+  s << "frame" << m_imageContentNameMap.size();
   m_imageContentNameMap[content]=s.str();
   return s.str();
 }
 
-std::string EPUBImageManager::getImageStyle(librevenge::RVNGPropertyList const &pList)
+std::string EPUBImageManager::getFrameStyle(librevenge::RVNGPropertyList const &pList)
 {
   EPUBCSSProperties content;
   extractImageProperties(pList, content);
diff --git a/src/lib/EPUBImageManager.h b/src/lib/EPUBImageManager.h
index c9f4236..939d350 100644
--- a/src/lib/EPUBImageManager.h
+++ b/src/lib/EPUBImageManager.h
@@ -53,9 +53,9 @@ public:
   void writeTo(EPUBPackage &package);
 
   //! returns the class name corresponding to a propertylist
-  std::string getImageClass(librevenge::RVNGPropertyList const &pList);
+  std::string getFrameClass(librevenge::RVNGPropertyList const &pList);
   //! returns the style string corresponding to a propertylist
-  std::string getImageStyle(librevenge::RVNGPropertyList const &pList);
+  std::string getFrameStyle(librevenge::RVNGPropertyList const &pList);
   //! send the data to the sink
   void send(EPUBCSSSink &out);
 
-- 
2.13.6

From da840df8eaacfcfbd93d82751a774371d7e5c9b9 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Fri, 10 Nov 2017 15:29:47 +0100
Subject: [PATCH] EPUBHTMLGenerator: avoid wrap type for as-char anchored
 images

---
 src/lib/EPUBHTMLGenerator.cpp      | 40 ++++++++++++++++++++++----------------
 src/test/EPUBTextGeneratorTest.cpp | 15 +++++++++++++-
 2 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/src/lib/EPUBHTMLGenerator.cpp b/src/lib/EPUBHTMLGenerator.cpp
index 5f10902..156f042 100644
--- a/src/lib/EPUBHTMLGenerator.cpp
+++ b/src/lib/EPUBHTMLGenerator.cpp
@@ -1000,6 +1000,7 @@ void EPUBHTMLGenerator::insertBinaryObject(const RVNGPropertyList &propList)
 
   RVNGPropertyList attrs;
   RVNGString wrap;
+  RVNGString anchorType;
 
   if (!m_impl->m_framePropertiesStack.empty())
   {
@@ -1016,6 +1017,8 @@ void EPUBHTMLGenerator::insertBinaryObject(const RVNGPropertyList &propList)
 
     if (frameProperties["style:wrap"])
       wrap = frameProperties["style:wrap"]->getStr();
+    if (frameProperties["text:anchor-type"])
+      anchorType = frameProperties["text:anchor-type"]->getStr();
   }
 
   attrs.insert("src", path.relativeTo(m_impl->m_path).str().c_str());
@@ -1023,24 +1026,27 @@ void EPUBHTMLGenerator::insertBinaryObject(const RVNGPropertyList &propList)
   attrs.insert("alt", path.str().c_str());
   m_impl->output().insertEmptyElement("img", attrs);
 
-  // Emulate wrap type with a break after the image.
-  RVNGString brStyle;
-  if (wrap == "none")
-    brStyle = "clear: both;";
-  else if (wrap == "left")
-    // We want content on the left side, space on the right side, so the next
-    // element should clear on its left.
-    brStyle = "clear: left;";
-  else if (wrap == "right")
-    // Same here.
-    brStyle = "clear: right;";
-  else if (wrap == "parallel")
-    brStyle = "clear: none;";
-  if (!brStyle.empty())
+  if (anchorType != "as-char")
   {
-    attrs.clear();
-    attrs.insert("style", brStyle);
-    m_impl->output().insertEmptyElement("br", attrs);
+    // Emulate wrap type with a break after the image.
+    RVNGString brStyle;
+    if (wrap == "none")
+      brStyle = "clear: both;";
+    else if (wrap == "left")
+      // We want content on the left side, space on the right side, so the next
+      // element should clear on its left.
+      brStyle = "clear: left;";
+    else if (wrap == "right")
+      // Same here.
+      brStyle = "clear: right;";
+    else if (wrap == "parallel")
+      brStyle = "clear: none;";
+    if (!brStyle.empty())
+    {
+      attrs.clear();
+      attrs.insert("style", brStyle);
+      m_impl->output().insertEmptyElement("br", attrs);
+    }
   }
 }
 
-- 
2.13.6

From 3da66e7b1fbda75e43b3ab63502d66097f39ef7a Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Fri, 10 Nov 2017 16:36:11 +0100
Subject: [PATCH] EPUBImageManager: handle text box wrap types

By sharing the image and textbox wrap code.
---
 src/lib/EPUBHTMLGenerator.cpp      | 44 ++++++++++++++++----------------------
 src/lib/EPUBImageManager.cpp       | 29 +++++++++++++++++++++++++
 src/lib/EPUBImageManager.h         |  2 ++
 src/test/EPUBTextGeneratorTest.cpp |  2 ++
 4 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/src/lib/EPUBHTMLGenerator.cpp b/src/lib/EPUBHTMLGenerator.cpp
index 156f042..9d39333 100644
--- a/src/lib/EPUBHTMLGenerator.cpp
+++ b/src/lib/EPUBHTMLGenerator.cpp
@@ -859,6 +859,18 @@ void EPUBHTMLGenerator::closeTextBox()
     return;
 
   m_impl->output().closeElement("div");
+
+  if (!m_impl->m_framePropertiesStack.empty())
+  {
+    RVNGPropertyList &frameProperties = m_impl->m_framePropertiesStack.top();
+    RVNGString wrapStyle = m_impl->m_imageManager.getWrapStyle(frameProperties).c_str();
+    if (!wrapStyle.empty())
+    {
+      RVNGPropertyList attrs;
+      attrs.insert("style", wrapStyle);
+      m_impl->output().insertEmptyElement("br", attrs);
+    }
+  }
 }
 
 void EPUBHTMLGenerator::openTable(const RVNGPropertyList &propList)
@@ -999,8 +1011,7 @@ void EPUBHTMLGenerator::insertBinaryObject(const RVNGPropertyList &propList)
                            propList["librevenge:mime-type"]->getStr());
 
   RVNGPropertyList attrs;
-  RVNGString wrap;
-  RVNGString anchorType;
+  RVNGString wrapStyle;
 
   if (!m_impl->m_framePropertiesStack.empty())
   {
@@ -1015,10 +1026,7 @@ void EPUBHTMLGenerator::insertBinaryObject(const RVNGPropertyList &propList)
       break;
     }
 
-    if (frameProperties["style:wrap"])
-      wrap = frameProperties["style:wrap"]->getStr();
-    if (frameProperties["text:anchor-type"])
-      anchorType = frameProperties["text:anchor-type"]->getStr();
+    wrapStyle = m_impl->m_imageManager.getWrapStyle(frameProperties).c_str();
   }
 
   attrs.insert("src", path.relativeTo(m_impl->m_path).str().c_str());
@@ -1026,27 +1034,11 @@ void EPUBHTMLGenerator::insertBinaryObject(const RVNGPropertyList &propList)
   attrs.insert("alt", path.str().c_str());
   m_impl->output().insertEmptyElement("img", attrs);
 
-  if (anchorType != "as-char")
+  if (!wrapStyle.empty())
   {
-    // Emulate wrap type with a break after the image.
-    RVNGString brStyle;
-    if (wrap == "none")
-      brStyle = "clear: both;";
-    else if (wrap == "left")
-      // We want content on the left side, space on the right side, so the next
-      // element should clear on its left.
-      brStyle = "clear: left;";
-    else if (wrap == "right")
-      // Same here.
-      brStyle = "clear: right;";
-    else if (wrap == "parallel")
-      brStyle = "clear: none;";
-    if (!brStyle.empty())
-    {
-      attrs.clear();
-      attrs.insert("style", brStyle);
-      m_impl->output().insertEmptyElement("br", attrs);
-    }
+    attrs.clear();
+    attrs.insert("style", wrapStyle);
+    m_impl->output().insertEmptyElement("br", attrs);
   }
 }
 
diff --git a/src/lib/EPUBImageManager.cpp b/src/lib/EPUBImageManager.cpp
index dfa0cb7..c31fb82 100644
--- a/src/lib/EPUBImageManager.cpp
+++ b/src/lib/EPUBImageManager.cpp
@@ -162,6 +162,35 @@ void EPUBImageManager::extractImageProperties(librevenge::RVNGPropertyList const
   }
 }
 
+std::string EPUBImageManager::getWrapStyle(librevenge::RVNGPropertyList const &pList)
+{
+  librevenge::RVNGString wrap;
+  librevenge::RVNGString anchorType;
+  std::string ret;
+
+  if (pList["style:wrap"])
+    wrap = pList["style:wrap"]->getStr();
+  if (pList["text:anchor-type"])
+    anchorType = pList["text:anchor-type"]->getStr();
+
+  if (anchorType == "as-char")
+    return ret;
+
+  // Emulate wrap type with a break after the image.
+  if (wrap == "none")
+    ret = "clear: both;";
+  else if (wrap == "left")
+    // We want content on the left side, space on the right side, so the next
+    // element should clear on its left.
+    ret = "clear: left;";
+  else if (wrap == "right")
+    ret = "clear: right;";
+  else if (wrap == "parallel")
+    ret = "clear: none;";
+
+  return ret;
+}
+
 void EPUBImageManager::send(EPUBCSSSink &out)
 {
   for (auto it = m_imageContentNameMap.begin(); m_imageContentNameMap.end() != it; ++it)
diff --git a/src/lib/EPUBImageManager.h b/src/lib/EPUBImageManager.h
index 939d350..9d1da4e 100644
--- a/src/lib/EPUBImageManager.h
+++ b/src/lib/EPUBImageManager.h
@@ -56,6 +56,8 @@ public:
   std::string getFrameClass(librevenge::RVNGPropertyList const &pList);
   //! returns the style string corresponding to a propertylist
   std::string getFrameStyle(librevenge::RVNGPropertyList const &pList);
+  //! returns the style for a follow-up <br> element, based on wrapping properties.
+  static std::string getWrapStyle(librevenge::RVNGPropertyList const &pList);
   //! send the data to the sink
   void send(EPUBCSSSink &out);
 
-- 
2.13.6

diff --git a/src/lib/EPUBGenerator.cpp b/src/lib/EPUBGenerator.cpp
index 38c3188..64707c5 100644
--- a/src/lib/EPUBGenerator.cpp
+++ b/src/lib/EPUBGenerator.cpp
@@ -35,6 +35,7 @@ EPUBGenerator::EPUBGenerator(EPUBPackage *const package, const EPUBSplitMethod s
   , m_manifest()
   , m_htmlManager(m_manifest)
   , m_imageManager(m_manifest)
+  , m_fontManager(m_manifest)
   , m_listStyleManager()
   , m_paragraphStyleManager()
   , m_spanStyleManager()
@@ -79,6 +80,7 @@ void EPUBGenerator::endDocument()
   writeStylesheet();
   m_htmlManager.writeTo(*m_package);
   m_imageManager.writeTo(*m_package);
+  m_fontManager.writeTo(*m_package);
 }
 
 void EPUBGenerator::setDocumentMetaData(const RVNGPropertyList &props)
@@ -97,7 +99,7 @@ void EPUBGenerator::startNewHtmlFile()
 
   m_splitGuard.onSplit();
 
-  m_currentHtml = m_htmlManager.create(m_imageManager, m_listStyleManager, m_paragraphStyleManager, m_spanStyleManager, m_tableStyleManager, m_stylesheetPath, m_stylesMethod);
+  m_currentHtml = m_htmlManager.create(m_imageManager, m_fontManager, m_listStyleManager, m_paragraphStyleManager, m_spanStyleManager, m_tableStyleManager, m_stylesheetPath, m_stylesMethod);
 
   // restore state in the new file
   m_currentHtml->startDocument(m_documentProps);
@@ -226,6 +228,7 @@ void EPUBGenerator::writeStylesheet()
 {
   EPUBCSSSink sink;
 
+  m_fontManager.send(sink);
   m_listStyleManager.send(sink);
   m_paragraphStyleManager.send(sink);
   m_spanStyleManager.send(sink);
diff --git a/src/lib/EPUBGenerator.h b/src/lib/EPUBGenerator.h
index 099eb4a..abc6a9a 100644
--- a/src/lib/EPUBGenerator.h
+++ b/src/lib/EPUBGenerator.h
@@ -68,6 +68,7 @@ private:
   EPUBManifest m_manifest;
   EPUBHTMLManager m_htmlManager;
   EPUBImageManager m_imageManager;
+  EPUBFontManager m_fontManager;
   EPUBListStyleManager m_listStyleManager;
   EPUBParagraphStyleManager m_paragraphStyleManager;
   EPUBSpanStyleManager m_spanStyleManager;
diff --git a/src/lib/EPUBHTMLGenerator.cpp b/src/lib/EPUBHTMLGenerator.cpp
index 9d39333..614dd02 100644
--- a/src/lib/EPUBHTMLGenerator.cpp
+++ b/src/lib/EPUBHTMLGenerator.cpp
@@ -351,9 +351,10 @@ std::string EPUBHTMLTextZone::label(int id) const
 struct EPUBHTMLGeneratorImpl
 {
   //! constructor
-  EPUBHTMLGeneratorImpl(EPUBXMLSink &document, EPUBImageManager &imageManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &path, const EPUBPath &stylesheetPath, EPUBStylesMethod stylesMethod)
+  EPUBHTMLGeneratorImpl(EPUBXMLSink &document, EPUBImageManager &imageManager, EPUBFontManager &fontManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &path, const EPUBPath &stylesheetPath, EPUBStylesMethod stylesMethod)
     : m_document(document)
     , m_imageManager(imageManager)
+    , m_fontManager(fontManager)
     , m_listManager(listStyleManager)
     , m_paragraphManager(paragraphStyleManager)
     , m_spanManager(spanStyleManager)
@@ -442,6 +443,7 @@ struct EPUBHTMLGeneratorImpl
 
   EPUBXMLSink &m_document;
   EPUBImageManager &m_imageManager;
+  EPUBFontManager &m_fontManager;
   EPUBListStyleManager &m_listManager;
   EPUBParagraphStyleManager &m_paragraphManager;
   EPUBSpanStyleManager &m_spanManager;
@@ -469,8 +471,8 @@ private:
   EPUBHTMLGeneratorImpl operator=(EPUBHTMLGeneratorImpl const &orig);
 };
 
-EPUBHTMLGenerator::EPUBHTMLGenerator(EPUBXMLSink &document, EPUBImageManager &imageManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &path, const EPUBPath &stylesheetPath, EPUBStylesMethod stylesMethod)
-  : m_impl(new EPUBHTMLGeneratorImpl(document, imageManager, listStyleManager, paragraphStyleManager, spanStyleManager, tableStyleManager, path, stylesheetPath, stylesMethod))
+EPUBHTMLGenerator::EPUBHTMLGenerator(EPUBXMLSink &document, EPUBImageManager &imageManager, EPUBFontManager &fontManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &path, const EPUBPath &stylesheetPath, EPUBStylesMethod stylesMethod)
+  : m_impl(new EPUBHTMLGeneratorImpl(document, imageManager, fontManager, listStyleManager, paragraphStyleManager, spanStyleManager, tableStyleManager, path, stylesheetPath, stylesMethod))
 {
 }
 
@@ -540,8 +542,9 @@ void EPUBHTMLGenerator::endDocument()
   m_impl->m_document.closeElement("html");
 }
 
-void EPUBHTMLGenerator::defineEmbeddedFont(const RVNGPropertyList &/*propList*/)
+void EPUBHTMLGenerator::defineEmbeddedFont(const RVNGPropertyList &propList)
 {
+  m_impl->m_fontManager.insert(propList, m_impl->m_path);
 }
 
 void EPUBHTMLGenerator::openPageSpan(const RVNGPropertyList & /* propList */)
diff --git a/src/lib/EPUBHTMLGenerator.h b/src/lib/EPUBHTMLGenerator.h
index d8783ed..49f76a3 100644
--- a/src/lib/EPUBHTMLGenerator.h
+++ b/src/lib/EPUBHTMLGenerator.h
@@ -21,6 +21,7 @@ namespace libepubgen
 
 struct EPUBHTMLGeneratorImpl;
 class EPUBImageManager;
+class EPUBFontManager;
 class EPUBListStyleManager;
 class EPUBSpanStyleManager;
 class EPUBParagraphStyleManager;
@@ -30,7 +31,7 @@ class EPUBPath;
 class EPUBHTMLGenerator : public librevenge::RVNGTextInterface
 {
 public:
-  EPUBHTMLGenerator(EPUBXMLSink &document, EPUBImageManager &imageManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &path, const EPUBPath &stylesheetPath, EPUBStylesMethod stylesMethod);
+  EPUBHTMLGenerator(EPUBXMLSink &document, EPUBImageManager &imageManager, EPUBFontManager &fontManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &path, const EPUBPath &stylesheetPath, EPUBStylesMethod stylesMethod);
   ~EPUBHTMLGenerator() override;
 
   void setDocumentMetaData(const librevenge::RVNGPropertyList &propList) override;
diff --git a/src/lib/EPUBHTMLManager.cpp b/src/lib/EPUBHTMLManager.cpp
index 33cba11..9d4c507 100644
--- a/src/lib/EPUBHTMLManager.cpp
+++ b/src/lib/EPUBHTMLManager.cpp
@@ -41,7 +41,7 @@ EPUBHTMLManager::EPUBHTMLManager(EPUBManifest &manifest)
 {
 }
 
-const EPUBHTMLGeneratorPtr_t EPUBHTMLManager::create(EPUBImageManager &imageManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &stylesheetPath, EPUBStylesMethod stylesMethod)
+const EPUBHTMLGeneratorPtr_t EPUBHTMLManager::create(EPUBImageManager &imageManager, EPUBFontManager &fontManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &stylesheetPath, EPUBStylesMethod stylesMethod)
 {
   std::ostringstream nameBuf;
   nameBuf << "section" << std::setw(4) << std::setfill('0') << m_number.next();
@@ -55,7 +55,7 @@ const EPUBHTMLGeneratorPtr_t EPUBHTMLManager::create(EPUBImageManager &imageMana
   m_contents.push_back(EPUBXMLSink());
 
   const EPUBHTMLGeneratorPtr_t gen(
-    new EPUBHTMLGenerator(m_contents.back(), imageManager, listStyleManager, paragraphStyleManager, spanStyleManager, tableStyleManager, m_paths.back(), stylesheetPath, stylesMethod));
+    new EPUBHTMLGenerator(m_contents.back(), imageManager, fontManager, listStyleManager, paragraphStyleManager, spanStyleManager, tableStyleManager, m_paths.back(), stylesheetPath, stylesMethod));
 
   return gen;
 }
diff --git a/src/lib/EPUBHTMLManager.h b/src/lib/EPUBHTMLManager.h
index f034657..ef56a52 100644
--- a/src/lib/EPUBHTMLManager.h
+++ b/src/lib/EPUBHTMLManager.h
@@ -41,7 +41,7 @@ class EPUBHTMLManager
 public:
   explicit EPUBHTMLManager(EPUBManifest &manifest);
 
-  const EPUBHTMLGeneratorPtr_t create(EPUBImageManager &imageManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &stylesheetPath, EPUBStylesMethod stylesMethod);
+  const EPUBHTMLGeneratorPtr_t create(EPUBImageManager &imageManager, EPUBFontManager &fontManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &stylesheetPath, EPUBStylesMethod stylesMethod);
 
   void writeTo(EPUBPackage &package);
 
diff --git a/src/lib/EPUBImageManager.cpp b/src/lib/EPUBImageManager.cpp
index c31fb82..c4c9457 100644
--- a/src/lib/EPUBImageManager.cpp
+++ b/src/lib/EPUBImageManager.cpp
@@ -42,6 +42,17 @@ string getExtension(const string &mimetype)
   return (extensionMap.end() == it) ? string("img") : it->second;
 }
 
+std::string getFontExtension(const std::string &mimetype)
+{
+  static const std::unordered_map<std::string, std::string> extensionMap =
+  {
+    {"application/vnd.ms-opentype", "otf"},
+  };
+
+  const auto it = extensionMap.find(mimetype);
+  return it == extensionMap.end() ? std::string("ttf") : it->second;
+}
+
 }
 
 std::size_t EPUBImageManager::BinaryDataHash::operator()(const librevenge::RVNGBinaryData &data) const
@@ -201,6 +212,113 @@ void EPUBImageManager::send(EPUBCSSSink &out)
   }
 }
 
+std::size_t EPUBFontManager::BinaryDataHash::operator()(const librevenge::RVNGBinaryData &data) const
+{
+  size_t seed = 0;
+
+  const unsigned char *const buf = data.getDataBuffer();
+  for (size_t i = 0; data.size() != i; ++i)
+    boost::hash_combine(seed, buf[i]);
+
+  return seed;
+}
+
+bool EPUBFontManager::BinaryDataEqual::operator()(const librevenge::RVNGBinaryData &left, const librevenge::RVNGBinaryData &right) const
+{
+  if (left.empty() && right.empty())
+    return true;
+  if (left.size() != right.size())
+    return false;
+  const unsigned char *const leftData = left.getDataBuffer();
+  return std::equal(leftData, leftData + left.size(), right.getDataBuffer());
+}
+
+EPUBFontManager::EPUBFontManager(EPUBManifest &manifest)
+  : m_manifest(manifest)
+  , m_map()
+  , m_number()
+  , m_set()
+{
+}
+
+void EPUBFontManager::insert(const librevenge::RVNGPropertyList &propertyList, const EPUBPath &base)
+{
+  librevenge::RVNGBinaryData data(propertyList["office:binary-data"]->getStr());
+  librevenge::RVNGString mimetype(propertyList["librevenge:mime-type"]->getStr());
+  if (mimetype == "truetype")
+    // librevenge's truetype is EPUB's opentype.
+    mimetype = "application/vnd.ms-opentype";
+
+  MapType_t::const_iterator it = m_map.find(data);
+  if (m_map.end() == it)
+  {
+    const std::string mime(mimetype.cstr());
+
+    std::ostringstream nameBuf;
+    nameBuf << "font" << std::setw(4) << std::setfill('0') << m_number.next();
+    const std::string id = nameBuf.str();
+
+    nameBuf << "." << getFontExtension(mime);
+
+    const EPUBPath path(EPUBPath("OEBPS/fonts") / nameBuf.str());
+
+    m_manifest.insert(path, mime, id, "");
+    it = m_map.insert(MapType_t::value_type(data, path)).first;
+  }
+
+  assert(m_map.end() != it); // the font must be present at this point
+
+  // Now collect CSS properties.
+  EPUBCSSProperties content;
+  extractFontProperties(propertyList, content);
+  std::stringstream ss;
+  ss << "url(";
+  ss << it->second.relativeTo(base).str();
+  ss << ")";
+  content["src"] = ss.str();
+  SetType_t::const_iterator contentIt = m_set.find(content);
+  if (contentIt != m_set.end())
+    return;
+
+  m_set.insert(content);
+}
+
+void EPUBFontManager::extractFontProperties(librevenge::RVNGPropertyList const &pList, EPUBCSSProperties &cssProps) const
+{
+  if (pList["librevenge:name"])
+  {
+    std::ostringstream name;
+    name << '\'' << pList["librevenge:name"]->getStr().cstr() << '\'';
+    cssProps["font-family"] = name.str();
+  }
+
+  if (pList["librevenge:font-style"])
+    cssProps["font-style"] = pList["librevenge:font-style"]->getStr().cstr();
+
+  if (pList["librevenge:font-weight"])
+    cssProps["font-weight"] = pList["librevenge:font-weight"]->getStr().cstr();
+}
+
+void EPUBFontManager::writeTo(EPUBPackage &package)
+{
+  for (MapType_t::const_iterator it = m_map.begin(); m_map.end() != it; ++it)
+  {
+    EPUBBinarySink sink;
+    sink.insertBinaryData(it->first);
+    sink.writeTo(package, it->second.str().c_str());
+  }
+}
+
+void EPUBFontManager::send(EPUBCSSSink &out)
+{
+  for (const auto &fontProperties : m_set)
+  {
+    librevenge::RVNGPropertyList props;
+    fillPropertyList(fontProperties, props);
+    out.insertRule("@font-face", props);
+  }
+}
+
 }
 
 /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/EPUBImageManager.h b/src/lib/EPUBImageManager.h
index 9d1da4e..3f4bf3c 100644
--- a/src/lib/EPUBImageManager.h
+++ b/src/lib/EPUBImageManager.h
@@ -11,6 +11,7 @@
 #define INCLUDED_EPUBIMAGEMANAGER_H
 
 #include <unordered_map>
+#include <unordered_set>
 
 #include <boost/functional/hash.hpp>
 #include <librevenge/librevenge.h>
@@ -72,6 +73,48 @@ private:
   ContentNameMap_t m_imageContentNameMap;
 };
 
+/// Manages embedded fonts.
+class EPUBFontManager
+{
+  // disable copying
+  EPUBFontManager(const EPUBFontManager &);
+  EPUBFontManager &operator=(const EPUBFontManager &);
+
+  struct BinaryDataHash // : public std::unary_function<librevenge::RVNGBinaryData, std::size_t>
+  {
+    std::size_t operator()(const librevenge::RVNGBinaryData &data) const;
+  };
+
+  struct BinaryDataEqual // : public std::binary_function<librevenge::RVNGBinaryData, librevenge::RVNGBinaryData, bool>
+  {
+    bool operator()(const librevenge::RVNGBinaryData &left, const librevenge::RVNGBinaryData &right) const;
+  };
+
+  typedef std::unordered_map<librevenge::RVNGBinaryData, EPUBPath, BinaryDataHash, BinaryDataEqual> MapType_t;
+  typedef std::unordered_set<EPUBCSSProperties, boost::hash<EPUBCSSProperties>> SetType_t;
+
+public:
+  explicit EPUBFontManager(EPUBManifest &manifest);
+
+  void insert(const librevenge::RVNGPropertyList &propertyList, const EPUBPath &path);
+
+  void writeTo(EPUBPackage &package);
+
+  //! send the data to the sink
+  void send(EPUBCSSSink &out);
+
+private:
+  //! convert a property list into a CSS property map
+  void extractFontProperties(librevenge::RVNGPropertyList const &pList, EPUBCSSProperties &cssProps) const;
+
+  EPUBManifest &m_manifest;
+  /// Font filename -> content map.
+  MapType_t m_map;
+  EPUBCounter m_number;
+  /// Set of font properties.
+  SetType_t m_set;
+};
+
 }
 
 #endif // INCLUDED_EPUBIMAGEMANAGER
diff --git a/src/lib/EPUBTableStyleManager.cpp b/src/lib/EPUBTableStyleManager.cpp
index d5e650c..a1ce33e 100644
--- a/src/lib/EPUBTableStyleManager.cpp
+++ b/src/lib/EPUBTableStyleManager.cpp
@@ -78,7 +78,9 @@ bool extractColumnsWidth(const std::vector< std::vector<double> > &columnWidthsS
   if (col < 0 || size_t(col+numSpanned-1) >= widths.size())
   {
     if (!relative)
+    {
       EPUBGEN_DEBUG_MSG(("EPUBTableStyleManager::getColumnsWidth: can not compute the columns width\n"));
+    }
     return false;
   }
   bool fixed = true;
From 0d06b60d45b3e1465976eb027c3fde31fccdc025 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Fri, 17 Nov 2017 15:45:12 +0100
Subject: [PATCH] EPUBGenerator: add support for cover image metadata

The librevenge:cover-images key can't have a property list as a value,
so go with a list of cover images, though in practice more than one
won't result in a valid EPUB3 file.
---
 src/lib/EPUBGenerator.cpp          | 18 ++++++++++++++++++
 src/lib/EPUBImageManager.cpp       |  4 ++--
 src/lib/EPUBImageManager.h         |  2 +-
 src/test/EPUBTextGeneratorTest.cpp | 31 +++++++++++++++++++++++++++++++
 4 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/src/lib/EPUBGenerator.cpp b/src/lib/EPUBGenerator.cpp
index 64707c5..62dac6e 100644
--- a/src/lib/EPUBGenerator.cpp
+++ b/src/lib/EPUBGenerator.cpp
@@ -86,6 +86,24 @@ void EPUBGenerator::endDocument()
 void EPUBGenerator::setDocumentMetaData(const RVNGPropertyList &props)
 {
   m_metadata = props;
+
+  if (m_version == 30)
+  {
+    const librevenge::RVNGPropertyListVector *coverImages = props.child("librevenge:cover-images");
+    if (coverImages)
+    {
+      for (size_t i = 0; i < coverImages->count(); ++i)
+      {
+        librevenge::RVNGPropertyList const &propertyList = (*coverImages)[i];
+        if (propertyList["office:binary-data"] && propertyList["librevenge:mime-type"])
+        {
+          m_imageManager.insert(librevenge::RVNGBinaryData(propertyList["office:binary-data"]->getStr()),
+                                propertyList["librevenge:mime-type"]->getStr(),
+                                "cover-image");
+        }
+      }
+    }
+  }
 }
 
 void EPUBGenerator::startNewHtmlFile()
diff --git a/src/lib/EPUBImageManager.cpp b/src/lib/EPUBImageManager.cpp
index c4c9457..bdf3bf0 100644
--- a/src/lib/EPUBImageManager.cpp
+++ b/src/lib/EPUBImageManager.cpp
@@ -84,7 +84,7 @@ EPUBImageManager::EPUBImageManager(EPUBManifest &manifest)
 {
 }
 
-const EPUBPath &EPUBImageManager::insert(const librevenge::RVNGBinaryData &data, const librevenge::RVNGString &mimetype)
+const EPUBPath &EPUBImageManager::insert(const librevenge::RVNGBinaryData &data, const librevenge::RVNGString &mimetype, const librevenge::RVNGString &properties)
 {
   MapType_t::const_iterator it = m_map.find(data);
   if (m_map.end() == it)
@@ -99,7 +99,7 @@ const EPUBPath &EPUBImageManager::insert(const librevenge::RVNGBinaryData &data,
 
     const EPUBPath path(EPUBPath("OEBPS/images") / nameBuf.str());
 
-    m_manifest.insert(path, mime, id, "");
+    m_manifest.insert(path, mime, id, properties.cstr());
     it = m_map.insert(MapType_t::value_type(data, path)).first;
   }
 
diff --git a/src/lib/EPUBImageManager.h b/src/lib/EPUBImageManager.h
index 3f4bf3c..cbb83b7 100644
--- a/src/lib/EPUBImageManager.h
+++ b/src/lib/EPUBImageManager.h
@@ -49,7 +49,7 @@ class EPUBImageManager
 public:
   explicit EPUBImageManager(EPUBManifest &manifest);
 
-  const EPUBPath &insert(const librevenge::RVNGBinaryData &data, const librevenge::RVNGString &mimetype);
+  const EPUBPath &insert(const librevenge::RVNGBinaryData &data, const librevenge::RVNGString &mimetype, const librevenge::RVNGString &properties="");
 
   void writeTo(EPUBPackage &package);
 
-- 
2.13.6

From 631b21834883aa8f2ee83a20717dd37900331696 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Tue, 21 Nov 2017 11:52:03 +0100
Subject: [PATCH] EPUBGenerator: allow overwriting dc:identifier default

All other types had a way to be overwritten.
---
 src/lib/EPUBGenerator.cpp          | 5 ++++-
 src/test/EPUBTextGeneratorTest.cpp | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/lib/EPUBGenerator.cpp b/src/lib/EPUBGenerator.cpp
index 62dac6e..1cb1112 100644
--- a/src/lib/EPUBGenerator.cpp
+++ b/src/lib/EPUBGenerator.cpp
@@ -285,7 +285,10 @@ void EPUBGenerator::writeRoot()
   boost::uuids::uuid uuid = boost::uuids::random_generator()();
   identifierStream << uuid;
   std::string identifierCharactrs = identifierStream.str();
-  sink.insertCharacters(identifierCharactrs.c_str());
+  RVNGString identifier = identifierCharactrs.c_str();
+  if (m_metadata["dc:identifier"] && !m_metadata["dc:identifier"]->getStr().empty())
+    identifier = m_metadata["dc:identifier"]->getStr();
+  sink.insertCharacters(identifier);
   sink.closeElement("dc:identifier");
 
   RVNGString title("Unknown Title");
-- 
2.13.6

From 8c447caee18b4400170ecce36ea3714fdc377989 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Thu, 23 Nov 2017 16:42:13 +0100
Subject: [PATCH 1/4] EPUBHTMLGenerator: fix footnotes/endnotes/comments

There were two problems here:

- when working with two sinks (footnote and main), make sure that we
  save the main one before the push of the sink stack

- when handing out a non-const xml sink reference, make sure there is no
  parallel empty bool that tracks its size, otherwise these can out of
  sync (empty is still true, even if there is footnote content)
---
 src/lib/EPUBHTMLGenerator.cpp      | 24 +++++++-----------------
 src/lib/EPUBXMLSink.cpp            |  5 +++++
 src/lib/EPUBXMLSink.h              |  2 ++
 src/test/EPUBTextGeneratorTest.cpp | 24 ++++++++++++++++++++++++
 4 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/src/lib/EPUBHTMLGenerator.cpp b/src/lib/EPUBHTMLGenerator.cpp
index 614dd02..3c8862b 100644
--- a/src/lib/EPUBHTMLGenerator.cpp
+++ b/src/lib/EPUBHTMLGenerator.cpp
@@ -51,20 +51,16 @@ public:
   const EPUBXMLSink &get() const;
   EPUBXMLSink &get();
 
-  bool empty() const;
-
   bool endsInLineBreak() const;
 
 private:
   EPUBXMLSink m_sink;
   std::string m_lastCloseElement;
-  bool m_empty;
 };
 
 ZoneSinkImpl::ZoneSinkImpl()
   : m_sink()
   , m_lastCloseElement()
-  , m_empty(true)
 {
 }
 
@@ -72,28 +68,24 @@ void ZoneSinkImpl::openElement(const char *const name, const librevenge::RVNGPro
 {
   m_sink.openElement(name, attributes);
   m_lastCloseElement.clear();
-  m_empty = false;
 }
 
 void ZoneSinkImpl::closeElement(const char *const name)
 {
   m_sink.closeElement(name);
   m_lastCloseElement = name;
-  m_empty = false;
 }
 
 void ZoneSinkImpl::insertCharacters(const librevenge::RVNGString &characters)
 {
   m_sink.insertCharacters(characters);
   m_lastCloseElement.clear();
-  m_empty = false;
 }
 
 void ZoneSinkImpl::append(const ZoneSinkImpl &other)
 {
   m_sink.append(other.m_sink);
   m_lastCloseElement = other.m_lastCloseElement;
-  m_empty |= other.m_empty;
 }
 
 const EPUBXMLSink &ZoneSinkImpl::get() const
@@ -106,11 +98,6 @@ EPUBXMLSink &ZoneSinkImpl::get()
   return m_sink;
 }
 
-bool ZoneSinkImpl::empty() const
-{
-  return m_empty;
-}
-
 bool ZoneSinkImpl::endsInLineBreak() const
 {
   return m_lastCloseElement == "p"
@@ -154,7 +141,7 @@ struct EPUBHTMLTextZone
   bool isEmpty() const
   {
     for (const auto &zoneSink : m_zoneSinks)
-      if (!zoneSink.empty())
+      if (!zoneSink.get().empty())
         return false;
     return true;
   }
@@ -791,8 +778,9 @@ void EPUBHTMLGenerator::openFootnote(const RVNGPropertyList &)
 {
   if (m_impl->m_ignore)
     return;
+  EPUBXMLSink &output = m_impl->output();
   m_impl->push(EPUBHTMLTextZone::Z_FootNote);
-  m_impl->getSink().addLabel(m_impl->output());
+  m_impl->getSink().addLabel(output);
 }
 
 void EPUBHTMLGenerator::closeFootnote()
@@ -806,8 +794,9 @@ void EPUBHTMLGenerator::openEndnote(const RVNGPropertyList &)
 {
   if (m_impl->m_ignore)
     return;
+  EPUBXMLSink &output = m_impl->output();
   m_impl->push(EPUBHTMLTextZone::Z_EndNote);
-  m_impl->getSink().addLabel(m_impl->output());
+  m_impl->getSink().addLabel(output);
 }
 
 void EPUBHTMLGenerator::closeEndnote()
@@ -821,8 +810,9 @@ void EPUBHTMLGenerator::openComment(const RVNGPropertyList & /*propList*/)
 {
   if (m_impl->m_ignore)
     return;
+  EPUBXMLSink &output = m_impl->output();
   m_impl->push(EPUBHTMLTextZone::Z_Comment);
-  m_impl->getSink().addLabel(m_impl->output());
+  m_impl->getSink().addLabel(output);
 }
 
 void EPUBHTMLGenerator::closeComment()
diff --git a/src/lib/EPUBXMLSink.cpp b/src/lib/EPUBXMLSink.cpp
index 7c12c6d..db480d7 100644
--- a/src/lib/EPUBXMLSink.cpp
+++ b/src/lib/EPUBXMLSink.cpp
@@ -155,6 +155,11 @@ void EPUBXMLSink::append(const EPUBXMLSink &other)
   m_elements.insert(m_elements.end(), other.m_elements.begin(), other.m_elements.end());
 }
 
+bool EPUBXMLSink::empty() const
+{
+  return m_elements.empty();
+}
+
 void EPUBXMLSink::writeTo(EPUBPackage &package, const char *const name)
 {
   package.openXMLFile(name);
diff --git a/src/lib/EPUBXMLSink.h b/src/lib/EPUBXMLSink.h
index ea7ac7a..a2bf951 100644
--- a/src/lib/EPUBXMLSink.h
+++ b/src/lib/EPUBXMLSink.h
@@ -40,6 +40,8 @@ public:
 
   void writeTo(EPUBPackage &package, const char *name);
 
+  bool empty() const;
+
 private:
   std::deque<EPUBXMLElementPtr_t> m_elements;
 };
-- 
2.13.6


From 9c723bbe42673906d8d0faf5083a186cf86d05ce Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Thu, 23 Nov 2017 17:27:00 +0100
Subject: [PATCH 2/4] EPUBHTMLGenerator: avoid <title> in EPUB3 XHTML content
 documents

- there were multiple of them, which is invalid
- just don't write them, content.opf has the same info
---
 src/lib/EPUBGenerator.cpp          |  2 +-
 src/lib/EPUBHTMLGenerator.cpp      | 18 ++++++++++++------
 src/lib/EPUBHTMLGenerator.h        |  2 +-
 src/lib/EPUBHTMLManager.cpp        |  4 ++--
 src/lib/EPUBHTMLManager.h          |  2 +-
 src/test/EPUBTextGeneratorTest.cpp |  5 ++++-
 6 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/lib/EPUBGenerator.cpp b/src/lib/EPUBGenerator.cpp
index 1cb1112..571f0eb 100644
--- a/src/lib/EPUBGenerator.cpp
+++ b/src/lib/EPUBGenerator.cpp
@@ -117,7 +117,7 @@ void EPUBGenerator::startNewHtmlFile()
 
   m_splitGuard.onSplit();
 
-  m_currentHtml = m_htmlManager.create(m_imageManager, m_fontManager, m_listStyleManager, m_paragraphStyleManager, m_spanStyleManager, m_tableStyleManager, m_stylesheetPath, m_stylesMethod);
+  m_currentHtml = m_htmlManager.create(m_imageManager, m_fontManager, m_listStyleManager, m_paragraphStyleManager, m_spanStyleManager, m_tableStyleManager, m_stylesheetPath, m_stylesMethod, m_version);
 
   // restore state in the new file
   m_currentHtml->startDocument(m_documentProps);
diff --git a/src/lib/EPUBHTMLGenerator.cpp b/src/lib/EPUBHTMLGenerator.cpp
index 3c8862b..209e7e1 100644
--- a/src/lib/EPUBHTMLGenerator.cpp
+++ b/src/lib/EPUBHTMLGenerator.cpp
@@ -338,7 +338,7 @@ std::string EPUBHTMLTextZone::label(int id) const
 struct EPUBHTMLGeneratorImpl
 {
   //! constructor
-  EPUBHTMLGeneratorImpl(EPUBXMLSink &document, EPUBImageManager &imageManager, EPUBFontManager &fontManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &path, const EPUBPath &stylesheetPath, EPUBStylesMethod stylesMethod)
+  EPUBHTMLGeneratorImpl(EPUBXMLSink &document, EPUBImageManager &imageManager, EPUBFontManager &fontManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &path, const EPUBPath &stylesheetPath, EPUBStylesMethod stylesMethod, int version)
     : m_document(document)
     , m_imageManager(imageManager)
     , m_fontManager(fontManager)
@@ -351,6 +351,7 @@ struct EPUBHTMLGeneratorImpl
     , m_actualPage(0)
     , m_ignore(false)
     , m_hasText(false)
+    , m_version(version)
     , m_frameAnchorTypes()
     , m_framePropertiesStack()
     , m_stylesMethod(stylesMethod)
@@ -442,6 +443,7 @@ struct EPUBHTMLGeneratorImpl
   bool m_ignore;
   /// Does the currently opened paragraph have some text?
   bool m_hasText;
+  int m_version;
 
   std::stack<std::string> m_frameAnchorTypes;
   std::stack<RVNGPropertyList> m_framePropertiesStack;
@@ -458,8 +460,8 @@ private:
   EPUBHTMLGeneratorImpl operator=(EPUBHTMLGeneratorImpl const &orig);
 };
 
-EPUBHTMLGenerator::EPUBHTMLGenerator(EPUBXMLSink &document, EPUBImageManager &imageManager, EPUBFontManager &fontManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &path, const EPUBPath &stylesheetPath, EPUBStylesMethod stylesMethod)
-  : m_impl(new EPUBHTMLGeneratorImpl(document, imageManager, fontManager, listStyleManager, paragraphStyleManager, spanStyleManager, tableStyleManager, path, stylesheetPath, stylesMethod))
+EPUBHTMLGenerator::EPUBHTMLGenerator(EPUBXMLSink &document, EPUBImageManager &imageManager, EPUBFontManager &fontManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &path, const EPUBPath &stylesheetPath, EPUBStylesMethod stylesMethod, int version)
+  : m_impl(new EPUBHTMLGeneratorImpl(document, imageManager, fontManager, listStyleManager, paragraphStyleManager, spanStyleManager, tableStyleManager, path, stylesheetPath, stylesMethod, version))
 {
 }
 
@@ -509,14 +511,18 @@ void EPUBHTMLGenerator::endDocument()
   htmlAttrs.insert("xmlns", "http://www.w3.org/1999/xhtml");
   m_impl->m_document.openElement("html", htmlAttrs);
   m_impl->m_document.openElement("head", RVNGPropertyList());
-  m_impl->m_document.openElement("title", RVNGPropertyList());
-  m_impl->m_document.closeElement("title");
+  if (m_impl->m_version != 30)
+  {
+    m_impl->m_document.openElement("title", RVNGPropertyList());
+    m_impl->m_document.closeElement("title");
+  }
   RVNGPropertyList metaAttrs;
   metaAttrs.insert("http-equiv", "content-type");
   metaAttrs.insert("content", "text/html; charset=UTF-8");
   m_impl->m_document.openElement("meta", metaAttrs);
   m_impl->m_document.closeElement("meta");
-  m_impl->sendMetaData(m_impl->m_document);
+  if (m_impl->m_version != 30)
+    m_impl->sendMetaData(m_impl->m_document);
   RVNGPropertyList linkAttrs;
   linkAttrs.insert("href", m_impl->m_stylesheetPath.relativeTo(m_impl->m_path).str().c_str());
   linkAttrs.insert("type", "text/css");
diff --git a/src/lib/EPUBHTMLGenerator.h b/src/lib/EPUBHTMLGenerator.h
index 49f76a3..11f20cb 100644
--- a/src/lib/EPUBHTMLGenerator.h
+++ b/src/lib/EPUBHTMLGenerator.h
@@ -31,7 +31,7 @@ class EPUBPath;
 class EPUBHTMLGenerator : public librevenge::RVNGTextInterface
 {
 public:
-  EPUBHTMLGenerator(EPUBXMLSink &document, EPUBImageManager &imageManager, EPUBFontManager &fontManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &path, const EPUBPath &stylesheetPath, EPUBStylesMethod stylesMethod);
+  EPUBHTMLGenerator(EPUBXMLSink &document, EPUBImageManager &imageManager, EPUBFontManager &fontManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &path, const EPUBPath &stylesheetPath, EPUBStylesMethod stylesMethod, int version);
   ~EPUBHTMLGenerator() override;
 
   void setDocumentMetaData(const librevenge::RVNGPropertyList &propList) override;
diff --git a/src/lib/EPUBHTMLManager.cpp b/src/lib/EPUBHTMLManager.cpp
index 9d4c507..d2c21da 100644
--- a/src/lib/EPUBHTMLManager.cpp
+++ b/src/lib/EPUBHTMLManager.cpp
@@ -41,7 +41,7 @@ EPUBHTMLManager::EPUBHTMLManager(EPUBManifest &manifest)
 {
 }
 
-const EPUBHTMLGeneratorPtr_t EPUBHTMLManager::create(EPUBImageManager &imageManager, EPUBFontManager &fontManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &stylesheetPath, EPUBStylesMethod stylesMethod)
+const EPUBHTMLGeneratorPtr_t EPUBHTMLManager::create(EPUBImageManager &imageManager, EPUBFontManager &fontManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &stylesheetPath, EPUBStylesMethod stylesMethod, int version)
 {
   std::ostringstream nameBuf;
   nameBuf << "section" << std::setw(4) << std::setfill('0') << m_number.next();
@@ -55,7 +55,7 @@ const EPUBHTMLGeneratorPtr_t EPUBHTMLManager::create(EPUBImageManager &imageMana
   m_contents.push_back(EPUBXMLSink());
 
   const EPUBHTMLGeneratorPtr_t gen(
-    new EPUBHTMLGenerator(m_contents.back(), imageManager, fontManager, listStyleManager, paragraphStyleManager, spanStyleManager, tableStyleManager, m_paths.back(), stylesheetPath, stylesMethod));
+    new EPUBHTMLGenerator(m_contents.back(), imageManager, fontManager, listStyleManager, paragraphStyleManager, spanStyleManager, tableStyleManager, m_paths.back(), stylesheetPath, stylesMethod, version));
 
   return gen;
 }
diff --git a/src/lib/EPUBHTMLManager.h b/src/lib/EPUBHTMLManager.h
index ef56a52..e1205e6 100644
--- a/src/lib/EPUBHTMLManager.h
+++ b/src/lib/EPUBHTMLManager.h
@@ -41,7 +41,7 @@ class EPUBHTMLManager
 public:
   explicit EPUBHTMLManager(EPUBManifest &manifest);
 
-  const EPUBHTMLGeneratorPtr_t create(EPUBImageManager &imageManager, EPUBFontManager &fontManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &stylesheetPath, EPUBStylesMethod stylesMethod);
+  const EPUBHTMLGeneratorPtr_t create(EPUBImageManager &imageManager, EPUBFontManager &fontManager, EPUBListStyleManager &listStyleManager, EPUBParagraphStyleManager &paragraphStyleManager, EPUBSpanStyleManager &spanStyleManager, EPUBTableStyleManager &tableStyleManager, const EPUBPath &stylesheetPath, EPUBStylesMethod stylesMethod, int version);
 
   void writeTo(EPUBPackage &package);
 
-- 
2.13.6


From 502948041df07729572bf4f2b222e03073baa6c8 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Fri, 24 Nov 2017 10:29:15 +0100
Subject: [PATCH 3/4] EPUBHTMLGenerator: implement EPUB3 footnote markup

The main difference is that in the EPUB3 case the footnote has an
explicit end.
---
 src/lib/EPUBHTMLGenerator.cpp      | 56 ++++++++++++++++++++++++++++----------
 src/test/EPUBTextGeneratorTest.cpp | 26 ++++++++++++++++++
 2 files changed, 68 insertions(+), 14 deletions(-)

diff --git a/src/lib/EPUBHTMLGenerator.cpp b/src/lib/EPUBHTMLGenerator.cpp
index 209e7e1..96e7623 100644
--- a/src/lib/EPUBHTMLGenerator.cpp
+++ b/src/lib/EPUBHTMLGenerator.cpp
@@ -122,7 +122,7 @@ struct EPUBHTMLTextZone
   //! the different zone
   enum Type { Z_Comment=0, Z_EndNote, Z_FootNote, Z_Main, Z_MetaData, Z_TextBox, Z_Unknown, Z_NumZones= Z_Unknown+1};
   //! constructor for basic stream
-  EPUBHTMLTextZone(Type tp=Z_Unknown) : m_type(tp), m_actualId(0), m_zoneSinks()
+  EPUBHTMLTextZone(Type tp=Z_Unknown) : m_type(tp), m_actualId(0), m_zoneSinks(), m_version(20)
   {
   }
   //! the type
@@ -135,6 +135,14 @@ struct EPUBHTMLTextZone
   {
     m_type=tp;
   }
+  void setVersion(int version)
+  {
+    m_version = version;
+  }
+  int getVersion() const
+  {
+    return m_version;
+  }
   //! returns a new sink corresponding to this zone
   std::unique_ptr<TextZoneSink> getNewSink();
   //! returns true if there is no data
@@ -150,7 +158,7 @@ struct EPUBHTMLTextZone
   {
     if (isEmpty() || m_type==Z_Unknown || m_type==Z_Main)
       return;
-    if (m_type!=Z_MetaData)
+    if (m_type!=Z_MetaData && m_version < 30)
     {
       out.openElement("hr", RVNGPropertyList());
       out.closeElement("hr");
@@ -197,6 +205,7 @@ protected:
   mutable int m_actualId;
   //! the list of data string
   std::vector<ZoneSinkImpl> m_zoneSinks;
+  int m_version;
 private:
   EPUBHTMLTextZone(EPUBHTMLTextZone const &orig);
   EPUBHTMLTextZone operator=(EPUBHTMLTextZone const &orig);
@@ -218,11 +227,16 @@ struct TextZoneSink
     std::string lbl=label();
     if (!lbl.length())
       return;
+    int version = 20;
+    if (m_zone)
+      version = m_zone->getVersion();
     {
       RVNGPropertyList supAttrs;
       supAttrs.insert("id", ("called" + lbl).c_str());
       output.openElement("sup", supAttrs);
       RVNGPropertyList aAttrs;
+      if (version == 30)
+        aAttrs.insert("epub:type", "noteref");
       aAttrs.insert("href", ("#data" + lbl).c_str());
       output.openElement("a", aAttrs);
       output.insertCharacters(lbl.c_str());
@@ -230,17 +244,23 @@ struct TextZoneSink
       output.closeElement("sup");
     }
     flush();
+    if (version == 30)
     {
-      RVNGPropertyList supAttrs;
-      supAttrs.insert("id", ("data" + lbl).c_str());
-      m_delayedLabel.openElement("sup", supAttrs);
-      RVNGPropertyList aAttrs;
-      aAttrs.insert("href", ("#called" + lbl).c_str());
-      m_delayedLabel.openElement("a", aAttrs);
-      m_delayedLabel.insertCharacters(lbl.c_str());
-      m_delayedLabel.closeElement("a");
-      m_delayedLabel.closeElement("sup");
+      RVNGPropertyList asideAttrs;
+      asideAttrs.insert("epub:type", "footnote");
+      asideAttrs.insert("id", ("data" + lbl).c_str());
+      m_sink.openElement("aside", asideAttrs);
     }
+    RVNGPropertyList supAttrs;
+    if (version < 30)
+      supAttrs.insert("id", ("data" + lbl).c_str());
+    m_delayedLabel.openElement("sup", supAttrs);
+    RVNGPropertyList aAttrs;
+    aAttrs.insert("href", ("#called" + lbl).c_str());
+    m_delayedLabel.openElement("a", aAttrs);
+    m_delayedLabel.insertCharacters(lbl.c_str());
+    m_delayedLabel.closeElement("a");
+    m_delayedLabel.closeElement("sup");
   }
   //! flush delayed label, ...
   void flush()
@@ -359,7 +379,10 @@ struct EPUBHTMLGeneratorImpl
     , m_sinkStack()
   {
     for (int i = 0; i < EPUBHTMLTextZone::Z_NumZones; ++i)
+    {
       m_zones[i].setType(EPUBHTMLTextZone::Type(i));
+      m_zones[i].setVersion(version);
+    }
     m_actualSink=m_zones[EPUBHTMLTextZone::Z_Main].getNewSink();
   }
   //! destructor
@@ -511,7 +534,7 @@ void EPUBHTMLGenerator::endDocument()
   htmlAttrs.insert("xmlns", "http://www.w3.org/1999/xhtml");
   m_impl->m_document.openElement("html", htmlAttrs);
   m_impl->m_document.openElement("head", RVNGPropertyList());
-  if (m_impl->m_version != 30)
+  if (m_impl->m_version < 30)
   {
     m_impl->m_document.openElement("title", RVNGPropertyList());
     m_impl->m_document.closeElement("title");
@@ -521,7 +544,7 @@ void EPUBHTMLGenerator::endDocument()
   metaAttrs.insert("content", "text/html; charset=UTF-8");
   m_impl->m_document.openElement("meta", metaAttrs);
   m_impl->m_document.closeElement("meta");
-  if (m_impl->m_version != 30)
+  if (m_impl->m_version < 30)
     m_impl->sendMetaData(m_impl->m_document);
   RVNGPropertyList linkAttrs;
   linkAttrs.insert("href", m_impl->m_stylesheetPath.relativeTo(m_impl->m_path).str().c_str());
@@ -529,7 +552,10 @@ void EPUBHTMLGenerator::endDocument()
   linkAttrs.insert("rel", "stylesheet");
   m_impl->m_document.insertEmptyElement("link", linkAttrs);
   m_impl->m_document.closeElement("head");
-  m_impl->m_document.openElement("body", RVNGPropertyList());
+  RVNGPropertyList bodyAttrs;
+  if (m_impl->m_version == 30)
+    bodyAttrs.insert("xmlns:epub", "http://www.idpf.org/2007/ops");
+  m_impl->m_document.openElement("body", bodyAttrs);
   m_impl->flushUnsent(m_impl->m_document);
   m_impl->m_document.closeElement("body");
   m_impl->m_document.closeElement("html");
@@ -793,6 +819,8 @@ void EPUBHTMLGenerator::closeFootnote()
 {
   if (m_impl->m_ignore)
     return;
+  if (m_impl->m_version == 30)
+    m_impl->output().closeElement("aside");
   m_impl->pop();
 }
 
-- 
2.13.6


From a8444b113df52769849ad45ea440def8d1884b15 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Fri, 24 Nov 2017 11:10:34 +0100
Subject: [PATCH 4/4] EPUBHTMLGenerator: implement custom footnote anchor text

Try to avoid our default F<N> anchor text if possible, which only makes
sense in English.
---
 src/lib/EPUBHTMLGenerator.cpp      | 22 +++++++++++++++-------
 src/test/EPUBTextGeneratorTest.cpp | 25 +++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/src/lib/EPUBHTMLGenerator.cpp b/src/lib/EPUBHTMLGenerator.cpp
index 96e7623..6b4c7c2 100644
--- a/src/lib/EPUBHTMLGenerator.cpp
+++ b/src/lib/EPUBHTMLGenerator.cpp
@@ -222,9 +222,14 @@ struct TextZoneSink
   //! destructor
   ~TextZoneSink() { }
   //! add a label called on main and a label in this ( delayed to allow openParagraph to be called )
-  void addLabel(EPUBXMLSink &output)
+  void addLabel(EPUBXMLSink &output, const librevenge::RVNGString &number)
   {
+    // Unique label, e.g. 'F1' for the first footnote.
     std::string lbl=label();
+    // User-visible label, e.g. '1'.
+    std::string uiLabel = lbl;
+    if (!number.empty())
+      uiLabel = number.cstr();
     if (!lbl.length())
       return;
     int version = 20;
@@ -239,7 +244,7 @@ struct TextZoneSink
         aAttrs.insert("epub:type", "noteref");
       aAttrs.insert("href", ("#data" + lbl).c_str());
       output.openElement("a", aAttrs);
-      output.insertCharacters(lbl.c_str());
+      output.insertCharacters(uiLabel.c_str());
       output.closeElement("a");
       output.closeElement("sup");
     }
@@ -258,7 +263,7 @@ struct TextZoneSink
     RVNGPropertyList aAttrs;
     aAttrs.insert("href", ("#called" + lbl).c_str());
     m_delayedLabel.openElement("a", aAttrs);
-    m_delayedLabel.insertCharacters(lbl.c_str());
+    m_delayedLabel.insertCharacters(uiLabel.c_str());
     m_delayedLabel.closeElement("a");
     m_delayedLabel.closeElement("sup");
   }
@@ -806,13 +811,16 @@ void EPUBHTMLGenerator::closeListElement()
   m_impl->output().closeElement("li");
 }
 
-void EPUBHTMLGenerator::openFootnote(const RVNGPropertyList &)
+void EPUBHTMLGenerator::openFootnote(const RVNGPropertyList &propList)
 {
   if (m_impl->m_ignore)
     return;
   EPUBXMLSink &output = m_impl->output();
   m_impl->push(EPUBHTMLTextZone::Z_FootNote);
-  m_impl->getSink().addLabel(output);
+  librevenge::RVNGString number;
+  if (const librevenge::RVNGProperty *numProp = propList["librevenge:number"])
+    number = numProp->getStr();
+  m_impl->getSink().addLabel(output, number);
 }
 
 void EPUBHTMLGenerator::closeFootnote()
@@ -830,7 +838,7 @@ void EPUBHTMLGenerator::openEndnote(const RVNGPropertyList &)
     return;
   EPUBXMLSink &output = m_impl->output();
   m_impl->push(EPUBHTMLTextZone::Z_EndNote);
-  m_impl->getSink().addLabel(output);
+  m_impl->getSink().addLabel(output, librevenge::RVNGString());
 }
 
 void EPUBHTMLGenerator::closeEndnote()
@@ -846,7 +854,7 @@ void EPUBHTMLGenerator::openComment(const RVNGPropertyList & /*propList*/)
     return;
   EPUBXMLSink &output = m_impl->output();
   m_impl->push(EPUBHTMLTextZone::Z_Comment);
-  m_impl->getSink().addLabel(output);
+  m_impl->getSink().addLabel(output, librevenge::RVNGString());
 }
 
 void EPUBHTMLGenerator::closeComment()
-- 
2.13.6