[ILUG] text flow tools

[Baruch Even]

Paul Biggar wrote:
> Folks,
> 
> grep can find two words one after the other by doing 'grep "word1
> word2"'. Does anybody know a way of making this return a case where
> word1 is at the end of one line, and word2 is at the start of the
> next.
> 
> On a similar note, I'm looking for a diff/merge tool that takes the
> flow of a paragraph into account. I'm trying to merge two slightly
> different copies of the same latex document. I saw texdiff, but its
> not exactly what I'm looking for, which would be more like a the
> standard diff tool. I also looked at wdiff, but it doesn't really
> merge things, and looks like it will be hard to use. Can anyone
> suggest better?

There is a program called wdiff:
Description: Compares two files word by word
 `wdiff' is a front-end to GNU `diff'.  It compares two files, finding
 which words have been deleted or added to the first in order to create
 the second.  It has many output formats and interacts well with
 terminals and pagers (notably with `less').  `wdiff' is particularly
 useful when two texts differ only by a few words and paragraphs have
 been refilled.

Baruch