Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update essay 7 .md, references.yml, and figures.yml based on revised text from author. #45

Closed
19 tasks done
Erin-Cecele opened this issue Dec 13, 2021 · 25 comments
Closed
19 tasks done
Assignees

Comments

@Erin-Cecele
Copy link
Contributor

Erin-Cecele commented Dec 13, 2021

@audreywarne Thank you so much for chatting with me today and for signing up to do all this work. Below is the list of changes that need to be made by Friday. For big questions, please respond in this issue. For small things, feel free to shoot me a quick email.

  • Replace Essay 7 text with converted text (but save original essay 7 text because you will need that as a guide)
  • Add #'s to create section headings (use original essay 7 as a guide)
  • Clean up tables following Greg’s formatting
    • Headings can be cut and pasted (use original essay 7 as a guide)
    • But content should follow Greg’s pattern
  • Clean up asterisks in transliterated text (look at original essay as guide)
    For example:
    ↓→ ***\@r Hwn n\<x\>t(?) \<nb.ty\> iTi*** ˹***m sxm***˺ ***bik nbw*** ˹***wsr rnp.w(t)***˺ ***aA nxt \<nsw.t bi.ty\>*** ˹***AW***˺***&QR&R K%R% nsw.t bi.ty &***˹***M***˺***\[&\]IN% anx D.t xbi in(.w) m tA.wy xAs.wt m ntyy.w r iy.t=f n.t Xnw \[!r\]***˹***m***˺
    should be
    | ↓→ ***\@r Hwn n\<x>t(?) \<nb.ty> iTi ˹m sxm˺ bik nbw ˹wsr rnp.w(t)˺ aA nxt \<nsw.t bi.ty> ˹AW˺&QR&R K%R% nsw.t bi.ty &˹M˺\[&\]IN% anx D.t xbi in(.w) m tA.wy xAs.wt m ntyy.w r iy.t=f n.t Xnw \[!r\]˹m˺*** |
  • Search for {.smallcaps} and replace curly brackets with span (use original essay 7 as a guide)
    For example: [Domitian]{.smallcaps} should be <span class="smallcaps">Domitian</span>
  • Search for {.ul} and replace curly brackets with span (use original essay 7 as a guide)
    For example: [the King of Upper and Lower Egypt]{.ul} should be <span class="underline">the King of Upper and Lower Egypt</span>
  • Search for instances of ![](media/....} images and follow Greg’s formatting
    For example: ![](media/image16.emf){width="0.20833333333333334in" height="0.19444444444444445in"} should be ![](/img/figures/essay-07-inline/image16.svg)
  • Use regex to wrap author date references in curly brackets (see issue Tag author date references and format references.yml entries #14)
  • Convert bibliography with regex and replace in references.yml (issue Tag author date references and format references.yml entries #14)
    • Keep original version of references.yml
  • Correct formatting of hieroglyph in Spalinger 2015 in references.yml (issue Convert hieroglyph to image in references.yml #32)
    • Use original references.yml text as a guide
  • Use regex to convert author date to q-cite shortcode (issue Finish work on essays 6 and 7 #27)
  • Correct any q-cite errors where the q-cite shortcode does not match the references.yml
    • Keep track of any broken links you're not sure how to fix
  • Copy and paste q-figure shortcodes from old version
    For example:

{FIG. 10 + caption (orthophoto of A/1)}
{FIG. 11 + caption (photo of B/1)}
{FIG. 12 + caption (A/1 and B/1 facsimile)}
{FIG. 13 + caption (side 1 hieroglyphs)}

should be

{{< q-figure-group grid="2" id="fig-7-10, fig-7-11" class="pdf-two-column" >}}
{{< q-figure-group grid="2" id="fig-7-12, fig-7-13" class="pdf-two-column" >}}

  • Replace captions text for all essay 7 captions in the figures.yml

Here are the FINAL markdown files you should use to make these changes (this is the same as what I previously sent you).

11_Prada essay_final_tracked_CLEAN_13dec21_GA.md
11b_Prada bibliography_final_tracked_CLEAN_13dec21.md
11a_Prada captions_final_tracked_CLEAN_13dec21.md

@ldizerega
Copy link
Contributor

ldizerega commented Dec 14, 2021 via email

@audreywarne
Copy link
Collaborator

audreywarne commented Dec 14, 2021

I found a shortcode in the old essay version that I didn't see above:

"Coptic ⲛⲟⲩⲧⲉ “god”"

Should I include it in the revised version as well? Its in note 4 of the side 3 summary in the Commented reedition of the inscriptions on the Benevento obelisks section.

@audreywarne
Copy link
Collaborator

Screen Shot 2021-12-13 at 6 27 53 PM

@ldizerega
Copy link
Contributor

ldizerega commented Dec 14, 2021 via email

@audreywarne
Copy link
Collaborator

Hi there I'm having an issue with my commits. I've been submitting them, but they aren't able to be linked to this project or issue. I'm not sure if I have to do something with the branch I created, but I just want to make sure my edits are uploading correctly.

@geealbers
Copy link
Member

We currently have two of your commits up on GitHub, both from yesterday. You can see the status of your branch at https://github.com/thegetty/egypt-classical-world/commits/issue-45-AW. Are there other commits aside from these that you haven’t been able to push up?

@audreywarne
Copy link
Collaborator

Oh wonderful—those are the only two. For some reason I wasn't seeing my commits as linked to Egypt when I clicked through my GitHub desktop. Thanks for confirming!

@Erin-Cecele
Copy link
Contributor Author

Hi @audreywarne I noticed that you have already place the q-figure shortcodes in the essay. The reason that item appeared lower down the list is because when you go to convert author date to the q-cite shortcode, the regex pattern will look for curly brackets. This means it will try to convert your q-figure shortcodes to q-cite. You will either need to redo the q-figure shortcodes or you will need to do find and replace one at a time to make sure it doesn't convert anything incorrectly. Just a heads up.

@audreywarne
Copy link
Collaborator

Got it, thanks @Erin-Cecele !

@audreywarne
Copy link
Collaborator

I'm running into an error when I try to preview. Any advice @geealbers ?

Audreys-MacBook:egypt-classical-world audreywarne$ quire preview
Launching preview server
ℹ Navigate to http://localhost:1313 to see your changes.
ℹ Press Control+C or type "quire stop" to stop the preview.
node:events:368
throw er; // Unhandled 'error' event
^

Error: spawn node_modules/.bin/webpack ENOENT
at Process.ChildProcess._handle.onexit (node:internal/child_process:282:19)
at onErrorNT (node:internal/child_process:475:16)
at processTicksAndRejections (node:internal/process/task_queues:83:21)
Emitted 'error' event on ChildProcess instance at:
at Process.ChildProcess._handle.onexit (node:internal/child_process:288:12)
at onErrorNT (node:internal/child_process:475:16)
at processTicksAndRejections (node:internal/process/task_queues:83:21) {
errno: -2,
code: 'ENOENT',
syscall: 'spawn node_modules/.bin/webpack',
path: 'node_modules/.bin/webpack',
spawnargs: [
'--watch',
'-d',
'--progress',
'--color',
'--config',
'webpack/webpack.config.dev.js'
]
}

@audreywarne
Copy link
Collaborator

@Erin-Cecele How would you like me to both replace and keep the references section? Should I make a copy like I've done with essay 7 and make the edits on the copied page?

Convert bibliography with regex and replace in references.yml (issue Tag author date references and format references.yml entries #14)

Keep original version of references.yml

@Erin-Cecele
Copy link
Contributor Author

@audreywarne if this is your first time previewing this project, run 'quire install' before 'quire preview'.

@Erin-Cecele
Copy link
Contributor Author

Erin-Cecele commented Dec 16, 2021

@audreywarne or you can just cut-and-paste all the chapter 7 references and save them wherever makes the most sense for you. I think the only reason I suggested keeping it was because of the one hieroglyph image that will need to corrected - Spalinger 2015.

@audreywarne
Copy link
Collaborator

Thanks for clarifying my references questions. I ran quire install and I still had the same error (along with a bunch of errors in the install process).

Terminal Saved Output.pdf
)

@geealbers
Copy link
Member

geealbers commented Dec 16, 2021

@audreywarne for your preview issue, in the Terminal output there's a reference to Node version 17.2.0, which if is what you have installed is too high for Quire and may be causing the issue. Check by running node --version in your Terminal. If it comes back as anything higher than 14.18.1, reinstall Node with this package: https://nodejs.org/download/release/v14.18.1/node-v14.18.1.pkg.

When the install is complete, run npm install --global @thegetty/quire-cli to reinstall Quire, and then in the project, delete the themes/default/node_modules directory and run quire install.

If preview still isn't working after that, or if you had the correct Node version from the start, run quire preview --verbose and share the output. Hopefully there will be more info there we can diagnose.

@audreywarne
Copy link
Collaborator

I'm not seeing the themes/default/node_modules @geealbers
Screen Shot 2021-12-17 at 6 57 36 PM

@audreywarne
Copy link
Collaborator

but I was running the wrong version of node and installed the correct one

@audreywarne
Copy link
Collaborator

@Erin-Cecele Correct any q-cite errors where the q-cite shortcode does not match the references.yml

This is something that needs to be done in preview, correct?

@audreywarne
Copy link
Collaborator

audreywarne commented Dec 18, 2021

@ldizerega should some of the captions end in a period? I noticed none of the captions in the new doc have punctuation but some of the old captions did

@Erin-Cecele
Copy link
Contributor Author

@Erin-Cecele Correct any q-cite errors where the q-cite shortcode does not match the references.yml

This is something that needs to be done in preview, correct?

That is correct, Audrey. You'll catch errors because they'll appear as broken shortcodes in the preview. You should see them when browsing the Notes at the end of each essay.

Is preview working for you now that you installed the correct version of node?

@audreywarne
Copy link
Collaborator

@Erin-Cecele I haven't tried again because I wasn't able to find the document Greg told me to delete. Let me see if it works without deleting it.

@audreywarne
Copy link
Collaborator

it's working now! I will review the q cite short codes and any other errors in the morning!

@audreywarne
Copy link
Collaborator

Swetnam-Burland 2011 isn't being recognized on the essay page but that same short code is in the references—any advice? I copied and pasted the text from the references to make sure there weren't any hidden characters, but no luck.

@audreywarne
Copy link
Collaborator

Okay I fixed all the errors I could see, it was some sort of hidden character I guess.

@audreywarne audreywarne mentioned this issue Dec 18, 2021
@Erin-Cecele
Copy link
Contributor Author

Closed with PR #46. Thank you @audreywarne for all your amazing work!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

4 participants