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

Issue298 #31

Open
wants to merge 307 commits into
base: master
Choose a base branch
from
Open

Issue298 #31

wants to merge 307 commits into from

Conversation

wsalesky
Copy link
Contributor

@wsalesky wsalesky commented Jul 21, 2017

Resolves conflicts introduced by DCLP customizations.
Merge conflicts found in the following (resolved by hand):

pn-xslt/MakeHTML.xsl
pn-xslt/metadata.xsl
pn-xslt/metadata-dclp.xsl
pn-mapping/project.clj
pn-mapping/src/info/papyri/map.clj

See specific commits for more details on changes.

paregorios and others added 30 commits July 18, 2014 14:03
…or or title is missing from an ancient edition element
resolves Issue33: regression error in pn-xslt commit db0f635
resolves issue 35: add support for properly serializing license information from XML
…es of code; regularized handling of spaces and punctuation and added trapping for sparse data
resolved issue 36: formatting in custodial events
…or intermittent appearance of semicolons in source data for fragment ids so our output looks uniform; applied that fix also to the corresponding fragments listings in custodial events
resolved issue 37: fragment listings need separation punctuation
…mplate can be used outside the bibliography master page
… the bibliographic citations in our reference citation section
resolved issue 39: serialization of reference edition bibliography has odd whitespace handling
resolved issue 22: support Book Form, No. of Columns, No. of Lines, No. of Pages on a single line in metadata transform
…der to get Solr indexing to work right, since hcayless has made changes.
paregorios and others added 29 commits June 1, 2017 15:42
Add Title Display functionality
Handle "outdent" and "indent"
Improve principal edition display
…hat they can be reused elsewhere (e.g., for HTML page heading) without the table structure used in the metadata section
Add to heading: P.Herc numbers and substantive principal edition citations
implement ordering and grouping of editions bibliography
hcayless pushed a commit that referenced this pull request Jan 8, 2019
handle principal edition in header and metadata with more nuance
fixes DCLP/dclpxsltbox#316
fixes DCLP/dclpxsltbox#31
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

Successfully merging this pull request may close these issues.

6 participants