From: Jean-Marc Lasgouttes Date: Fri, 20 Jul 2001 13:04:36 +0000 (+0000) Subject: rename hyphenation-break to ligature-break X-Git-Tag: 1.6.10~21044 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=0adacb84bac891adce41ffb2e0ee244826d6d261;p=features.git rename hyphenation-break to ligature-break git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2294 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/lib/ChangeLog b/lib/ChangeLog index feb79efc04..d46d587076 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,7 @@ +2001-07-20 Jean-Marc Lasgouttes + + * ui/default.ui: change 'hyphenation break' to 'ligature break'. + 2001-07-19 Jean-Marc Lasgouttes * ui/default.ui: change a shortcut diff --git a/lib/ui/default.ui b/lib/ui/default.ui index c0033d5d37..7a3e752a71 100644 --- a/lib/ui/default.ui +++ b/lib/ui/default.ui @@ -217,7 +217,7 @@ Menuset Item "Subscript|u" "command-sequence math-insert _;math-mode;" Item "HFill|H" "hfill-insert" Item "Hyphenation Point|P" "hyphenation-point-insert" - Item "Hyphenation break|k" "hyphenation-break-insert" + Item "Ligature break|k" "ligature-break-insert" Item "Protected Blank|B" "protected-space-insert" Item "Linebreak|L" "break-line" Item "Ellipsis|i" "dots-insert" diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C index de035b282a..77ede5b129 100644 --- a/src/BufferView_pimpl.C +++ b/src/BufferView_pimpl.C @@ -1523,8 +1523,8 @@ bool BufferView::Pimpl::Dispatch(kb_action action, string const & argument) specialChar(InsetSpecialChar::HYPHENATION); break; - case LFUN_HYPHENATION_BREAK: - specialChar(InsetSpecialChar::HYPHENATION_BREAK); + case LFUN_LIGATURE_BREAK: + specialChar(InsetSpecialChar::LIGATURE_BREAK); break; case LFUN_LDOTS: diff --git a/src/ChangeLog b/src/ChangeLog index 22204548f9..6acf4f1e4f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2001-07-20 Jean-Marc Lasgouttes + + * LyXAction.C (init): + * commandtags.h: + * BufferView_pimpl.C (Dispatch): change HYPHENATION_BREAK to + LIGATURE_BREAK, since the name is so stupid. + 2001-07-20 Angus Leeming * buffer.C (readInset): enable reading of new InsetNotes as well as old @@ -5,12 +12,8 @@ * FontLoader.C: remove FORMS_H_LOCATION cruft. -2001-07-20 Angus Leeming - * sp_form.[Ch]: remove. -2001-07-20 Angus Leeming - * src/LColor.[Ch]: remove noteframe. Change note to "yellow". * src/BufferView_pimpl.C (insertNote): use InsetNote in place of diff --git a/src/LyXAction.C b/src/LyXAction.C index 6c4a60d3dd..be73d2a68d 100644 --- a/src/LyXAction.C +++ b/src/LyXAction.C @@ -232,8 +232,8 @@ void LyXAction::init() { LFUN_HTMLURL, "html-insert", "", Noop }, { LFUN_HYPHENATION, "hyphenation-point-insert", N_("Insert hyphenation point"), Noop }, - { LFUN_HYPHENATION_BREAK, "hyphenation-break-insert", - N_("Insert hyphenation break"), Noop }, + { LFUN_LIGATURE_BREAK, "ligature-break-insert", + N_("Insert ligature break"), Noop }, { LFUN_INDEX_CREATE, "index-insert", N_("Insert index item"), Noop }, { LFUN_INDEX_INSERT_LAST, "index-insert-last", diff --git a/src/commandtags.h b/src/commandtags.h index 5a18c90531..cff23e3c8b 100644 --- a/src/commandtags.h +++ b/src/commandtags.h @@ -51,7 +51,7 @@ enum kb_action { LFUN_GOTONOTE, LFUN_INSET_TOGGLE, LFUN_HYPHENATION, - LFUN_HYPHENATION_BREAK, + LFUN_LIGATURE_BREAK, LFUN_HFILL, LFUN_DEPTH, LFUN_FREE, // 30 diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index a7045c1a5d..5ad07060bf 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,8 @@ +2001-07-20 Jean-Marc Lasgouttes + + * insetspecialchar.[Ch]: change HYPHENATION_BREAK to + LIGATURE_BREAK, since the name is so stupid. + 2001-07-20 Angus Leeming * insetnote.[Ch]: (insertInset, insetAllowed): removed. Note now uses @@ -5,8 +10,6 @@ (write) output the name of the inset, not some silly hack for compatability with the old InsetInfo. -2001-07-20 Angus Leeming - * insetinfo.[Ch]: removed. * insetnote.[Ch]: new files. InsetNote replaces InsetInfo. The inset is now collapsable, but functionality is otherwise identical to InsetInfo. diff --git a/src/insets/insetspecialchar.C b/src/insets/insetspecialchar.C index 2b5e7fab0a..7979f1ff8f 100644 --- a/src/insets/insetspecialchar.C +++ b/src/insets/insetspecialchar.C @@ -50,7 +50,7 @@ int InsetSpecialChar::width(BufferView *, LyXFont const & font) const w -= 2; // to make it look shorter return w; } - case HYPHENATION_BREAK: + case LIGATURE_BREAK: { return lyxfont::width('|', font); } @@ -90,7 +90,7 @@ void InsetSpecialChar::draw(BufferView * bv, LyXFont const & f, x += width(bv, font); break; } - case HYPHENATION_BREAK: + case LIGATURE_BREAK: { font.setColor(LColor::special); pain.text(int(x), baseline, "|", font); @@ -162,7 +162,7 @@ void InsetSpecialChar::write(Buffer const *, ostream & os) const case HYPHENATION: command = "\\-"; break; - case HYPHENATION_BREAK: + case LIGATURE_BREAK: command = "\\textcompwordmark{}"; break; case END_OF_SENTENCE: @@ -192,7 +192,7 @@ void InsetSpecialChar::read(Buffer const *, LyXLex & lex) if (command == "\\-") kind = HYPHENATION; else if (command == "\\textcompwordmark{}") - kind = HYPHENATION_BREAK; + kind = LIGATURE_BREAK; else if (command == "\\@.") kind = END_OF_SENTENCE; else if (command == "\\ldots{}") @@ -214,7 +214,7 @@ int InsetSpecialChar::latex(Buffer const *, ostream & os, bool /*fragile*/, case HYPHENATION: os << "\\-"; break; - case HYPHENATION_BREAK: + case LIGATURE_BREAK: os << "\\textcompwordmark{}"; break; case END_OF_SENTENCE: @@ -238,7 +238,7 @@ int InsetSpecialChar::ascii(Buffer const *, ostream & os, int) const { switch (kind) { case HYPHENATION: - case HYPHENATION_BREAK: + case LIGATURE_BREAK: break; case END_OF_SENTENCE: os << "."; diff --git a/src/insets/insetspecialchar.h b/src/insets/insetspecialchar.h index e2678a7712..507f42cb8f 100644 --- a/src/insets/insetspecialchar.h +++ b/src/insets/insetspecialchar.h @@ -28,8 +28,8 @@ public: enum Kind { /// Optional hyphenation point (\-) HYPHENATION, - /// Hyphenation break point (\textcompwordmark) - HYPHENATION_BREAK, + /// Ligature break point (\textcompwordmark) + LIGATURE_BREAK, /// ... (\ldots) LDOTS, /// End of sentence punctuation (\@)