From b2332083146dc0a2f0d735003bf85a7251f4a9f1 Mon Sep 17 00:00:00 2001 From: Peter Stadler Date: Thu, 15 Jun 2023 15:41:36 +0200 Subject: [PATCH 1/2] fix font paths #145 --- style/mei_to_html.css | 18 +++++++++--------- style/mei_to_html_print.css | 20 ++++++++++---------- style/mei_to_html_public.css | 18 +++++++++--------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/style/mei_to_html.css b/style/mei_to_html.css index 47aa3aa8..74c1c407 100644 --- a/style/mei_to_html.css +++ b/style/mei_to_html.css @@ -379,22 +379,22 @@ div.MEI_score { /* Unicode music symbols font */ @font-face { font-family: 'Bravura Text'; - src: url('/editor/style/fonts/BravuraText.eot'); + src: url('/resources/css/fonts/BravuraText.eot'); src: local('Bravura Text'), - url('/editor/style/fonts/BravuraText.eot?#iefix') format('embedded-opentype'), - url('/editor/style/fonts/BravuraText.woff') format('woff'), - url('/editor/style/fonts/BravuraText.svg#BravuraText') format('svg'); + url('/resources/css/fonts/BravuraText.eot?#iefix') format('embedded-opentype'), + url('/resources/css/fonts/BravuraText.woff') format('woff'), + url('/resources/css/fonts/BravuraText.svg#BravuraText') format('svg'); } /* Runic font */ @font-face { font-family: 'Hnias'; - src: url('/editor/style/fonts/Hnias.eot'); + src: url('/resources/css/fonts/Hnias.eot'); src: local('Hnias Regular'), local('Hnias'), - url('/editor/style/fonts/Hnias.eot?#iefix') format('embedded-opentype'), - url('/editor/style/fonts/Hnias.ttf') format('truetype'), - url('/editor/style/fonts/Hnias.woff') format('woff'), - url('/editor/style/fonts/Hnias.svg#Hnias') format('svg'); + url('/resources/css/fonts/Hnias.eot?#iefix') format('embedded-opentype'), + url('/resources/css/fonts/Hnias.ttf') format('truetype'), + url('/resources/css/fonts/Hnias.woff') format('woff'), + url('/resources/css/fonts/Hnias.svg#Hnias') format('svg'); } /* End embedded fonts */ diff --git a/style/mei_to_html_print.css b/style/mei_to_html_print.css index 34511a51..a3cbf737 100644 --- a/style/mei_to_html_print.css +++ b/style/mei_to_html_print.css @@ -268,22 +268,22 @@ table.source_component_list td.label_cell { /* Unicode music symbols font */ @font-face { font-family: 'Bravura Text'; - src: url('/editor/style/fonts/BravuraText.eot'); + src: url('/resources/css/fonts/BravuraText.eot'); src: local('Bravura Text'), - url('/editor/style/fonts/BravuraText.eot?#iefix') format('embedded-opentype'), - url('/editor/style/fonts/BravuraText.woff') format('woff'), - url('/editor/style/fonts/BravuraText.svg#BravuraText') format('svg'); + url('/resources/css/fonts/BravuraText.eot?#iefix') format('embedded-opentype'), + url('/resources/css/fonts/BravuraText.woff') format('woff'), + url('/resources/css/fonts/BravuraText.svg#BravuraText') format('svg'); } /* Runic font */ @font-face { font-family: 'Hnias'; - src: url('/editor/style/fonts/Hnias.eot'); - src: local('/editor/style/Hnias Regular'), local('Hnias'), - url('/editor/style/fonts/Hnias.eot?#iefix') format('embedded-opentype'), - url('/editor/style/fonts/Hnias.ttf') format('truetype'), - url('/editor/style/fonts/Hnias.woff') format('woff'), - url('/editor/style/fonts/Hnias.svg#Hnias') format('svg'); + src: url('/resources/css/fonts/Hnias.eot'); + src: local('Hnias Regular'), local('Hnias'), + url('/resources/css/fonts/Hnias.eot?#iefix') format('embedded-opentype'), + url('/resources/css/fonts/Hnias.ttf') format('truetype'), + url('/resources/css/fonts/Hnias.woff') format('woff'), + url('/resources/css/fonts/Hnias.svg#Hnias') format('svg'); } /* End embedded fonts */ diff --git a/style/mei_to_html_public.css b/style/mei_to_html_public.css index 2408e218..6ad61d51 100644 --- a/style/mei_to_html_public.css +++ b/style/mei_to_html_public.css @@ -335,22 +335,22 @@ table.source_component_list td.label_cell { /* Unicode music symbols font */ @font-face { font-family: 'Bravura Text'; - src: url('/editor/style/fonts/BravuraText.eot'); + src: url('/resources/css/fonts/BravuraText.eot'); src: local('Bravura Text'), - url('/editor/style/fonts/BravuraText.eot?#iefix') format('embedded-opentype'), - url('/editor/style/fonts/BravuraText.woff') format('woff'), - url('/editor/style/fonts/BravuraText.svg#BravuraText') format('svg'); + url('/resources/css/fonts/BravuraText.eot?#iefix') format('embedded-opentype'), + url('/resources/css/fonts/BravuraText.woff') format('woff'), + url('/resources/css/fonts/BravuraText.svg#BravuraText') format('svg'); } /* Runic font */ @font-face { font-family: 'Hnias'; - src: url('/editor/style/fonts/Hnias.eot'); + src: url('/resources/css/fonts/Hnias.eot'); src: local('Hnias Regular'), local('Hnias'), - url('/editor/style/fonts/Hnias.eot?#iefix') format('embedded-opentype'), - url('/editor/style/fonts/Hnias.ttf') format('truetype'), - url('/editor/style/fonts/Hnias.woff') format('woff'), - url('/editor/style/fonts/Hnias.svg#Hnias') format('svg'); + url('/resources/css/fonts/Hnias.eot?#iefix') format('embedded-opentype'), + url('/resources/css/fonts/Hnias.ttf') format('truetype'), + url('/resources/css/fonts/Hnias.woff') format('woff'), + url('/resources/css/fonts/Hnias.svg#Hnias') format('svg'); } /* End embedded fonts */ From 374045c40c526481d288c667164af025f384e129 Mon Sep 17 00:00:00 2001 From: Peter Stadler Date: Wed, 21 Jun 2023 16:35:02 +0200 Subject: [PATCH 2/2] check for element content in addition to the attributes `@count`, `@unit`, and `@sym`. This will then simply output the metre text as suggested in the MerMEId help text --- style/mei_to_html.xsl | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/style/mei_to_html.xsl b/style/mei_to_html.xsl index 098d02ca..2e7a483a 100644 --- a/style/mei_to_html.xsl +++ b/style/mei_to_html.xsl @@ -749,9 +749,7 @@ - - - + @@ -849,9 +847,7 @@ - - - + @@ -1105,7 +1101,7 @@ - + :