Skip to content

Closer structure and typography #293

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

Draft
vak2ve wants to merge 34 commits into
base: master
Choose a base branch
from
Draft

Closer structure and typography #293

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
353bc2d
closer edits based on new guidelines
vak2ve Nov 9, 2021
ec1f07b
Update frus1981-88v05.xml
vak2ve Nov 11, 2021
0150d42
Revert "Update frus1981-88v05.xml"
vak2ve Nov 12, 2021
240fa19
Update frus1981-88v05.xml
vak2ve Nov 12, 2021
230ac6a
Start of a query for batch fixing signatures
joewiz Nov 15, 2021
38571e4
Update fix-signatures.xq
vak2ve Nov 16, 2021
7be5ebd
Update fix-signatures.xq
vak2ve Nov 16, 2021
37547a7
Update fix-signatures.xq
vak2ve Nov 17, 2021
0a31638
renamed xquery for signature fixes
vak2ve Nov 17, 2021
2cc39a5
Update fix-signature-structure.xq
vak2ve Nov 18, 2021
7113789
Update fix-signature-structure.xq
vak2ve Nov 19, 2021
7fb5180
Update fix-signature-structure.xq
vak2ve Nov 23, 2021
fb06390
add a function to prevent saxon adding namespaces
joewiz Nov 23, 2021
08cdf9e
minor edits
vak2ve Nov 23, 2021
9441687
Update frus1861.xml
vak2ve Nov 24, 2021
81a0132
xquery scripts and schematron warnings tests
vak2ve Dec 1, 2021
e1fb075
Add signature block checks
joewiz Dec 1, 2021
c20ea71
Review rules, add before/after documentation
joewiz Dec 1, 2021
4a68fec
updates to Reagan files
vak2ve Dec 1, 2021
8877173
fixes from review
vak2ve Dec 3, 2021
9283524
Add test file
joewiz Dec 6, 2021
2ea9653
Relax wording of warning
joewiz Dec 6, 2021
68600f0
Add xspec for signature block checks
joewiz Dec 6, 2021
a9453a4
Update fix-signature-structure.xq
vak2ve Dec 6, 2021
0a52fa8
Use copy-namespaces declaration
joewiz Dec 6, 2021
2e34b8b
Delete expression causing over-eager persName
joewiz Dec 6, 2021
d347157
Improve descriptions and examples
joewiz Dec 6, 2021
ba8f122
Fix placement of closer's attributes
joewiz Dec 6, 2021
dca0527
Add a "debug" mode to track behavior of rules
joewiz Dec 6, 2021
fa01620
Add a rule to fix signed without child persName
joewiz Dec 6, 2021
ae4cd2f
Add whitespace inside newly nested elements
joewiz Dec 6, 2021
e7d2425
Remove unnecessary attribute from documentation
joewiz Dec 6, 2021
4c95dbd
Update frus1981-88v11.xml
vak2ve Dec 7, 2021
818b830
frus-xspec updates ongoing
vak2ve Dec 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions schema/fix-signature-structure.xq
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,24 @@ after:

:)

for $signed in $vol//tei:closer//tei:signed[not(descendant::tei:persName)]

return
replace node $signed
with
element
{QName("http://www.tei-c.org/ns/1.0", "signed")}
{
element
{ QName("http://www.tei-c.org/ns/1.0", "persName") }
{
$signed/@*,
local:reconstruct-node($signed/node())
}
}

,

for $hi in $vol//tei:signed//tei:hi[@rend="strong"][not(parent::tei:persName)]
return
replace node $hi with
Expand Down
31 changes: 9 additions & 22 deletions volumes/frus1981-88v03.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,28 +247,15 @@
January 1981 until January 1983.</p>
<closer>
<signed><persName>
<hi xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:frus="http://history.state.gov/frus/ns/1.0" rend="strong">Adam
M. Howard, Ph.D.</hi>
<lb xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:frus="http://history.state.gov/frus/ns/1.0"/>
<affiliation xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:frus="http://history.state.gov/frus/ns/1.0">
<hi rend="italic">General Editor</hi>
</affiliation>
</persName></signed>
<lb/>
<signed><persName>
<hi xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:frus="http://history.state.gov/frus/ns/1.0" rend="strong"
>Stephen P. Randolph, Ph.D.</hi>
<lb xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:frus="http://history.state.gov/frus/ns/1.0"/>
<affiliation xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:frus="http://history.state.gov/frus/ns/1.0">
<hi rend="italic">The Historian</hi>
</affiliation>
</persName></signed>
<hi rend="strong">Adam M. Howard, Ph.D.</hi></persName>
<lb/>
<hi rend="italic">General Editor</hi>
<lb/>
<persName>
<hi rend="strong">Stephen P. Randolph, Ph.D.</hi></persName>
<lb/>
<hi rend="italic">The Historian</hi>
</signed>
<lb/>
<orgName>Bureau of Public Affairs</orgName>
<lb/>
Expand Down
4 changes: 1 addition & 3 deletions volumes/frus1981-88v05.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37356,9 +37356,7 @@
boost to the Soviet political offensive against our <gloss
target="#t_SDI_1">SDI</gloss> program.</p></quote>
<closer>
<signed><persName><hi rend="strong">Fred C. Ikle<note
xmlns:frus="http://history.state.gov/frus/ns/1.0"
xmlns:xi="http://www.w3.org/2001/XInclude" n="6"
<signed><persName><hi rend="strong">Fred C. Ikle<note n="6"
xml:id="d148fn6">Printed from a copy that bears this
typed signature.</note></hi></persName></signed>
Comment thread
vak2ve marked this conversation as resolved.
Outdated
</closer>
Expand Down
10 changes: 4 additions & 6 deletions volumes/frus1981-88v06.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4154,12 +4154,10 @@
the public in the <gloss target="#t_US_2">U.S.</gloss> and overseas. (S)</p>
<p>FOR THE PRESIDENT:</p>
<closer>
<signed><persName><hi rend="strong">John<note
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:frus="http://history.state.gov/frus/ns/1.0" n="5"
xml:id="d5fn5">Printed from a copy that bears this
handwritten signature.</note>
</hi></persName></signed>
<signed><persName corresp="#p_PJM_1"><hi rend="strong">John</hi><note n="5"
xml:id="d5fn5">Printed from a copy that bears this handwritten
signature.</note>
</persName></signed>
Comment thread
vak2ve marked this conversation as resolved.
Outdated
</closer>
</div>
<pb n="28" facs="0065" xml:id="pg_28"/>
Expand Down
Loading