Skip to content

Commit

Permalink
Merge pull request #167 from Edirom/issue-145
Browse files Browse the repository at this point in the history 
Thanks @peterprovaznik
  • Loading branch information
@daniel-jettka
daniel-jettka authored Nov 15, 2023
2 parents 056f814 + 374045c commit 864b234
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 35 deletions.
18 changes: 9 additions & 9 deletions style/mei_to_html.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down
10 changes: 3 additions & 7 deletions style/mei_to_html.xsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -749,9 +749,7 @@
</xsl:apply-templates>
<!-- meter, key, incipit – only relevant at this level in single movement works -->
<xsl:apply-templates select="m:tempo[text()]"/>
<xsl:if test="m:meter[normalize-space(concat(@count,@unit,@sym))]">
<xsl:apply-templates select="m:meter"/>
</xsl:if>
<xsl:apply-templates select="m:meter"/>
<xsl:apply-templates select="m:key[normalize-space(concat(@pname,@accid,@mode,string(.)))]"/>
<xsl:apply-templates select="m:extent"/>
<xsl:apply-templates select="m:incip"/>
Expand Down Expand Up @@ -849,9 +847,7 @@
</xsl:if>
</xsl:if>
<xsl:apply-templates select="m:tempo[text()]"/>
<xsl:if test="m:meter[normalize-space(concat(@count,@unit,@sym))]">
<xsl:apply-templates select="m:meter"/>
</xsl:if>
<xsl:apply-templates select="m:meter"/>
<xsl:apply-templates select="m:key[normalize-space(concat(@pname,@accid,@mode,string(.)))]"/>
<xsl:apply-templates select="m:extent"/>
<xsl:apply-templates select="m:incip"/>
Expand Down Expand Up @@ -1105,7 +1101,7 @@
</xsl:for-each>
</xsl:template>

<xsl:template match="m:meter">
<xsl:template match="m:meter[normalize-space(concat(@count,@unit,@sym,.))]">
<xsl:if test="position() = 1">
<span class="label">
<xsl:value-of select="$l/metre"/>: </span>
Expand Down
20 changes: 10 additions & 10 deletions style/mei_to_html_print.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down
18 changes: 9 additions & 9 deletions style/mei_to_html_public.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down

0 comments on commit 864b234

Please sign in to comment.