Open weijia-cheng opened 9 months ago
I noticed some issues in your recent changes.
As for doing a rebase, I would begin by reading this guide and creating a local copy of your repository as a backup in case you make a mistake while rebasing. Rebasing is very powerful and has the potential to really screw up your commit history, so it's a good precaution.
You'll begin by running the command git rebase -i --root
. This will open a temporary file with your git text editor (usually vim; see this page for instructions on how to switch to some popular GUI editors). The temporary file will look like this:
pick e007db6 Initial commit
pick b26edd5 Clean and renamed files of volume 1
pick c0f272b Clean and rename files of volume 2
pick bd0761b Clean and renamed files for volume 3
pick eeda1c6 Clean and renamed files of volume 4
pick d43b2cb Fix titles
pick e70ec76 Add cover
pick 5c3c638 Renamed chapters
pick 1c9394b Typogrify
pick 7cb7a9e Semanticate
etc. You will need to change the pick
in the first line pick e007db6 Initial commit
to edit
. Also, you need to find the pick 9c4ca19 [Editorial] Change capitalization of a word
line and change pick
there to reword
. Once you have made those changes, save and quit from the temporary file.
Once you're in this point, you'll see the message
Stopped at e007db6... Initial commit
You can amend the commit now, with
git commit --amend
Once you are satisfied with your changes, run
git rebase --continue
At this point, you can edit the body file, delete the license, then run git add -A
and then git rebase --continue
. Then, git will try to automatically apply the following commits in sequence, but there will be a merge conflict while applying the commit that deleted body.xhtml
. It will complain with this message:
CONFLICT (modify/delete): src/epub/text/body.xhtml deleted in b26edd5 (Clean and renamed files of volume 1) and modified in HEAD. Version HEAD of src/epub/text/body.xhtml left in tree.
error: could not apply b26edd5... Clean and renamed files of volume 1
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply b26edd5... Clean and renamed files of volume 1
Once you get to that point, use git rm src/epub/text/body.xhtml
to delete the body.xhtml file again and use git rebase --continue
afterwards. Then the following commits will be applied without any issues until you get to a screen where you get to change the message of the [Editorial] Change capitalization of a word
commit. Just delete [Editorial]
there, save the buffer, and afterwards all of the remaining commits will be applied.
After you've done all this and run git status
, you will see a message like
wcheng@pop-os:~/git/ann-radcliffe_the-mysteries-of-udolpho$ git status
On branch main
Your branch and 'origin/main' have diverged,
and have 95 and 95 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
nothing to commit, working tree clean
That means that your local repository has different history than your remote git repository. You need to use git push --force
to overwrite your remote repository with your local history. Once you are done with this, your git commit history will look as it should.
I basically did the rebase myself locally and reproduced my steps here, so I can assure you these instructions work :) But please let me know if anything is unclear or you get stuck on anything.
Some follow-up issues:
cite
s. Instead of <cite epub:type="se:name.publication.play"><i>Macbeth</i></cite>
, it should be <cite><i epub:type="se:name.publication.play">Macbeth</i></cite>
with the semantics going on the italics.em
s on loanwords: eclât (I think this should be modernized to éclat by the way), conversazione. em
should be removed on these.em
s with xml:lang
s that need to be changed to i
s. Use the command se xpath '//em[@xml:lang]' .
to find all of them.em
around The Traveller
which is the name of a poem. This needs to be italics with the poem title semantics like we discussed with the titles in citations. Please review 8.2.11.em
that look like loanwords and not actual emphases, which should be removed. Some examples I noticed on a quick scan are clematis and Jarl Please review again with grep --recursive --line-number --extended-regexp "<i|<em" src/epub/text/*.xhtml
and consider if any more em
s should be removed--please feel free to ask in the mailing list if you find any unclear cases.
Typography
typogrify
makes many changes which should be accepted.Chapter
labels from each chapter.Semantics
<em>
s ina <em xml:lang="fr">salle à manger</em>, a <em xml:lang="fr">salon</em>, a <em xml:lang="fr">salle au commune</em>
, just use<i>
s.span epub:type
elements around loanwords into English likechâteau
unless those loanwords are also part of proper names in the original language. (See 8.2.9.2.)<em>
s arounddebonnaire
, and also modernize todebonair
in a separate commit.em epub:type
elements, as seen in commit 292420e818dfdaa8a95681eb8dfd32ca2e9022ae. There are two possibilities for these. If these are loanwords that are found in Merriam-Webster, and were originally italicized as foreign-language words, we should totally remove the semantics around them. If they are actually foreign-language words, that are not found in Merriam-Webster, they should be italicized in ani
tag and not anem
. That being said most of them looked like loanwords at first glance. Usegrep --recursive --line-number --extended-regexp "<i|<em" src/epub/text/*.xhtml
to help you examine all instances of your italics usage.LAURENTINI DI UDOLPHO
should not be in all-caps. If you need an all-caps appearance, use CSS to applytext-transform: lowercase
to the header. (This might seem a little counter-intuitive—why not uppercase? But the header rule already applies the small-caps font variant, so lowercase will make it all small caps, which looks closer to what the printed text is.)cite
elements that are referring to a book/play/etc., the title should get the appropriate italics and semantics. Make sure you get in the epigraph CSS for italics in the citation too.z3998:verse
.z3998:poem
is for an entire quoted poem or poems in poetry collections.Spelling
modernize-spelling
makes some changes to prose which should be accepted.Metadata
https://archive.org/details/mysteriesudolph00unkngoog
. Same thing in the colophon and imprint.l
.Colophon
in c. 1650
, usecirca 1650
.Commit History
git rebase -i --root
to rebase the Gutenberg license out ofbody.xhtml
in the initial commit. We are not supposed to commit the Gutenberg license into our code. Please let me know if you need more detailed instructions on rebasing.