Age | Commit message (Collapse) | Author |
|
.uno:SetOutline and .uno:OutlineFont refer respectively to selection
of an Outline format and application of the font outline attribute.
The patch adjusts, elaborates or expands their labels and tooltips
to make them more comprehensible in the UI.
Plus a small followup to clean-up adjustment of labels for
.uno:DefaultBullets and .uno:DefaultNumbering. (tdf#139667)
Change-Id: Ic8951bf338fd699ae57ca52374aaa03fe4c797db
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110436
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
|
|
general aim to introduce consistency and clarity in labelling
between menus, toolbar and appearance in Customize dialog.
Label is shown in Customize dialog
Context Label is shown in Menus
Tooltip is shown in Toolbar
GenericCommands.xcu has the .uno commands.
WriterCommands.xcu has some .uno aliases that are used in
the menubar and the context menus, but they use actual
list styles. For now have marked their true labels, so that
it is possible to see in UI whether one is working with DF
or a List Style. Further development may be needed.
Change-Id: I2790a19d133d2c2a7bdf074eca398fda1e6f8e81
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110137
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin <sdc.blanco@youmail.dk>
|
|
As suggested by UX meeting:
- Remove P and N keys from previous/next slide
- Assign them to Pen (on=off) and erase ink commands
Do this for presenter console as well.
Modify help text of the presenter console to reflect these changes.
Change-Id: I28d2178f7391739d4f8f5e8f63ab54714fcc97c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109108
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
|
|
and link to LibreOffice volunteer page
Change-Id: Ie422983d0e23faa16c2e2364b25798b938712a43
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109637
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
|
|
layout mode to allow to show the original text inline,
i.e. only deletions, while insertions are showed in margin
(opposite of the Show Deletions in Margin mode).
Add a menu to the Show Changes icon on the
Changes toolbar with menu items for the 3 layout modes
"All Changes Inline", "Deletions in Margin" and
"Insertions in Margin" with the following behavior:
– Selecting a menu item turns on also the Show Changes mode
to show the result immediately;
– Disabling Show Changes mode always show the final text, i.e.
only insertions. Enabling Show Changes mode again shows the
changes according to the last Show Changes mode selected in
the menu.
– The new "Insertions in Margin" mode is intended to be only a
run-time option, i.e. it's not possible to set it as a default
Show Changes mode in Options, unlike "Deletions in Margin".
Change-Id: Ie4dc9fe3b4b201fa9976ef04877af649e242ab46
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109649
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
|
|
Annoyingly the packinfo_*.txt don't support conditionals but we can
work-around that with a little duplication.
Change-Id: Id00a6831effcc63a917fc21d2cd201474fdb559d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109569
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
|
|
Change-Id: Ifb1fc36151e3aee72a4977b5bbe1601f3b0b6ec7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109131
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
|
|
This patch makes the Navigation (navigationobjectbar) toolbar reappear
when Writer is started if it was displayed in the toolbar layout when
Writer was ended.
Change-Id: I71ddf85daf98720f7c5fd29462d1a2bcb48114d8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109503
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <raykowj@gmail.com>
|
|
Allow refreshing the document layout via UNO slot
Change-Id: I956bb884b1fb4231b1f617c4aa5a80ff9a45ec92
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109230
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
|
|
- Adds Recency to Navigate By and when selected, previous and next
scroll controls navigate the navigation manager stack backwards and
forward.
- Removes the code that makes the Navigation tool bar appear when an
entry is added to the navigation manager stack so the tool bar doesn't
appear unless the user explicilty chooses for it to.
- Changes Navigation toolbar context sensitivity to false.
Change-Id: I246dd442b4bc5191324c35f9b91a9cb2eac8e7f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108316
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <raykowj@gmail.com>
|
|
This is useful when encountering layout problems, to refresh
the doc layout from an extension.
Change-Id: Ie2472f061ebea203a9d876782b3bb953477de7c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109169
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
|
|
tdf#136686 demonstrates the confusion that arises, if one is
not familiar with the HTML convention of "strong emphasis"
* remove "Strong" label in "Styles formatting toolbar"so that
"Strong Emphasis" appears in Toolbar Customization.
* remove "Default" label in "Styles formatting toolbar"so that
"Default Character" appears in Toolbar Customization.
(reflecting change to distinguish Default Character from
Default Paragraph)
* remove "Quote" label in "Styles formatting toolbar"so that
"Quotation" appears in Toolbar Customization.
* add "Table" to "Default Table Style" (reflecting change to
differentiate Default Styles)
* Add tooltips for "Strong Emphasis" and "Quotation" CS
These changes should also result in identical label appearance
in both Menus customization and Toolbar customization.
Change-Id: I588cdcba51ab6b8ab1e8a44de577ebe7d4f4658d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108577
Reviewed-by: Seth Chaiklin <sdc.blanco@youmail.dk>
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Tested-by: Jenkins
|
|
Change-Id: I9091e19dcfb44e9aeb89eb005b4f309d29359549
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109006
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
|
|
Better path forward is to use a dockable window for the DevTools - added in
commit 5f5ee992bd8377dc984b576950d468f6407d5c63
This reverts commit c0d770d4feb919cb3306c48d576ac30709154eae.
|
|
Change-Id: Id3b8f424e24bac5164b8b3069580ffee65dd265c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107993
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
|
|
Use the same combination as Word does
Change-Id: Ied621cab6170392dbcd792a67d973adb3a2cd92e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108490
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Tested-by: Jenkins
|
|
As suggested in tdf#134151
Change-Id: I0f99b5d6313dddaba8c5350dccf6ecea9370f675
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108329
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
|
|
Also included in this patch:
- Modifications to make all outline content visible during move
operations.
- Removal of code intended to redraw buttons when layout is changed that
seems not to work as intended.
- Function IsOutlineContentFolded changed to IsOutlineContentVisible
- Change of delay before button is shown to half of what it was.
Change-Id: I0dde555ccd0693ca382c1f15326edfdc2fc44a93
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107815
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <raykowj@gmail.com>
|
|
Change-Id: I9e7e4719663cd80e9f7d3afb42fe94c6224fb920
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107536
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin <sdc.blanco@youmail.dk>
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
|
|
it is considered deprecated/scheduled for removal in next version
This change only removes it from the default menu, but leaves it
available in the set of available commands/doesn't remove the actual
conversion wizard
Change-Id: Ib7a37b55a0d6f09d90da66f89c0a2b1b80d0071a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107919
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
|
|
the live SDK method had been deprecated quite a while ago and has been
turned off a while back.
Notes:
While you can access and save existing files using the remote files
dialog, creating new files or using "save as" requires using the
LibreOffice open/save dialogs.
Authentication is clunky: username and password you're asked when
creating a new connection is not used at all for connecting, so only
fill out a username to label your onedrive entry. Actual authentication
is done in browser - copy'n'paste the URL from the dialog into the
browser, login and approve access for LibreOffice (approving access only
necessary once), then you get redirected to localhost, ignore that there
is nothing to display. The important part is the code from the URL-bar.
Copy and paste that into the LibreOffice dialog and LO can request an
authentication token for API access.
Testing this feature requires compiling with corresponding api-keys
specified in configure/having an app registered with microsoft.
Change-Id: I2db11ac09f9fdc354a10d6c749b2bec84b5d34a9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107646
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
|
|
As asked for in tdf#136244 comment #11. The default fits 4x 2000px
32bpp images, which is 64MiB, which is not that little, but then
4x 2000px is not that much either. So, yes, configurable ...
A good further improvement would be to make the cache grow more
if the memory is available and reduce the size on memory pressure
(https://lists.freedesktop.org/archives/libreoffice/2020-December/086404.html).
Change-Id: Ifa05025ab34630e456465ac8a96950463fd18b60
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107468
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
|
|
Showing them means that the layout is different from what is printed.
This probably shouldn't be the default.
The similiar HiddenCharacter is also false by default.
Change-Id: Id68408463ccbceab18b73ac78f24d1b4b4cbeaeb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107385
Tested-by: Jenkins
Reviewed-by: Oliver Brinzing <oliver.brinzing@gmx.de>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
|
|
we are still promoting slot: in the odk example though
Change-Id: I5e7fb33799b39f5709d0341ff145fee9e28ebbf0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107494
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: Ic26a18b703408634dc6fb7582159090e0ce5d229
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107469
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
|
|
The VCL OpenGL backend code has been removed, so the settings
for it no longer make sense.
But there's still the code for detecting if OpenGL is broken,
and that one makes sense to keep. It turns out other OpenGL code
(such as slideshows) doesn't even use that, so turn this into
a new DisableOpenGL option, make OpenGL-related failsafe code
set and use that, and OpenGL code should use
OpenGLHelper::supportsOpenGL() to make sure OpenGL use is not blocked.
Change-Id: Iec83f204e89bfb0b6eea13be77da8f0f4727a074
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107398
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
|
|
Option introduced at Tools > Options > Writer > Formatting Aids
Change-Id: I8d890f84107647821c39669114b991c301727788
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106970
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
|
|
This commit mostly just adds the plumbing to officecfg to display the
DevTools toolbar. The code for it does not yet implement any specific
functionality. The name "DevTools" is likely not what this will
actually be called in the end. The DevTools toolbar just contains two
unrelated combo boxes.
(See
https://blog.documentfoundation.org/blog/2020/07/27/tender-for-implementing-support-for-a-dedicated-built-in-uno-object-inspection-tool-in-libreoffice-202007-02/
)
Change-Id: I23cb129b48fde64ae39de5db5811cdf61c8993e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107432
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
|
|
Change-Id: Id64be29854dd23b8022861dd9fb0b97f5fc34603
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105813
Tested-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
|
|
Change-Id: I6d0690cdcabaee6fe898fa7fc09d2abcd4c3f3ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105979
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
|
|
Change-Id: I98f7ef76334272c14b1443f077d3cb53104cfe9e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106392
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Tested-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
|
|
Change-Id: Ie20a8931a16f6609ac5be23032a0b2e3a7ad1784
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95627
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
|
|
This removes user command .uno:ZoomIn in GenericCommands.xcu which
doesn't seem to be used and curiously has label "Zoom Out".
Change-Id: I1c9f49692324362507701c064473b25c27662cee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104197
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <raykowj@gmail.com>
|
|
Change-Id: I90dfb0afc631a39ae999d3b52ca7ca6321402101
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105792
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
|
|
Similar to commit 2cddaa6e199ed8bb6185b7825791199f9da4a670 done for
Writer view shell, this patch makes zoom in and zoom out commands
functional for Calc view shell in addition to the preview shell.
Change-Id: Ibf1fd92e79c82cdea91d0d01491ac25577df54fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104196
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <raykowj@gmail.com>
|
|
"Equal triangle" is not a correct English term, as people use "regular
triangle" or "equilateral triangle".
Technically this is not a true regular triangle (i.e. equilateral and
equiangular), but an isosceles triangle with equal width and height.
For the name of an animation path there is no need for too much detail
though, and "regular triangle" is close enough.
Change-Id: I72f5373ae68dc1ba771cf605073c15210c5300e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105223
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
|
|
Change-Id: I0fa4c981a1dd833f14c134a33911ee31eb81748c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105186
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
|
|
Change-Id: I558c2555ebdf0569cf6c61e5811c57f111c32d82
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105148
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
|
|
Change-Id: I8e83cd09ad68a7abd29db6cc41ea601114d68ffc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104927
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
|
|
missing warning
Change-Id: Iac940b24a9fbe914af46fe928b758ad962d3d3e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103881
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
|
|
Shows tooltip for UNO commands
Check if the UNO command is available in the current module
Don't show the menu entry on the start center
Change-Id: I5c67ec3f8543b5442a6e2c2a478bfeb4ec0e1f3d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104558
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
|
|
Change-Id: I19381009f5b286b051ae0cb90a794ed51a413a7a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103835
Tested-by: Jenkins
Reviewed-by: Andreas Kainz <kainz.a@gmail.com>
|
|
As per discussion in the bug report, in some systems these fonts are named as
"Noto {Sans, Serif} {SC,TC,HK,KR,JP}", instead of ""Noto {Sans, Serif} CJK
{SC,TC,HK,KR,JP}".
It is noted that the KR section has already been updated.
Also removed the non-mono fonts from zh_CN section.
Change-Id: I0e67b895649502780b8e5cdff2b7d6dade3ff6b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104222
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
|
|
In ShowTrackedChanges mode, hide tracked deletions
in text optionally and show their shortened text
in margin next to the vertical "Changed line" mark
(showing only the first deletion of the line).
Add "Tracked deletions in margin" checkbox to Writer->View page.
Add "Display tracked changes" and "Outline View" sections to View, too.
Add property ShowChangesInMargin to com::sun::star::text::ViewSettings.
Add config setting:
org/openoffice/Office/Writer/Content/Display/ShowChangesInMargin
Show more information in Manage Changes dialog window
about the tracked deletions with restricted visibility
in ShowChangesInMargin mode: show shortened text content
of a deletion in its (otherwise empty) Comment field.
Change-Id: I1d19a4bf8225f536a635c6dd5062344c51e03b79
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104350
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
|
|
* Reverts 231a4e024b85aa0ad06a5632d3f514152babea30 and sets
initial value to -1 to start from zero
* Improves translatability of string
Change-Id: Ib541a72fa3f6eecdf5bbdf17ce2a4e56ff90c397
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104276
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Jenkins
|
|
UNO command and linkbutton interaction replaced with the internal dialog
DICT_REPO_URL removed, README adjusted
Change-Id: I401737b538da229ac0d432007e7564105672ff40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103769
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
|
|
changed font order priority.
1. put 'Noto Sans KR' ahead of 'Noto Sans CJK KR'.
Because, New Noto Sans CJK font change the name.
New Noto Sans CJK V2.001 released on 10 Apr 2019.
In these font files, removed 'CJK' on names.
Nowadays, New Linux distributions includes Noto CJK font V2.0.
In Korean Linux environments, Noto CJK font v2.0 'Noto Sans KR' & 'Noto Serif KR' are already set default.
2. fixed Windows fonts for Korean on LibreOffice
I watched Windows 10's Korean Font List
Microsoft Docs: Font List Windows 10 - Typography; Korean Supplemental Fonts
https://docs.microsoft.com/en-us/typography/fonts/windows_10_font_list#korean-supplemental-fonts
I missed 굴림체;GulimChe, 돋움체;DotumChe, 굴림체;GulimChe.
So. I added MS Default Korean fonts.
As a result, I changed font order and add default Windows font names.
Ref.
1: Google Noto CJK fonts Repository: https://github.com/googlefonts/noto-cjk
2: Microsoft Docs: Font List Windows's Korean supplemental fonts
https://docs.microsoft.com/en-us/typography/fonts/windows_10_font_list#korean-supplemental-fonts
cf.Apple Docs - Format Chinese, Japanese, or Korean text in Pages on Mac
https://support.apple.com/guide/pages/format-chinese-japanese-or-korean-text-tanfbd4156e/mac
Change-Id: I12594aa8f3122c05810a07a718aae7ec185ba481
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104189
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
* New dialog to pick and apply one of the UI variants
* Tip-of-the-Day enhanced to execute UNO commands in order
to advertise the UI chooser on first start
Change-Id: I5e5c4a8e0fb11d11bafc99cc37b7ec244a993781
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99957
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
|
|
Custom button text or background colors don't play nice with any
complex theming. Maybe we should still allow a custom background
color for the button bar, but probably that attempt is also futile
and clashes with theming easily.
As long as the botton bar uses themable push-buttons as a control
custom coloring will break at some point, as these buttons can
have too many states, which curently depend on the theme. There is
no way for LO to know, if a roll-over button will return with a
different backround or just some changed border from a themed
paint call.
So this reverts the button part of tdf#90452. It doesn't affect
the preview area, as that is a custom widget, which doesn't use
any theming, but has it's own setting - for better or worse.
Change-Id: I1ef17a50d15a5876a11bce89ae3f764aa91f66bc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103041
Tested-by: Jenkins
Tested-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
|
|
WhatsNew IB uses the Newly introduced Enabled property now
IsReadOnly got removed
Follow-up to 3fb1477de164bba260e3e9a39afcb3f67c78fb5e
Change-Id: I3989acf835ee219575106bc6c7d5edac4e6accd8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103841
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
|