Re: [bug-gtypist] Patch to fix typos in gtypist lessons

[Chris Jones]

On Sun, Apr 28, 2013 at 08:10:00AM EDT, Tim Marston wrote:
> Hi Chris,
> 
> On Sat, Apr 27, 2013 at 07:30:45PM -0400, Chris Jones wrote:

> > I'm keeping track of typos in gtypist.typ and other lessons via
> > a "private" patch in my $HOME directory.
> > 
> > No idea if you're interested and if so how it should be maintained
> > and formatted..
> 
> Excellent!  Yes please, we'd definitely be interested in lesson
> corrections.  Just a patch, such as you've provided, is absolutely
> fine.

I decided to patch this after losing my hard-coded edits to the system's
/usr/share/gtypist/* lessons for the second time following an upgrade..
that's what... :-(

> > Attaching current state of the gtypist.typ patch as a sample for your
> > review.
> 
> Great, thanks!
> 
> I had a quick look through the patch, and there were just a couple of
> points that I should mention...
> 
> The patch is generated the wrong way round (i.e. the + and - lines are
> the wrong way round), so it currently removes the corrections and adds
> the errors!

Hehe.. way to go isn't it.. :-(
> 
> Also, I don't think the following change is correct.  The full-stop at
> the end of "lbs." indicates an abbreviation, not the end of a sentence.
> 
> > --- gtypist.typ     2013-04-25 13:36:52.000000000 -0400
> > +++ /usr/share/gtypist/gtypist.typ  2013-01-02 12:49:41.000000000 -0500
> > @@ -4313,8 +4313,8 @@
> >  I:(6)
> >  *:_V_R_L125
> >  D:d3d k8k d3d k8k d3d k8k d3d k8k 318 813 138 813 381
> > - :13 lbs. lamb roast; 38 lbs. lamb chops; 8 lbs. bananas;
> > - :31 lbs. lamb chops; 83 lbs. lamb roast; 3 lbs. peaches;
> > + :13 lbs.  lamb roast; 38 lbs. lamb chops; 8 lbs. bananas;
> > + :31 lbs.  lamb chops; 83 lbs. lamb roast; 3 lbs. peaches;
> >   :
> >   :lie 3 dye 3 pie 3 dye 3 Fiji 8 Fiji 8 Fiji 8
> >   :18 cans grape juice; 138 cans prune juice; 4 lbs. coffee;

The correct version is the one with just one space. The two spaces on
both those lines in lesson V.16 are from the gtypist.typ that came with
gtypist. Due to my having made my diff the wrong way round..?

> I'll apply the patch now (minus the above change).  If you want to
> keep sending us updates to your patch, we would appreciate them very
> much indeed!

Glad to know I did something marginally useful this once...

As I mentioned this patch was just a sample so you could check I was
doing it right.. wrong I mean..

Now, the bad news is that I have separate patches for each of the
individual series of lessons -- v.typ, d.typ, s.typ... because although
they are the same as the lessons in gtypist.typ.. they live in different
files that need to be kept in sync'. Oh dear, oh dear.. ;-) 

In other words, whenever I spot a typo, I  need to make sure I edit two
files, that my changes are exacty identical, and create/update two
different patches. At this point everything is done manually.. which is
clunky and a waste of time to say the least, and error-prone, naturally. 

Unless someone can think of some way to automate this so I can be sure
I remembered to make the changes to both the gtypist.typ file and the
corresponding x.typ _and_ that the changes are identical _and_ that
I remembered to generate both patches, I guess I'll have to take another
look and see if I can come up with something more reliable using the
usual standard tools -- in my case vim, diff, and patch.

Sorry for being so verbose.. this was rather hard to describe accurately
in a few words.

Anyway, attaching all four patches to make sure we're in sync'..

Thanks,

CJ

P.S. How would I go about setting up a git gtypist repos on my machine
and use version control to keep track of my changes.. Would that help
even for such trivial fixes..? Where would I find a short user-oriented
introduction to using git, would you know..?

-- 
SOMEBODY SET UP US THE BOMB

2013+118-c.patch
Description: Text Data

2013+118-gtypist.patch
Description: Text Data

2013+118-q.patch
Description: Text Data

2013+118-v.patch
Description: Text Data