diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-08-08 18:09:02 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-08-08 18:09:02 +0000 |
| commit | 2fc159927c7b36be2d59edd991ecbdb558705284 (patch) | |
| tree | 20ac6bae27da6f88548b0f90145f6ae11072cd08 | |
| parent | b312191e48c2ea8f0894c4077af69f1aff6c195c (diff) | |
| parent | b69c5063162d779020f331f291431e250a769d5c (diff) | |
| download | pango-2fc159927c7b36be2d59edd991ecbdb558705284.tar.gz | |
Merge branch 'layout-docs' into 'main'
docs: Add more details
See merge request GNOME/pango!393
| -rw-r--r-- | docs/align-center-justify.png | bin | 0 -> 649 bytes | |||
| -rw-r--r-- | docs/align-center.png | bin | 0 -> 539 bytes | |||
| -rw-r--r-- | docs/align-left-justify.png | bin | 0 -> 622 bytes | |||
| -rw-r--r-- | docs/align-left.png | bin | 0 -> 513 bytes | |||
| -rw-r--r-- | docs/align-right-justify.png | bin | 0 -> 628 bytes | |||
| -rw-r--r-- | docs/align-right.png | bin | 0 -> 497 bytes | |||
| -rw-r--r-- | docs/pango.toml.in | 8 | ||||
| -rw-r--r-- | pango/pango-layout.c | 10 |
8 files changed, 17 insertions, 1 deletions
diff --git a/docs/align-center-justify.png b/docs/align-center-justify.png Binary files differnew file mode 100644 index 00000000..c9244853 --- /dev/null +++ b/docs/align-center-justify.png diff --git a/docs/align-center.png b/docs/align-center.png Binary files differnew file mode 100644 index 00000000..a32ba3ca --- /dev/null +++ b/docs/align-center.png diff --git a/docs/align-left-justify.png b/docs/align-left-justify.png Binary files differnew file mode 100644 index 00000000..4c6f3970 --- /dev/null +++ b/docs/align-left-justify.png diff --git a/docs/align-left.png b/docs/align-left.png Binary files differnew file mode 100644 index 00000000..775c0721 --- /dev/null +++ b/docs/align-left.png diff --git a/docs/align-right-justify.png b/docs/align-right-justify.png Binary files differnew file mode 100644 index 00000000..430c57e5 --- /dev/null +++ b/docs/align-right-justify.png diff --git a/docs/align-right.png b/docs/align-right.png Binary files differnew file mode 100644 index 00000000..05968f2a --- /dev/null +++ b/docs/align-right.png diff --git a/docs/pango.toml.in b/docs/pango.toml.in index c4a1c11e..0b1cef06 100644 --- a/docs/pango.toml.in +++ b/docs/pango.toml.in @@ -71,5 +71,11 @@ content_images = [ "rects1.png", "rects2.png", "arabic-markup.png", - "blue-text.png" + "blue-text.png", + "align-left.png", + "align-center.png", + "align-right.png", + "align-left-justify.png", + "align-center-justify.png", + "align-right-justify.png", ] diff --git a/pango/pango-layout.c b/pango/pango-layout.c index b39ca62b..e0475a5e 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -45,6 +45,16 @@ * *  * + * The following images demonstrate the effect of alignment and + * justification on the layout of text: + * + * | | | + * | --- | --- | + * |  |  | + * |  |  | + * |  |  | + * + * * It is possible, as well, to ignore the 2-D setup, * and simply treat the results of a `PangoLayout` as a list of lines. */ |
