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

Bazga merge #172

Merged
merged 102 commits into from
Feb 2, 2022
Merged

Bazga merge #172

merged 102 commits into from
Feb 2, 2022

Conversation

bwbohl
Copy link
Member

@bwbohl bwbohl commented Jan 21, 2022

  • adds Docker based automatic build on pullrequests
  • mardown improvement in README
  • introduces index.xql with CSS injection options
  • adds no-break spaces to lang file de
  • adds missing lang keys to en
  • only show priority and category label in annotation meta if at least one value is present
  • adds localization of categories and priorities
    • fixes annotation previews
  • adds XQDoc to annotation.xqm and edition.xqm
    • introduces source:isSource function
  • adds annotationIcons to openseadragonView
  • some indentation

bwbohl and others added 30 commits February 9, 2021 07:13
change headings markup to hash
Beethoven features

* search for edition and work
* alternatively get source labels from different xpath, but always return a string
* reactivate concordance navigator

all seem plausible to me
change headings markup to hash
add token replacement for app version in expath-pkg
fix to not include build/temp in xar
change headings markup to hash
Before it would fail due to the removed `mei:work/mei:titleStmt`
Before it would fail due to the removed `mei:work/mei:titleStmt`
add MEI 4.0.1 specific isSource test
add MEI 4.0.1 specific call for getLabel
use source:isSource to determine type: source
local:getTextParticipants sourceTitle now calls source:getLable
Update getAnnotationPreviews.xql
change headings markup to hash
make variable names more comprehensive
Before it would fail due to the removed `mei:work/mei:titleStmt`
bwbohl and others added 16 commits June 17, 2021 16:36
* upgrade to xquery 3.0
* use case switch differentiation whether the annotation holds a value one or more in the respective metadatum
* use eutil:gelLanguageString for getting localized labels
reactivate onClick for annotations in openseadragon
fix sizes of inner annot tip elements
fix $annotIDLabel
to run on PR vs develp and main
@bwbohl bwbohl requested a review from riedde January 21, 2022 08:19
@bwbohl
Copy link
Member Author

bwbohl commented Jan 21, 2022

might also close other PRs from BAZ-GA

add/data/xqm/edition.xqm Outdated Show resolved Hide resolved
Copy link
Contributor

@riedde riedde left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had a look and added just some comments and questions. I also tried to understand the js-script changes but I'm not qualified for that ;)

add/data/xqm/source.xqm Outdated Show resolved Hide resolved
add/data/xqm/source.xqm Outdated Show resolved Hide resolved
add/index.xql Show resolved Hide resolved
@riedde
Copy link
Contributor

riedde commented Jan 21, 2022

@bwbohl There was a minor merge conflict. I resolved it. After that the checks startet, but failed. Just for your interest.

fix typo in xqDoc
* also allow MEI 4.0.0 when retrieving mei:manifestation[@singleton] or fetching source label
@bwbohl
Copy link
Member Author

bwbohl commented Feb 2, 2022

tested locally with current EditionExample, seems to work

@bwbohl
Copy link
Member Author

bwbohl commented Feb 2, 2022

tested locally and works with current EditionExample

@bwbohl bwbohl merged commit f7c6d0a into develop Feb 2, 2022
@bwbohl bwbohl deleted the bazga-merge branch February 2, 2022 10:25
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.

3 participants