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

[Tim Marston]

Hi Chris,

On Sun, Apr 28, 2013 at 06:51:56PM -0400, Chris Jones wrote:
> > 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..?

Sorry, yes, you're absolutely right!  I must have momentarily not
reversed the +/- lines in my head!

> 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.. ;-) 

No, this is excellent news.  gtypist.typ is actually generated from
those constituent files, so I would have had to update them
individually anyway.  Patches against the individual lessons are much
more useful.

> 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..?

Yes, in fact I would recommend it.  Search on the internet for some git
tutorials -- there are loads of them!

You can clone the gtypist git repo by going

  $ git clone git://git.savannah.gnu.org/gtypist.git

But unless your git repo is on a machine that is publicly accessible to
the internet (like savannah.gnu.org is), you won't be able to give us
the location of your repo to pull changes back from.  So you'll end up
having to send us patches all the same.  But git is very good at
producing diffs/patches.  This creates a patch from uncommitted
changes:

  $ git diff

Or you can create a diff from a specific revision and you know that
revision's REVISION-ID, you can go

  $ git show REVISION-ID

And when we incorporate your (or other) changes to our repo, you can go

  $ git pull

to merge-in the latest changes from us, so you'll be able to keep in
sync with the project as well.

Kind regards,

-- 
Tim Marston
ed.am