diff --git a/Makefile b/Makefile
index d29b475..b3baecf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-STYLES = fonts/Roboto.css fonts/Asset.css fonts/ThroughStruggleDEMO.css fonts/RobotoSlab.css style.css fonts/Tinos.css
+STYLES = fonts/Roboto.css fonts/Asset.css fonts/ThroughStruggleDEMO.css fonts/RobotoSlab.css style.css fonts/Tinos.css fonts/PT_Mono.css fonts/PT_Sans.css fonts/Vollkorn.css
all: index.html $(STYLES)
diff --git a/OEGFMM-2009.png b/OEGFMM-2009.png
new file mode 100644
index 0000000..3d2ab9a
Binary files /dev/null and b/OEGFMM-2009.png differ
diff --git a/fonts/PT_Mono.scss b/fonts/PT_Mono.scss
new file mode 100644
index 0000000..97caf07
--- /dev/null
+++ b/fonts/PT_Mono.scss
@@ -0,0 +1,24 @@
+@mixin font-face($family, $local1, $local2, $rpath, $weight: normal, $style: normal) {
+ $path: "#{$rpath}";
+
+ @font-face {
+ font-family: $family;
+ font-weight: $weight;
+ font-style: $style;
+ /*src: url("#{$path}.eot");*/
+ src: local($local1), local($local2), /*url("#{$path}.eot?#iefix") format("embedded-opentype"),*/ url("#{$path}.woff") format("woff"), url("#{$path}.ttf") format("truetype") /*, url("#{$path}.svg") format("svg")*/;
+ }
+}
+
+@mixin font-face-normal($family, $local1, $local2, $rpath, $weight: normal, $style: normal) {
+ $path: "#{$rpath}";
+
+ @font-face {
+ font-family: $family;
+ /*src: url("#{$path}.eot");*/
+ src: local($local1), local($local2), /*url("#{$path}.eot?#iefix") format("embedded-opentype"),*/ url("#{$path}.woff") format("woff"), url("#{$path}.ttf") format("truetype") /*, url("#{$path}.svg") format("svg")*/;
+ }
+}
+
+@include font-face-normal("PT Mono", "PT Mono Regular", "PTM55F_W", "PT_Mono/PTM55F_W");
+@include font-face-normal("PT Mono", "PT Mono Bold", "PTM75F_W", "PT_Mono/PTM75F_W");
diff --git a/fonts/PT_Mono/PTM55FT.ttf b/fonts/PT_Mono/PTM55FT.ttf
new file mode 100644
index 0000000..f580123
Binary files /dev/null and b/fonts/PT_Mono/PTM55FT.ttf differ
diff --git a/fonts/PT_Mono/PTM55F_W.eot b/fonts/PT_Mono/PTM55F_W.eot
new file mode 100644
index 0000000..8365db6
Binary files /dev/null and b/fonts/PT_Mono/PTM55F_W.eot differ
diff --git a/fonts/PT_Mono/PTM55F_W.svg b/fonts/PT_Mono/PTM55F_W.svg
new file mode 100644
index 0000000..8157397
--- /dev/null
+++ b/fonts/PT_Mono/PTM55F_W.svg
@@ -0,0 +1,798 @@
+
+
+
diff --git a/fonts/PT_Mono/PTM55F_W.ttf b/fonts/PT_Mono/PTM55F_W.ttf
new file mode 100644
index 0000000..35e76a3
Binary files /dev/null and b/fonts/PT_Mono/PTM55F_W.ttf differ
diff --git a/fonts/PT_Mono/PTM55F_W.woff b/fonts/PT_Mono/PTM55F_W.woff
new file mode 100644
index 0000000..179b1f5
Binary files /dev/null and b/fonts/PT_Mono/PTM55F_W.woff differ
diff --git a/fonts/PT_Mono/PTM55F_stylesheet.css b/fonts/PT_Mono/PTM55F_stylesheet.css
new file mode 100644
index 0000000..5c9819f
--- /dev/null
+++ b/fonts/PT_Mono/PTM55F_stylesheet.css
@@ -0,0 +1,15 @@
+/* Generated by ParaType (http://www.paratype.com)*/
+/* Font PT Mono: Copyright © ParaType, 2013. All rights reserved.*/
+
+
+@font-face {
+ font-family: 'PTMonoRegular';
+ src: url('PTM55F_W.eot');
+ src:
+ url('PTM55F_W.eot?#iefix') format('embedded-opentype'),
+ url('PTM55F_W.woff') format('woff'),
+ url('PTM55F_W.ttf') format('truetype'),
+ url('PTM55F_W.svg#PTMono-Regular') format('svg');
+ font-weight: normal;
+ font-style: normal;
+}
\ No newline at end of file
diff --git a/fonts/PT_Mono/PTM75F_W.eot b/fonts/PT_Mono/PTM75F_W.eot
new file mode 100644
index 0000000..2de4486
Binary files /dev/null and b/fonts/PT_Mono/PTM75F_W.eot differ
diff --git a/fonts/PT_Mono/PTM75F_W.svg b/fonts/PT_Mono/PTM75F_W.svg
new file mode 100644
index 0000000..fe4ec14
--- /dev/null
+++ b/fonts/PT_Mono/PTM75F_W.svg
@@ -0,0 +1,798 @@
+
+
+
diff --git a/fonts/PT_Mono/PTM75F_W.ttf b/fonts/PT_Mono/PTM75F_W.ttf
new file mode 100644
index 0000000..6fcf00c
Binary files /dev/null and b/fonts/PT_Mono/PTM75F_W.ttf differ
diff --git a/fonts/PT_Mono/PTM75F_W.woff b/fonts/PT_Mono/PTM75F_W.woff
new file mode 100644
index 0000000..644fb25
Binary files /dev/null and b/fonts/PT_Mono/PTM75F_W.woff differ
diff --git a/fonts/PT_Mono/PTM75F_stylesheet.css b/fonts/PT_Mono/PTM75F_stylesheet.css
new file mode 100644
index 0000000..ad7ade8
--- /dev/null
+++ b/fonts/PT_Mono/PTM75F_stylesheet.css
@@ -0,0 +1,15 @@
+/* Generated by ParaType (http://www.paratype.com)*/
+/* Font PT Mono: Copyright © ParaType, 2013. All rights reserved.*/
+
+
+@font-face {
+ font-family: 'PTMonoBold';
+ src: url('PTM75F_W.eot');
+ src:
+ url('PTM75F_W.eot?#iefix') format('embedded-opentype'),
+ url('PTM75F_W.woff') format('woff'),
+ url('PTM75F_W.ttf') format('truetype'),
+ url('PTM75F_W.svg#PTMono-Bold') format('svg');
+ font-weight: normal;
+ font-style: normal;
+}
\ No newline at end of file
diff --git a/fonts/PT_Sans.scss b/fonts/PT_Sans.scss
new file mode 100644
index 0000000..d292ca0
--- /dev/null
+++ b/fonts/PT_Sans.scss
@@ -0,0 +1,26 @@
+@mixin font-face($family, $local1, $local2, $rpath, $weight: normal, $style: normal) {
+ $path: "#{$rpath}";
+
+ @font-face {
+ font-family: $family;
+ font-weight: $weight;
+ font-style: $style;
+ src: url("#{$path}.eot");
+ src: local($local1), local($local2), url("#{$path}.eot?#iefix") format("embedded-opentype"), url("#{$path}.woff") format("woff"), url("#{$path}.ttf") format("truetype"), url("#{$path}.svg") format("svg");
+ }
+}
+
+@mixin font-face-normal($family, $local1, $local2, $rpath, $weight: normal, $style: normal) {
+ $path: "#{$rpath}";
+
+ @font-face {
+ font-family: $family;
+ src: url("#{$path}.eot");
+ src: local($local1), local($local2), url("#{$path}.eot?#iefix") format("embedded-opentype"), url("#{$path}.woff") format("woff"), url("#{$path}.ttf") format("truetype"), url("#{$path}.svg") format("svg");
+ }
+}
+
+@include font-face-normal("PT Sans", "PT Sans", "PT_Sans-Regular", "PT_Sans/PT_Sans-Regular");
+@include font-face("PT Sans", "PT Sans Bold", "PT_Sans-Bold", "PT_Sans/PT_Sans-Bold", 700);
+@include font-face("PT Sans", "PT Sans Italic", "PT_Sans-Italic", "PT_Sans/PT_Sans-Italic", 400, italic);
+@include font-face("PT Sans", "PT Sans Bold Italic", "PT_Sans-BoldItalic", "PT_Sans/PT_Sans-BoldItalic", 700, italic);
diff --git a/fonts/PT_Sans/PT_Sans-Bold.ttf b/fonts/PT_Sans/PT_Sans-Bold.ttf
new file mode 100644
index 0000000..3d4e6fe
Binary files /dev/null and b/fonts/PT_Sans/PT_Sans-Bold.ttf differ
diff --git a/fonts/PT_Sans/PT_Sans-Bold.woff b/fonts/PT_Sans/PT_Sans-Bold.woff
new file mode 100644
index 0000000..1ba6b90
Binary files /dev/null and b/fonts/PT_Sans/PT_Sans-Bold.woff differ
diff --git a/fonts/PT_Sans/PT_Sans-BoldItalic.ttf b/fonts/PT_Sans/PT_Sans-BoldItalic.ttf
new file mode 100644
index 0000000..eb61f14
Binary files /dev/null and b/fonts/PT_Sans/PT_Sans-BoldItalic.ttf differ
diff --git a/fonts/PT_Sans/PT_Sans-BoldItalic.woff b/fonts/PT_Sans/PT_Sans-BoldItalic.woff
new file mode 100644
index 0000000..6155efa
Binary files /dev/null and b/fonts/PT_Sans/PT_Sans-BoldItalic.woff differ
diff --git a/fonts/PT_Sans/PT_Sans-Italic.ttf b/fonts/PT_Sans/PT_Sans-Italic.ttf
new file mode 100644
index 0000000..180a5d6
Binary files /dev/null and b/fonts/PT_Sans/PT_Sans-Italic.ttf differ
diff --git a/fonts/PT_Sans/PT_Sans-Italic.woff b/fonts/PT_Sans/PT_Sans-Italic.woff
new file mode 100644
index 0000000..8948232
Binary files /dev/null and b/fonts/PT_Sans/PT_Sans-Italic.woff differ
diff --git a/fonts/PT_Sans/PT_Sans-Regular.ttf b/fonts/PT_Sans/PT_Sans-Regular.ttf
new file mode 100644
index 0000000..83a21b7
Binary files /dev/null and b/fonts/PT_Sans/PT_Sans-Regular.ttf differ
diff --git a/fonts/PT_Sans/PT_Sans-Regular.woff b/fonts/PT_Sans/PT_Sans-Regular.woff
new file mode 100644
index 0000000..1c24e99
Binary files /dev/null and b/fonts/PT_Sans/PT_Sans-Regular.woff differ
diff --git a/fonts/Vollkorn.scss b/fonts/Vollkorn.scss
new file mode 100644
index 0000000..94e5440
--- /dev/null
+++ b/fonts/Vollkorn.scss
@@ -0,0 +1,26 @@
+@mixin font-face($family, $local1, $local2, $rpath, $weight: normal, $style: normal) {
+ $path: "#{$rpath}";
+
+ @font-face {
+ font-family: $family;
+ font-weight: $weight;
+ font-style: $style;
+ src: url("#{$path}.eot");
+ src: local($local1), local($local2), url("#{$path}.eot?#iefix") format("embedded-opentype"), url("#{$path}.woff") format("woff"), url("#{$path}.ttf") format("truetype"), url("#{$path}.svg") format("svg");
+ }
+}
+
+@mixin font-face-normal($family, $local1, $local2, $rpath, $weight: normal, $style: normal) {
+ $path: "#{$rpath}";
+
+ @font-face {
+ font-family: $family;
+ src: url("#{$path}.eot");
+ src: local($local1), local($local2), url("#{$path}.eot?#iefix") format("embedded-opentype"), url("#{$path}.woff") format("woff"), url("#{$path}.ttf") format("truetype"), url("#{$path}.svg") format("svg");
+ }
+}
+
+@include font-face-normal("Vollkorn", "Vollkorn", "Vollkorn-Regular", "Vollkorn/Vollkorn-Regular");
+@include font-face("Vollkorn", "Vollkorn Bold", "Vollkorn-Bold", "Vollkorn/Vollkorn-Bold", 700);
+@include font-face("Vollkorn", "Vollkorn Italic", "Vollkorn-Italic", "Vollkorn/Vollkorn-Italic", 400, italic);
+@include font-face("Vollkorn", "Vollkorn Bold Italic", "Vollkorn-BoldItalic", "Vollkorn/Vollkorn-BoldItalic", 700, italic);
diff --git a/fonts/Vollkorn/Vollkorn-Bold.ttf b/fonts/Vollkorn/Vollkorn-Bold.ttf
new file mode 100644
index 0000000..9d4730f
Binary files /dev/null and b/fonts/Vollkorn/Vollkorn-Bold.ttf differ
diff --git a/fonts/Vollkorn/Vollkorn-Bold.woff b/fonts/Vollkorn/Vollkorn-Bold.woff
new file mode 100644
index 0000000..610c909
Binary files /dev/null and b/fonts/Vollkorn/Vollkorn-Bold.woff differ
diff --git a/fonts/Vollkorn/Vollkorn-BoldItalic.ttf b/fonts/Vollkorn/Vollkorn-BoldItalic.ttf
new file mode 100644
index 0000000..f703559
Binary files /dev/null and b/fonts/Vollkorn/Vollkorn-BoldItalic.ttf differ
diff --git a/fonts/Vollkorn/Vollkorn-BoldItalic.woff b/fonts/Vollkorn/Vollkorn-BoldItalic.woff
new file mode 100644
index 0000000..ffa90a0
Binary files /dev/null and b/fonts/Vollkorn/Vollkorn-BoldItalic.woff differ
diff --git a/fonts/Vollkorn/Vollkorn-Italic.ttf b/fonts/Vollkorn/Vollkorn-Italic.ttf
new file mode 100644
index 0000000..d55c2ee
Binary files /dev/null and b/fonts/Vollkorn/Vollkorn-Italic.ttf differ
diff --git a/fonts/Vollkorn/Vollkorn-Italic.woff b/fonts/Vollkorn/Vollkorn-Italic.woff
new file mode 100644
index 0000000..2ab2cbb
Binary files /dev/null and b/fonts/Vollkorn/Vollkorn-Italic.woff differ
diff --git a/fonts/Vollkorn/Vollkorn-Regular.ttf b/fonts/Vollkorn/Vollkorn-Regular.ttf
new file mode 100644
index 0000000..a913a1b
Binary files /dev/null and b/fonts/Vollkorn/Vollkorn-Regular.ttf differ
diff --git a/fonts/Vollkorn/Vollkorn-Regular.woff b/fonts/Vollkorn/Vollkorn-Regular.woff
new file mode 100644
index 0000000..1d1bc3a
Binary files /dev/null and b/fonts/Vollkorn/Vollkorn-Regular.woff differ
diff --git a/haerte_nach_genre.svg b/haerte_nach_genre.svg
index 49d638b..41b467c 100644
--- a/haerte_nach_genre.svg
+++ b/haerte_nach_genre.svg
@@ -5,9 +5,9 @@
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
- viewBox="0 0 681.25 443.75"
+ viewBox="0 0 620 443.75"
height="443.75"
- width="681.25"
+ width="620"
xml:space="preserve"
version="1.1"
id="svg2">
%img#uni-logo(src="uni_logo_transparent.png")
- %br
- %img#tagungs-logo(src="DAGA2017.png")
- Christian-Albrechts-Universität zu Kiel 6.-9. März 2017
+ %img#tagungs-logo(src="OEGFMM-2009.png")
+ %br<>
+ Internationales Symposium MUSIK ± LEIDENSCHAFT
+ %br<>
+ Universität für Musik und darstellende Kunst Wien
+ %br<>
+ 7. - 8. April 2017
%h1
- Was macht Musik
- hart
?
- Klangliche Merkmale zur genreübergreifenden Identifikation musikalischer Härte
- %p#authors(style="margin-top:0.1em")<>
+ Heavy passion for heavy percussion
+ –
+ akustische Kriterien musikalischer Härte
+ %p#authors<>
%span.author(data-mark="1")<> Isabella Czedik-Eysenberg
%span.author(data-mark="2")<> Denis Knauf
%span.author(data-mark="1")<> Christoph Reuter
@@ -122,13 +131,13 @@
vorhandene Korrelationen mit den Härte
-Werten geprĂĽft, und
es wurde die Konstruktion eines geeigneten Meta-Deskriptors angestrebt.
- %section#ergebnisse1(style="padding-bottom:0.86em")
+ %section#ergebnisse1
%h1 Ergebnisse 1
%p
Probanden mit positiver Präferenz gegenüber harter Musik waren
signifikant häufiger männlich (p < 0.05 laut exaktem Fisher-Test)
und wiesen ein niedrigeres Alter auf (p = 0.01 laut t-Test).
- %figure.fifty(style="width:48%")
+ %figure.fifty(style="width:48%")<>
%img{src: "durchschnittsbewertung_nach_praeferenz.svg"}
%p
Jene Hart-Hörer
bewerteten Stimuli im Durchschnitt signifikant
@@ -138,7 +147,7 @@
#column2
%section#ergebnisse2
%h1 Ergebnisse 2
- %figure.fifty
+ %figure.fifty(style="margin-right:0;margin-bottom:-0.75em")<>
%img(src="haerte_nach_genre.svg")
%p Die Härte-Urteile wiesen eine starke Abhängigkeit von dem Genre der Stimuli auf.
%p
@@ -161,7 +170,7 @@
Envelope Flatness|0.50|< 0.01
Low Frequency Ratio|0.48|< 0.01
Inharmonicity|0.25|< 0.05
- %p(style="margin-top:4.5em")
+ %p(style="clear:right;margin-top:6em")
Nach Analyse der klanglichen Eigenschaften zeigt sich, dass eine
Kombination aus der Intensität perkussiver Signalkomponenten
und dem Gesangsstil gut zur Beschreibung musikalischer Härte
@@ -169,18 +178,18 @@
Ein entsprechender mittels multipler linearer Regression gewonnener
Meta-Deskriptor korreliert stark mit den Bewertungen der
Versuchspersonen (r = 0.88, p < 0.01).
- %figure.fifty(style="clear:left;width:65%")
+ %figure.fifty(style="width:65%;margin-right:0em;margin-top:0")<>
%img(src="haerte_percussiveEnergy_Gesangsstil.svg")
%p(style="clear:left")
Nachweisen lässt sich auch eine flachere Hüllkurve im Falle der als
- härter bewerteten Musikbeispiele (r = 0.50, p < 0.01).
- %figure(style="width:34%;float:left;margin: 1em 0")
+ härter bewerteten Musikbeispiele (r = 0.50, p < 0.01).
+ %figure(style="width:34%;float:left;margin: 1em 0")<>
%img(src="stevens_envelope.svg" style="width:100%")
%img(src="marduk_envelope.svg" style="width:100%;margin-top:0.5em")
- %div(style="height:0;clear:both")
- %figure.fifty(style="clear:both;margin:0")
+ -#%div(style="height:0;clear:both")
+ %figure.fifty(style="margin:0;margin-right:-1.75em")<>
%img(src="haerte_ts_perc_lowcentroid_khz2-4energy_mit_legende_neu2.svg")
- %p()
+ %p(style="clear:left")
Aus der Menge der automatisiert extrahierten Signaleigenschaften
wurden mittels partieller Korrelationen die perkussive
Energie, die Intensität der Signalkomponenten zwischen 2
@@ -191,7 +200,7 @@
Auch der auf diese Weise vollständig automatisiert extrahierbare
Härte-Deskriptor weist eine starke Korrelation mit den von
Versuchspersonen abgegebenen Härte-Bewertungen auf (r = 0.86, p < 0.01).
- %figure(style="clear:left;width:35%;float:left;margin:1em 1em 1em 0")
+ %figure(style="clear:left;width:35%;float:left;margin: 0.5em -0.5em 0.5em 0")<>
%img(src="metadeskriptor_korr2.svg")
%p(style="clear:right")
Die Auswahl der für die Härtewahrnehmung relevanten akustischen
@@ -206,7 +215,7 @@
zuzukommen scheint (r = 0.90, p < 0.01).
.clear
- %section#schlussfolgerungen
+ %section#schlussfolgerungen(style="padding-bottom:0.7em")
%h1 Schlussfolgerungen
%p
Die in der Literatur und seitens der Versuchspersonen genannten
diff --git a/style.scss b/style.scss
index a8b5561..3ff8179 100644
--- a/style.scss
+++ b/style.scss
@@ -4,12 +4,12 @@
}
}
-#uni-logo {
+/*#uni-logo {
zoom: 0.9;
-}
-#tagungs-logo {
+}*/
+/*#tagungs-logo {
float: left
-}
+}*/
#nurtext {
&, * {
@@ -45,10 +45,10 @@ html {
header {
h1 {
margin: 0 {
- bottom: 0.5rem;
+ //bottom: 0.5rem;
};
padding: 0;
- font-size: 2.4rem;
+ font-size: 2.3rem;
text-align: center;
}
@@ -81,18 +81,25 @@ header, main, footer {
footer {
padding-top: 0.5em;
+ section {
+ padding: 2.25rem 0.5rem 0.25rem 0.5rem;
+ h1:first-child {
+ margin: (-2.25rem) -0.5rem 0.25rem -0.5rem;
+ }
+ }
}
body {
margin: 0;
background: url(brushed-metal.new.svg);
color: black;
- font-family: "Roboto";
+ font-family: "PT Sans";
}
/*img
* filter: url("#rauschen") */
section {
+ line-height: 1.2em;
margin: 1rem 0 0 0;
padding: 2.5rem 1rem 0.5rem 1rem;
border-radius: 0 0 0.5rem 0.5rem;
@@ -105,7 +112,7 @@ section {
&:before {
z-index: -1;
- background: linear-gradient(rgba(67, 148, 160, 0.8) 2.2rem, rgba(256, 256, 256, 0.8) 2.2rem);
+ background: linear-gradient(rgba(147, 18, 0, 0.8) 2.2rem, rgba(256, 256, 256, 0.8) 2.2rem);
content: "";
border-radius: 0.5rem 2rem 0.5rem 0.5rem;
position: absolute;
@@ -122,6 +129,8 @@ section {
//border-bottom: 0.3rem solid black
//border-radius: 0.18rem 1.68rem 0 0
font-size: 1.5rem;
+ color: white;
+ line-height: normal;
//border-radius: 0.5rem 2rem 0 0
padding: 0.1em 0.5rem;
@@ -185,11 +194,16 @@ quellen {
}
.logos {
- width: 19em;
- float: right;
+ width: 25rem;
+ height: 10rem;
+ //float: right;
+ line-height: 1.0em;
+ text-align: right;
img {
height: 4em;
+ margin-left: 0.2em;
+ margin-bottom: 0.2em;
//margin: 0.3em;
}
}
@@ -199,7 +213,7 @@ q {
}
h1 {
- font-family: "Tinos";
+ font-family: "Vollkorn";
//font-weight: normal;
}
@@ -222,7 +236,7 @@ li p:first-child:last-child {
}
feature {
- font-family: monospace;
+ font-family: "PT Mono", monospace;
font-size: 0.9em;
}
@@ -256,7 +270,7 @@ main {
&.fifty {
float: right;
- width: 50%;
+ width: 47%;
clear: right;
}
@@ -357,3 +371,14 @@ ul.literatur {
}
}
}
+
+.HART {
+ line-height: 0.9em;
+ vertical-align: top;
+ & > * {
+ font-family: "Through Struggle";
+ font-weight: 400;
+ color: #500;
+ text-shadow: 0.5em 1em 0.2em rgba(85,0,0,0.3);
+ }
+}