ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity
Files
e668dc84eb97bf46fc108ec209fc8383a34123f7
odfstudio/cui/source/inc/paragrph.hxx
T
László Németh e668dc84eb tdf#173389 cui offapi sw xmloff: add custom compound-based hyphenation 
Add new paragraph justification option "Split compound words" for
custom compound-based "smart" hyphenation. Add compound-based "smart"
hyphenation support for Danish, Dutch, Esperanto, Estonian, German,
Norwegian, Swedish (and potentially, Icelandic, Finnish and
Latvian) languages by fixing Hunspell morphological analysis and the
associated lingucomponent code. (Previously compound-based "smart"
hyphenation was enabled only for Hungarian.)

With the new option it's possible to keep MSO/MS-DOCX interoperability,
also introducing a better hyphenation algorithm for several languages.

Details:

    * Add check box to Alignment in paragraph formatting dialog window;

    * Store properties in paragraph model:

      css::style::ParagraphProperties::ParaIsCompoundBased

    * Implement it by checking the new option in the previously
      added commit f9f694f5d9f39c5801bc5fec45867252c293bbcb;

    * Add ODF import/export (loext:compound-based);

    * Add ODF unit tests by the new tdf173389_smart_hyphenation_nl.odt
      and tdf173389_smart_hyphenation_hu.odt. Now use the previous
      tdf119908_smart_hyphenation_hu for disabled compound-based "smart"
      hyphenation, also the new tdf119908_smart_hyphenation_nl.odt.
      Note: the Dutch test document results better compound-based
      hyphenation in two positions.

    * Add Hunspell patch to fix Danish, Dutch, Esperanto, Estonian,
      German, Norwegian, Swedish (and future Icelandic, Latvian,
      Finnish) morphological analysis for compound word constituents;

    * hyphenimp.cxx hyphenate(): fix tokenization for consecutive
      pa: elements, like resulted in the fixed Hunspell dictionaries.

Follow-up to commit f9f694f5d9
"tdf#173389 sw: add compound-based “smart” hyphenation for readability".

Change-Id: I4414bd588646ecf6dc86b77642833ac9c7820a98
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/211341
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
2026-09-23 14:38:07 +02:00

381 lines
15 KiB
C++
Raw Blame History

/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#pragma once
#include <sfx2/tabdlg.hxx>
#include <svx/relfld.hxx>
#include <svx/paraprev.hxx>
#include <svx/frmdirlbox.hxx>
#include <vcl/weld/CheckButton.hxx>
#include <vcl/weld/Label.hxx>
#include <vcl/weld/MetricSpinButton.hxx>
#include <vcl/weld/RadioButton.hxx>
#include <vcl/weld/Scale.hxx>
#include <vcl/weld/SpinButton.hxx>
#include <vcl/weld/TriStateEnabled.hxx>
class SvxLineSpacingItem;
// class SvxStdParagraphTabPage ------------------------------------------
/*
[Description]
With this TabPage standard attributes of a paragraph can be set
(indention, distance, alignment, line spacing).
[Items]
<SvxAdjustItem><SID_ATTR_PARA_ADJUST>
<SvxLineSpacingItem><SID_ATTR_PARA_LINESPACE>
<SvxULSpaceItem><SID_ATTR_ULSPACE>
<SvxLRSpaceItem><SID_ATTR_LRSPACE>
*/
class SvxStdParagraphTabPage: public SfxTabPage
{
static const WhichRangesContainer pStdRanges;
private:
tools::Long nWidth;
tools::Long nMinFixDist;
bool bRelativeMode;
SvxParaPrevWindow m_aExampleWin;
// indentation
bool m_bSplitLRSpace = false; ///< which items to use?
SvxRelativeField m_aLeftIndent;
SvxRelativeField m_aRightIndent;
std::unique_ptr<weld::Label> m_xFLineLabel;
SvxRelativeField m_aFLineIndent;
std::unique_ptr<weld::CheckButton> m_xAutoCB;
// distance
SvxRelativeField m_aTopDist;
SvxRelativeField m_aBottomDist;
std::unique_ptr<weld::CheckButton> m_xContextualCB;
// line spacing
std::unique_ptr<weld::ComboBox> m_xLineDist;
std::unique_ptr<weld::MetricSpinButton> m_xLineDistAtPercentBox;
std::unique_ptr<weld::MetricSpinButton> m_xLineDistAtMetricBox;
std::unique_ptr<weld::MetricSpinButton> m_xLineDistAtPlaceHolderBox;
std::unique_ptr<weld::Label> m_xLineDistAtLabel;
std::unique_ptr<weld::Label> m_xAbsDist;
// only writer
std::unique_ptr<weld::CheckButton> m_xRegisterCB;
// preview
std::unique_ptr<weld::CustomWeld> m_xExampleWin;
void SetLineSpacing_Impl( const SvxLineSpacingItem& rAttr );
void Init_Impl();
void UpdateExample_Impl();
void ELRLoseFocus();
DECL_LINK(LineDistPopupHdl_Impl, weld::ComboBox&, void);
DECL_LINK(LineDistHdl_Impl, weld::ComboBox&, void);
DECL_LINK(ModifyHdl_Impl, weld::MetricSpinButton&, void);
DECL_LINK(AutoHdl_Impl, weld::Toggleable&, void);
bool m_bLineDistToggled = false;
protected:
virtual void ActivatePage( const SfxItemSet& rSet ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
public:
SvxStdParagraphTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
virtual ~SvxStdParagraphTabPage() override;
DECL_LINK(ELRLoseFocusHdl, weld::MetricSpinButton&, void);
static const WhichRangesContainer & GetRanges() { return pStdRanges; }
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
virtual void ChangesApplied() override;
void EnableRelativeMode();
void EnableRegisterMode();
void EnableContextualMode();
void EnableAutoFirstLine();
void EnableNegativeMode();
virtual void PageCreated(const SfxAllItemSet& aSet) override;
};
// class SvxParaAlignTabPage ------------------------------------------------
class SvxParaAlignTabPage : public SfxTabPage
{
static const WhichRangesContainer pAlignRanges, pSdrAlignRanges;
bool m_bSdrVertAlign;
SvxParaPrevWindow m_aExampleWin;
// alignment
std::unique_ptr<weld::RadioButton> m_xLeft;
std::unique_ptr<weld::RadioButton> m_xStart;
std::unique_ptr<weld::RadioButton> m_xRight;
std::unique_ptr<weld::RadioButton> m_xEnd;
std::unique_ptr<weld::RadioButton> m_xCenter;
std::unique_ptr<weld::RadioButton> m_xJustify;
std::unique_ptr<weld::Label> m_xLeftBottom;
std::unique_ptr<weld::Label> m_xRightTop;
std::unique_ptr<weld::Label> m_xLastLineFT;
std::unique_ptr<weld::ComboBox> m_xLastLineLB;
std::unique_ptr<weld::CheckButton> m_xExpandCB;
std::unique_ptr<weld::CheckButton> m_xSnapToGridCB;
//preview
std::unique_ptr<weld::CustomWeld> m_xExampleWin;
//vertical alignment
std::unique_ptr<weld::Widget> m_xVertAlignFL;
std::unique_ptr<weld::ComboBox> m_xVertAlignLB;
std::unique_ptr<weld::Label> m_xVertAlign;
std::unique_ptr<weld::Label> m_xVertAlignSdr;
std::unique_ptr<svx::FrameDirectionListBox> m_xTextDirectionLB;
std::unique_ptr<weld::CheckButton> m_xAutoTextDirectionCB;
/// word spacing
std::unique_ptr<weld::Label> m_xLabelWordSpacing;
std::unique_ptr<weld::Label> m_xLabelMinimum;
std::unique_ptr<weld::Label> m_xLabelDesired;
std::unique_ptr<weld::Label> m_xLabelMaximum;
std::unique_ptr<weld::MetricSpinButton> m_xWordSpacing;
std::unique_ptr<weld::MetricSpinButton> m_xWordSpacingMinimum;
std::unique_ptr<weld::MetricSpinButton> m_xWordSpacingMaximum;
/// paragraph composer
std::unique_ptr<weld::CheckButton> m_xParagraphComposer;
/// letter spacing
std::unique_ptr<weld::Label> m_xLabelLetterSpacing;
std::unique_ptr<weld::MetricSpinButton> m_xLetterSpacingMinimum;
std::unique_ptr<weld::MetricSpinButton> m_xLetterSpacingMaximum;
/// compound-based hyphenation
std::unique_ptr<weld::CheckButton> m_xCompoundBased;
/// glyph scaling
std::unique_ptr<weld::Label> m_xLabelGlyphScaling;
std::unique_ptr<weld::MetricSpinButton> m_xGlyphScalingMinimum;
std::unique_ptr<weld::MetricSpinButton> m_xGlyphScalingMaximum;
DECL_LINK(AlignHdl_Impl, weld::Toggleable&, void);
DECL_LINK(LastLineHdl_Impl, weld::ComboBox&, void);
DECL_LINK(TextDirectionHdl_Impl, weld::ComboBox&, void);
DECL_LINK(WordSpacingHdl_Impl, weld::MetricSpinButton&, void);
DECL_LINK(WordSpacingMinimumHdl_Impl, weld::MetricSpinButton&, void);
DECL_LINK(WordSpacingMaximumHdl_Impl, weld::MetricSpinButton&, void);
void UpdateExample_Impl();
protected:
virtual void ActivatePage( const SfxItemSet& rSet ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
public:
SvxParaAlignTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
virtual ~SvxParaAlignTabPage() override;
static const WhichRangesContainer & GetRanges() { return pAlignRanges; }
static const WhichRangesContainer & GetSdrRanges() { return pSdrAlignRanges; }
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
virtual void ChangesApplied() override;
void EnableJustifyExt();
void EnableSdrVertAlign();
virtual void PageCreated(const SfxAllItemSet& aSet) override;
};
// class SvxExtParagraphTabPage ------------------------------------------
/*
[Description]
With this TabPage special attributes of a paragraph can be set
(hyphenation, pagebreak, orphan, widow, ...).
[Items]
<SvxHyphenZoneItem><SID_ATTR_PARA_HYPHENZONE>
<SvxFormatBreakItem><SID_ATTR_PARA_PAGEBREAK>
<SvxFormatSplitItem><SID_ATTR_PARA_SPLIT>
<SvxWidowsItem><SID_ATTR_PARA_WIDOWS>
<SvxOrphansItem><SID_ATTR_PARA_ORPHANS>
*/
class SvxExtParagraphTabPage: public SfxTabPage
{
static const WhichRangesContainer pExtRanges;
public:
SvxExtParagraphTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rSet );
virtual ~SvxExtParagraphTabPage() override;
static const WhichRangesContainer & GetRanges() { return pExtRanges; }
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
virtual void ChangesApplied() override;
void DisablePageBreak();
protected:
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
private:
weld::TriStateEnabled aHyphenState;
weld::TriStateEnabled aPageBreakState;
weld::TriStateEnabled aApplyCollState;
weld::TriStateEnabled aPageNumState;
weld::TriStateEnabled aAllowSplitState;
weld::TriStateEnabled aKeepParaState;
weld::TriStateEnabled aOrphanState;
weld::TriStateEnabled aWidowState;
weld::TriStateEnabled aAcrossParagraphState;
weld::TriStateEnabled aAcrossColumnState;
weld::TriStateEnabled aAcrossPageState;
weld::TriStateEnabled aAcrossSpreadState;
bool bPageBreak;
bool bHtmlMode;
sal_uInt16 nStdPos;
sal_Int16 nHyphenLevel;
// hyphenation
std::unique_ptr<weld::CheckButton> m_xHyphenBox;
std::unique_ptr<weld::CheckButton> m_xHyphenNoCapsBox;
std::unique_ptr<weld::CheckButton> m_xHyphenNoLastWordBox;
std::unique_ptr<weld::Label> m_xBeforeText;
std::unique_ptr<weld::SpinButton> m_xExtHyphenBeforeBox;
std::unique_ptr<weld::Label> m_xAfterText;
std::unique_ptr<weld::SpinButton> m_xExtHyphenAfterBox;
std::unique_ptr<weld::Label> m_xCompoundBeforeText;
std::unique_ptr<weld::SpinButton> m_xExtCompoundHyphenBeforeBox;
std::unique_ptr<weld::Label> m_xCompoundAfterText;
std::unique_ptr<weld::SpinButton> m_xExtCompoundHyphenAfterBox;
std::unique_ptr<weld::Label> m_xMaxHyphenLabel;
std::unique_ptr<weld::SpinButton> m_xMaxHyphenEdit;
std::unique_ptr<weld::Label> m_xMinWordLabel;
std::unique_ptr<weld::SpinButton> m_xMinWordLength;
std::unique_ptr<weld::Label> m_xBetterSpacingLabel;
std::unique_ptr<weld::Label> m_xLessHyphenLabel;
std::unique_ptr<weld::Scale> m_xSliderHyphen;
std::unique_ptr<weld::Label> m_xHyphenZoneLabel;
SvxRelativeField m_aHyphenZone;
std::unique_ptr<weld::Label> m_xParagraphEndZoneLabel;
SvxRelativeField m_aParagraphEndZone;
std::unique_ptr<weld::Label> m_xColumnEndZoneLabel;
SvxRelativeField m_aColumnEndZone;
std::unique_ptr<weld::Label> m_xPageEndZoneLabel;
SvxRelativeField m_aPageEndZone;
std::unique_ptr<weld::Label> m_xSpreadEndZoneLabel;
SvxRelativeField m_aSpreadEndZone;
// pagebreak
std::unique_ptr<weld::CheckButton> m_xPageBreakBox;
std::unique_ptr<weld::Label> m_xBreakTypeFT;
std::unique_ptr<weld::ComboBox> m_xBreakTypeLB;
std::unique_ptr<weld::Label> m_xBreakPositionFT;
std::unique_ptr<weld::ComboBox> m_xBreakPositionLB;
std::unique_ptr<weld::CheckButton> m_xApplyCollBtn;
std::unique_ptr<weld::ComboBox> m_xApplyCollBox;
std::unique_ptr<weld::CheckButton> m_xPageNumBox;
std::unique_ptr<weld::SpinButton> m_xPagenumEdit;
// paragraph division
std::unique_ptr<weld::CheckButton> m_xAllowSplitBox;
std::unique_ptr<weld::CheckButton> m_xKeepParaBox;
// orphan/widow
std::unique_ptr<weld::CheckButton> m_xOrphanBox;
std::unique_ptr<weld::SpinButton> m_xOrphanRowNo;
std::unique_ptr<weld::Label> m_xOrphanRowLabel;
std::unique_ptr<weld::CheckButton> m_xWidowBox;
std::unique_ptr<weld::SpinButton> m_xWidowRowNo;
std::unique_ptr<weld::Label> m_xWidowRowLabel;
// avoid hyphenation across
std::unique_ptr<weld::Label> m_xAcrossText;
std::unique_ptr<weld::CheckButton> m_xAcrossParagraphBox;
std::unique_ptr<weld::CheckButton> m_xAcrossColumnBox;
std::unique_ptr<weld::CheckButton> m_xAcrossPageBox;
std::unique_ptr<weld::CheckButton> m_xAcrossSpreadBox;
std::unique_ptr<weld::CheckButton> m_xAcrossMoveLineBox;
void HyphenClickHdl();
void PageNumBoxClickHdl();
void ApplyCollClickHdl();
void PageBreakHdl();
void AllowSplitHdl();
void OrphanHdl();
void WidowHdl();
DECL_LINK(PageBreakHdl_Impl, weld::Toggleable&, void);
DECL_LINK(AllowSplitHdl_Impl, weld::Toggleable&, void);
DECL_LINK(WidowHdl_Impl, weld::Toggleable&, void);
DECL_LINK(OrphanHdl_Impl, weld::Toggleable&, void);
DECL_LINK(HyphenClickHdl_Impl, weld::Toggleable&, void);
DECL_LINK(ApplyCollClickHdl_Impl, weld::Toggleable&, void);
DECL_LINK(PageBreakPosHdl_Impl, weld::ComboBox&, void);
DECL_LINK(PageBreakTypeHdl_Impl, weld::ComboBox&, void);
DECL_LINK(PageNumBoxClickHdl_Impl, weld::Toggleable&, void);
DECL_LINK(KeepParaBoxClickHdl_Impl, weld::Toggleable&, void);
DECL_LINK(AcrossParagraphHdl_Impl, weld::Toggleable&, void);
DECL_LINK(AcrossColumnHdl_Impl, weld::Toggleable&, void);
DECL_LINK(AcrossPageHdl_Impl, weld::Toggleable&, void);
DECL_LINK(AcrossSpreadHdl_Impl, weld::Toggleable&, void);
virtual void PageCreated(const SfxAllItemSet& aSet) override;
};
class SvxAsianTabPage : public SfxTabPage
{
std::unique_ptr<weld::CheckButton> m_xForbiddenRulesCB;
std::unique_ptr<weld::CheckButton> m_xHangingPunctCB;
std::unique_ptr<weld::CheckButton> m_xScriptSpaceCB;
public:
SvxAsianTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet);
virtual ~SvxAsianTabPage() override;
static const WhichRangesContainer & GetRanges();
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
virtual void ChangesApplied() override;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Reference in New Issue View Git Blame Copy Permalink