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.

Sign up for GitHub

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

Jump to bottom

Revise and define div/@subtype values #300

Merged
merged 47 commits into from
Jan 18, 2022
Merged

Revise and define div/@subtype values #300

merged 47 commits into from
Jan 18, 2022

Conversation

WaxCylinderRevival
Copy link
Member

Re: issue #299

@WaxCylinderRevival
Remove div/@subtype="undetermined"
c20e7d2 
Format and indent
@WaxCylinderRevival
Remove div/@subtype="undetermined"
c333802 
Format and indent
@WaxCylinderRevival
Remove div/@subtype="undetermined"
20843e0 
Format and indent
@WaxCylinderRevival
Add div/@subtype="graphic-materials" as valid attribute value
95f9ce8
@WaxCylinderRevival
Format and indent
4d21d5f
@WaxCylinderRevival
Replace div/@subtyoe="chapter-introduction" with "editorial-note"
747a8ba 
Format and indent

---
Note: I had debated adding a more general "introduction" so the subtype could be used where appropriate at any level (section/subsection/comp/chapter/subchapter) but the content is appropriate to be returned on "editorial-note" queries and "editorial-note" would be suitable at any level (section/subsection/comp/chapter/subchapter) in addition to document.  If, however, @joewiz disagrees, I am happy to change to "introduction" or another term.
@WaxCylinderRevival
Add div/@subtype="subsection" as valid attribute value
1b4e1da 
Format and indent
@WaxCylinderRevival
Replace div/@subtype="event" with "subsection"
3b4b020 
Format and indent
@WaxCylinderRevival
Add div/@subtype="section" as valid attribute value
520565f 
Format and indent
@WaxCylinderRevival
Change to div/@subtype="section" to improve nesting
5c045fc 
Format and indent
@WaxCylinderRevival
Add div/@subtype="note-on-covert-actions" as valid attribute value
71007e5 
Format and indent
@WaxCylinderRevival
Convert div/@subtype to "editorial-note"
1b15047 
Format and indent
@WaxCylinderRevival
Convert to div/@subtype="graphic-materials"
f2dc12f 
Format and indent
@WaxCylinderRevival
Convert div/@subtype="notes" to "editorial-note" or "note-on-covert-a…
df22ca9 
…ctions"

Format and indent
@WaxCylinderRevival
Format and indent
49c28a2
@WaxCylinderRevival
Format and indent
6110c08
@WaxCylinderRevival
Deprecate div/@subtype = 'historian-statement', 'maps', 'notes'
9f5fcac 
Format and indent
@WaxCylinderRevival
Add div/@subtype = 'map-or-chart'; convert 'graphic-materials' to 'gr…
0ec44ae 
…aphic-material'

Format and indent
@WaxCylinderRevival
Convert div/@subtype to 'map-or-chart'
36b8003 
Format and indent
@WaxCylinderRevival
Add/remove div/@subtype values; Update descriptions
df280bc 
Format and indent
@WaxCylinderRevival
Add description to referral
a5bbb50 
Format and indent
@WaxCylinderRevival
Update spelling of acknowledgments
c0783b4
@WaxCylinderRevival
Add/covert to div/@subtype="foreword"
2d12946
@WaxCylinderRevival
Add div/@subtype="errata"
6c75fb6
@WaxCylinderRevival
Correct encoding of Foreword and Summary
fb7af39 
Format and indent
@WaxCylinderRevival
Correct encoding of Foreword and Summary
0a3fee8 
Format and indent

---
Volumes needing encoding review:
- frus1964-68v22
- frus1964-68v24
@WaxCylinderRevival
Define editorial-policies
593a7a0 
Format and indent
@WaxCylinderRevival
Remove div/@subtype="related-materials"
d821cdc
@WaxCylinderRevival
Define press-release
1ea9842 
Format and indent
@WaxCylinderRevival
Define table-of-contents
ba357ce 
Format and indent
@WaxCylinderRevival
Define sources
47abe57 
Format and indent
@WaxCylinderRevival
Improve nesting
a9259b6 
Format and indent
@WaxCylinderRevival
Define volume-summary
b466e3a 
Format and indent
@WaxCylinderRevival
Define section and subsection; tweak table-of-contents
5c0eaae 
Format and indent
@WaxCylinderRevival
Change "of volume" to "of the volume" for consistency
41d1936 
Format and indent
@WaxCylinderRevival
Tweak errata desc
4378439 
Format and indent
@WaxCylinderRevival
Define editorial-note
7752f8a 
Format and indent

---
Definition adapted from FRUS Style Guide
@WaxCylinderRevival
Define historical-document
4ca138b 
Format and indent

---
Drew from FRUS Style Guide
@joewiz
Copy link
Member

joewiz commented Jan 11, 2022

@WaxCylinderRevival Re your comment in 747a8ba, I have no objection to merging the chapter-introduction subtype value into editorial-note, as these sections are authored by the editor. Their divs' @type of section distinguishes these from formal editorial notes, i.e., the ones that are given document numbers.

@WaxCylinderRevival
Copy link
Member Author

@joewiz, agreed. Wonderful!

@joewiz
Copy link
Member

joewiz commented Jan 12, 2022 •
edited
Loading

@WaxCylinderRevival Is work ongoing in this branch, or is it ready for review now?

@WaxCylinderRevival
Copy link
Member Author

WaxCylinderRevival commented Jan 12, 2022 •
edited
Loading

@joewiz, ready for you! I folded in the changes you made to the master yesterday (and resolved one conflict) so it would hopefully be easier for you to review.

@joewiz joewiz merged commit 0290213 into master Jan 18, 2022
@joewiz
Copy link
Member

joewiz commented Jan 18, 2022

@WaxCylinderRevival Looks good. Many thanks!

Closes #299

@joewiz joewiz mentioned this pull request Jan 18, 2022
Closed
@WaxCylinderRevival
Copy link
Member Author

Terrific! Thanks, @joewiz

@WaxCylinderRevival WaxCylinderRevival deleted the issue-0299-div-subtype branch January 18, 2022 02:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joewiz joewiz joewiz approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@WaxCylinderRevival @joewiz