Made the following changes to some site content based on advice from the French team:
Other changes are pending after some discussion.
LSPW reported that an entry in the references file was missing (Chypre). We checked back through SVN, and confirmed that it had never been present during the time we've been using SVN, but I found an old version of the references file from Mariage version 4, and we retrieved it from there.
Meanwhile, there were conflicts with the le_bon_mariage.xml file, arising I think when EGB forgot to do an svn update before starting work, after I had edited the file on the 14th. I think I've resolved these, but we'll know for sure tomorrow when she comes in and does an update.
My previous changes caused a change to the way paragraphs were displayed in the popup references. I've now refined the XSLT a little so that paragraphs in references no longer get the host document's default paragraph styles added to them (as they shouldn't, because they're editorial content and should be consistent across the collection, rather than varying with the style of their host documents).
Fixed some bugs in CSS and XSLT shown up by Le Bon Mariage:
<teiHeader>; this turned out to be a bug in the XSLT, which I fixed.<note type="marginal">) were being treated as editorial notes, and turned into buttons with popups, so I suppressed that (and see below).Also added handling for the marginal notes, grouping them in with the arguments, because that's the way to handle them IMHO; in some cases too, judging by EGB's markup, it's hard to tell the difference between them. So the argument markup now handles editorial marginal notes.
In the process, I fixed a few typos in the Bon Mariage XML file too.
Note to self: TOCs are still not being handled at all. That's a must-do sometime soon.
Added in the new members of the team and more details about tasks, on CC's instructions.
Faut-il se marier? La question de Panurge s’avère incontournable en Occident, surtout à partir de la contre-réforme. Des débuts de la Concile de Trente en 1545 jusqu’à la fin du règne de Louis XIV, la tentative de renouveler le mariage se heurte en France à l’intervention croissante de la monarchie dans cette institution dominée auparavent par l’Église. La rencontre entre ces deux autorités fut tumultueuse mais propice au foisonnement des documents qui font l’objet de ce site : « l’imaginaire nuptial » se compose de divers genres textuels, chacun ayant son caractère propre, mais tous traitant des peurs, des désirs et des fantasmes de plus en plus visibles dans la société d’Ancien Régime grâce aux débats soulevés par la nouvelle problématique de l’union conjugale. L’accent pour le moment est sur les textes et images misogames qui font partie d’un renouveau de la Querelle des femmes pendant les 25 premières années du XVIIe siècle.
| Sun | Mon | Tue | Wed | Thu | Fri | Sat |
|---|---|---|---|---|---|---|
| << < | Current | > >> | ||||
| 1 | 2 | |||||
| 3 | 4 | 5 | 6 | 7 | 8 | 9 |
| 10 | 11 | 12 | 13 | 14 | 15 | 16 |
| 17 | 18 | 19 | 20 | 21 | 22 | 23 |
| 24 | 25 | 26 | 27 | 28 | 29 | 30 |