Two strategies for this: for the superscript one, regexp, and for the simple one just a case-sensitive search and replace:
(?<!abbr>)([A])(tt<hi rend="[^"]+super+[^"]+">y\.?</hi>\.?) <choice><abbr>$1$2</abbr><expan>$1ttorney</expan></choice>
Att. <choice><abbr>Att.</abbr><expan>Attorney</expan></choice>
Using this regexp:
(?<!abbr>)([Gg])(en<hi rend="[^"]+super+[^"]+">l\.?</hi>\.?) <choice><abbr>$1$2</abbr><expan>$1eneral</expan></choice>
Used these regexps to mark up instances of "Secy" and "Secty" for "Secretary":
(?<!abbr>)([Ss])(ec[t]?<hi rend="[^"]+super+[^"]+">y\.?</hi>\.?) <choice><abbr>$1$2</abbr><expan>$1ecretary</expan></choice>
Last review is done.
A handful of new documents has come in from JH, based on transcriptions from MF B-3006 through B-3008 (CO 6/19 through CO 6/23). These MFs have not been processed yet, so I'd like to wait on doing the markup until they have, but I took a look through the documents and found a couple of anomalies, one being mislabelled 6/25, and a name misspelled. The name issue caused me to find a similar error in one of our existing transcriptions, B585HB06, which I've now corrected.
The version information data is crucial for completing the <teiHeader> in a useful way, and I've been puzzling over how best to do it in an automated way. Following hints from this post: http://qtcreator.blogspot.com/2009/10/generating-automatic-version-numbers.html, I've written a bash script that creates a version.h header file, which provides all the key versioning info I'll want to include. Below is the script at the moment (it will probably get a bit more complicated later). I'll also want to figure out how to include the same info into a resource file in order to embed the correct versioning info into Windows builds, based on this post: http://stackoverflow.com/questions/2784697/setting-application-info-in-qt. I run the script automatically when doing a build, to get an up-to-date version.h file. This is done using a Custom Build Step in the Build Settings panel of QT (in "Projects").
#!/bin/bash
#Major version number (unlikely to change).
major=2
#Minor version number is changeable, but done manually.
minor=0
#Build number is yyyymmdd from today.
date=$(date +%Y%m%d)
#This is the file we're dealing with.
outfile="version.h"
#Remove the old file.
rm $outfile
#Do an SVN commit to update the revision number.
svn commit --message "Committing before an application build."
#Get the SVN revision number into a variable.
svnrev=`svnversion`
#echo the info into the output file.
#echo $svnrev>>$outfile
#echo $major"."$minor"."$build"."$svnrev>>$outfile
echo "#ifndef VERSION_H">>$outfile
echo "#define VERSION_H">>$outfile
echo "">>$outfile
echo "namespace Version">>$outfile
echo "{">>$outfile
echo "const int MAJOR = "$major";">>$outfile
echo "const int MINOR = "$minor";">>$outfile
echo "const int DATE = "$date";">>$outfile
echo "const int REVISION = "$svnrev";">>$outfile
echo "}">>$outfile
echo "inline const char* versionString(){return "$'\042'$major"."$minor"."$date"."$svnrev$'\042'"};">>$outfile
echo "">>$outfile
echo "">>$outfile
echo "">>$outfile
echo "#endif // VERSION_H">>$outfile
Created a heavily-commented header template, and EGB used it to create a header for her document. By Monday I'll have one for the frontispiece, which will of necessity be more exemplary than prescriptive, because the structure and layout of frontispieces differs.
Received a new version of the Spanish 100A test from 2009, much expanded from before. Rebuild the Masher file, recreated the unit, tested and uploaded it. The old data has been archived.
Metadata display functionality has been added to the images and the editorial articles.
I've implemented the metadata box in the images slightly differently; it's position: absolute; z-index: 1000; to make sure it pops up on top of the image, rather than displacing the image and making all the zone offsets wrong. I also had to override the default float: left; setting of the popupCloser for the box; in text, and here, it's float: right. Maybe that should be universal, for consistency.
This one was a panel, and took a while to review, but also sent me off to look at some stuff that might be useful for our proposed ColDesp grant application.