Skip to content

Commit

Permalink
Merge branch 'main' into fix/arabic-rtl-improvements
Browse files Browse the repository at this point in the history
# Conflicts:
#	packages/widget-reader/src/ReaderWidget.vue
  • Loading branch information
jacobwegner committed Dec 28, 2023
2 parents 6750c50 + d84b3ab commit 4c68524
Show file tree
Hide file tree
Showing 67 changed files with 2,006 additions and 298 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ on:
paths:
- 'packages/**'
- 'src/**'
- .github/workflows/ci-frontend.yml
- .github/workflows/ci.yml
- package.json
- yarn.lock

jobs:

Expand Down
541 changes: 541 additions & 0 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

Large diffs are not rendered by default.

874 changes: 874 additions & 0 deletions .yarn/releases/yarn-3.6.4.cjs

Large diffs are not rendered by default.

115 changes: 114 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,120 @@ All notable changes to this project will be documented in this file.

## Unreleased

- _wip for `0.5.0-beta.1`_
## 0.6.1 (2023-12-2)

## Fixes
- `vue-treant`
- Tweak tree container styles [#84](https://github.com/scaife-viewer/frontend/pull/84)

## 0.6.0 (2023-11-18)

NOTE: Please see [Beyond Translation releases](https://github.com/scaife-viewer/beyond-translation-site/releases) for additional context / information.

Changes in the `0.6.0` release were developed to support features on [scaife.perseus.org](https://scaife.perseus.org), [Beyond Translation](https://beyond-translation.perseus.org) and [Brill's Scholarly Editions](https://scholarlyeditions.brill.com/).

## Fixes
- `common`
- fix style collision with bootstrap in `CustomSelect` component

## Features

- `common`
- Parse text group from URNs

- `reader-alignments-mode`
- Add metadata / attributions to alignments
- Improve "regrouped" alignments display

- `reader-commentaries-mode`
- Adds a new display mode widget that highlights tokens with commentary annotations (useful for app crit or commentary annotations)

- `reader-dictionary-entries-mode`
- Adds a new display mode widget that highlights tokens to show where their lemmas exist as headwords in one or more lexicons, as well as if a particular passage is cited within a lexicon

- `reader-grammatical-entries-mode`
- Adds a display-mode widget that highlights tokens based based on an active grammar entry

- `reader-image-mode`
- Updates the image mode to integrate region of interest data and integrate selections of ROIs with the Scholia widget

- `reader-interlinear-mode`
- Adds toggles to token annotations in the interlinear display mode

- `reader-syntax-trees-mode`
- Integrate transliteration, grammatical entries and glosses

- `reader-tei-fallback-mode`
- Adds a "fallback" reader used to display TEI from Bellum Alexandrinum. [CETEIcean](https://github.com/TEIC/CETEIcean) is used to display the TEI. The content of the TEI documents are **not** made available to the `ReaderToken` components, so highlighting / selection functionality is not available.

- `vue-treant`
- Adds pan / zoom support

- `widget-commentary`
- Shows commentary content and integrates with `reader-commentary-mode`

- `widget-dictionary-entries`
- Improve resolution of clicks on tokens to dictionary headwords
- Improves formatting on entries using [CETEIcean](https://github.com/TEIC/CETEIcean)

- `widget-display-mode`
- Filters available display modes based on annotations for a given CTS Version in ATLAS

- `widget-embed`
- Adds a widget that generates a URL suitable for embedding the SV reader in an iframe.

- `widget-grammatical-entries`
- Shows grammar content and integrates with `reader-grammatical-entries-mode`

- `widget-library`
- Adds alphanumeric sorting and typeahead filtering

- `widget-metadata`
- Add configuration options to show the editor and data repository for a given CTS Version (implemented to credit the Digital Latin Library for [Bellum Alexandrinum](https://catalog.digitallatin.org/dll-work/w4394))

- `widget-morphology`
- Backport of the Morphology widget from scaife.perseus.org

- `widget-passage-lemma-traversal`
- Adds a widget that shows other instances of a given lemma within a CTS Version

- `widget-reader-sv1`
- Backport the `CompiledToken` component from scaife.perseus.org

- `widget-reader`
- Refactor whitespace handling using `spaceAfter` attr (allows for non-whitespace tokenization)
- Integration with `widget-scholia` and `widget-grammatical-entries`

- `widget-scholia`
- Improved interoperability with `reader-image-mode`
- Adds a legend to highlight scholia by kind

- `widget-toc`
- Fix issues from port from scaife-widgets

- `widget-token-annotations`
- Backport of WidgetTokenList from scaife.perseus.org

## 0.5.0-beta (2021-11-16)

### Fixes
- `entity-map`
- Fixes an issue with coordinates X / Y values being flipped

### Features

- `reader-aligments-mode`
- adds a configuration option to highlight unaligned tokens
- add a new "regrouped" token display mode (for Hafez)
- `reader-syntax-trees-mode`
- adds toggles to show / hide word attributes
- improves layout of sentences
- show metadata / attributions
- `widget-named-entities`
- adds attributions support
- `widget-reader`
- adds a configuration option to set RTL languages and CSS variable for Amiri font


## 0.4.1 (2021-03-29)

Expand Down
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,11 @@ yarn install
```
npx lerna add graphql-tag --scope=@scaife-viewer/<package-name>
```

## Release new packages

```
yarn release
```

This will run the [lerna publish command](https://github.com/lerna/lerna/tree/f6e7a13e60fefc523d701efddfcf0ed41a77749b/commands/publish#readme). You will need to be a member of the [scaife-viewer NPM.js organization](https://www.npmjs.com/settings/scaife-viewer/members) to publish new releases.
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
"packages": [
"packages/*"
],
"version": "0.5.0-beta.2"
"version": "0.6.1"
}
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"workspaces": [
"packages/*"
],
"nodeLinker": "node-modules",
"private": true,
"scripts": {
"build": "NODE_ENV=production rollup -c ./build/rollup.config.js",
Expand Down Expand Up @@ -43,10 +44,11 @@
"eslint": "^7.11.0",
"eslint-plugin-prettier": "^3.1.4",
"eslint-plugin-vue": "^7.0.1",
"sass": "1.60.0",
"sass-loader": "^9.0.3",
"vue-router": "^3.4.2",
"vuex": "^3.5.1",
"vuex-router-sync": "^5.0.0"
},
"packageManager": "yarn@2.4.2"
"packageManager": "yarn@3.6.4"
}
4 changes: 2 additions & 2 deletions packages/common/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@scaife-viewer/common",
"version": "0.4.0",
"version": "0.6.0",
"main": "src/index.js",
"publishConfig": {
"access": "public"
Expand All @@ -11,7 +11,7 @@
"@fortawesome/fontawesome-svg-core": "^1.2.28",
"@fortawesome/free-solid-svg-icons": "^5.14.0",
"@fortawesome/vue-fontawesome": "^0.1.8",
"@scaife-viewer/store": "^0.5.0-beta.1",
"@scaife-viewer/store": "^0.6.0",
"lodash.debounce": "^4.0.8"
}
}
2 changes: 1 addition & 1 deletion packages/common/src/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const SCHOLIA_KIND_CHOICES = new Map([
[SCHOLIA_KIND_INTERMARGINAL, 'Intermarginal'],
[SCHOLIA_KIND_INTERIOR, 'Interior'],
[SCHOLIA_KIND_MISC, 'Miscellaneous'],
])
]);

export const SCHOLIA_URN_MAIN = 'urn:cts:greekLit:tlg5026.msA.hmt:';
export const SCHOLIA_URN_EXTERIOR = 'urn:cts:greekLit:tlg5026.msAext.hmt:';
Expand Down
2 changes: 1 addition & 1 deletion packages/entity-map/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@scaife-viewer/entity-map",
"version": "0.5.0-beta.2",
"version": "0.6.0",
"main": "src/index.js",
"publishConfig": {
"access": "public"
Expand Down
8 changes: 4 additions & 4 deletions packages/reader-alignments-mode/package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"name": "@scaife-viewer/reader-alignments-mode",
"version": "0.5.0-beta.1",
"version": "0.6.1",
"main": "src/index.js",
"publishConfig": {
"access": "public"
},
"author": "Eldarion",
"license": "MIT",
"dependencies": {
"@scaife-viewer/common": "^0.4.0",
"@scaife-viewer/store": "^0.5.0-beta.1",
"@scaife-viewer/widget-attributions": "^0.5.0-beta.1",
"@scaife-viewer/common": "^0.6.0",
"@scaife-viewer/store": "^0.6.0",
"@scaife-viewer/widget-attributions": "^0.6.1",
"graphql-tag": "^2.10.3"
}
}
8 changes: 4 additions & 4 deletions packages/reader-commentaries-mode/package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"name": "@scaife-viewer/reader-commentaries-mode",
"version": "0.5.0-beta.2",
"version": "0.6.0",
"main": "src/index.js",
"publishConfig": {
"access": "public"
},
"author": "Eldarion",
"license": "MIT",
"dependencies": {
"@scaife-viewer/common": "^0.4.0",
"@scaife-viewer/store": "^0.5.0-beta.1",
"@scaife-viewer/widget-reader": "^0.5.0-beta.1",
"@scaife-viewer/common": "^0.6.0",
"@scaife-viewer/store": "^0.6.0",
"@scaife-viewer/widget-reader": "^0.6.0",
"graphql-tag": "^2.10.3",
"vue-apollo": "^3.0.4"
}
Expand Down
8 changes: 4 additions & 4 deletions packages/reader-dictionary-entries-mode/package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"name": "@scaife-viewer/reader-dictionary-entries-mode",
"version": "0.5.0-beta.2",
"version": "0.6.0",
"main": "src/index.js",
"publishConfig": {
"access": "public"
},
"author": "Eldarion",
"license": "MIT",
"dependencies": {
"@scaife-viewer/common": "^0.4.0",
"@scaife-viewer/store": "^0.5.0-beta.1",
"@scaife-viewer/widget-reader": "^0.5.0-beta.1",
"@scaife-viewer/common": "^0.6.0",
"@scaife-viewer/store": "^0.6.0",
"@scaife-viewer/widget-reader": "^0.6.0",
"graphql-tag": "^2.10.3",
"vue-apollo": "^3.0.4"
}
Expand Down
8 changes: 4 additions & 4 deletions packages/reader-grammatical-entries-mode/package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"name": "@scaife-viewer/reader-grammatical-entries-mode",
"version": "0.5.0-beta.2",
"version": "0.6.0",
"main": "src/index.js",
"publishConfig": {
"access": "public"
},
"author": "Eldarion",
"license": "MIT",
"dependencies": {
"@scaife-viewer/common": "^0.4.0",
"@scaife-viewer/store": "^0.5.0-beta.1",
"@scaife-viewer/widget-reader": "^0.5.0-beta.1",
"@scaife-viewer/common": "^0.6.0",
"@scaife-viewer/store": "^0.6.0",
"@scaife-viewer/widget-reader": "^0.6.0",
"graphql-tag": "^2.10.3",
"vue-apollo": "^3.0.4"
}
Expand Down
8 changes: 4 additions & 4 deletions packages/reader-image-mode/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@scaife-viewer/reader-image-mode",
"version": "0.5.0-beta.1",
"version": "0.6.0",
"main": "src/index.js",
"publishConfig": {
"access": "public"
Expand All @@ -9,9 +9,9 @@
"license": "MIT",
"dependencies": {
"@fortawesome/free-solid-svg-icons": "^5.14.0",
"@scaife-viewer/common": "^0.4.0",
"@scaife-viewer/store": "^0.5.0-beta.1",
"@scaife-viewer/widget-reader": "^0.5.0-beta.1",
"@scaife-viewer/common": "^0.6.0",
"@scaife-viewer/store": "^0.6.0",
"@scaife-viewer/widget-reader": "^0.6.0",
"graphql-tag": "^2.10.3",
"openseadragon": "^2.4.2",
"vue-apollo": "^3.0.4"
Expand Down
3 changes: 2 additions & 1 deletion packages/reader-image-mode/src/ImageViewer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -272,12 +272,13 @@
location,
});
// eslint-disable-next-line no-new
const userData = {
roi,
};
// eslint-disable-next-line no-new
new OpenSeadragon.MouseTracker({
element,
// eslint-disable-next-line no-unused-vars
clickHandler: event => {
this.$store.dispatch(
`${MODULE_NS}/${HIGHLIGHT_TRANSCRIPTION}`,
Expand Down
8 changes: 4 additions & 4 deletions packages/reader-interlinear-mode/package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"name": "@scaife-viewer/reader-interlinear-mode",
"version": "0.5.0-beta.1",
"version": "0.6.0",
"main": "src/index.js",
"publishConfig": {
"access": "public"
},
"author": "Eldarion",
"license": "MIT",
"dependencies": {
"@scaife-viewer/common": "^0.4.0",
"@scaife-viewer/store": "^0.5.0-beta.1",
"@scaife-viewer/widget-reader": "^0.5.0-beta.1",
"@scaife-viewer/common": "^0.6.0",
"@scaife-viewer/store": "^0.6.0",
"@scaife-viewer/widget-reader": "^0.6.0",
"graphql-tag": "^2.10.3",
"vue-apollo": "^3.0.4"
}
Expand Down
8 changes: 4 additions & 4 deletions packages/reader-metrical-mode/package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"name": "@scaife-viewer/reader-metrical-mode",
"version": "0.5.0-beta.1",
"version": "0.6.0",
"main": "src/index.js",
"publishConfig": {
"access": "public"
},
"author": "Eldarion",
"license": "MIT",
"dependencies": {
"@scaife-viewer/common": "^0.4.0",
"@scaife-viewer/store": "^0.5.0-beta.1",
"@scaife-viewer/widget-reader": "^0.5.0-beta.1",
"@scaife-viewer/common": "^0.6.0",
"@scaife-viewer/store": "^0.6.0",
"@scaife-viewer/widget-reader": "^0.6.0",
"graphql-tag": "^2.10.3",
"vue-apollo": "^3.0.4"
}
Expand Down
10 changes: 5 additions & 5 deletions packages/reader-named-entities-mode/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@scaife-viewer/reader-named-entities-mode",
"version": "0.5.0-beta.2",
"version": "0.6.0",
"main": "src/index.js",
"publishConfig": {
"access": "public"
Expand All @@ -9,10 +9,10 @@
"license": "MIT",
"dependencies": {
"@fortawesome/free-solid-svg-icons": "^5.14.0",
"@scaife-viewer/common": "^0.4.0",
"@scaife-viewer/entity-map": "^0.5.0-beta.2",
"@scaife-viewer/store": "^0.5.0-beta.1",
"@scaife-viewer/widget-reader": "^0.5.0-beta.1",
"@scaife-viewer/common": "^0.6.0",
"@scaife-viewer/entity-map": "^0.6.0",
"@scaife-viewer/store": "^0.6.0",
"@scaife-viewer/widget-reader": "^0.6.0",
"graphql-tag": "^2.10.3",
"vue-apollo": "^3.0.4"
}
Expand Down
Loading

0 comments on commit 4c68524

Please sign in to comment.