Re: [tei-council] Sharp Kills LaTeX, film at 11

If you haven’t committed your changes, git reset —hard HEAD is probably what you want. This will take your working directories back to the satate they were in at the last commit. Note that it will get rid of *all* changes you’ve made. If there are any you want to keep, you should add and commit them first.

On Oct 4, 2015, at 12:44 , Lou Burnard wrote:

In the bad old days of subversion, if I were (as I am) in the situation where I had made some changes locally in files which I now wish to junk and replace with the changes that have meantime been made in the repo, I would simply delete my modified local versions, and then do "svn up".

What hoops do I have to jump through to get the same effect with git?

On 04/10/15 17:33, Lou Burnard wrote:

...

Thanks for doing the job properly !

Now, please remind me how to update my local branch... if I do "git pull" it says

From https://github.com/TEIC/Stylesheets 05c9755..2dca741 master -> origin/master Already up-to-date.

But I know this is not the case. I tried "git merge" in my local branch but got:

fatal: No commit specified and merge.defaultToUpstream not set.

(I have another copy of the Stylesheets directory, checked out with svn. I go there and type "svn up" and bingo, the two files you have changed get changed locally. Why does everything with git have to be so much more complicated?)

On 04/10/15 15:56, Hugh Cayless wrote:

...

Just committed a fix, I think. We’ll see if Mr. Jenkins blows up. Local builds of the PDF Guidelines work again anyway, with the hash in the RDF namespace.

...

On Oct 3, 2015, at 19:14 , Lou Burnard wrote:

OK, I have now found what seems to be the relevant bit of the stylesheets (it's in common/verbatim.xsl)

There is a parameter which controls whether or not namespace declarations are copied into the start of a verbatim example. By default they are; however by setting the parameter "false" I can make this problem go away, at the small space of removing all such namespace declarations in the output.

Going to sleep on it now.

On 03/10/15 18:19, Lou Burnard wrote:

...

On 03/10/15 01:22, Syd Bauman wrote:

...

So what's different between the <code> in xenoData.xml which contains a sharp, and the one above? Or better yet, between it and <code>personography.xml#MDH</code> which also occurs inside an <exemplum>? The problem isn't caused by the presence of an unescaped # in the ODD source which, as you rightly observe, happens all over the place. The problem is that the namespace declarations you have added in order to make your example code valid are getting copied into the output.

Suppose, for example, you had

some text <egXML xmlns="http://www.tei-c.org/ns/1.0" xmlns:foo ="http://www.example.foo"> <p>foo:whatever something </p> </egXML>

The resulting example has to look like

sometext <p xmlns:foo ="http://www.example.foo"> foo:whatever something </p>

Whatever it is that copies the namespace declaration from the egXML element into the root element of the egXML content doesn't know to do the escaping. Indeed, it probably shouldn't.

Regrettably, you don't have the option of simply removing the additional namespace declarations from the <exemplum> as your examples then look ill-formed.

(And no, it makes no difference whether the declarations are on the exemplum or the egXML: they still have to be copied into the output)

Hmmmm.

-- tei-council mailing list tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council

PLEASE NOTE: postings to this list are publicly archived

-- tei-council mailing list tei-council@lists.tei-c.org http://lists.lists.tei-c.org/mailman/listinfo/tei-council

PLEASE NOTE: postings to this list are publicly archived