[librsvg: 8/8] Merge branch 'revert-text-as-path' into 'main'

[Marge Bot <marge-bot src gnome org>]

commit f94b89bb3a28b3c9bcb1feacd99994ff6b861b5b
Merge: 0ce7ee100 13255e0bc
Author: Marge Bot <marge-bot gnome org>
Date:   Sat Mar 5 04:32:09 2022 +0000

    Merge branch 'revert-text-as-path' into 'main'
    
    Revert text-as-path
    
    See merge request GNOME/librsvg!672

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