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 feb79efc04f62809bdaa761e59d026c1bb6d21a7..d46d58707640c414292e5637cb60869a127b2898 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-20  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * ui/default.ui: change 'hyphenation break' to 'ligature break'.
+
 2001-07-19  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
        * ui/default.ui: change a shortcut

diff --git a/lib/ui/default.ui b/lib/ui/default.ui
index c0033d5d376753881ad7f9983b1029abbc219774..7a3e752a71bc7b00ec351349a6b5317e8a6033c1 100644 (file)
--- 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 de035b282accf052fb1da2ff5ea52f1ce5cf49b4..77ede5b129087bf4ce26a425d04c0025a5cbc592 100644 (file)
--- 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 22204548f96b022fbcdfde3274fe28f77fac8fe4..6acf4f1e4f706436198a0f51cad8d260cfb62775 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2001-07-20  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * 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  <a.leeming@ic.ac.uk>
 
        * 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  <a.leeming@ic.ac.uk>
-
        * sp_form.[Ch]: remove.
 
-2001-07-20  Angus Leeming  <a.leeming@ic.ac.uk>
-
        * 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 6c4a60d3dddfe1ece248e5c762c4e592397aa8cc..be73d2a68db3b3b607a503935650142445145687 100644 (file)
--- 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 5a18c90531e3fe047e923a740e3d7bdc62b04de4..cff23e3c8bb785cd1530bb595cd059624848d5f0 100644 (file)
--- 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 a7045c1a5dbb4a0614dfed1476e20e28ba7bc6de..5ad07060bf18aa123c2b1c31268892172b508271 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-20  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * insetspecialchar.[Ch]: change HYPHENATION_BREAK to
+       LIGATURE_BREAK, since the name is so stupid.
+
 2001-07-20  Angus Leeming  <a.leeming@ic.ac.uk>
 
        * 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  <a.leeming@ic.ac.uk>
-
        * 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 2b5e7fab0a74c06f3e82077906f7c1cfd5a6cb49..7979f1ff8f83490cabf8401ddb6729b79f84bdd7 100644 (file)
--- 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 e2678a7712dae3421d69279fa893aa14744b4f31..507f42cb8f92da360a6ed2629fd8269dfca6f7c6 100644 (file)
--- 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 (\@)