[librsvg: 14/14] Merge branch 'pdf-text-as-text' into 'main'




commit e33995f39532abfbc67b1b5eaa904a5e3af729f4
Merge: f94b89bb3 b973fab35
Author: Marge Bot <marge-bot gnome org>
Date:   Wed Mar 9 23:43:09 2022 +0000

    Merge branch 'pdf-text-as-text' into 'main'
    
    Output text-as-text for PDF
    
    Closes #851 and #599
    
    See merge request GNOME/librsvg!673

 benches/path_parser.rs                             |   4 +-
 ci/container_builds.yml                            |   5 +-
 src/bin/rsvg-convert.rs                            |   3 +-
 src/drawing_ctx.rs                                 | 189 +++++++++++++++------
 src/href.rs                                        |   3 +-
 src/layout.rs                                      |   1 +
 src/parsers.rs                                     |   2 +-
 src/text.rs                                        |   1 +
 tests/fixtures/reftests/a-pseudo-class-ref.png     | Bin 3152 -> 3753 bytes
 .../reftests/bugs/108-font-size-relative-ref.png   | Bin 2354 -> 2397 bytes
 tests/fixtures/reftests/bugs/340047-ref.png        | Bin 5219 -> 5565 bytes
 .../reftests/bugs/363-missing-space-ref.png        | Bin 7014 -> 7943 bytes
 .../bugs/481-tspan-uses-at-least-first-x-ref.png   | Bin 1117 -> 1530 bytes
 .../reftests/bugs/494-text-accumulate-dy-ref.png   | Bin 3075 -> 4178 bytes
 .../reftests/bugs/587721-text-transform-ref.png    | Bin 3974 -> 4050 bytes
 .../reftests/bugs/642-nested-tspan-dx-dy-ref.png   | Bin 6217 -> 7092 bytes
 .../reftests/bugs/667-tspan-visibility-ref.png     | Bin 1913 -> 2236 bytes
 .../fixtures/reftests/bugs/668-small-caps-ref.png  | Bin 1645 -> 2383 bytes
 .../reftests/bugs/730-font-scaling-ref.png         | Bin 14780 -> 16123 bytes
 tests/fixtures/reftests/bugs/749415-ref.png        | Bin 23223 -> 26974 bytes
 tests/fixtures/reftests/bugs/760180-ref.png        | Bin 9634 -> 10641 bytes
 .../bugs/a-inside-text-content-738-ref.png         | Bin 2493 -> 2799 bytes
 .../a-inside-text-content-pseudo-class-738-ref.png | Bin 2493 -> 2799 bytes
 ...-component-transfer-from-reference-page-ref.png | Bin 8017 -> 8371 bytes
 .../filter-morphology-from-reference-page-ref.png  | Bin 3929 -> 3951 bytes
 tests/fixtures/reftests/font-shorthand-ref.png     | Bin 3792 -> 4228 bytes
 tests/fixtures/reftests/include-fallback-ref.png   | Bin 1229 -> 1303 bytes
 tests/fixtures/reftests/include-text-ref.png       | Bin 1008 -> 1078 bytes
 tests/fixtures/reftests/rtl-tspan-ref.png          | Bin 3961 -> 5132 bytes
 .../reftests/svg1.1/coords-trans-01-b-ref.png      | Bin 13119 -> 15526 bytes
 .../reftests/svg1.1/coords-trans-02-t-ref.png      | Bin 9010 -> 10948 bytes
 .../reftests/svg1.1/coords-trans-03-t-ref.png      | Bin 8479 -> 9447 bytes
 .../reftests/svg1.1/coords-trans-04-t-ref.png      | Bin 7275 -> 7345 bytes
 .../reftests/svg1.1/coords-trans-05-t-ref.png      | Bin 8822 -> 10865 bytes
 .../reftests/svg1.1/coords-trans-06-t-ref.png      | Bin 9130 -> 11568 bytes
 .../reftests/svg1.1/coords-trans-07-t-ref.png      | Bin 12156 -> 13471 bytes
 .../reftests/svg1.1/coords-trans-08-t-ref.png      | Bin 13897 -> 15167 bytes
 .../reftests/svg1.1/coords-trans-09-t-ref.png      | Bin 18954 -> 24169 bytes
 .../reftests/svg1.1/coords-viewattr-01-b-ref.png   | Bin 17981 -> 20579 bytes
 .../reftests/svg1.1/coords-viewattr-02-b-ref.png   | Bin 38827 -> 41857 bytes
 .../reftests/svg1.1/coords-viewattr-03-b-ref.png   | Bin 25959 -> 32874 bytes
 .../svg1.1/filters-background-01-f-ref.png         | Bin 19566 -> 19599 bytes
 .../reftests/svg1.1/filters-blend-01-b-ref.png     | Bin 18734 -> 19129 bytes
 .../reftests/svg1.1/filters-color-01-b-ref.png     | Bin 25568 -> 30271 bytes
 .../reftests/svg1.1/filters-color-02-b-ref.png     | Bin 7299 -> 7757 bytes
 .../reftests/svg1.1/filters-composite-02-b-ref.png | Bin 17772 -> 19527 bytes
 .../reftests/svg1.1/filters-composite-03-f-ref.png | Bin 4947 -> 4994 bytes
 .../reftests/svg1.1/filters-composite-04-f-ref.png | Bin 114952 -> 115093 bytes
 .../reftests/svg1.1/filters-composite-05-f-ref.png | Bin 30361 -> 30491 bytes
 .../reftests/svg1.1/filters-comptran-01-b-ref.png  | Bin 17857 -> 21117 bytes
 .../reftests/svg1.1/filters-conv-01-f-ref.png      | Bin 50438 -> 52909 bytes
 .../reftests/svg1.1/filters-conv-02-f-ref.png      | Bin 34262 -> 35787 bytes
 .../reftests/svg1.1/filters-conv-03-f-ref.png      | Bin 28525 -> 29721 bytes
 .../reftests/svg1.1/filters-conv-04-f-ref.png      | Bin 77475 -> 77530 bytes
 .../reftests/svg1.1/filters-conv-05-f-ref.png      | Bin 10453 -> 11750 bytes
 .../reftests/svg1.1/filters-diffuse-01-f-ref.png   | Bin 20210 -> 25302 bytes
 .../reftests/svg1.1/filters-displace-02-f-ref.png  | Bin 8124 -> 8210 bytes
 .../reftests/svg1.1/filters-felem-02-f-ref.png     | Bin 13740 -> 13814 bytes
 .../reftests/svg1.1/filters-gauss-01-b-ref.png     | Bin 21330 -> 21424 bytes
 .../reftests/svg1.1/filters-gauss-02-f-ref.png     | Bin 7273 -> 7329 bytes
 .../reftests/svg1.1/filters-gauss-03-f-ref.png     | Bin 4966 -> 5023 bytes
 .../reftests/svg1.1/filters-image-01-b-ref.png     | Bin 92104 -> 92798 bytes
 .../reftests/svg1.1/filters-image-02-b-ref.png     | Bin 26108 -> 27166 bytes
 .../reftests/svg1.1/filters-image-03-f-ref.png     | Bin 12126 -> 12185 bytes
 .../reftests/svg1.1/filters-image-04-f-ref.png     | Bin 12271 -> 12972 bytes
 .../reftests/svg1.1/filters-image-05-f-ref.png     | Bin 20498 -> 23055 bytes
 .../reftests/svg1.1/filters-light-01-f-ref.png     | Bin 32456 -> 41139 bytes
 .../reftests/svg1.1/filters-light-02-f-ref.png     | Bin 11868 -> 12396 bytes
 .../reftests/svg1.1/filters-light-03-f-ref.png     | Bin 13347 -> 15089 bytes
 .../reftests/svg1.1/filters-light-04-f-ref.png     | Bin 12109 -> 13284 bytes
 .../reftests/svg1.1/filters-light-05-f-ref.png     | Bin 28008 -> 35062 bytes
 .../reftests/svg1.1/filters-morph-01-f-ref.png     | Bin 33809 -> 34940 bytes
 .../reftests/svg1.1/filters-offset-01-b-ref.png    | Bin 11099 -> 11188 bytes
 .../reftests/svg1.1/filters-overview-01-b-ref.png  | Bin 36046 -> 38045 bytes
 .../reftests/svg1.1/filters-overview-02-b-ref.png  | Bin 43638 -> 45458 bytes
 .../reftests/svg1.1/filters-overview-03-b-ref.png  | Bin 43859 -> 45573 bytes
 .../reftests/svg1.1/filters-specular-01-f-ref.png  | Bin 28534 -> 34884 bytes
 .../reftests/svg1.1/filters-tile-01-b-ref.png      | Bin 6983 -> 8034 bytes
 .../reftests/svg1.1/filters-turb-01-f-ref.png      | Bin 143066 -> 144941 bytes
 .../reftests/svg1.1/filters-turb-02-f-ref.png      | Bin 19921 -> 22335 bytes
 .../reftests/svg1.1/masking-filter-01-f-ref.png    | Bin 7044 -> 7924 bytes
 .../reftests/svg1.1/masking-intro-01-f-ref.png     | Bin 15495 -> 17747 bytes
 .../reftests/svg1.1/masking-mask-01-b-ref.png      | Bin 20126 -> 23283 bytes
 .../reftests/svg1.1/masking-mask-02-f-ref.png      | Bin 4965 -> 5021 bytes
 .../reftests/svg1.1/masking-opacity-01-b-ref.png   | Bin 34855 -> 43003 bytes
 .../reftests/svg1.1/masking-path-01-b-ref.png      | Bin 13053 -> 15837 bytes
 .../reftests/svg1.1/masking-path-02-b-ref.png      | Bin 14363 -> 17531 bytes
 .../reftests/svg1.1/masking-path-03-b-ref.png      | Bin 23652 -> 26498 bytes
 .../reftests/svg1.1/masking-path-04-b-ref.png      | Bin 93196 -> 93356 bytes
 .../reftests/svg1.1/masking-path-05-f-ref.png      | Bin 8113 -> 9010 bytes
 .../reftests/svg1.1/masking-path-08-b-ref.png      | Bin 7169 -> 8232 bytes
 .../reftests/svg1.1/painting-control-02-f-ref.png  | Bin 5049 -> 5105 bytes
 .../reftests/svg1.1/painting-marker-01-f-ref.png   | Bin 9429 -> 10432 bytes
 .../reftests/svg1.1/painting-marker-02-f-ref.png   | Bin 10289 -> 11457 bytes
 .../reftests/svg1.1/painting-marker-03-f-ref.png   | Bin 29985 -> 36022 bytes
 .../reftests/svg1.1/painting-marker-04-f-ref.png   | Bin 28607 -> 35004 bytes
 .../reftests/svg1.1/painting-marker-06-f-ref.png   | Bin 9634 -> 10641 bytes
 .../reftests/svg1.1/painting-marker-07-f-ref.png   | Bin 5612 -> 5669 bytes
 .../svg1.1/painting-marker-properties-01-f-ref.png | Bin 6799 -> 6820 bytes
 .../reftests/svg1.1/painting-stroke-01-t-ref.png   | Bin 13486 -> 16681 bytes
 .../reftests/svg1.1/painting-stroke-02-t-ref.png   | Bin 17037 -> 20598 bytes
 .../reftests/svg1.1/painting-stroke-03-t-ref.png   | Bin 17416 -> 21276 bytes
 .../reftests/svg1.1/painting-stroke-04-t-ref.png   | Bin 15700 -> 20026 bytes
 .../reftests/svg1.1/painting-stroke-05-t-ref.png   | Bin 7964 -> 8797 bytes
 .../reftests/svg1.1/painting-stroke-06-t-ref.png   | Bin 5187 -> 5266 bytes
 .../reftests/svg1.1/painting-stroke-07-t-ref.png   | Bin 6736 -> 6812 bytes
 .../reftests/svg1.1/painting-stroke-08-t-ref.png   | Bin 9061 -> 9131 bytes
 .../reftests/svg1.1/painting-stroke-09-t-ref.png   | Bin 4910 -> 4985 bytes
 .../reftests/svg1.1/paths-data-01-t-ref.png        | Bin 26399 -> 27842 bytes
 .../reftests/svg1.1/paths-data-02-t-ref.png        | Bin 33710 -> 35876 bytes
 .../reftests/svg1.1/paths-data-03-f-ref.png        | Bin 31695 -> 33259 bytes
 .../reftests/svg1.1/paths-data-04-t-ref.png        | Bin 19047 -> 19715 bytes
 .../reftests/svg1.1/paths-data-05-t-ref.png        | Bin 16742 -> 17198 bytes
 .../reftests/svg1.1/paths-data-06-t-ref.png        | Bin 7852 -> 8461 bytes
 .../reftests/svg1.1/paths-data-07-t-ref.png        | Bin 7084 -> 7647 bytes
 .../reftests/svg1.1/paths-data-08-t-ref.png        | Bin 20084 -> 21515 bytes
 .../reftests/svg1.1/paths-data-09-t-ref.png        | Bin 18175 -> 19348 bytes
 .../reftests/svg1.1/paths-data-10-t-ref.png        | Bin 22672 -> 23846 bytes
 .../reftests/svg1.1/paths-data-12-t-ref.png        | Bin 10133 -> 10181 bytes
 .../reftests/svg1.1/paths-data-13-t-ref.png        | Bin 4991 -> 5039 bytes
 .../reftests/svg1.1/paths-data-14-t-ref.png        | Bin 12867 -> 12954 bytes
 .../reftests/svg1.1/paths-data-15-t-ref.png        | Bin 6383 -> 6468 bytes
 .../reftests/svg1.1/paths-data-16-t-ref.png        | Bin 8536 -> 9812 bytes
 .../reftests/svg1.1/paths-data-17-f-ref.png        | Bin 4903 -> 4954 bytes
 .../reftests/svg1.1/paths-data-18-f-ref.png        | Bin 5164 -> 5250 bytes
 .../reftests/svg1.1/paths-data-19-f-ref.png        | Bin 23865 -> 23941 bytes
 .../reftests/svg1.1/paths-data-20-f-ref.png        | Bin 9572 -> 9633 bytes
 .../reftests/svg1.1/pservers-grad-01-b-ref.png     | Bin 10440 -> 12480 bytes
 .../reftests/svg1.1/pservers-grad-02-b-ref.png     | Bin 23376 -> 25561 bytes
 .../reftests/svg1.1/pservers-grad-03-b-ref.png     | Bin 10705 -> 12249 bytes
 .../reftests/svg1.1/pservers-grad-04-b-ref.png     | Bin 24904 -> 27281 bytes
 .../reftests/svg1.1/pservers-grad-05-b-ref.png     | Bin 65533 -> 65682 bytes
 .../reftests/svg1.1/pservers-grad-06-b-ref.png     | Bin 22598 -> 24587 bytes
 .../reftests/svg1.1/pservers-grad-07-b-ref.png     | Bin 11852 -> 16104 bytes
 ...ervers-grad-07-b.svg => pservers-grad-07-b.svg} |   0
 .../reftests/svg1.1/pservers-grad-08-b-ref.png     | Bin 39385 -> 42953 bytes
 ...ervers-grad-08-b.svg => pservers-grad-08-b.svg} |   0
 .../reftests/svg1.1/pservers-grad-09-b-ref.png     | Bin 6757 -> 7685 bytes
 .../reftests/svg1.1/pservers-grad-10-b-ref.png     | Bin 10337 -> 12051 bytes
 .../reftests/svg1.1/pservers-grad-11-b-ref.png     | Bin 60103 -> 63163 bytes
 .../reftests/svg1.1/pservers-grad-12-b-ref.png     | Bin 25565 -> 33466 bytes
 .../reftests/svg1.1/pservers-grad-14-b-ref.png     | Bin 26424 -> 29324 bytes
 .../reftests/svg1.1/pservers-grad-15-b-ref.png     | Bin 10564 -> 10660 bytes
 .../reftests/svg1.1/pservers-grad-16-b-ref.png     | Bin 5206 -> 5254 bytes
 .../reftests/svg1.1/pservers-grad-18-b-ref.png     | Bin 5205 -> 5251 bytes
 .../reftests/svg1.1/pservers-grad-22-b-ref.png     | Bin 8028 -> 8073 bytes
 .../reftests/svg1.1/pservers-grad-23-f-ref.png     | Bin 6816 -> 6841 bytes
 .../reftests/svg1.1/pservers-grad-24-f-ref.png     | Bin 8101 -> 8890 bytes
 .../svg1.1/pservers-grad-stops-01-f-ref.png        | Bin 7029 -> 7057 bytes
 .../reftests/svg1.1/pservers-pattern-01-b-ref.png  | Bin 23804 -> 29302 bytes
 .../reftests/svg1.1/pservers-pattern-02-f-ref.png  | Bin 35332 -> 35378 bytes
 .../reftests/svg1.1/pservers-pattern-03-f-ref.png  | Bin 6711 -> 6845 bytes
 .../reftests/svg1.1/pservers-pattern-04-f-ref.png  | Bin 6583 -> 6634 bytes
 .../reftests/svg1.1/pservers-pattern-05-f-ref.png  | Bin 7812 -> 7836 bytes
 .../reftests/svg1.1/pservers-pattern-06-f-ref.png  | Bin 6731 -> 6751 bytes
 .../reftests/svg1.1/pservers-pattern-07-f-ref.png  | Bin 8265 -> 8292 bytes
 .../reftests/svg1.1/pservers-pattern-08-f-ref.png  | Bin 8263 -> 8291 bytes
 .../reftests/svg1.1/pservers-pattern-09-f-ref.png  | Bin 6493 -> 6625 bytes
 .../reftests/svg1.1/shapes-intro-01-t-ref.png      | Bin 8210 -> 9248 bytes
 .../reftests/svg1.1/shapes-intro-02-f-ref.png      | Bin 12989 -> 13081 bytes
 .../reftests/svg1.1/struct-cond-01-t-ref.png       | Bin 4962 -> 5010 bytes
 .../reftests/svg1.1/struct-cond-03-t-ref.png       | Bin 4811 -> 4885 bytes
 .../reftests/svg1.1/struct-group-03-t-ref.png      | Bin 19303 -> 22347 bytes
 .../reftests/svg1.1/struct-svg-03-f-ref.png        | Bin 6531 -> 6668 bytes
 .../reftests/svg1.1/struct-symbol-01-b-ref.png     | Bin 52608 -> 52664 bytes
 .../reftests/svg1.1/struct-use-01-t-ref.png        | Bin 16084 -> 17058 bytes
 .../reftests/svg1.1/struct-use-03-t-ref.png        | Bin 8355 -> 8892 bytes
 .../reftests/svg1.1/struct-use-04-b-ref.png        | Bin 20432 -> 21560 bytes
 .../reftests/svg1.1/struct-use-09-b-ref.png        | Bin 7239 -> 7252 bytes
 .../reftests/svg1.1/struct-use-10-f-ref.png        | Bin 7147 -> 8339 bytes
 .../reftests/svg1.1/styling-css-01-b-ref.png       | Bin 9610 -> 10437 bytes
 .../reftests/svg1.1/styling-css-02-b-ref.png       | Bin 9706 -> 10228 bytes
 .../reftests/svg1.1/styling-css-03-b-ref.png       | Bin 10878 -> 13192 bytes
 .../reftests/svg1.1/styling-css-04-f-ref.png       | Bin 8643 -> 9426 bytes
 .../reftests/svg1.1/styling-css-07-f-ref.png       | Bin 4965 -> 5020 bytes
 .../reftests/svg1.1/styling-css-08-f-ref.png       | Bin 11125 -> 11155 bytes
 .../reftests/svg1.1/text-align-01-b-ref.png        | Bin 20175 -> 24464 bytes
 .../reftests/svg1.1/text-align-02-b-ref.png        | Bin 22826 -> 26495 bytes
 .../reftests/svg1.1/text-align-03-b-ref.png        | Bin 16776 -> 20317 bytes
 .../reftests/svg1.1/text-fonts-02-t-ref.png        | Bin 19470 -> 23442 bytes
 .../reftests/svg1.1/text-text-03-b-ref.png         | Bin 22840 -> 28286 bytes
 .../reftests/svg1.1/text-text-08-b-ref.png         | Bin 44211 -> 43814 bytes
 .../reftests/svg1.1/text-text-10-t-ref.png         | Bin 46725 -> 50554 bytes
 .../reftests/svg1.1/text-tref-01-b-ref.png         | Bin 10142 -> 13431 bytes
 .../reftests/svg1.1/text-tref-02-b-ref.png         | Bin 9828 -> 11909 bytes
 .../reftests/svg1.1/text-tref-03-b-ref.png         | Bin 8441 -> 9970 bytes
 .../reftests/svg1.1/types-basic-02-f-ref.png       | Bin 18139 -> 18281 bytes
 .../reftests/svg2/text-paint-order-ref.png         | Bin 23527 -> 23494 bytes
 tests/fixtures/text/hello-world.svg                |  11 ++
 tests/src/cmdline/rsvg_convert.rs                  |  21 ++-
 tests/src/main.rs                                  |   4 -
 tests/src/predicates/mod.rs                        |   2 -
 tests/src/predicates/pdf.rs                        |  30 ++++
 tests/src/predicates/png.rs                        |   3 +-
 tests/src/predicates/svg.rs                        |   1 +
 tests/src/text.rs                                  |  21 ++-
 196 files changed, 222 insertions(+), 79 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]