diff options
author | Matthias Clasen <mclasen@redhat.com> | 2022-07-04 11:16:05 -0400 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2022-07-04 11:17:21 -0400 |
commit | bcdce34c8ac0adffd589e9fb68b62ff09368bb0f (patch) | |
tree | 7b92ba875b22212d15ffb9d9620d517cfa427a1e | |
parent | b197cc08b18bc44a3e93f859ca7e61dfe335bbc5 (diff) | |
download | pango-bcdce34c8ac0adffd589e9fb68b62ff09368bb0f.tar.gz |
Move the code from pango/ to pango2/
Life is easier if the src path matches the installed
header path prefix, so make them match. Update all
users.
-rw-r--r-- | .gitlab-ci.yml | 2 | ||||
-rw-r--r-- | docs/meson.build | 2 | ||||
-rw-r--r-- | examples/cairoshape.c | 2 | ||||
-rw-r--r-- | examples/cairosimple.c | 2 | ||||
-rw-r--r-- | examples/cairotwisted.c | 2 | ||||
-rw-r--r-- | examples/columns.c | 3 | ||||
-rw-r--r-- | examples/first-steps.c | 2 | ||||
-rw-r--r-- | examples/parshape.c | 3 | ||||
-rw-r--r-- | examples/userfont.c | 2 | ||||
-rw-r--r-- | meson.build | 4 | ||||
-rw-r--r-- | pango/pango.h | 61 | ||||
-rw-r--r-- | pango2/break-arabic.c (renamed from pango/break-arabic.c) | 0 | ||||
-rw-r--r-- | pango2/break-indic.c (renamed from pango/break-indic.c) | 0 | ||||
-rw-r--r-- | pango2/break-latin.c (renamed from pango/break-latin.c) | 0 | ||||
-rw-r--r-- | pango2/break-thai.c (renamed from pango/break-thai.c) | 0 | ||||
-rw-r--r-- | pango2/break.c (renamed from pango/break.c) | 0 | ||||
-rw-r--r-- | pango2/ellipsize.c (renamed from pango/ellipsize.c) | 0 | ||||
-rw-r--r-- | pango2/emoji_presentation_scanner.c (renamed from pango/emoji_presentation_scanner.c) | 0 | ||||
-rw-r--r-- | pango2/emoji_presentation_scanner.rl (renamed from pango/emoji_presentation_scanner.rl) | 0 | ||||
-rw-r--r-- | pango2/glyphstring.c (renamed from pango/glyphstring.c) | 0 | ||||
-rw-r--r-- | pango2/itemize.c (renamed from pango/itemize.c) | 0 | ||||
-rw-r--r-- | pango2/json/gtkjsonparser.c (renamed from pango/json/gtkjsonparser.c) | 0 | ||||
-rw-r--r-- | pango2/json/gtkjsonparserprivate.h (renamed from pango/json/gtkjsonparserprivate.h) | 0 | ||||
-rw-r--r-- | pango2/json/gtkjsonprinter.c (renamed from pango/json/gtkjsonprinter.c) | 0 | ||||
-rw-r--r-- | pango2/json/gtkjsonprinterprivate.h (renamed from pango/json/gtkjsonprinterprivate.h) | 0 | ||||
-rw-r--r-- | pango2/meson.build (renamed from pango/meson.build) | 0 | ||||
-rw-r--r-- | pango2/pango-attr-iterator-private.h (renamed from pango/pango-attr-iterator-private.h) | 2 | ||||
-rw-r--r-- | pango2/pango-attr-iterator.c (renamed from pango/pango-attr-iterator.c) | 0 | ||||
-rw-r--r-- | pango2/pango-attr-iterator.h (renamed from pango/pango-attr-iterator.h) | 2 | ||||
-rw-r--r-- | pango2/pango-attr-list-private.h (renamed from pango/pango-attr-list-private.h) | 2 | ||||
-rw-r--r-- | pango2/pango-attr-list.c (renamed from pango/pango-attr-list.c) | 0 | ||||
-rw-r--r-- | pango2/pango-attr-list.h (renamed from pango/pango-attr-list.h) | 2 | ||||
-rw-r--r-- | pango2/pango-attr-private.h (renamed from pango/pango-attr-private.h) | 2 | ||||
-rw-r--r-- | pango2/pango-attr.c (renamed from pango/pango-attr.c) | 0 | ||||
-rw-r--r-- | pango2/pango-attr.h (renamed from pango/pango-attr.h) | 4 | ||||
-rw-r--r-- | pango2/pango-attributes-private.h (renamed from pango/pango-attributes-private.h) | 0 | ||||
-rw-r--r-- | pango2/pango-attributes.c (renamed from pango/pango-attributes.c) | 0 | ||||
-rw-r--r-- | pango2/pango-attributes.h (renamed from pango/pango-attributes.h) | 6 | ||||
-rw-r--r-- | pango2/pango-bidi-private.h (renamed from pango/pango-bidi-private.h) | 4 | ||||
-rw-r--r-- | pango2/pango-bidi.c (renamed from pango/pango-bidi.c) | 0 | ||||
-rw-r--r-- | pango2/pango-break-table.h (renamed from pango/pango-break-table.h) | 0 | ||||
-rw-r--r-- | pango2/pango-break.h (renamed from pango/pango-break.h) | 2 | ||||
-rw-r--r-- | pango2/pango-color-table.h (renamed from pango/pango-color-table.h) | 0 | ||||
-rw-r--r-- | pango2/pango-color.c (renamed from pango/pango-color.c) | 0 | ||||
-rw-r--r-- | pango2/pango-color.h (renamed from pango/pango-color.h) | 2 | ||||
-rw-r--r-- | pango2/pango-context-private.h (renamed from pango/pango-context-private.h) | 2 | ||||
-rw-r--r-- | pango2/pango-context.c (renamed from pango/pango-context.c) | 0 | ||||
-rw-r--r-- | pango2/pango-context.h (renamed from pango/pango-context.h) | 10 | ||||
-rw-r--r-- | pango2/pango-direction.h (renamed from pango/pango-direction.h) | 0 | ||||
-rw-r--r-- | pango2/pango-emoji-private.h (renamed from pango/pango-emoji-private.h) | 0 | ||||
-rw-r--r-- | pango2/pango-emoji-table.h (renamed from pango/pango-emoji-table.h) | 0 | ||||
-rw-r--r-- | pango2/pango-emoji.c (renamed from pango/pango-emoji.c) | 0 | ||||
-rw-r--r-- | pango2/pango-enum-types.c.template (renamed from pango/pango-enum-types.c.template) | 0 | ||||
-rw-r--r-- | pango2/pango-enum-types.h.template (renamed from pango/pango-enum-types.h.template) | 2 | ||||
-rw-r--r-- | pango2/pango-features.h.meson (renamed from pango/pango-features.h.meson) | 0 | ||||
-rw-r--r-- | pango2/pango-font-description-private.h (renamed from pango/pango-font-description-private.h) | 0 | ||||
-rw-r--r-- | pango2/pango-font-description.c (renamed from pango/pango-font-description.c) | 0 | ||||
-rw-r--r-- | pango2/pango-font-description.h (renamed from pango/pango-font-description.h) | 2 | ||||
-rw-r--r-- | pango2/pango-font-face-private.h (renamed from pango/pango-font-face-private.h) | 4 | ||||
-rw-r--r-- | pango2/pango-font-face.c (renamed from pango/pango-font-face.c) | 0 | ||||
-rw-r--r-- | pango2/pango-font-face.h (renamed from pango/pango-font-face.h) | 2 | ||||
-rw-r--r-- | pango2/pango-font-family-private.h (renamed from pango/pango-font-family-private.h) | 2 | ||||
-rw-r--r-- | pango2/pango-font-family.c (renamed from pango/pango-font-family.c) | 0 | ||||
-rw-r--r-- | pango2/pango-font-family.h (renamed from pango/pango-font-family.h) | 2 | ||||
-rw-r--r-- | pango2/pango-font-metrics-private.h (renamed from pango/pango-font-metrics-private.h) | 2 | ||||
-rw-r--r-- | pango2/pango-font-metrics.c (renamed from pango/pango-font-metrics.c) | 0 | ||||
-rw-r--r-- | pango2/pango-font-metrics.h (renamed from pango/pango-font-metrics.h) | 2 | ||||
-rw-r--r-- | pango2/pango-font-private.h (renamed from pango/pango-font-private.h) | 6 | ||||
-rw-r--r-- | pango2/pango-font.c (renamed from pango/pango-font.c) | 0 | ||||
-rw-r--r-- | pango2/pango-font.h (renamed from pango/pango-font.h) | 8 | ||||
-rw-r--r-- | pango2/pango-fontmap-private.h (renamed from pango/pango-fontmap-private.h) | 6 | ||||
-rw-r--r-- | pango2/pango-fontmap.c (renamed from pango/pango-fontmap.c) | 4 | ||||
-rw-r--r-- | pango2/pango-fontmap.h (renamed from pango/pango-fontmap.h) | 6 | ||||
-rw-r--r-- | pango2/pango-fontset-cached-private.h (renamed from pango/pango-fontset-cached-private.h) | 6 | ||||
-rw-r--r-- | pango2/pango-fontset-cached.c (renamed from pango/pango-fontset-cached.c) | 0 | ||||
-rw-r--r-- | pango2/pango-fontset-private.h (renamed from pango/pango-fontset-private.h) | 0 | ||||
-rw-r--r-- | pango2/pango-fontset.c (renamed from pango/pango-fontset.c) | 0 | ||||
-rw-r--r-- | pango2/pango-fontset.h (renamed from pango/pango-fontset.h) | 4 | ||||
-rw-r--r-- | pango2/pango-generic-family-private.h (renamed from pango/pango-generic-family-private.h) | 0 | ||||
-rw-r--r-- | pango2/pango-generic-family.c (renamed from pango/pango-generic-family.c) | 0 | ||||
-rw-r--r-- | pango2/pango-generic-family.h (renamed from pango/pango-generic-family.h) | 0 | ||||
-rw-r--r-- | pango2/pango-glyph-item-private.h (renamed from pango/pango-glyph-item-private.h) | 8 | ||||
-rw-r--r-- | pango2/pango-glyph-item.c (renamed from pango/pango-glyph-item.c) | 0 | ||||
-rw-r--r-- | pango2/pango-glyph-iter-private.h (renamed from pango/pango-glyph-iter-private.h) | 2 | ||||
-rw-r--r-- | pango2/pango-glyph.h (renamed from pango/pango-glyph.h) | 6 | ||||
-rw-r--r-- | pango2/pango-gravity.c (renamed from pango/pango-gravity.c) | 0 | ||||
-rw-r--r-- | pango2/pango-gravity.h (renamed from pango/pango-gravity.h) | 5 | ||||
-rw-r--r-- | pango2/pango-hbface-private.h (renamed from pango/pango-hbface-private.h) | 0 | ||||
-rw-r--r-- | pango2/pango-hbface.c (renamed from pango/pango-hbface.c) | 0 | ||||
-rw-r--r-- | pango2/pango-hbface.h (renamed from pango/pango-hbface.h) | 4 | ||||
-rw-r--r-- | pango2/pango-hbfamily-private.h (renamed from pango/pango-hbfamily-private.h) | 0 | ||||
-rw-r--r-- | pango2/pango-hbfamily.c (renamed from pango/pango-hbfamily.c) | 0 | ||||
-rw-r--r-- | pango2/pango-hbfont-private.h (renamed from pango/pango-hbfont-private.h) | 0 | ||||
-rw-r--r-- | pango2/pango-hbfont.c (renamed from pango/pango-hbfont.c) | 0 | ||||
-rw-r--r-- | pango2/pango-hbfont.h (renamed from pango/pango-hbfont.h) | 6 | ||||
-rw-r--r-- | pango2/pango-impl-utils.h (renamed from pango/pango-impl-utils.h) | 2 | ||||
-rw-r--r-- | pango2/pango-item-private.h (renamed from pango/pango-item-private.h) | 4 | ||||
-rw-r--r-- | pango2/pango-item.c (renamed from pango/pango-item.c) | 0 | ||||
-rw-r--r-- | pango2/pango-item.h (renamed from pango/pango-item.h) | 6 | ||||
-rw-r--r-- | pango2/pango-language-sample-table.h (renamed from pango/pango-language-sample-table.h) | 0 | ||||
-rw-r--r-- | pango2/pango-language-set-private.h (renamed from pango/pango-language-set-private.h) | 0 | ||||
-rw-r--r-- | pango2/pango-language-set-simple-private.h (renamed from pango/pango-language-set-simple-private.h) | 0 | ||||
-rw-r--r-- | pango2/pango-language-set-simple.c (renamed from pango/pango-language-set-simple.c) | 0 | ||||
-rw-r--r-- | pango2/pango-language-set.c (renamed from pango/pango-language-set.c) | 0 | ||||
-rw-r--r-- | pango2/pango-language.c (renamed from pango/pango-language.c) | 0 | ||||
-rw-r--r-- | pango2/pango-language.h (renamed from pango/pango-language.h) | 6 | ||||
-rw-r--r-- | pango2/pango-layout.c (renamed from pango/pango-layout.c) | 0 | ||||
-rw-r--r-- | pango2/pango-layout.h (renamed from pango/pango-layout.h) | 8 | ||||
-rw-r--r-- | pango2/pango-line-breaker.c (renamed from pango/pango-line-breaker.c) | 0 | ||||
-rw-r--r-- | pango2/pango-line-breaker.h (renamed from pango/pango-line-breaker.h) | 8 | ||||
-rw-r--r-- | pango2/pango-line-iter-private.h (renamed from pango/pango-line-iter-private.h) | 0 | ||||
-rw-r--r-- | pango2/pango-line-iter.c (renamed from pango/pango-line-iter.c) | 0 | ||||
-rw-r--r-- | pango2/pango-line-iter.h (renamed from pango/pango-line-iter.h) | 4 | ||||
-rw-r--r-- | pango2/pango-line-private.h (renamed from pango/pango-line-private.h) | 0 | ||||
-rw-r--r-- | pango2/pango-line.c (renamed from pango/pango-line.c) | 0 | ||||
-rw-r--r-- | pango2/pango-line.h (renamed from pango/pango-line.h) | 4 | ||||
-rw-r--r-- | pango2/pango-lines-private.h (renamed from pango/pango-lines-private.h) | 0 | ||||
-rw-r--r-- | pango2/pango-lines.c (renamed from pango/pango-lines.c) | 0 | ||||
-rw-r--r-- | pango2/pango-lines.h (renamed from pango/pango-lines.h) | 4 | ||||
-rw-r--r-- | pango2/pango-markup.c (renamed from pango/pango-markup.c) | 0 | ||||
-rw-r--r-- | pango2/pango-markup.h (renamed from pango/pango-markup.h) | 2 | ||||
-rw-r--r-- | pango2/pango-matrix.c (renamed from pango/pango-matrix.c) | 0 | ||||
-rw-r--r-- | pango2/pango-matrix.h (renamed from pango/pango-matrix.h) | 3 | ||||
-rw-r--r-- | pango2/pango-renderer.c (renamed from pango/pango-renderer.c) | 0 | ||||
-rw-r--r-- | pango2/pango-renderer.h (renamed from pango/pango-renderer.h) | 6 | ||||
-rw-r--r-- | pango2/pango-run-private.h (renamed from pango/pango-run-private.h) | 0 | ||||
-rw-r--r-- | pango2/pango-run.c (renamed from pango/pango-run.c) | 0 | ||||
-rw-r--r-- | pango2/pango-run.h (renamed from pango/pango-run.h) | 6 | ||||
-rw-r--r-- | pango2/pango-script-lang-table.h (renamed from pango/pango-script-lang-table.h) | 0 | ||||
-rw-r--r-- | pango2/pango-script-private.h (renamed from pango/pango-script-private.h) | 0 | ||||
-rw-r--r-- | pango2/pango-script.c (renamed from pango/pango-script.c) | 0 | ||||
-rw-r--r-- | pango2/pango-script.h (renamed from pango/pango-script.h) | 4 | ||||
-rw-r--r-- | pango2/pango-tabs.c (renamed from pango/pango-tabs.c) | 0 | ||||
-rw-r--r-- | pango2/pango-tabs.h (renamed from pango/pango-tabs.h) | 2 | ||||
-rw-r--r-- | pango2/pango-trace-private.h (renamed from pango/pango-trace-private.h) | 0 | ||||
-rw-r--r-- | pango2/pango-trace.c (renamed from pango/pango-trace.c) | 0 | ||||
-rw-r--r-- | pango2/pango-types.h (renamed from pango/pango-types.h) | 12 | ||||
-rw-r--r-- | pango2/pango-userface-private.h (renamed from pango/pango-userface-private.h) | 0 | ||||
-rw-r--r-- | pango2/pango-userface.c (renamed from pango/pango-userface.c) | 0 | ||||
-rw-r--r-- | pango2/pango-userface.h (renamed from pango/pango-userface.h) | 6 | ||||
-rw-r--r-- | pango2/pango-userfont-private.h (renamed from pango/pango-userfont-private.h) | 0 | ||||
-rw-r--r-- | pango2/pango-userfont.c (renamed from pango/pango-userfont.c) | 0 | ||||
-rw-r--r-- | pango2/pango-userfont.h (renamed from pango/pango-userfont.h) | 4 | ||||
-rw-r--r-- | pango2/pango-utils.c (renamed from pango/pango-utils.c) | 0 | ||||
-rw-r--r-- | pango2/pango-utils.h (renamed from pango/pango-utils.h) | 2 | ||||
-rw-r--r-- | pango2/pango-version-macros.h (renamed from pango/pango-version-macros.h) | 2 | ||||
-rw-r--r-- | pango2/pango.h | 61 | ||||
-rw-r--r-- | pango2/pango.rc.in (renamed from pango/pango.rc.in) | 0 | ||||
-rw-r--r-- | pango2/pangocairo-context.c (renamed from pango/pangocairo-context.c) | 0 | ||||
-rw-r--r-- | pango2/pangocairo-context.h (renamed from pango/pangocairo-context.h) | 2 | ||||
-rw-r--r-- | pango2/pangocairo-dwrite-font.cpp (renamed from pango/pangocairo-dwrite-font.cpp) | 0 | ||||
-rw-r--r-- | pango2/pangocairo-font.c (renamed from pango/pangocairo-font.c) | 0 | ||||
-rw-r--r-- | pango2/pangocairo-font.h (renamed from pango/pangocairo-font.h) | 2 | ||||
-rw-r--r-- | pango2/pangocairo-private.h (renamed from pango/pangocairo-private.h) | 4 | ||||
-rw-r--r-- | pango2/pangocairo-render.c (renamed from pango/pangocairo-render.c) | 0 | ||||
-rw-r--r-- | pango2/pangocairo-render.h (renamed from pango/pangocairo-render.h) | 2 | ||||
-rw-r--r-- | pango2/pangocairo.h (renamed from pango/pangocairo.h) | 6 | ||||
-rw-r--r-- | pango2/pangocoretext-fontmap.c (renamed from pango/pangocoretext-fontmap.c) | 0 | ||||
-rw-r--r-- | pango2/pangocoretext-fontmap.h (renamed from pango/pangocoretext-fontmap.h) | 2 | ||||
-rw-r--r-- | pango2/pangodwrite-fontmap.cpp (renamed from pango/pangodwrite-fontmap.cpp) | 0 | ||||
-rw-r--r-- | pango2/pangodwrite-fontmap.h (renamed from pango/pangodwrite-fontmap.h) | 2 | ||||
-rw-r--r-- | pango2/pangofc-fontmap.c (renamed from pango/pangofc-fontmap.c) | 0 | ||||
-rw-r--r-- | pango2/pangofc-fontmap.h (renamed from pango/pangofc-fontmap.h) | 2 | ||||
-rw-r--r-- | pango2/pangofc-language-set-private.h (renamed from pango/pangofc-language-set-private.h) | 0 | ||||
-rw-r--r-- | pango2/pangofc-language-set.c (renamed from pango/pangofc-language-set.c) | 0 | ||||
-rw-r--r-- | pango2/serializer.c (renamed from pango/serializer.c) | 24 | ||||
-rw-r--r-- | pango2/shape.c (renamed from pango/shape.c) | 0 | ||||
-rw-r--r-- | tests/cxx-test.cpp | 4 | ||||
-rw-r--r-- | tests/dump-boundaries.c | 2 | ||||
-rw-r--r-- | tests/markup-parse.c | 2 | ||||
-rw-r--r-- | tests/test-bidi.c | 2 | ||||
-rw-r--r-- | tests/test-break.c | 2 | ||||
-rw-r--r-- | tests/test-common.c | 2 | ||||
-rw-r--r-- | tests/test-ellipsize.c | 2 | ||||
-rw-r--r-- | tests/test-font.c | 6 | ||||
-rw-r--r-- | tests/test-fontsets.c | 2 | ||||
-rw-r--r-- | tests/test-harfbuzz.c | 2 | ||||
-rw-r--r-- | tests/test-itemize.c | 6 | ||||
-rw-r--r-- | tests/test-layout.c | 2 | ||||
-rw-r--r-- | tests/test-pangocairo-threads.c | 3 | ||||
-rw-r--r-- | tests/test-shape.c | 2 | ||||
-rw-r--r-- | tests/testattributes.c | 4 | ||||
-rw-r--r-- | tests/testboundaries.c | 2 | ||||
-rw-r--r-- | tests/testboundaries_ucd.c | 2 | ||||
-rw-r--r-- | tests/testcolor.c | 2 | ||||
-rw-r--r-- | tests/testcontext.c | 2 | ||||
-rw-r--r-- | tests/testhbfont.c | 2 | ||||
-rw-r--r-- | tests/testiter.c | 2 | ||||
-rw-r--r-- | tests/testlanguage.c | 2 | ||||
-rw-r--r-- | tests/testmatrix.c | 2 | ||||
-rw-r--r-- | tests/testmisc.c | 4 | ||||
-rw-r--r-- | tests/testrandom.c | 2 | ||||
-rw-r--r-- | tests/testscript.c | 2 | ||||
-rw-r--r-- | tests/testserialize.c | 2 | ||||
-rw-r--r-- | tests/testtabs.c | 2 | ||||
-rw-r--r-- | tests/validate-log-attrs.c | 2 | ||||
-rw-r--r-- | tests/validate-log-attrs.h | 2 | ||||
-rw-r--r-- | tools/gen-script-for-lang.c | 6 | ||||
-rw-r--r-- | utils/pango-list.c | 4 | ||||
-rw-r--r-- | utils/pango-segmentation.c | 2 | ||||
-rw-r--r-- | utils/userfont.c | 2 | ||||
-rw-r--r-- | utils/viewer-pangocairo.c | 4 | ||||
-rw-r--r-- | utils/viewer-pangoxft.c | 2 | ||||
-rw-r--r-- | utils/viewer-render.c | 2 | ||||
-rw-r--r-- | utils/viewer-render.h | 2 | ||||
-rw-r--r-- | utils/viewer-x.h | 2 | ||||
-rw-r--r-- | utils/viewer.h | 2 |
207 files changed, 260 insertions, 259 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a4de603d..cd6cbf6f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -121,7 +121,7 @@ reference: - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} -Ddocumentation=true _build - ninja -C _build - mkdir -p _reference/ - - mv _build/docs/Pango/ _reference/ + - mv _build/docs/Pango2/ _reference/ artifacts: paths: - _reference diff --git a/docs/meson.build b/docs/meson.build index 52ab55c3..208c47b3 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -77,7 +77,7 @@ custom_target('pango-doc', gidocgen, 'generate', '--quiet', - '--add-include-path=@0@'.format(meson.current_build_dir() / '../pango'), + '--add-include-path=@0@'.format(meson.current_build_dir() / '../pango2'), '--config', pango_toml, '--output-dir=@OUTPUT@', '--no-namespace-dir', diff --git a/examples/cairoshape.c b/examples/cairoshape.c index ea38e95d..a778cd76 100644 --- a/examples/cairoshape.c +++ b/examples/cairoshape.c @@ -20,7 +20,7 @@ #include <stdio.h> #include <string.h> -#include <pango/pangocairo.h> +#include <pango2/pangocairo.h> #define BULLET "•" #define HEART "♥" diff --git a/examples/cairosimple.c b/examples/cairosimple.c index 26c72a3f..75bc30b3 100644 --- a/examples/cairosimple.c +++ b/examples/cairosimple.c @@ -1,5 +1,5 @@ #include <math.h> -#include <pango/pangocairo.h> +#include <pango2/pangocairo.h> #define RADIUS 150 #define N_WORDS 10 diff --git a/examples/cairotwisted.c b/examples/cairotwisted.c index ee9a6119..d809703c 100644 --- a/examples/cairotwisted.c +++ b/examples/cairotwisted.c @@ -11,7 +11,7 @@ #include <math.h> #include <stdlib.h> -#include <pango/pangocairo.h> +#include <pango2/pangocairo.h> void fancy_cairo_stroke (cairo_t *cr); void fancy_cairo_stroke_preserve (cairo_t *cr); diff --git a/examples/columns.c b/examples/columns.c index 5288e754..514d71dd 100644 --- a/examples/columns.c +++ b/examples/columns.c @@ -1,5 +1,4 @@ -#include <pango/pango.h> -#include <pango/pangocairo.h> +#include <pango2/pangocairo.h> int main (int argc, char *argv[]) diff --git a/examples/first-steps.c b/examples/first-steps.c index df9f460c..50f1ab28 100644 --- a/examples/first-steps.c +++ b/examples/first-steps.c @@ -1,5 +1,5 @@ #include <math.h> -#include <pango/pangocairo.h> +#include <pango2/pangocairo.h> #define SIZE 150 diff --git a/examples/parshape.c b/examples/parshape.c index ad6e972b..0f3f3096 100644 --- a/examples/parshape.c +++ b/examples/parshape.c @@ -1,5 +1,4 @@ -#include <pango/pango.h> -#include <pango/pangocairo.h> +#include <pango2/pangocairo.h> static Pango2Lines * format_text (const char *text) diff --git a/examples/userfont.c b/examples/userfont.c index c9edaee1..930ad2cf 100644 --- a/examples/userfont.c +++ b/examples/userfont.c @@ -14,7 +14,7 @@ #include <stdlib.h> #include <stdio.h> -#include <pango/pangocairo.h> +#include <pango2/pangocairo.h> static Pango2FontMap *fontmap; diff --git a/meson.build b/meson.build index 01cd8fd2..1d371b5c 100644 --- a/meson.build +++ b/meson.build @@ -366,9 +366,9 @@ pkgconfig = import('pkgconfig') configure_file(output: 'config.h', configuration: pango_conf) root_inc = include_directories('.') -pango_inc = include_directories('pango') +pango_inc = include_directories('pango2') -subdir('pango') +subdir('pango2') subdir('utils') subdir('examples') subdir('tests') diff --git a/pango/pango.h b/pango/pango.h deleted file mode 100644 index 54e0aaf1..00000000 --- a/pango/pango.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (C) 1999 Red Hat Software - * - * SPDX-License-Identifier: LGPL-2.1-or-later - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#include <pango/pango-attr.h> -#include <pango/pango-attr-list.h> -#include <pango/pango-attr-iterator.h> -#include <pango/pango-attributes.h> -#include <pango/pango-break.h> -#include <pango/pango-color.h> -#include <pango/pango-context.h> -#include <pango/pango-direction.h> -#include <pango/pango-enum-types.h> -#include <pango/pango-features.h> -#include <pango/pango-font.h> -#include <pango/pango-font-description.h> -#include <pango/pango-font-face.h> -#include <pango/pango-font-family.h> -#include <pango/pango-font-metrics.h> -#include <pango/pango-fontmap.h> -#include <pango/pango-fontset.h> -#include <pango/pango-generic-family.h> -#include <pango/pango-glyph.h> -#include <pango/pango-gravity.h> -#include <pango/pango-hbface.h> -#include <pango/pango-hbfont.h> -#include <pango/pango-item.h> -#include <pango/pango-language.h> -#include <pango/pango-layout.h> -#include <pango/pango-line.h> -#include <pango/pango-line-breaker.h> -#include <pango/pango-line-iter.h> -#include <pango/pango-lines.h> -#include <pango/pango-markup.h> -#include <pango/pango-matrix.h> -#include <pango/pango-renderer.h> -#include <pango/pango-run.h> -#include <pango/pango-script.h> -#include <pango/pango-tabs.h> -#include <pango/pango-types.h> -#include <pango/pango-userface.h> -#include <pango/pango-userfont.h> -#include <pango/pango-utils.h> -#include <pango/pango-version-macros.h> diff --git a/pango/break-arabic.c b/pango2/break-arabic.c index 2368586b..2368586b 100644 --- a/pango/break-arabic.c +++ b/pango2/break-arabic.c diff --git a/pango/break-indic.c b/pango2/break-indic.c index 62ecdaab..62ecdaab 100644 --- a/pango/break-indic.c +++ b/pango2/break-indic.c diff --git a/pango/break-latin.c b/pango2/break-latin.c index ffbc8f9e..ffbc8f9e 100644 --- a/pango/break-latin.c +++ b/pango2/break-latin.c diff --git a/pango/break-thai.c b/pango2/break-thai.c index ce38cfc1..ce38cfc1 100644 --- a/pango/break-thai.c +++ b/pango2/break-thai.c diff --git a/pango/break.c b/pango2/break.c index 404f3058..404f3058 100644 --- a/pango/break.c +++ b/pango2/break.c diff --git a/pango/ellipsize.c b/pango2/ellipsize.c index a5f74131..a5f74131 100644 --- a/pango/ellipsize.c +++ b/pango2/ellipsize.c diff --git a/pango/emoji_presentation_scanner.c b/pango2/emoji_presentation_scanner.c index e40b9d45..e40b9d45 100644 --- a/pango/emoji_presentation_scanner.c +++ b/pango2/emoji_presentation_scanner.c diff --git a/pango/emoji_presentation_scanner.rl b/pango2/emoji_presentation_scanner.rl index d9c26919..d9c26919 100644 --- a/pango/emoji_presentation_scanner.rl +++ b/pango2/emoji_presentation_scanner.rl diff --git a/pango/glyphstring.c b/pango2/glyphstring.c index 9ae86b93..9ae86b93 100644 --- a/pango/glyphstring.c +++ b/pango2/glyphstring.c diff --git a/pango/itemize.c b/pango2/itemize.c index 1cf4e6ea..1cf4e6ea 100644 --- a/pango/itemize.c +++ b/pango2/itemize.c diff --git a/pango/json/gtkjsonparser.c b/pango2/json/gtkjsonparser.c index 0599d8f1..0599d8f1 100644 --- a/pango/json/gtkjsonparser.c +++ b/pango2/json/gtkjsonparser.c diff --git a/pango/json/gtkjsonparserprivate.h b/pango2/json/gtkjsonparserprivate.h index 83f72374..83f72374 100644 --- a/pango/json/gtkjsonparserprivate.h +++ b/pango2/json/gtkjsonparserprivate.h diff --git a/pango/json/gtkjsonprinter.c b/pango2/json/gtkjsonprinter.c index e9ca03a3..e9ca03a3 100644 --- a/pango/json/gtkjsonprinter.c +++ b/pango2/json/gtkjsonprinter.c diff --git a/pango/json/gtkjsonprinterprivate.h b/pango2/json/gtkjsonprinterprivate.h index e25a1b1d..e25a1b1d 100644 --- a/pango/json/gtkjsonprinterprivate.h +++ b/pango2/json/gtkjsonprinterprivate.h diff --git a/pango/meson.build b/pango2/meson.build index 8dce43d8..8dce43d8 100644 --- a/pango/meson.build +++ b/pango2/meson.build diff --git a/pango/pango-attr-iterator-private.h b/pango2/pango-attr-iterator-private.h index 30d64ede..5fead454 100644 --- a/pango/pango-attr-iterator-private.h +++ b/pango2/pango-attr-iterator-private.h @@ -19,7 +19,7 @@ #pragma once -#include <pango/pango-attr-iterator.h> +#include "pango-attr-iterator.h" struct _Pango2AttrIterator diff --git a/pango/pango-attr-iterator.c b/pango2/pango-attr-iterator.c index 59bb1255..59bb1255 100644 --- a/pango/pango-attr-iterator.c +++ b/pango2/pango-attr-iterator.c diff --git a/pango/pango-attr-iterator.h b/pango2/pango-attr-iterator.h index 283b710a..f22ba499 100644 --- a/pango/pango-attr-iterator.h +++ b/pango2/pango-attr-iterator.h @@ -19,7 +19,7 @@ #pragma once -#include <pango/pango-attr-list.h> +#include <pango2/pango-attr-list.h> #include <glib-object.h> G_BEGIN_DECLS diff --git a/pango/pango-attr-list-private.h b/pango2/pango-attr-list-private.h index fb007beb..e010febd 100644 --- a/pango/pango-attr-list-private.h +++ b/pango2/pango-attr-list-private.h @@ -19,7 +19,7 @@ #pragma once -#include <pango/pango-attr-list.h> +#include "pango-attr-list.h" struct _Pango2AttrList diff --git a/pango/pango-attr-list.c b/pango2/pango-attr-list.c index 6f0f47d0..6f0f47d0 100644 --- a/pango/pango-attr-list.c +++ b/pango2/pango-attr-list.c diff --git a/pango/pango-attr-list.h b/pango2/pango-attr-list.h index faf0443d..e51dc5ff 100644 --- a/pango/pango-attr-list.h +++ b/pango2/pango-attr-list.h @@ -19,7 +19,7 @@ #pragma once -#include <pango/pango-attributes.h> +#include <pango2/pango-attributes.h> #include <glib-object.h> G_BEGIN_DECLS diff --git a/pango/pango-attr-private.h b/pango2/pango-attr-private.h index 9e37ce40..f8152f8d 100644 --- a/pango/pango-attr-private.h +++ b/pango2/pango-attr-private.h @@ -19,7 +19,7 @@ #pragma once -#include <pango/pango-attr.h> +#include "pango-attr.h" struct _Pango2Attribute { diff --git a/pango/pango-attr.c b/pango2/pango-attr.c index 5f7876d3..5f7876d3 100644 --- a/pango/pango-attr.c +++ b/pango2/pango-attr.c diff --git a/pango/pango-attr.h b/pango2/pango-attr.h index 08fb932b..1dda2924 100644 --- a/pango/pango-attr.h +++ b/pango2/pango-attr.h @@ -19,8 +19,8 @@ #pragma once -#include <pango/pango-font.h> -#include <pango/pango-color.h> +#include <pango2/pango-font.h> +#include <pango2/pango-color.h> #include <glib-object.h> G_BEGIN_DECLS diff --git a/pango/pango-attributes-private.h b/pango2/pango-attributes-private.h index ef1ab2c3..ef1ab2c3 100644 --- a/pango/pango-attributes-private.h +++ b/pango2/pango-attributes-private.h diff --git a/pango/pango-attributes.c b/pango2/pango-attributes.c index ea782a07..ea782a07 100644 --- a/pango/pango-attributes.c +++ b/pango2/pango-attributes.c diff --git a/pango/pango-attributes.h b/pango2/pango-attributes.h index 744e1b36..98e89d7b 100644 --- a/pango/pango-attributes.h +++ b/pango2/pango-attributes.h @@ -19,9 +19,9 @@ #pragma once -#include <pango/pango-font.h> -#include <pango/pango-color.h> -#include <pango/pango-attr.h> +#include <pango2/pango-font.h> +#include <pango2/pango-color.h> +#include <pango2/pango-attr.h> G_BEGIN_DECLS diff --git a/pango/pango-bidi-private.h b/pango2/pango-bidi-private.h index 584678bd..3a0b1ab5 100644 --- a/pango/pango-bidi-private.h +++ b/pango2/pango-bidi-private.h @@ -21,8 +21,8 @@ #include <stdio.h> #include <glib.h> -#include <pango/pango-font.h> -#include <pango/pango-direction.h> +#include "pango-font.h" +#include "pango-direction.h" guint8 * pango2_log2vis_get_embedding_levels (const char *text, int length, diff --git a/pango/pango-bidi.c b/pango2/pango-bidi.c index 1bf1a436..1bf1a436 100644 --- a/pango/pango-bidi.c +++ b/pango2/pango-bidi.c diff --git a/pango/pango-break-table.h b/pango2/pango-break-table.h index 0ee37cdf..0ee37cdf 100644 --- a/pango/pango-break-table.h +++ b/pango2/pango-break-table.h diff --git a/pango/pango-break.h b/pango2/pango-break.h index ae1e7185..e3e479e4 100644 --- a/pango/pango-break.h +++ b/pango2/pango-break.h @@ -20,7 +20,7 @@ #pragma once #include <glib.h> -#include <pango/pango-item.h> +#include <pango2/pango-item.h> G_BEGIN_DECLS diff --git a/pango/pango-color-table.h b/pango2/pango-color-table.h index a3b95927..a3b95927 100644 --- a/pango/pango-color-table.h +++ b/pango2/pango-color-table.h diff --git a/pango/pango-color.c b/pango2/pango-color.c index adc9a0d1..adc9a0d1 100644 --- a/pango/pango-color.c +++ b/pango2/pango-color.c diff --git a/pango/pango-color.h b/pango2/pango-color.h index 0e9af474..f62a3dd5 100644 --- a/pango/pango-color.h +++ b/pango2/pango-color.h @@ -19,7 +19,7 @@ #pragma once -#include <pango/pango-types.h> +#include <pango2/pango-types.h> #include <glib-object.h> G_BEGIN_DECLS diff --git a/pango/pango-context-private.h b/pango2/pango-context-private.h index 32c1e984..07b4b506 100644 --- a/pango/pango-context-private.h +++ b/pango2/pango-context-private.h @@ -19,7 +19,7 @@ #pragma once -#include <pango/pango-context.h> +#include "pango-context.h" #ifdef HAVE_CAIRO #include <cairo.h> diff --git a/pango/pango-context.c b/pango2/pango-context.c index 58f2719a..58f2719a 100644 --- a/pango/pango-context.c +++ b/pango2/pango-context.c diff --git a/pango/pango-context.h b/pango2/pango-context.h index 70bc03c5..902e840d 100644 --- a/pango/pango-context.h +++ b/pango2/pango-context.h @@ -19,11 +19,11 @@ #pragma once -#include <pango/pango-types.h> -#include <pango/pango-font.h> -#include <pango/pango-fontmap.h> -#include <pango/pango-attributes.h> -#include <pango/pango-direction.h> +#include <pango2/pango-types.h> +#include <pango2/pango-font.h> +#include <pango2/pango-fontmap.h> +#include <pango2/pango-attributes.h> +#include <pango2/pango-direction.h> G_BEGIN_DECLS diff --git a/pango/pango-direction.h b/pango2/pango-direction.h index cf32c48a..cf32c48a 100644 --- a/pango/pango-direction.h +++ b/pango2/pango-direction.h diff --git a/pango/pango-emoji-private.h b/pango2/pango-emoji-private.h index f7578bf4..f7578bf4 100644 --- a/pango/pango-emoji-private.h +++ b/pango2/pango-emoji-private.h diff --git a/pango/pango-emoji-table.h b/pango2/pango-emoji-table.h index 00f1dd13..00f1dd13 100644 --- a/pango/pango-emoji-table.h +++ b/pango2/pango-emoji-table.h diff --git a/pango/pango-emoji.c b/pango2/pango-emoji.c index aa82e9ec..aa82e9ec 100644 --- a/pango/pango-emoji.c +++ b/pango2/pango-emoji.c diff --git a/pango/pango-enum-types.c.template b/pango2/pango-enum-types.c.template index b71b0a39..b71b0a39 100644 --- a/pango/pango-enum-types.c.template +++ b/pango2/pango-enum-types.c.template diff --git a/pango/pango-enum-types.h.template b/pango2/pango-enum-types.h.template index e511f9c2..ff369b96 100644 --- a/pango/pango-enum-types.h.template +++ b/pango2/pango-enum-types.h.template @@ -3,7 +3,7 @@ #include <glib-object.h> -#include <pango/pango-version-macros.h> +#include <pango2/pango-version-macros.h> G_BEGIN_DECLS /*** END file-header ***/ diff --git a/pango/pango-features.h.meson b/pango2/pango-features.h.meson index d89f5ad8..d89f5ad8 100644 --- a/pango/pango-features.h.meson +++ b/pango2/pango-features.h.meson diff --git a/pango/pango-font-description-private.h b/pango2/pango-font-description-private.h index 11b09d00..11b09d00 100644 --- a/pango/pango-font-description-private.h +++ b/pango2/pango-font-description-private.h diff --git a/pango/pango-font-description.c b/pango2/pango-font-description.c index db22853b..db22853b 100644 --- a/pango/pango-font-description.c +++ b/pango2/pango-font-description.c diff --git a/pango/pango-font-description.h b/pango2/pango-font-description.h index 414696b1..160ee50d 100644 --- a/pango/pango-font-description.h +++ b/pango2/pango-font-description.h @@ -19,7 +19,7 @@ #pragma once -#include <pango/pango-types.h> +#include <pango2/pango-types.h> #include <glib-object.h> #include <hb.h> diff --git a/pango/pango-font-face-private.h b/pango2/pango-font-face-private.h index 6c0172a5..b7031a26 100644 --- a/pango/pango-font-face-private.h +++ b/pango2/pango-font-face-private.h @@ -19,8 +19,8 @@ #pragma once -#include <pango/pango-font-face.h> -#include <pango/pango-font-description.h> +#include "pango-font-face.h" +#include "pango-font-description.h" struct _Pango2FontFace diff --git a/pango/pango-font-face.c b/pango2/pango-font-face.c index 475cb871..475cb871 100644 --- a/pango/pango-font-face.c +++ b/pango2/pango-font-face.c diff --git a/pango/pango-font-face.h b/pango2/pango-font-face.h index 37c1f18a..dea2b6df 100644 --- a/pango/pango-font-face.h +++ b/pango2/pango-font-face.h @@ -19,7 +19,7 @@ #pragma once -#include <pango/pango-types.h> +#include <pango2/pango-types.h> #include <glib-object.h> diff --git a/pango/pango-font-family-private.h b/pango2/pango-font-family-private.h index 6875678c..2c2c28fa 100644 --- a/pango/pango-font-family-private.h +++ b/pango2/pango-font-family-private.h @@ -19,7 +19,7 @@ #pragma once -#include <pango/pango-font-family.h> +#include "pango-font-family.h" typedef struct _Pango2FontFamilyClass Pango2FontFamilyClass; diff --git a/pango/pango-font-family.c b/pango2/pango-font-family.c index 1042c7d3..1042c7d3 100644 --- a/pango/pango-font-family.c +++ b/pango2/pango-font-family.c diff --git a/pango/pango-font-family.h b/pango2/pango-font-family.h index 667bb9b9..f6896530 100644 --- a/pango/pango-font-family.h +++ b/pango2/pango-font-family.h @@ -19,7 +19,7 @@ #pragma once -#include <pango/pango-types.h> +#include <pango2/pango-types.h> #include <glib-object.h> diff --git a/pango/pango-font-metrics-private.h b/pango2/pango-font-metrics-private.h index c01e295a..3ad27a3a 100644 --- a/pango/pango-font-metrics-private.h +++ b/pango2/pango-font-metrics-private.h @@ -19,7 +19,7 @@ #pragma once -#include <pango/pango-font-metrics.h> +#include "pango-font-metrics.h" struct _Pango2FontMetrics { diff --git a/pango/pango-font-metrics.c b/pango2/pango-font-metrics.c index d2b61d44..d2b61d44 100644 --- a/pango/pango-font-metrics.c +++ b/pango2/pango-font-metrics.c diff --git a/pango/pango-font-metrics.h b/pango2/pango-font-metrics.h index 9d89a791..e138be7d 100644 --- a/pango/pango-font-metrics.h +++ b/pango2/pango-font-metrics.h @@ -19,7 +19,7 @@ #pragma once -#include <pango/pango-types.h> +#include <pango2/pango-types.h> #include <glib-object.h> diff --git a/pango/pango-font-private.h b/pango2/pango-font-private.h index 8d5e067b..ca8d3a77 100644 --- a/pango/pango-font-private.h +++ b/pango2/pango-font-private.h @@ -19,9 +19,9 @@ #pragma once -#include <pango/pango-font-family.h> -#include <pango/pango-font.h> -#include <pango/pango-types.h> +#include "pango-font-family.h" +#include "pango-font.h" +#include "pango-types.h" #include <glib-object.h> diff --git a/pango/pango-font.c b/pango2/pango-font.c index cdf2fc42..cdf2fc42 100644 --- a/pango/pango-font.c +++ b/pango2/pango-font.c diff --git a/pango/pango-font.h b/pango2/pango-font.h index 6d144647..63e98351 100644 --- a/pango/pango-font.h +++ b/pango2/pango-font.h @@ -19,10 +19,10 @@ #pragma once -#include <pango/pango-types.h> -#include <pango/pango-font-description.h> -#include <pango/pango-font-metrics.h> -#include <pango/pango-font-family.h> +#include <pango2/pango-types.h> +#include <pango2/pango-font-description.h> +#include <pango2/pango-font-metrics.h> +#include <pango2/pango-font-family.h> #include <glib-object.h> #include <hb.h> diff --git a/pango/pango-fontmap-private.h b/pango2/pango-fontmap-private.h index 4a80f00c..b8388836 100644 --- a/pango/pango-fontmap-private.h +++ b/pango2/pango-fontmap-private.h @@ -19,9 +19,9 @@ #pragma once -#include <pango/pango-fontmap.h> -#include <pango/pango-hbfamily-private.h> -#include <pango/pango-fontmap-private.h> +#include "pango-fontmap.h" +#include "pango-hbfamily-private.h" +#include "pango-fontmap-private.h" G_BEGIN_DECLS diff --git a/pango/pango-fontmap.c b/pango2/pango-fontmap.c index bca8fcff..fd87c9d0 100644 --- a/pango/pango-fontmap.c +++ b/pango2/pango-fontmap.c @@ -1103,6 +1103,10 @@ pango2_font_map_remove_family (Pango2FontMap *self, * This can be used to make a custom font available only via a * special fontmap, while still having all the regular fonts * from the fallback fontmap. + * + * Note that families are *not* merged. If you are iterating + * the families, you will first get all the families in @self, + * followed by all the families in the @fallback. */ void pango2_font_map_set_fallback (Pango2FontMap *self, diff --git a/pango/pango-fontmap.h b/pango2/pango-fontmap.h index 752b992e..a8e9a778 100644 --- a/pango/pango-fontmap.h +++ b/pango2/pango-fontmap.h @@ -19,9 +19,9 @@ #pragma once -#include <pango/pango-types.h> -#include <pango/pango-fontset.h> -#include <pango/pango-hbface.h> +#include <pango2/pango-types.h> +#include <pango2/pango-fontset.h> +#include <pango2/pango-hbface.h> G_BEGIN_DECLS diff --git a/pango/pango-fontset-cached-private.h b/pango2/pango-fontset-cached-private.h index 23309bce..95059a79 100644 --- a/pango/pango-fontset-cached-private.h +++ b/pango2/pango-fontset-cached-private.h @@ -19,9 +19,9 @@ #pragma once -#include <pango/pango-types.h> -#include <pango/pango-fontset-private.h> -#include <pango/pango-generic-family.h> +#include "pango-types.h" +#include "pango-fontset-private.h" +#include "pango-generic-family.h" #include <glib-object.h> #ifdef HAVE_CAIRO diff --git a/pango/pango-fontset-cached.c b/pango2/pango-fontset-cached.c index 9feaca79..9feaca79 100644 --- a/pango/pango-fontset-cached.c +++ b/pango2/pango-fontset-cached.c diff --git a/pango/pango-fontset-private.h b/pango2/pango-fontset-private.h index 06e0e7c0..06e0e7c0 100644 --- a/pango/pango-fontset-private.h +++ b/pango2/pango-fontset-private.h diff --git a/pango/pango-fontset.c b/pango2/pango-fontset.c index b3ef1e8e..b3ef1e8e 100644 --- a/pango/pango-fontset.c +++ b/pango2/pango-fontset.c diff --git a/pango/pango-fontset.h b/pango2/pango-fontset.h index 144c4de8..5e6ed716 100644 --- a/pango/pango-fontset.h +++ b/pango2/pango-fontset.h @@ -19,8 +19,8 @@ #pragma once -#include <pango/pango-types.h> -#include <pango/pango-font-metrics.h> +#include <pango2/pango-types.h> +#include <pango2/pango-font-metrics.h> #include <glib-object.h> diff --git a/pango/pango-generic-family-private.h b/pango2/pango-generic-family-private.h index 8c406d81..8c406d81 100644 --- a/pango/pango-generic-family-private.h +++ b/pango2/pango-generic-family-private.h diff --git a/pango/pango-generic-family.c b/pango2/pango-generic-family.c index c0697f00..c0697f00 100644 --- a/pango/pango-generic-family.c +++ b/pango2/pango-generic-family.c diff --git a/pango/pango-generic-family.h b/pango2/pango-generic-family.h index ab1d0fd2..ab1d0fd2 100644 --- a/pango/pango-generic-family.h +++ b/pango2/pango-generic-family.h diff --git a/pango/pango-glyph-item-private.h b/pango2/pango-glyph-item-private.h index 71e07d1c..1fa80871 100644 --- a/pango/pango-glyph-item-private.h +++ b/pango2/pango-glyph-item-private.h @@ -19,10 +19,10 @@ #pragma once -#include <pango/pango-attributes.h> -#include <pango/pango-break.h> -#include <pango/pango-item.h> -#include <pango/pango-glyph.h> +#include "pango-attributes.h" +#include "pango-break.h" +#include "pango-item.h" +#include "pango-glyph.h" G_BEGIN_DECLS diff --git a/pango/pango-glyph-item.c b/pango2/pango-glyph-item.c index 6ba75961..6ba75961 100644 --- a/pango/pango-glyph-item.c +++ b/pango2/pango-glyph-item.c diff --git a/pango/pango-glyph-iter-private.h b/pango2/pango-glyph-iter-private.h index 35c038f0..5321b33d 100644 --- a/pango/pango-glyph-iter-private.h +++ b/pango2/pango-glyph-iter-private.h @@ -19,7 +19,7 @@ #pragma once -#include <pango/pango-glyph-item-private.h> +#include "pango-glyph-item-private.h" G_BEGIN_DECLS diff --git a/pango/pango-glyph.h b/pango2/pango-glyph.h index d2b0770b..7cc014a2 100644 --- a/pango/pango-glyph.h +++ b/pango2/pango-glyph.h @@ -19,9 +19,9 @@ #pragma once -#include <pango/pango-types.h> -#include <pango/pango-item.h> -#include <pango/pango-break.h> +#include <pango2/pango-types.h> +#include <pango2/pango-item.h> +#include <pango2/pango-break.h> G_BEGIN_DECLS diff --git a/pango/pango-gravity.c b/pango2/pango-gravity.c index 0e9b4299..0e9b4299 100644 --- a/pango/pango-gravity.c +++ b/pango2/pango-gravity.c diff --git a/pango/pango-gravity.h b/pango2/pango-gravity.h index c12fe1da..b3e79d3d 100644 --- a/pango/pango-gravity.h +++ b/pango2/pango-gravity.h @@ -21,6 +21,7 @@ #include <glib.h> + G_BEGIN_DECLS /** @@ -102,8 +103,8 @@ typedef enum { #define PANGO2_GRAVITY_IS_IMPROPER(gravity) \ ((gravity) == PANGO2_GRAVITY_WEST || (gravity) == PANGO2_GRAVITY_NORTH) -#include <pango/pango-matrix.h> -#include <pango/pango-script.h> +#include <pango2/pango-matrix.h> +#include <pango2/pango-script.h> PANGO2_AVAILABLE_IN_ALL double pango2_gravity_to_rotation (Pango2Gravity gravity) G_GNUC_CONST; diff --git a/pango/pango-hbface-private.h b/pango2/pango-hbface-private.h index e2920388..e2920388 100644 --- a/pango/pango-hbface-private.h +++ b/pango2/pango-hbface-private.h diff --git a/pango/pango-hbface.c b/pango2/pango-hbface.c index f549b41a..f549b41a 100644 --- a/pango/pango-hbface.c +++ b/pango2/pango-hbface.c diff --git a/pango/pango-hbface.h b/pango2/pango-hbface.h index 356db1e4..2d4662d7 100644 --- a/pango/pango-hbface.h +++ b/pango2/pango-hbface.h @@ -19,8 +19,8 @@ #pragma once -#include <pango/pango-types.h> -#include <pango/pango-font-face.h> +#include <pango2/pango-types.h> +#include <pango2/pango-font-face.h> #include <hb.h> diff --git a/pango/pango-hbfamily-private.h b/pango2/pango-hbfamily-private.h index fb92cfb6..fb92cfb6 100644 --- a/pango/pango-hbfamily-private.h +++ b/pango2/pango-hbfamily-private.h diff --git a/pango/pango-hbfamily.c b/pango2/pango-hbfamily.c index dc990683..dc990683 100644 --- a/pango/pango-hbfamily.c +++ b/pango2/pango-hbfamily.c diff --git a/pango/pango-hbfont-private.h b/pango2/pango-hbfont-private.h index 6794357f..6794357f 100644 --- a/pango/pango-hbfont-private.h +++ b/pango2/pango-hbfont-private.h diff --git a/pango/pango-hbfont.c b/pango2/pango-hbfont.c index a8876224..a8876224 100644 --- a/pango/pango-hbfont.c +++ b/pango2/pango-hbfont.c diff --git a/pango/pango-hbfont.h b/pango2/pango-hbfont.h index 26fd4d43..1b98cd49 100644 --- a/pango/pango-hbfont.h +++ b/pango2/pango-hbfont.h @@ -19,9 +19,9 @@ #pragma once -#include <pango/pango-types.h> -#include <pango/pango-font.h> -#include <pango/pango-hbface.h> +#include <pango2/pango-types.h> +#include <pango2/pango-font.h> +#include <pango2/pango-hbface.h> #include <hb.h> G_BEGIN_DECLS diff --git a/pango/pango-impl-utils.h b/pango2/pango-impl-utils.h index 3723fcfb..cc21bc0b 100644 --- a/pango/pango-impl-utils.h +++ b/pango2/pango-impl-utils.h @@ -21,7 +21,7 @@ #include <glib.h> #include <glib-object.h> -#include <pango/pango.h> +#include <pango2/pango.h> G_BEGIN_DECLS diff --git a/pango/pango-item-private.h b/pango2/pango-item-private.h index da7d8ae4..13925b32 100644 --- a/pango/pango-item-private.h +++ b/pango2/pango-item-private.h @@ -19,8 +19,8 @@ #pragma once -#include <pango/pango-item.h> -#include <pango/pango-break.h> +#include "pango-item.h" +#include "pango-break.h" /*< private > * Pango2Analysis: diff --git a/pango/pango-item.c b/pango2/pango-item.c index 97b0a2b9..97b0a2b9 100644 --- a/pango/pango-item.c +++ b/pango2/pango-item.c diff --git a/pango/pango-item.h b/pango2/pango-item.h index 09b8e76c..c5dccfd2 100644 --- a/pango/pango-item.h +++ b/pango2/pango-item.h @@ -19,9 +19,9 @@ #pragma once -#include <pango/pango-types.h> -#include <pango/pango-attr-list.h> -#include <pango/pango-attr-list.h> +#include <pango2/pango-types.h> +#include <pango2/pango-attr-list.h> +#include <pango2/pango-attr-list.h> G_BEGIN_DECLS diff --git a/pango/pango-language-sample-table.h b/pango2/pango-language-sample-table.h index 59513209..59513209 100644 --- a/pango/pango-language-sample-table.h +++ b/pango2/pango-language-sample-table.h diff --git a/pango/pango-language-set-private.h b/pango2/pango-language-set-private.h index 53aac1cc..53aac1cc 100644 --- a/pango/pango-language-set-private.h +++ b/pango2/pango-language-set-private.h diff --git a/pango/pango-language-set-simple-private.h b/pango2/pango-language-set-simple-private.h index c473d01e..c473d01e 100644 --- a/pango/pango-language-set-simple-private.h +++ b/pango2/pango-language-set-simple-private.h diff --git a/pango/pango-language-set-simple.c b/pango2/pango-language-set-simple.c index d117a0c1..d117a0c1 100644 --- a/pango/pango-language-set-simple.c +++ b/pango2/pango-language-set-simple.c diff --git a/pango/pango-language-set.c b/pango2/pango-language-set.c index a96ba929..a96ba929 100644 --- a/pango/pango-language-set.c +++ b/pango2/pango-language-set.c diff --git a/pango/pango-language.c b/pango2/pango-language.c index 71af5a83..71af5a83 100644 --- a/pango/pango-language.c +++ b/pango2/pango-language.c diff --git a/pango/pango-language.h b/pango2/pango-language.h index 760b9e8e..f4484fd9 100644 --- a/pango/pango-language.h +++ b/pango2/pango-language.h @@ -22,9 +22,9 @@ #include <glib.h> #include <glib-object.h> -#include <pango/pango-types.h> -#include <pango/pango-version-macros.h> -#include <pango/pango-script.h> +#include <pango2/pango-types.h> +#include <pango2/pango-version-macros.h> +#include <pango2/pango-script.h> G_BEGIN_DECLS diff --git a/pango/pango-layout.c b/pango2/pango-layout.c index 9a01b490..9a01b490 100644 --- a/pango/pango-layout.c +++ b/pango2/pango-layout.c diff --git a/pango/pango-layout.h b/pango2/pango-layout.h index 38b3cd1a..f3ad61dd 100644 --- a/pango/pango-layout.h +++ b/pango2/pango-layout.h @@ -20,10 +20,10 @@ #pragma once #include <glib-object.h> -#include <pango/pango-types.h> -#include <pango/pango-attributes.h> -#include <pango/pango-lines.h> -#include <pango/pango-tabs.h> +#include <pango2/pango-types.h> +#include <pango2/pango-attributes.h> +#include <pango2/pango-lines.h> +#include <pango2/pango-tabs.h> G_BEGIN_DECLS diff --git a/pango/pango-line-breaker.c b/pango2/pango-line-breaker.c index 1049fe5e..1049fe5e 100644 --- a/pango/pango-line-breaker.c +++ b/pango2/pango-line-breaker.c diff --git a/pango/pango-line-breaker.h b/pango2/pango-line-breaker.h index c7e362bb..666f67f5 100644 --- a/pango/pango-line-breaker.h +++ b/pango2/pango-line-breaker.h @@ -20,10 +20,10 @@ #pragma once #include <glib-object.h> -#include <pango/pango-types.h> -#include <pango/pango-break.h> -#include <pango/pango-layout.h> -#include <pango/pango-line.h> +#include <pango2/pango-types.h> +#include <pango2/pango-break.h> +#include <pango2/pango-layout.h> +#include <pango2/pango-line.h> G_BEGIN_DECLS diff --git a/pango/pango-line-iter-private.h b/pango2/pango-line-iter-private.h index 1aba2956..1aba2956 100644 --- a/pango/pango-line-iter-private.h +++ b/pango2/pango-line-iter-private.h diff --git a/pango/pango-line-iter.c b/pango2/pango-line-iter.c index 8139e4ef..8139e4ef 100644 --- a/pango/pango-line-iter.c +++ b/pango2/pango-line-iter.c diff --git a/pango/pango-line-iter.h b/pango2/pango-line-iter.h index 8923c134..59a4f5c2 100644 --- a/pango/pango-line-iter.h +++ b/pango2/pango-line-iter.h @@ -21,8 +21,8 @@ #include <glib-object.h> -#include <pango/pango-types.h> -#include <pango/pango-lines.h> +#include <pango2/pango-types.h> +#include <pango2/pango-lines.h> G_BEGIN_DECLS diff --git a/pango/pango-line-private.h b/pango2/pango-line-private.h index 963674c2..963674c2 100644 --- a/pango/pango-line-private.h +++ b/pango2/pango-line-private.h diff --git a/pango/pango-line.c b/pango2/pango-line.c index 992a29fe..992a29fe 100644 --- a/pango/pango-line.c +++ b/pango2/pango-line.c diff --git a/pango/pango-line.h b/pango2/pango-line.h index c2c85195..31458d41 100644 --- a/pango/pango-line.h +++ b/pango2/pango-line.h @@ -21,8 +21,8 @@ #include <glib-object.h> -#include <pango/pango-types.h> -#include <pango/pango-run.h> +#include <pango2/pango-types.h> +#include <pango2/pango-run.h> G_BEGIN_DECLS diff --git a/pango/pango-lines-private.h b/pango2/pango-lines-private.h index 8832fba0..8832fba0 100644 --- a/pango/pango-lines-private.h +++ b/pango2/pango-lines-private.h diff --git a/pango/pango-lines.c b/pango2/pango-lines.c index e528ec05..e528ec05 100644 --- a/pango/pango-lines.c +++ b/pango2/pango-lines.c diff --git a/pango/pango-lines.h b/pango2/pango-lines.h index 83abaa97..f2a89f43 100644 --- a/pango/pango-lines.h +++ b/pango2/pango-lines.h @@ -21,8 +21,8 @@ #include <glib-object.h> -#include <pango/pango-types.h> -#include <pango/pango-line.h> +#include <pango2/pango-types.h> +#include <pango2/pango-line.h> G_BEGIN_DECLS diff --git a/pango/pango-markup.c b/pango2/pango-markup.c index c03196e8..c03196e8 100644 --- a/pango/pango-markup.c +++ b/pango2/pango-markup.c diff --git a/pango/pango-markup.h b/pango2/pango-markup.h index 28ba98c0..8bc37af7 100644 --- a/pango/pango-markup.h +++ b/pango2/pango-markup.h @@ -19,7 +19,7 @@ #pragma once -#include <pango/pango-attr-list.h> +#include <pango2/pango-attr-list.h> G_BEGIN_DECLS diff --git a/pango/pango-matrix.c b/pango2/pango-matrix.c index 9381ffcd..9381ffcd 100644 --- a/pango/pango-matrix.c +++ b/pango2/pango-matrix.c diff --git a/pango/pango-matrix.h b/pango2/pango-matrix.h index 800d5299..0456a4fc 100644 --- a/pango/pango-matrix.h +++ b/pango2/pango-matrix.h @@ -70,8 +70,7 @@ struct _Pango2Matrix */ #define PANGO2_MATRIX_INIT { 1., 0., 0., 1., 0., 0. } -/* for Pango2Rectangle */ -#include <pango/pango-types.h> +#include <pango2/pango-types.h> PANGO2_AVAILABLE_IN_ALL GType pango2_matrix_get_type (void) G_GNUC_CONST; diff --git a/pango/pango-renderer.c b/pango2/pango-renderer.c index 5f1d3de6..5f1d3de6 100644 --- a/pango/pango-renderer.c +++ b/pango2/pango-renderer.c diff --git a/pango/pango-renderer.h b/pango2/pango-renderer.h index b9d361d6..e641bb3e 100644 --- a/pango/pango-renderer.h +++ b/pango2/pango-renderer.h @@ -19,9 +19,9 @@ #pragma once -#include <pango/pango-layout.h> -#include <pango/pango-lines.h> -#include <pango/pango-glyph.h> +#include <pango2/pango-layout.h> +#include <pango2/pango-lines.h> +#include <pango2/pango-glyph.h> G_BEGIN_DECLS diff --git a/pango/pango-run-private.h b/pango2/pango-run-private.h index 2e84bdfe..2e84bdfe 100644 --- a/pango/pango-run-private.h +++ b/pango2/pango-run-private.h diff --git a/pango/pango-run.c b/pango2/pango-run.c index 8c36f138..8c36f138 100644 --- a/pango/pango-run.c +++ b/pango2/pango-run.c diff --git a/pango/pango-run.h b/pango2/pango-run.h index fd090ae4..26760cb3 100644 --- a/pango/pango-run.h +++ b/pango2/pango-run.h @@ -20,9 +20,9 @@ #pragma once #include <glib-object.h> -#include <pango/pango-types.h> -#include <pango/pango-item.h> -#include <pango/pango-glyph.h> +#include <pango2/pango-types.h> +#include <pango2/pango-item.h> +#include <pango2/pango-glyph.h> PANGO2_AVAILABLE_IN_ALL Pango2Item * pango2_run_get_item (Pango2Run *run); diff --git a/pango/pango-script-lang-table.h b/pango2/pango-script-lang-table.h index 1332b2d6..1332b2d6 100644 --- a/pango/pango-script-lang-table.h +++ b/pango2/pango-script-lang-table.h diff --git a/pango/pango-script-private.h b/pango2/pango-script-private.h index 06c84b65..06c84b65 100644 --- a/pango/pango-script-private.h +++ b/pango2/pango-script-private.h diff --git a/pango/pango-script.c b/pango2/pango-script.c index e65c6265..e65c6265 100644 --- a/pango/pango-script.c +++ b/pango2/pango-script.c diff --git a/pango/pango-script.h b/pango2/pango-script.h index ad4e5cbf..abe822c8 100644 --- a/pango/pango-script.h +++ b/pango2/pango-script.h @@ -21,8 +21,8 @@ #include <glib-object.h> -#include <pango/pango-language.h> -#include <pango/pango-version-macros.h> +#include <pango2/pango-language.h> +#include <pango2/pango-version-macros.h> G_BEGIN_DECLS diff --git a/pango/pango-tabs.c b/pango2/pango-tabs.c index 71fdfe2f..71fdfe2f 100644 --- a/pango/pango-tabs.c +++ b/pango2/pango-tabs.c diff --git a/pango/pango-tabs.h b/pango2/pango-tabs.h index e98fdef1..b5303789 100644 --- a/pango/pango-tabs.h +++ b/pango2/pango-tabs.h @@ -19,7 +19,7 @@ #pragma once -#include <pango/pango-types.h> +#include <pango2/pango-types.h> G_BEGIN_DECLS diff --git a/pango/pango-trace-private.h b/pango2/pango-trace-private.h index 5ef2a5ff..5ef2a5ff 100644 --- a/pango/pango-trace-private.h +++ b/pango2/pango-trace-private.h diff --git a/pango/pango-trace.c b/pango2/pango-trace.c index 99417c45..99417c45 100644 --- a/pango/pango-trace.c +++ b/pango2/pango-trace.c diff --git a/pango/pango-types.h b/pango2/pango-types.h index 373ace78..003dec8e 100644 --- a/pango/pango-types.h +++ b/pango2/pango-types.h @@ -22,7 +22,7 @@ #include <glib.h> #include <glib-object.h> -#include <pango/pango-version-macros.h> +#include <pango2/pango-version-macros.h> G_BEGIN_DECLS @@ -227,11 +227,11 @@ void pango2_extents_to_pixels (Pango2Rectangle *inclusive, Pango2Rectangle *nearest); -#include <pango/pango-direction.h> -#include <pango/pango-gravity.h> -#include <pango/pango-language.h> -#include <pango/pango-matrix.h> -#include <pango/pango-script.h> +#include <pango2/pango-direction.h> +#include <pango2/pango-gravity.h> +#include <pango2/pango-language.h> +#include <pango2/pango-matrix.h> +#include <pango2/pango-script.h> /** * Pango2Alignment: diff --git a/pango/pango-userface-private.h b/pango2/pango-userface-private.h index a8a564fc..a8a564fc 100644 --- a/pango/pango-userface-private.h +++ b/pango2/pango-userface-private.h diff --git a/pango/pango-userface.c b/pango2/pango-userface.c index d4cb60f5..d4cb60f5 100644 --- a/pango/pango-userface.c +++ b/pango2/pango-userface.c diff --git a/pango/pango-userface.h b/pango2/pango-userface.h index 68c7079c..359ded72 100644 --- a/pango/pango-userface.h +++ b/pango2/pango-userface.h @@ -19,9 +19,9 @@ #pragma once -#include <pango/pango-types.h> -#include <pango/pango-glyph.h> -#include <pango/pango-font-face.h> +#include <pango2/pango-types.h> +#include <pango2/pango-glyph.h> +#include <pango2/pango-font-face.h> G_BEGIN_DECLS diff --git a/pango/pango-userfont-private.h b/pango2/pango-userfont-private.h index 94be5a18..94be5a18 100644 --- a/pango/pango-userfont-private.h +++ b/pango2/pango-userfont-private.h diff --git a/pango/pango-userfont.c b/pango2/pango-userfont.c index 6bd4b20c..6bd4b20c 100644 --- a/pango/pango-userfont.c +++ b/pango2/pango-userfont.c diff --git a/pango/pango-userfont.h b/pango2/pango-userfont.h index c3c3f9aa..47b23b01 100644 --- a/pango/pango-userfont.h +++ b/pango2/pango-userfont.h @@ -19,8 +19,8 @@ #pragma once -#include <pango/pango-types.h> -#include <pango/pango-userface.h> +#include <pango2/pango-types.h> +#include <pango2/pango-userface.h> #include <hb.h> G_BEGIN_DECLS diff --git a/pango/pango-utils.c b/pango2/pango-utils.c index 89e20dac..89e20dac 100644 --- a/pango/pango-utils.c +++ b/pango2/pango-utils.c diff --git a/pango/pango-utils.h b/pango2/pango-utils.h index 069978c8..f5187dc9 100644 --- a/pango/pango-utils.h +++ b/pango2/pango-utils.h @@ -21,7 +21,7 @@ #include <stdio.h> #include <glib.h> -#include <pango/pango-font.h> +#include <pango2/pango-font.h> G_BEGIN_DECLS diff --git a/pango/pango-version-macros.h b/pango2/pango-version-macros.h index c40f373d..bce4e314 100644 --- a/pango/pango-version-macros.h +++ b/pango2/pango-version-macros.h @@ -21,7 +21,7 @@ #pragma once -#include <pango/pango-features.h> +#include <pango2/pango-features.h> #include <glib.h> diff --git a/pango2/pango.h b/pango2/pango.h new file mode 100644 index 00000000..f3486c4d --- /dev/null +++ b/pango2/pango.h @@ -0,0 +1,61 @@ +/* + * Copyright (C) 1999 Red Hat Software + * + * SPDX-License-Identifier: LGPL-2.1-or-later + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see <http://www.gnu.org/licenses/>. + */ + +#pragma once + +#include <pango2/pango-attr.h> +#include <pango2/pango-attr-list.h> +#include <pango2/pango-attr-iterator.h> +#include <pango2/pango-attributes.h> +#include <pango2/pango-break.h> +#include <pango2/pango-color.h> +#include <pango2/pango-context.h> +#include <pango2/pango-direction.h> +#include <pango2/pango-enum-types.h> +#include <pango2/pango-features.h> +#include <pango2/pango-font.h> +#include <pango2/pango-font-description.h> +#include <pango2/pango-font-face.h> +#include <pango2/pango-font-family.h> +#include <pango2/pango-font-metrics.h> +#include <pango2/pango-fontmap.h> +#include <pango2/pango-fontset.h> +#include <pango2/pango-generic-family.h> +#include <pango2/pango-glyph.h> +#include <pango2/pango-gravity.h> +#include <pango2/pango-hbface.h> +#include <pango2/pango-hbfont.h> +#include <pango2/pango-item.h> +#include <pango2/pango-language.h> +#include <pango2/pango-layout.h> +#include <pango2/pango-line.h> +#include <pango2/pango-line-breaker.h> +#include <pango2/pango-line-iter.h> +#include <pango2/pango-lines.h> +#include <pango2/pango-markup.h> +#include <pango2/pango-matrix.h> +#include <pango2/pango-renderer.h> +#include <pango2/pango-run.h> +#include <pango2/pango-script.h> +#include <pango2/pango-tabs.h> +#include <pango2/pango-types.h> +#include <pango2/pango-userface.h> +#include <pango2/pango-userfont.h> +#include <pango2/pango-utils.h> +#include <pango2/pango-version-macros.h> diff --git a/pango/pango.rc.in b/pango2/pango.rc.in index 3af81445..3af81445 100644 --- a/pango/pango.rc.in +++ b/pango2/pango.rc.in diff --git a/pango/pangocairo-context.c b/pango2/pangocairo-context.c index 2346b635..2346b635 100644 --- a/pango/pangocairo-context.c +++ b/pango2/pangocairo-context.c diff --git a/pango/pangocairo-context.h b/pango2/pangocairo-context.h index 628de27e..5532beab 100644 --- a/pango/pangocairo-context.h +++ b/pango2/pangocairo-context.h @@ -19,7 +19,7 @@ #pragma once -#include <pango/pango.h> +#include <pango2/pango.h> #include <cairo.h> G_BEGIN_DECLS diff --git a/pango/pangocairo-dwrite-font.cpp b/pango2/pangocairo-dwrite-font.cpp index ed5b4f0c..ed5b4f0c 100644 --- a/pango/pangocairo-dwrite-font.cpp +++ b/pango2/pangocairo-dwrite-font.cpp diff --git a/pango/pangocairo-font.c b/pango2/pangocairo-font.c index 3eda3d5a..3eda3d5a 100644 --- a/pango/pangocairo-font.c +++ b/pango2/pangocairo-font.c diff --git a/pango/pangocairo-font.h b/pango2/pangocairo-font.h index f6c59bdc..9c57318d 100644 --- a/pango/pangocairo-font.h +++ b/pango2/pangocairo-font.h @@ -19,7 +19,7 @@ #pragma once -#include <pango/pango.h> +#include <pango2/pango.h> #include <cairo.h> G_BEGIN_DECLS diff --git a/pango/pangocairo-private.h b/pango2/pangocairo-private.h index b9398109..d3ad6994 100644 --- a/pango/pangocairo-private.h +++ b/pango2/pangocairo-private.h @@ -19,8 +19,8 @@ #pragma once -#include <pango/pangocairo.h> -#include <pango/pango-renderer.h> +#include "pangocairo.h" +#include "pango-renderer.h" G_BEGIN_DECLS diff --git a/pango/pangocairo-render.c b/pango2/pangocairo-render.c index b5189bee..b5189bee 100644 --- a/pango/pangocairo-render.c +++ b/pango2/pangocairo-render.c diff --git a/pango/pangocairo-render.h b/pango2/pangocairo-render.h index fcd767f4..fb40fba9 100644 --- a/pango/pangocairo-render.h +++ b/pango2/pangocairo-render.h @@ -19,7 +19,7 @@ #pragma once -#include <pango/pango.h> +#include <pango2/pango.h> #include <cairo.h> G_BEGIN_DECLS diff --git a/pango/pangocairo.h b/pango2/pangocairo.h index 1ffa4bbd..2291fb8e 100644 --- a/pango/pangocairo.h +++ b/pango2/pangocairo.h @@ -19,6 +19,6 @@ #pragma once -#include <pango/pangocairo-context.h> -#include <pango/pangocairo-font.h> -#include <pango/pangocairo-render.h> +#include <pango2/pangocairo-context.h> +#include <pango2/pangocairo-font.h> +#include <pango2/pangocairo-render.h> diff --git a/pango/pangocoretext-fontmap.c b/pango2/pangocoretext-fontmap.c index 3b7cdd47..3b7cdd47 100644 --- a/pango/pangocoretext-fontmap.c +++ b/pango2/pangocoretext-fontmap.c diff --git a/pango/pangocoretext-fontmap.h b/pango2/pangocoretext-fontmap.h index c7602e69..ecbe7c51 100644 --- a/pango/pangocoretext-fontmap.h +++ b/pango2/pangocoretext-fontmap.h @@ -19,7 +19,7 @@ #pragma once -#include <pango/pango.h> +#include <pango2/pango.h> G_BEGIN_DECLS diff --git a/pango/pangodwrite-fontmap.cpp b/pango2/pangodwrite-fontmap.cpp index 37307a3d..37307a3d 100644 --- a/pango/pangodwrite-fontmap.cpp +++ b/pango2/pangodwrite-fontmap.cpp diff --git a/pango/pangodwrite-fontmap.h b/pango2/pangodwrite-fontmap.h index 4cb3b2c7..c873759d 100644 --- a/pango/pangodwrite-fontmap.h +++ b/pango2/pangodwrite-fontmap.h @@ -21,7 +21,7 @@ #pragma once -#include <pango/pango.h> +#include <pango2/pango.h> G_BEGIN_DECLS diff --git a/pango/pangofc-fontmap.c b/pango2/pangofc-fontmap.c index c3d026e2..c3d026e2 100644 --- a/pango/pangofc-fontmap.c +++ b/pango2/pangofc-fontmap.c diff --git a/pango/pangofc-fontmap.h b/pango2/pangofc-fontmap.h index f11d17b3..7af8f0bb 100644 --- a/pango/pangofc-fontmap.h +++ b/pango2/pangofc-fontmap.h @@ -19,7 +19,7 @@ #pragma once -#include <pango/pango.h> +#include <pango2/pango.h> #include <fontconfig/fontconfig.h> G_BEGIN_DECLS diff --git a/pango/pangofc-language-set-private.h b/pango2/pangofc-language-set-private.h index e1c48d4c..e1c48d4c 100644 --- a/pango/pangofc-language-set-private.h +++ b/pango2/pangofc-language-set-private.h diff --git a/pango/pangofc-language-set.c b/pango2/pangofc-language-set.c index 1c4534c2..1c4534c2 100644 --- a/pango/pangofc-language-set.c +++ b/pango2/pangofc-language-set.c diff --git a/pango/serializer.c b/pango2/serializer.c index 07e28ff9..4e7e8a39 100644 --- a/pango/serializer.c +++ b/pango2/serializer.c @@ -21,20 +21,20 @@ #include "config.h" -#include <pango/pango-layout.h> -#include <pango/pango-context-private.h> -#include <pango/pango-enum-types.h> -#include <pango/pango-font-private.h> -#include <pango/pango-line-private.h> -#include <pango/pango-hbface.h> -#include <pango/pango-hbfont.h> -#include <pango/pango-attributes.h> -#include <pango/pango-attr-private.h> -#include <pango/pango-item-private.h> +#include "pango-layout.h" +#include "pango-context-private.h" +#include "pango-enum-types.h" +#include "pango-font-private.h" +#include "pango-line-private.h" +#include "pango-hbface.h" +#include "pango-hbfont.h" +#include "pango-attributes.h" +#include "pango-attr-private.h" +#include "pango-item-private.h" #include <hb-ot.h> -#include "pango/json/gtkjsonparserprivate.h" -#include "pango/json/gtkjsonprinterprivate.h" +#include "json/gtkjsonparserprivate.h" +#include "json/gtkjsonprinterprivate.h" /* {{{ Error handling */ diff --git a/pango/shape.c b/pango2/shape.c index 62ea953a..62ea953a 100644 --- a/pango/shape.c +++ b/pango2/shape.c diff --git a/tests/cxx-test.cpp b/tests/cxx-test.cpp index ac72a8b3..3fa1c20d 100644 --- a/tests/cxx-test.cpp +++ b/tests/cxx-test.cpp @@ -2,10 +2,10 @@ * and compiled in a C++ program. */ -#include <pango/pango.h> +#include <pango2/pango.h> #if PANGO_RENDERING_CAIRO -#include <pango/pangocairo.h> +#include <pango2/pangocairo.h> #endif int diff --git a/tests/dump-boundaries.c b/tests/dump-boundaries.c index 467e637b..5e98123c 100644 --- a/tests/dump-boundaries.c +++ b/tests/dump-boundaries.c @@ -24,7 +24,7 @@ #include <stdio.h> #include <unistd.h> -#include <pango/pango.h> +#include <pango2/pango.h> #define CHFORMAT "%0#6x" diff --git a/tests/markup-parse.c b/tests/markup-parse.c index a8de714d..35ea03b2 100644 --- a/tests/markup-parse.c +++ b/tests/markup-parse.c @@ -30,7 +30,7 @@ #include <locale.h> -#include <pango/pango.h> +#include <pango2/pango.h> #include "test-common.h" static void diff --git a/tests/test-bidi.c b/tests/test-bidi.c index db128279..11df1758 100644 --- a/tests/test-bidi.c +++ b/tests/test-bidi.c @@ -20,7 +20,7 @@ */ #include <locale.h> -#include <pango/pango.h> +#include <pango2/pango.h> static Pango2Context *context; diff --git a/tests/test-break.c b/tests/test-break.c index 23caba69..933c20cf 100644 --- a/tests/test-break.c +++ b/tests/test-break.c @@ -28,7 +28,7 @@ #endif #include "config.h" -#include <pango/pango.h> +#include <pango2/pango.h> #include "test-common.h" #include "validate-log-attrs.h" diff --git a/tests/test-common.c b/tests/test-common.c index 84dfbef9..aa51378a 100644 --- a/tests/test-common.c +++ b/tests/test-common.c @@ -32,7 +32,7 @@ #include <unistd.h> #endif -#include <pango/pangocairo.h> +#include <pango2/pangocairo.h> #include "test-common.h" #include <hb-ot.h> diff --git a/tests/test-ellipsize.c b/tests/test-ellipsize.c index a469cb63..b01a9441 100644 --- a/tests/test-ellipsize.c +++ b/tests/test-ellipsize.c @@ -19,7 +19,7 @@ * Boston, MA 02111-1307, USA. */ -#include <pango/pango.h> +#include <pango2/pango.h> #include "test-common.h" static Pango2Context *context; diff --git a/tests/test-font.c b/tests/test-font.c index e37d0a63..dd3ef1b5 100644 --- a/tests/test-font.c +++ b/tests/test-font.c @@ -24,9 +24,9 @@ #include <locale.h> #include <gio/gio.h> -#include <pango/pango.h> -#include <pango/pango-item-private.h> -#include <pango/pango-font-private.h> +#include <pango2/pango.h> +#include <pango2/pango-item-private.h> +#include <pango2/pango-font-private.h> #include "test-common.h" diff --git a/tests/test-fontsets.c b/tests/test-fontsets.c index 339411c9..fda49cfc 100644 --- a/tests/test-fontsets.c +++ b/tests/test-fontsets.c @@ -1,7 +1,7 @@ #include <string.h> #include <locale.h> -#include <pango/pango.h> +#include <pango2/pango.h> #include "test-common.h" static gboolean diff --git a/tests/test-harfbuzz.c b/tests/test-harfbuzz.c index 4d4fd7be..dcd7ca4b 100644 --- a/tests/test-harfbuzz.c +++ b/tests/test-harfbuzz.c @@ -19,7 +19,7 @@ * Boston, MA 02111-1307, USA. */ -#include <pango/pango.h> +#include <pango2/pango.h> #include <gio/gio.h> #include "test-common.h" diff --git a/tests/test-itemize.c b/tests/test-itemize.c index d7b4074c..a13ceaee 100644 --- a/tests/test-itemize.c +++ b/tests/test-itemize.c @@ -29,11 +29,11 @@ #endif #include "config.h" -#include <pango/pango.h> +#include <pango2/pango.h> #include "test-common.h" -#include "pango/pango-attr-private.h" -#include "pango/pango-item-private.h" +#include "pango2/pango-attr-private.h" +#include "pango2/pango-item-private.h" static Pango2Context *context; diff --git a/tests/test-layout.c b/tests/test-layout.c index 868806df..5146416a 100644 --- a/tests/test-layout.c +++ b/tests/test-layout.c @@ -27,7 +27,7 @@ #include <unistd.h> #endif -#include <pango/pango.h> +#include <pango2/pango.h> #include "test-common.h" #include <hb-ot.h> diff --git a/tests/test-pangocairo-threads.c b/tests/test-pangocairo-threads.c index 4db903c2..47a49081 100644 --- a/tests/test-pangocairo-threads.c +++ b/tests/test-pangocairo-threads.c @@ -1,7 +1,6 @@ #include <stdlib.h> #include <string.h> -#include <pango/pango.h> -#include <pango/pangocairo.h> +#include <pango2/pangocairo.h> #include "test-common.h" diff --git a/tests/test-shape.c b/tests/test-shape.c index 8f0732f6..dc4f01af 100644 --- a/tests/test-shape.c +++ b/tests/test-shape.c @@ -30,7 +30,7 @@ #endif #include "config.h" -#include <pango/pangocairo.h> +#include <pango2/pangocairo.h> #include "test-common.h" diff --git a/tests/testattributes.c b/tests/testattributes.c index 13db3b97..b256eb8b 100644 --- a/tests/testattributes.c +++ b/tests/testattributes.c @@ -19,8 +19,8 @@ * Boston, MA 02111-1307, USA. */ -#include <pango/pango.h> -#include <pango/pango-attr-private.h> +#include <pango2/pango.h> +#include <pango2/pango-attr-private.h> static void test_copy (Pango2Attribute *attr) diff --git a/tests/testboundaries.c b/tests/testboundaries.c index 1deaa65d..eb6a8207 100644 --- a/tests/testboundaries.c +++ b/tests/testboundaries.c @@ -24,7 +24,7 @@ #include <stdio.h> #include <glib.h> -#include <pango/pango.h> +#include <pango2/pango.h> #ifndef G_OS_WIN32 #include <unistd.h> diff --git a/tests/testboundaries_ucd.c b/tests/testboundaries_ucd.c index 64fa66ff..b34f7573 100644 --- a/tests/testboundaries_ucd.c +++ b/tests/testboundaries_ucd.c @@ -20,10 +20,10 @@ * Boston, MA 02111-1307, USA. */ -#include <pango/pango.h> #include <stdlib.h> #include <string.h> #include <locale.h> +#include <pango2/pango.h> static gboolean failed = FALSE; diff --git a/tests/testcolor.c b/tests/testcolor.c index 125d1023..d783844b 100644 --- a/tests/testcolor.c +++ b/tests/testcolor.c @@ -20,7 +20,7 @@ */ #include <glib.h> -#include <pango/pango.h> +#include <pango2/pango.h> typedef struct _ColorSpec { const char *spec; diff --git a/tests/testcontext.c b/tests/testcontext.c index 59517e57..05917d52 100644 --- a/tests/testcontext.c +++ b/tests/testcontext.c @@ -20,7 +20,7 @@ */ #include <glib.h> -#include <pango/pango.h> +#include <pango2/pango.h> static void test_set_language (void) diff --git a/tests/testhbfont.c b/tests/testhbfont.c index 9f6e76ce..88fc3ef6 100644 --- a/tests/testhbfont.c +++ b/tests/testhbfont.c @@ -22,7 +22,7 @@ #include "config.h" #include <glib.h> #include <gio/gio.h> -#include <pango/pango.h> +#include <pango2/pango.h> #include <hb-ot.h> diff --git a/tests/testiter.c b/tests/testiter.c index b180f66f..007608df 100644 --- a/tests/testiter.c +++ b/tests/testiter.c @@ -30,7 +30,7 @@ #include <glib.h> -#include <pango/pango.h> +#include <pango2/pango.h> static void verbose (const char *format, ...) G_GNUC_PRINTF (1, 2); static void diff --git a/tests/testlanguage.c b/tests/testlanguage.c index 1a6f238a..14329ac4 100644 --- a/tests/testlanguage.c +++ b/tests/testlanguage.c @@ -20,7 +20,7 @@ */ #include <glib.h> -#include <pango/pango.h> +#include <pango2/pango.h> static void test_language_to_string (void) diff --git a/tests/testmatrix.c b/tests/testmatrix.c index 0549764c..c0b7e47d 100644 --- a/tests/testmatrix.c +++ b/tests/testmatrix.c @@ -20,7 +20,7 @@ */ #include <glib.h> -#include <pango/pango.h> +#include <pango2/pango.h> #include <math.h> #define matrix_equal(m1, m2) \ diff --git a/tests/testmisc.c b/tests/testmisc.c index 32efb932..cecec9bb 100644 --- a/tests/testmisc.c +++ b/tests/testmisc.c @@ -21,8 +21,8 @@ #include "config.h" #include <glib.h> -#include <pango/pangocairo.h> -#include <pango/pango-item-private.h> +#include <pango2/pangocairo.h> +#include <pango2/pango-item-private.h> /* Test that itemizing a string with 0 characters works */ diff --git a/tests/testrandom.c b/tests/testrandom.c index 8d7b19c4..5de90d08 100644 --- a/tests/testrandom.c +++ b/tests/testrandom.c @@ -23,7 +23,7 @@ #include <locale.h> #include <gio/gio.h> -#include <pango/pango.h> +#include <pango2/pango.h> #define N_SENTENCES 20 diff --git a/tests/testscript.c b/tests/testscript.c index 435c9d4e..05d30a38 100644 --- a/tests/testscript.c +++ b/tests/testscript.c @@ -58,7 +58,7 @@ #include <stdlib.h> #include <string.h> -#include "pango/pango-script.h" +#include "pango2/pango-script.h" typedef struct { diff --git a/tests/testserialize.c b/tests/testserialize.c index 60333d1f..6ee21da8 100644 --- a/tests/testserialize.c +++ b/tests/testserialize.c @@ -21,7 +21,7 @@ #include "config.h" #include <glib.h> -#include <pango/pango.h> +#include <pango2/pango.h> #include <gio/gio.h> #include "test-common.h" diff --git a/tests/testtabs.c b/tests/testtabs.c index 873c2427..7e33cb86 100644 --- a/tests/testtabs.c +++ b/tests/testtabs.c @@ -20,7 +20,7 @@ */ #include <glib.h> -#include <pango/pango.h> +#include <pango2/pango.h> static void test_tabs_basic (void) diff --git a/tests/validate-log-attrs.c b/tests/validate-log-attrs.c index 16c9817f..369c7729 100644 --- a/tests/validate-log-attrs.c +++ b/tests/validate-log-attrs.c @@ -21,7 +21,7 @@ #include "config.h" #include "validate-log-attrs.h" -#include "pango.h" +#include <pango2/pango.h> #include <string.h> /* {{{ Validation */ diff --git a/tests/validate-log-attrs.h b/tests/validate-log-attrs.h index dcdf0b09..e9991d14 100644 --- a/tests/validate-log-attrs.h +++ b/tests/validate-log-attrs.h @@ -25,7 +25,7 @@ G_BEGIN_DECLS -#include <pango/pango-item.h> +#include <pango2/pango-item.h> #define PANGO2_VALIDATE_ERROR (pango2_validate_error_quark ()) diff --git a/tools/gen-script-for-lang.c b/tools/gen-script-for-lang.c index f4e83adb..d34a93dd 100644 --- a/tools/gen-script-for-lang.c +++ b/tools/gen-script-for-lang.c @@ -26,9 +26,9 @@ #include <string.h> #include <time.h> -#include <pango/pango-enum-types.h> -#include <pango/pango-script.h> -#include <pango/pango-types.h> +#include <pango2/pango-enum-types.h> +#include <pango2/pango-script.h> +#include <pango2/pango-types.h> #include <fontconfig/fontconfig.h> diff --git a/utils/pango-list.c b/utils/pango-list.c index 3023bce8..5dd21313 100644 --- a/utils/pango-list.c +++ b/utils/pango-list.c @@ -21,8 +21,8 @@ */ #include "config.h" -#include <pango/pango.h> -#include <pango/pango-hbface-private.h> +#include <pango2/pango.h> +#include <pango2/pango-hbface-private.h> #include <hb-ot.h> #include <glib/gstdio.h> #include <gio/gio.h> diff --git a/utils/pango-segmentation.c b/utils/pango-segmentation.c index d99852ff..42c5d3e8 100644 --- a/utils/pango-segmentation.c +++ b/utils/pango-segmentation.c @@ -20,7 +20,7 @@ */ #include <glib.h> -#include <pango/pango.h> +#include <pango2/pango.h> #include <string.h> #include <stdlib.h> #include <locale.h> diff --git a/utils/userfont.c b/utils/userfont.c index 6d064c49..e8445516 100644 --- a/utils/userfont.c +++ b/utils/userfont.c @@ -1,7 +1,7 @@ #include <stdlib.h> #include <stdio.h> -#include <pango/pangocairo.h> +#include <pango2/pangocairo.h> #include "userfont.h" #define END_GLYPH 0 diff --git a/utils/viewer-pangocairo.c b/utils/viewer-pangocairo.c index bd6ca9a5..df391259 100644 --- a/utils/viewer-pangocairo.c +++ b/utils/viewer-pangocairo.c @@ -25,8 +25,8 @@ #include "viewer-cairo.h" #include "userfont.h" -#include <pango/pangocairo.h> -#include <pango/pango-run.h> +#include <pango2/pango.h> +#include <pango2/pangocairo.h> #include <hb-ot.h> diff --git a/utils/viewer-pangoxft.c b/utils/viewer-pangoxft.c index 08aadb7e..a6d4e221 100644 --- a/utils/viewer-pangoxft.c +++ b/utils/viewer-pangoxft.c @@ -23,7 +23,7 @@ #include "viewer-render.h" #include "viewer-x.h" -#include <pango/pangoxft.h> +#include <pango2/pangoxft.h> static void default_substitute (FcPattern *pattern, diff --git a/utils/viewer-render.c b/utils/viewer-render.c index 1cb9b4f3..4e60cbf6 100644 --- a/utils/viewer-render.c +++ b/utils/viewer-render.c @@ -28,7 +28,7 @@ #include <glib.h> #include <glib/gprintf.h> -#include <pango/pango.h> +#include <pango2/pango.h> #include "viewer-render.h" diff --git a/utils/viewer-render.h b/utils/viewer-render.h index c57b9588..d785ab18 100644 --- a/utils/viewer-render.h +++ b/utils/viewer-render.h @@ -21,7 +21,7 @@ #ifndef VIEWER_RENDER_H #define VIEWER_RENDER_H -#include <pango/pango-layout.h> +#include <pango2/pango.h> #include "viewer.h" diff --git a/utils/viewer-x.h b/utils/viewer-x.h index f39ed188..af06e3e2 100644 --- a/utils/viewer-x.h +++ b/utils/viewer-x.h @@ -21,7 +21,7 @@ #ifndef VIEWER_X_H #define VIEWER_X_H -#include <pango/pango.h> +#include <pango2/pango.h> #include <X11/Xlib.h> #include <X11/Xutil.h> diff --git a/utils/viewer.h b/utils/viewer.h index adcd740a..e7e78e16 100644 --- a/utils/viewer.h +++ b/utils/viewer.h @@ -21,7 +21,7 @@ #ifndef VIEWER_H #define VIEWER_H -#include <pango/pango.h> +#include <pango2/pango.h> typedef struct _Pango2Viewer Pango2Viewer; |