"Ping Yin" <pkufranky@xxxxxxxxx> writes:
> On Mon, May 12, 2008 at 12:27 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
>> "Ping Yin" <pkufranky@xxxxxxxxx> writes:
>>
>>> With following patch, the diff output becomes (i don't know which
>>> one is better)
>>>
>>> OpenOffice.org has {+a }user setting for defining the minimum length for
>>> words to be hyphenated. By default the word length is counted from the
>>> whole word - even for compound words. For example the {compound +}word
>>> 'elokuvalippu' is {+considered }12 characters long. The word will be hyphenated like
>>> 'elo-ku-va-lip-pu' in all cases when the minimum word length is set to
>>> 12 or less. If the minimum length is set to 13 or more the word is not
>>> hyphenated at all.
>>
>> Yeah, after playing with it a bit, I realize that my original
>> stated goal of not playing games with "newline suppression" goes
>> very against what color-words, which is a word oriented diff,
>> tries to achieve. It appears that it is necessary to reintroduce
>> suppressed_newline.
>>
>
> No matter how well we play with suppressed_newline, we still can't
> achieve the best result by doing word diff between multiple minus
> lines and multiple plus lines.
>
> ( i think the result of vimdiff can be considered as the best).
Is the vimdiff algorithm described anywhere? What about wdiff output?
> To achieve the best, we have to find the pairs of lines (one minus and
> one plus for each pair) which most match each other, and then do the
> word diff for each pair.
Wouldn't be enough to treat run of plus/minus lines as a single block,
tokenize, do token-based (as opposed to line-based) diff, then show it
using linebreaks of the destination file (pluses line)?
--
Jakub Narebski
Poland
ShadeHawk on #git
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
