Hi, Unfortunately I miss-spelled "doc" in the previous eMail - suppose its done now :-( I don't know if any one besides Carlos has looked at my previous patches for DOC. I attach another patch for README., including some suggestions by Carlos. Since the previous patches was not installed yet, this patch replaces the previous patch Steve will you please commit this if it meets your approval, and ignore the previous? Previous message: Steve, Attached 2 patches for mkgmap-r1381\doc\ READMEjava.patch READMEinstalling.patch If you would be so kind to commit it? Please? BTW I see a heading like Index: doc/README.java on the patches of others. Is it hand edited in, or do you use different DiffUtils than I do? Should I include it as well? Further- do you prefer the patch text copied into the email body? Groete BennieD ##################################################################################### Scanned by MailMarshal - Marshal's comprehensive email content security solution. Download a free evaluation of MailMarshal at www.marshal.com #####################################################################################
I had a look at your patch. I think that the character encoding should be ASCII or UTF-8. The apparent encoding of your patch is Microsoft Code Page 1252.
BTW I see a heading like
Index: doc/README.java
on the patches of others. Is it hand edited in, or do you use different DiffUtils than I do?
"svn diff" will output that header. Best regards, Marko
Hi Marko,
I had a look at your patch.
Thanks for taking the time
I think that the character encoding should be ASCII or UTF-8. The apparent encoding of your patch is Microsoft Code Page 1252.>
Ahh, that won't do- I want to help improve mkgmap, not hamper it! I'll try to find out what that means and will refrain from patching till then. .. .. I had a look at GNU DiffUtils to see if I'm going wrong somewhere there. No options for encoding (at least NAFAICT) What do happen is: I hand edit the header paths, with wordpad, to correspond to the svn paths. I suppose when I save it, it saves in 1252 i.s.o utf-8. I can do the editing in Word and encode to UTF-8 if it is a problem. How can you tell which character encoding is used? What is the reason for the headings --- +++ and index: are they needed for the patch to be applied, or do I just waste my time to hand edit it?
BTW I see a heading like
Index: doc/README.java
on the patches of others. Is it hand edited in, or do you use different DiffUtils than I do?
"svn diff" will output that header.
Ok, does that mean you diff the paths on-line to create your patches? Is it OK then if I don't include that header or does it make it more difficult to apply the patch if I don't? Hang on - I've tried to get a diff from comparing two paths on svn, but it didn't work: all I get is a diff like output on screen (which is fine to read, but does not save / download as a diff file with the + - @ etc - how do you get a diff file from it? I've tried to copy & paste but all the diff symbols has to be added manualy then - I'm guaranteed to make a typo. .. .. Sorry, I tried svn quickly to see if I can figure it out: no luck. Maybe someone will be so kind to spell it out for me. BennieD ##################################################################################### Scanned by MailMarshal - Marshal's comprehensive email content security solution. Download a free evaluation of MailMarshal at www.marshal.com #####################################################################################
Hi Bennie, On Tue, Nov 17, 2009 at 12:15:55PM +0200, Du Plessis, Bennie wrote:
Hi Marko,
I had a look at your patch.
Thanks for taking the time
I think that the character encoding should be ASCII or UTF-8. The apparent encoding of your patch is Microsoft Code Page 1252.>
Ahh, that won't do- I want to help improve mkgmap, not hamper it! I'll try to find out what that means and will refrain from patching till then.
The text you added contains some characters that are not in ASCII (7-bit). They were not encoded in UTF-8, even though UTF-8 is the standard encoding of OpenStreetMap. (OSM is based on XML, whose default encoding is UTF-8, as far as I understand.) In this case, the fix is simple: use ASCII apostrophes (') instead of curly quotes and spell Windows correctly. I think that it is better to have the English plain text documentation in ASCII, because ASCII is a proper subset of most character encodings, and some people could still be using system configurations that do not display UTF-8.
How can you tell which character encoding is used?
Educated guess verified with GNU Recode. I viewed the patch in a program that is configured to expect UTF-8. It displayed the non-ASCII characters in hexadecimal notation, because they were not valid UTF-8.
Hang on - I've tried to get a diff from comparing two paths on svn, but it didn't work: all I get is a diff like output on screen (which is fine to read, but does not save / download as a diff file with the + - @ etc - how do you get a diff file from it? I've tried to copy & paste but all the diff symbols has to be added manualy then - I'm guaranteed to make a typo.
How about redirecting the output of the command to a file: svn diff > some_descriptive_name.patch With best regards, Marko
Quoting "Du Plessis, Bennie" <Bennie.DuPlessis@sappi.com>:
Hi,
Unfortunately I miss-spelled "doc" in the previous eMail - suppose its done now :-(
I don't know if any one besides Carlos has looked at my previous patches for DOC.
I attach another patch for README., including some suggestions by Carlos.
Since the previous patches was not installed yet, this patch replaces the previous patch
Steve will you please commit this if it meets your approval, and ignore the previous?
Previous message:
Steve,
Attached 2 patches for mkgmap-r1381\doc\
READMEjava.patch
READMEinstalling.patch
If you would be so kind to commit it? Please?
BTW I see a heading like
Index: doc/README.java
on the patches of others. Is it hand edited in, or do you use different DiffUtils than I do?
Should I include it as well?
Further- do you prefer the patch text copied into the email body?
Groete
BennieD
##################################################################################### Scanned by MailMarshal - Marshal's comprehensive email content security solution. Download a free evaluation of MailMarshal at www.marshal.com #####################################################################################
Hi What I was trying to say here, was that I am in Norway and will not be back until the 30th. I am unable to commit anything until then (nor send email reliably it seems). Its fine for someone else to commit it if it looks good to them. Best wishes, ..Steve
participants (3)
-
Du Plessis, Bennie -
Marko Mäkelä -
Steve Ratcliffe