| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2007-05-04 Behdad Esfahbod <behdad@gnome.org>
* pango/pangocairo.h:
* pango/pangocairo-context.c:
* pango/pangocairo-render.c:
New API
PangoCairoShapeRendererFunc and
pango_cairo_context_[sg]et_shape_renderer()
* docs/pango-sections.txt, docs/tmpl/pangocairo.sgml: Document new
* API.
* examples/Makefile.am, examples/cairoshape.c: New example to show off
new API/feature.
svn path=/trunk/; revision=2261
|
|
|
|
|
|
|
|
|
| |
2007-01-16 Behdad Esfahbod <behdad@gnome.org>
*.c, *.h: Replace preceding sequences of 8 spaces with tabs.
svn path=/trunk/; revision=2165
|
|
|
|
|
|
|
|
|
|
|
| |
2007-01-16 Behdad Esfahbod <behdad@gnome.org>
* examples/pangowin32tobmp.c (SaveBitmap):
* modules/tibetan/tibetan-fc.c:
Replace C++-style // comments with C-style /* */ ones.
svn path=/trunk/; revision=2164
|
|
|
|
|
|
|
|
|
| |
2007-01-16 Behdad Esfahbod <behdad@gnome.org>
*.c, *.h: Drop trailing whitespace.
svn path=/trunk/; revision=2163
|
|
|
|
|
|
|
|
|
|
|
| |
2007-01-16 Behdad Esfahbod <behdad@gnome.org>
* examples/cairotwisted.c (point_on_path), (draw_text),
(draw_twisted), (draw_dream), (draw_wow), (main):
Improve text-on-path example.
svn path=/trunk/; revision=2156
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2007-01-16 Behdad Esfahbod <behdad@gnome.org>
* examples/pango-view.c:
* examples/pangocairo-view.c:
* examples/pangoft2-view.c:
* examples/pangox-view.c:
* examples/pangoxft-view.c:
* examples/renderdemo.c:
* examples/renderdemo.h:
* examples/test-arabic.txt:
* examples/test-chinese.txt:
* examples/test-devanagari.txt:
* examples/test-gurmukhi.txt:
* examples/test-hebrew.txt:
* examples/test-ipa.txt:
* examples/test-lao.txt:
* examples/test-latin.txt:
* examples/test-mixed.txt:
* examples/test-syriac.txt:
* examples/test-tamil.txt:
* examples/test-thai.txt:
* examples/test-tibetan.txt:
* examples/viewer-cairo.c:
* examples/viewer-cairo.h:
* examples/viewer-main.c:
* examples/viewer-pangocairo.c:
* examples/viewer-pangoft2.c:
* examples/viewer-pangox.c:
* examples/viewer-pangoxft.c:
* examples/viewer-win32.c:
* examples/viewer-x.c:
* examples/viewer-x.h:
* examples/viewer.h:
Move into pango-view/
* Makefile.am:
* configure.in:
* examples/Makefile.am:
* pango-view/Makefile.am:
Update.
svn path=/trunk/; revision=2152
|
|
|
|
|
|
|
|
|
| |
2007-01-16 Behdad Esfahbod <behdad@gnome.org>
* examples/renderdemo.c (parse_enum): Oops. Replace GType* with GType.
svn path=/trunk/; revision=2151
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2007-01-16 Behdad Esfahbod <behdad@gnome.org>
* examples/cairotwisted.c (draw_text):
* pango/pangocairo-win32font.c (max_glyph_width):
* pango/pangofc-font.c (max_glyph_width):
* pango/pangowin32.c (max_glyph_width),
(pango_win32_render_layout):
* pango/pangox.c (pango_x_render_layout):
Use pango_layout(_iter)?_get_line_readonly() instead of
pango_layout(_iter)?_get_line().
svn path=/trunk/; revision=2146
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2007-01-16 Behdad Esfahbod <behdad@gnome.org>
* pango/pango-attributes.h:
* pango/pango-attributes.c:
New attribute types PANGO_ATTR_GRAVITY and PANGO_ATTR_GRAVITY_HINT.
New public functions:
pango_attr_gravity_new()
pango_attr_gravity_hint_new()
* pango/pango-context.c (update_attr_iterator),
(itemize_state_init), (itemize_state_add_character),
(get_shaper_and_font), (itemize_state_update_for_new_run):
Handle gravity and gravity_hint attributes.
* pango/pango-utils.h:
* pango/pango-utils.c:
New public function:
pango_parse_enum()
* pango/pango-markup.c (span_parse_func): Parse gravity and
gravity_hint attributes for <span>. Optimize a bit.
* pango/pango-markup.c (parse_absolute_size), (attr_strcmp),
(span_parse_int), (span_parse_boolean), (span_parse_color),
(span_parse_enum), (span_parse_func): Use pango_scan_int(),
pango_color_parse(), and pango_parse_enum(). Also, ignore '-' and
'_' differences when matching attribute names for <span>.
* examples/renderdemo.c (parse_enum), (parse_ellipsis),
(parse_gravity), (parse_gravity_hint), (parse_hinting),
(parse_wrap): Use a generic parse_enum() that uses pango_parse_enum().
* modules/basic/basic-fc.c (basic_engine_shape):
* pango/pangofc-fontmap.c (pango_fc_make_pattern):
Use PANGO_GRAVITY_IS_VERTICAL().
* pango/pango.def:
* docs/pango-sections.txt:
* docs/tmpl/text-attributes.sgml:
* docs/tmpl/utils.sgml:
Update.
svn path=/trunk/; revision=2145
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2007-01-15 Behdad Esfahbod <behdad@gnome.org>
Bug 323173 – Add layout of mixed direction text for vertical layout
* pango/pango-gravity.h:
* pango/pango-gravity.c:
Moved gravity stuff here. New public API:
PangoGravityHint
pango_gravity_get_for_matrix()
pango_gravity_get_for_script()
* pango/pango-context.h:
* pango/pango-context.c (pango_context_init),
(update_resolved_gravity), (itemize_state_update_for_new_run):
Support gravity hint. New public API:
pango_context_set_gravity_hint()
pango_context_get_gravity_hint()
* pango/pango-utils.c:
* pango/pango-matrix.c:
* pango/pango-matrix.h:
* pango/pango-types.h:
Moved gravity and matrix stuff into its own header. pango-types.h
includes both pango-matrix.h and pango-gravity.h
* pango/pango.h:
Include new headers.
* pango/pango.def:
* pango/Makefile.am:
Update.
* docs/pango-docs.sgml:
* docs/pango-sections.txt:
* docs/tmpl/glyphs.sgml:
* docs/tmpl/main.sgml:
* docs/tmpl/vertical.sgml:
Add a section for Vertical Text.
* examples/renderdemo.c (do_output), (parse_gravity_hint),
(parse_options):
Support gravity hint.
* examples/test-mixed.txt:
New test, mixed Latin, Arabic, Chinese text.
svn path=/trunk/; revision=2144
|
|
|
|
| |
svn path=/trunk/; revision=2137
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2007-01-04 Behdad Esfahbod <behdad@gnome.org>
Part of Bug 332266 – gdk_draw_layout fails for coordinates >= 2^21
* pango/pango-types.h:
* pango/pango-matrix.c: New public API:
pango_matrix_transform_distance()
pango_matrix_transform_point()
pango_matrix_transform_rectangle()
pango_matrix_transform_pixel_rectangle()
* pango/pango-utils.h:
* pango/pango-utils.c: New public API:
pango_units_from_double()
pango_units_to_double()
pango_extents_to_pixels()
* pango/pango-layout.c (pango_layout_get_pixel_extents),
(pango_layout_line_get_pixel_extents): Use pango_extents_to_pixels().
* pango/pangocairo-fcfont.c:
(pango_cairo_fc_font_glyph_extents_cache_init),
(compute_glyph_extents): Use pango_units_from_double().
* examples/renderdemo.c (do_output): Use
pango_matrix_transform_pixel_rectangle();
* pango/pango.def:
* docs/pango-sections.txt:
* docs/tmpl/glyphs.sgml: Update.
svn path=/trunk/; revision=2126
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2006-12-06 Behdad Esfahbod <behdad@gnome.org>
* configure.in:
* pango/Makefile.am:
New generated public header file pango-features.h. Currently contains
the version information. In the future, can be expanded to define
which backends have been enabled, etc.
* pango/pango.def:
* pango/pango-utils.h:
* pango/pango-utils.c:
New public macros and functions: PANGO_VERSION_ENCODE(),
PANGO_VERSION_MAJOR, PANGO_VERSION_MINOR, PANGO_VERSION_MICRO,
PANGO_VERSION, PANGO_VERSION_STRING, PANGO_VERSION_CHECK(),
pango_version(), pango_version_string(), pango_version_check().
* docs/pango-docs.sgml:
* docs/pango-sections.txt:
* docs/tmpl/pango-version.sgml:
Docs for new symbols, in a new section.
* examples/renderdemo.c (show_version):
If run-time Pango lib version is different than the compile-time one,
show that one too.
* pango/pango.h:
#include <pango-utils.h> as well as almost all other public pango-*.h
headers (though, the other ones were already included indirectly).
The only public pango-*.h header pango.h shouldn't include are
pango-ot.h (which is really misnamed) and pango-modules.h (that should
not be needed by 99.99% users anyway).
* docs/Makefile.am:
* docs/check.docs: Test to check that all symbols are documented and
properly hooked into documentation tree.
* pango/pango.rc.in:
* pango/pangoft2.rc.in:
* pango/pangowin32.rc.in:
Update, reflecting some internal symbol changes.
* pango/check.defs: Improve.
|
|
|
|
|
|
|
|
|
| |
2006-12-06 Behdad Esfahbod <behdad@gnome.org>
* examples/renderdemo.c (do_output): Set context language to
pango_language_get_default() instead of hardcoding "en-US".
* pango/pango-utils.c (pango_language_get_default): Improve docs.
|
|
|
|
|
|
|
|
| |
2006-12-06 Behdad Esfahbod <behdad@gnome.org>
* examples/Makefile.am:
* examples/test-gurmukhi.txt:
Gurmukhi test text from supreet sethi.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2006-11-27 Behdad Esfahbod <behdad@gnome.org>
Bug 371388 – Add Thai langauage engine
Patch from Theppitak Karoonboonyanan
* configure.in: Look for libthai and enable thai-lang module.
* modules/thai/Makefile.am: Hook thai-lang module.
* modules/thai/thai-lang.c: New Thai language engine that uses libthai
to do dictionary-based Thai line-breaking.
* examples/test-thai.txt: Improved.
|
|
|
|
|
|
|
|
|
| |
2006-11-22 Behdad Esfahbod <behdad@gnome.org>
* examples/HELLO.utf8:
* examples/Makefile.am:
* examples/test-lao.txt:
Add Lao text samples from Anousak Souphavanh.
|
|
|
|
|
|
|
| |
2006-10-24 Behdad Esfahbod <behdad@gnome.org>
* examples/Makefile.am (cairosimple_LDADD): Do not require pangoft2
unconditionally.
|
|
|
|
|
|
| |
2006-10-18 Behdad Esfahbod <behdad@gnome.org>
* examples/test-thai.txt: Replace by a better one.
|
|
|
|
|
|
|
| |
2006-10-17 Behdad Esfahbod <behdad@gnome.org>
* examples/Makefile.am:
* examples/test-thai.txt: Added.
|
|
|
|
|
|
|
| |
2006-10-07 Behdad Esfahbod <behdad@gnome.org>
* examples/Makefile.am:
* examples/test-latin.txt: Add part of Jabberwocky as Latin test text.
|
| |
|
|
|
|
|
|
|
|
|
| |
2006-09-08 Behdad Esfahbod <behdad@gnome.org>
* examples/cairotwisted.c: A simple text-on-path example using
pangocairo.
* examples/Makefile.am: Update.
|
|
|
|
|
|
|
|
|
|
| |
2006-08-30 Behdad Esfahbod <behdad@gnome.org>
Bug 353525 – libpangoft2-1.0.so.0: undefined reference to
`pango_font_description_get_gravity'
* examples/Makefile.am: Explicitly link to the just built pangoft2 for
pangocairo uses, like we already do for pangoxft.
|
|
|
|
|
|
|
|
|
|
| |
2006-08-23 Tor Lillqvist <tml@novell.com>
* pango/Makefile.am
* examples/Makefile.am
* pango/testfonts.c
* examples/pangowin32tobmp.c: Rename pango/testfonts.c to
examples/pangowin32tobmp.c. (#104151)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2006-08-20 Behdad Esfahbod <behdad@gnome.org>
* pango/pango-matrix.c (pango_matrix_to_gravity): Correct switched
return value of EAST/WEST.
* pango/pango-types.h (PangoGravity): Add PANGO_GRAVITY_AUTO.
* pango/pango-context.h: Add pango_context_get_gravity().
* examples/renderdemo.c (parse_gravity), (parse_options):
* pango/pango-context.c (pango_context_init),
(update_resolved_gravity), (pango_context_set_matrix),
(pango_context_set_base_gravity), (pango_context_get_gravity),
(itemize_state_init), (get_shaper_and_font):
* pango/pango-layout.c (line_set_resolved_dir):
* pango/pangocairo-fcfont.c (pango_cairo_fc_font_get_metrics),
(pango_cairo_fc_font_glyph_extents_cache_init),
(_pango_cairo_fc_font_new):
* pango/pangofc-fontmap.c (pango_fc_make_pattern),
(pango_fc_font_map_load_fontset):
* pango/pango.def:
* docs/pango-sections.txt:
* docs/tmpl/main.sgml:
Update to above.
|
|
|
|
|
|
|
|
| |
2006-08-20 Behdad Esfahbod <behdad@gnome.org>
* examples/renderdemo.c (parse_options):
* examples/renderdemo.h: Change the --rotate parameter to double now
that we depend on a recent-enough glib.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2006-08-16 Behdad Esfahbod <behdad@gnome.org>
* examples/viewer-pangocairo.c (render_callback): Render block
progression and line direction arrows, and a base gravity roof-top.
* pango/pango-matrix.c (pango_matrix_to_gravity): New function.
* pango/pango-utils.c (pango_gravity_to_rotation): New function.
* pango/pangocairo-fcfont.c (_pango_cairo_fc_font_new): Use
pango_gravity_to_rotation().
* pango/pango-utils.h:
* pango/pango-types.h:
Reorder a bit.
* examples/Makefile.am:
* examples/test-chinese.txt: New test text for Chinese.
* pango/check.defs: New script that checks that all the exported
symbols are listed in the respective .def file. (only checks the
libraries actually built. No win32 for example.)
* pango/Makefile.am: Hook check.defs as a 'make check' test.
* pango/pango.def:
* pango/pangoft2.def:
* pango/pangocairo.def:
Update.
* docs/tmpl/glyphs.sgml:
* docs/tmpl/main.sgml:
* docs/pango-sections.txt:
Update.
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
2006-08-15 Behdad Esfahbod <behdad@gnome.org>
* examples/renderdemo.c (do_output): Render the header with SOUTH
gravity.
* pango/pangocairo-fcfont.c (pango_cairo_fc_font_get_metrics),
(pango_cairo_fc_font_glyph_extents_cache_init): Center baseline
for east/west gravity in pango_font_metrics too.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2006-08-15 Behdad Esfahbod <behdad@gnome.org>
* examples/HELLO.utf8: Remove excess LRM.
* examples/viewer-pangocairo.c (render_callback): Draw baselines in
border-drawing mode.
* pango/pango-layout.c (pango_layout_line_get_extents): Make sure
we set logical_rect.y on empty lines. Previously empty lines had
wrong baseline. The code apparently was written like that
intentionally, but I cannot find out why.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2006-08-15 Behdad Esfahbod <behdad@gnome.org>
* docs/pango-sections.txt:
* docs/tmpl/main.sgml:
* examples/renderdemo.c (parse_gravity), (parse_options):
* pango/pango-context.c (pango_context_init),
(pango_context_get_base_gravity), (itemize_state_add_character):
* pango/pango-types.h:
* pango/pangocairo-fcfont.c (pango_cairo_fc_font_get_scaled_font):
* pango/pangofc-fontmap.c (pango_fc_make_pattern):
Oops. Exchange west<->east and north<->south gravities. The gravity
is the side that the glyph sits on. So, for normal Latin text for
example, gravity is south, not north.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2006-08-15 Behdad Esfahbod <behdad@gnome.org>
* examples/renderdemo.c (do_output), (parse_gravity),
(parse_options): Support --gravity.
* pango/pangocairo-fcfont.c (pango_cairo_fc_font_get_scaled_font),
(compute_glyph_extents), (_pango_cairo_fc_font_new): Load rotated
scaled_fonts to handle gravity.
* pango/pangofc-fontmap.c (pango_fc_make_pattern),
(pango_fc_font_map_get_patterns), (pango_fc_font_map_load_fontset):
Set FC_VERTICAL_LAYOUT on West and East gravity.
|
|
|
|
|
|
|
|
|
|
| |
2006-08-01 Behdad Esfahbod <behdad@gnome.org>
* examples/renderdemo.c (parse_options): Don't ignore all trailing
whitespace in input text. Only chop one newline.
* examples/viewer-main.c (main): setlocale(LC_ALL, "") to get GOption
work for UTF-8 text on the command line.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2006-04-29 Behdad Esfahbod <behdad@gnome.org>
* docs/tmpl/atsui-fonts.sgml:
* docs/tmpl/coverage-maps.sgml:
* docs/tmpl/engines.sgml:
* docs/tmpl/fonts.sgml:
* docs/tmpl/freetype-fonts.sgml:
* docs/tmpl/glyphs.sgml:
* docs/tmpl/layout.sgml:
* docs/tmpl/main.sgml:
* docs/tmpl/modules.sgml:
* docs/tmpl/opentype.sgml:
* docs/tmpl/pango-engine-lang.sgml:
* docs/tmpl/pango-engine-shape.sgml:
* docs/tmpl/pango-renderer.sgml:
* docs/tmpl/pangocairo.sgml:
* docs/tmpl/pangofc-decoder.sgml:
* docs/tmpl/pangofc-font.sgml:
* docs/tmpl/pangofc-fontmap.sgml:
* docs/tmpl/scripts.sgml:
* docs/tmpl/tab-stops.sgml:
* docs/tmpl/text-attributes.sgml:
* docs/tmpl/utils.sgml:
* docs/tmpl/win32-fonts.sgml:
* docs/tmpl/x-fonts.sgml:
* docs/tmpl/xft-fonts.sgml:
* examples/Makefile.am:
* pango/modules.c:
* pango/pango-coverage.c: Doc updates.
|
|
|
|
|
|
| |
2006-04-14 Behdad Esfahbod <behdad@gnome.org>
* examples/HELLO.utf8: Add Sinhala. (patch from Harshula)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2006-04-11 Behdad Esfahbod <behdad@gnome.org>
Bug 337924 – cleanups for issues reported by various compilers
Patch from Kjartan Maraas.
* examples/viewer-x.c (update):
* modules/arabic/arabic-fc.c (fallback_shape),
(arabic_engine_shape):
* modules/basic/basic-fc.c (fallback_shape), (basic_engine_shape):
* modules/basic/basic-x.c:
* modules/hangul/hangul-fc.c:
* modules/hebrew/hebrew-fc.c (hebrew_engine_shape):
* modules/indic/indic-fc.c:
* modules/khmer/khmer-fc.c:
* modules/syriac/syriac-fc.c:
* modules/thai/thai-fc.c:
* modules/tibetan/tibetan-fc.c:
* pango/break.c:
* pango/modules.c:
* pango/opentype/ftglue.c (_hb_ftglue_face_goto_table):
* pango/pango-attributes.c (pango_attr_list_filter):
* pango/pango-engine.c:
* pango/pango-fontset.c:
* pango/pango-layout.c (pango_layout_set_text),
(pango_layout_xy_to_index), (pango_layout_get_cursor_pos):
* pango/pango-markup.c (text_handler):
* pango/pango-utils.c (read_alias_file):
* pango/pangocairo-fcfont.c (G_DEFINE_TYPE_WITH_CODE):
* pango/pangocairo-fcfontmap.c (G_DEFINE_TYPE_WITH_CODE):
* pango/pangocairo-font.c (_pango_cairo_font_get_hex_box_info):
* pango/pangox-fontmap.c (pango_x_make_matching_xlfd):
* tests/dump-boundaries.c (fail):
Remove unused variables. Remove excess semicolon after DEFINE_TYPE
macros.
|
|
|
|
|
|
|
| |
2006-04-10 Behdad Esfahbod <behdad@gnome.org>
* config.h.win32, examples/makefile.msc: Removed. Have not been
updated since Feb 2001.
|
|
|
|
|
|
|
|
|
| |
2006-02-26 Behdad Esfahbod <behdad@gnome.org>
* pango/pango-layout.c (pango_layout_set_text): Replace each byte in invalid
UTF-8 sequences with '?'. (bug #331995)
* examples/renderdemo.c: Don't exit on invalid UTF-8 input.
|
|
|
|
|
|
|
|
| |
2006-02-25 Behdad Esfahbod <behdad@gnome.org>
* examples/test-hebrew.txt: Added. Parts of Genesis.
* examples/Makefile.am: Adjusted.
|
|
|
|
|
|
|
|
| |
2006-02-17 Behdad Esfahbod <behdad@gnome.org>
Bug 329148 – pango_glyph_item_split: assertion `split_index > 0' failed
* pango/ellipsize.c (init_state): Do not mistakenly set start_offset = 0.
|
|
|
|
|
|
|
|
|
| |
2006-02-15 Behdad Esfahbod <behdad@gnome.org>
Bug 331038 – pango-querymodules --help and --version
Patch from Antoine Dopffer.
* examples/renderdemo.c, pango/querymodules.c: Add --version option.
|
|
|
|
|
|
|
|
|
| |
2006-02-08 Behdad Esfahbod <behdad@gnome.org>
Bug 330146 – pango-view --help should list available backends
Patch from Antoine Dopffer.
* examples/renderdemo.c: Show backends in --help output.
|
| |
|
|
|
|
|
|
|
|
| |
2006-02-07 Behdad Esfahbod <behdad@gnome.org>
Bug 330289 – Fix build with gcc 2.95 (pangox.c)
* pango/pangox.c (get_subfonts_foreach): Fixed.
|
|
|
|
|
|
|
| |
2006-02-07 Tor Lillqvist <tml@novell.com>
* examples/viewer-main.c (main): Initialise GError pointer to
NULL. Use waitpid() only on Unix.
|
| |
|