> On Oct 19, 2017, at 8:06 AM, Willem Ferguson > <[email protected]> wrote: > > On 19/10/2017 12:43, Dirk Hohndel wrote: >> On Thu, Oct 19, 2017 at 08:52:54AM +0200, Willem Ferguson wrote: >>> Attached a patch. Apologies for the old-fashioned way of doing this. >> Can you update to the latest master (I just pushed this out) and make sure >> that what I have there is what you wanted? And if not, send another patch, >> please? >> >> /D >> > There are several problems with the merging of text. A large section of text > on Lubomir's map has been lost. In addition, a whole range of special > characters have been lost. For what possible reason can the software not > render Bühlmann???? Or the delta character in the minimum gas calculation? I > do not wish to resort to images of the text.
Of course not. Let's look into the asciidoc documentation. I'm sure it can do Umlaute and Greek letters. > Should I edit the existing user-manual.txt and insert the omitted part(s) or > should I re-start with the previous version? Any way to facilitate merging? I > did use an up-to-date version of user-manual.txt. The easiest way at this point is to just send me the final text that you want. I'll create a commit for you locally. /D _______________________________________________ subsurface mailing list [email protected] http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
