commit aa65b153b13861eb406f7fc29b9a22cfd08d982a Author: Denis Knauf Date: Tue Feb 28 14:39:54 2017 +0100 init diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4b68470 --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +*.eps +*.pdf +.sass-cache +*.html +fonts/*.css +fonts/*.map +style.css diff --git a/DGM_logo.png b/DGM_logo.png new file mode 100644 index 0000000..ec475c0 Binary files /dev/null and b/DGM_logo.png differ diff --git a/DGM_logo_transparent.png b/DGM_logo_transparent.png new file mode 100644 index 0000000..fb0f2fa Binary files /dev/null and b/DGM_logo_transparent.png differ diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..3498301 --- /dev/null +++ b/Gemfile @@ -0,0 +1,5 @@ +source 'https://rubygems.org/' + +gem 'haml' +gem 'sass' +gem 'kramdown' diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..b702e75 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,19 @@ +GEM + remote: https://rubygems.org/ + specs: + haml (4.0.7) + tilt + kramdown (1.13.1) + sass (3.4.23) + tilt (2.0.6) + +PLATFORMS + ruby + +DEPENDENCIES + haml + kramdown + sass + +BUNDLED WITH + 1.14.5 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..d29b475 --- /dev/null +++ b/Makefile @@ -0,0 +1,17 @@ + +STYLES = fonts/Roboto.css fonts/Asset.css fonts/ThroughStruggleDEMO.css fonts/RobotoSlab.css style.css fonts/Tinos.css + +all: index.html $(STYLES) + +index.html: index.html.haml + @echo HAML $< $@ + @bundle exec haml $< $@.tmp && mv $@.tmp $@ + +%.css: %.scss + @echo SASS $< $@ + @bundle exec sass --sourcemap=none $< $@.tmp && mv $@.tmp $@ + +clean: + rm $(STYLES) index.html + +.PHONY: all clean diff --git a/brushed-metal.is.png b/brushed-metal.is.png new file mode 100644 index 0000000..17d2cc3 Binary files /dev/null and b/brushed-metal.is.png differ diff --git a/brushed-metal.is.svg b/brushed-metal.is.svg new file mode 100644 index 0000000..155a3f8 --- /dev/null +++ b/brushed-metal.is.svg @@ -0,0 +1,83 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/brushed-metal.min.svg b/brushed-metal.min.svg new file mode 100644 index 0000000..439dd98 --- /dev/null +++ b/brushed-metal.min.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/brushed-metal.new.svg b/brushed-metal.new.svg new file mode 100644 index 0000000..ac05b78 --- /dev/null +++ b/brushed-metal.new.svg @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/brushed-metal.old.min.svg b/brushed-metal.old.min.svg new file mode 100644 index 0000000..033d578 --- /dev/null +++ b/brushed-metal.old.min.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/brushed-metal.old.svg b/brushed-metal.old.svg new file mode 100644 index 0000000..bf48737 --- /dev/null +++ b/brushed-metal.old.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/brushed-metal.svg b/brushed-metal.svg new file mode 100644 index 0000000..9dd75a6 --- /dev/null +++ b/brushed-metal.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + diff --git a/durchschnittsbewertung_nach_praeferenz.min.min.svg b/durchschnittsbewertung_nach_praeferenz.min.min.svg new file mode 100644 index 0000000..a031d24 --- /dev/null +++ b/durchschnittsbewertung_nach_praeferenz.min.min.svg @@ -0,0 +1 @@ +33.544.5negativneutralpositivPräferenz gegenüber harter MusikDurchschnittliche Bewertung \ No newline at end of file diff --git a/durchschnittsbewertung_nach_praeferenz.min.svg b/durchschnittsbewertung_nach_praeferenz.min.svg new file mode 100644 index 0000000..2c1df39 --- /dev/null +++ b/durchschnittsbewertung_nach_praeferenz.min.svg @@ -0,0 +1 @@ +33.544.5negativneutralpositivPräferenz gegenüber harter MusikDurchschnittliche Bewertung \ No newline at end of file diff --git a/durchschnittsbewertung_nach_praeferenz.svg b/durchschnittsbewertung_nach_praeferenz.svg new file mode 100644 index 0000000..7f845bc --- /dev/null +++ b/durchschnittsbewertung_nach_praeferenz.svg @@ -0,0 +1,218 @@ + +image/svg+xml3 +3.5 +4 +4.5 +negativneutralpositivPräferenz gegenüber harter Musik +Durchschnittliche Bewertung + diff --git a/fonts/Asset.scss b/fonts/Asset.scss new file mode 100644 index 0000000..a87d263 --- /dev/null +++ b/fonts/Asset.scss @@ -0,0 +1,23 @@ +@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("Asset", "Asset Regular", "Asset-Regular", "Asset/Asset"); diff --git a/fonts/Asset/Asset.ttf b/fonts/Asset/Asset.ttf new file mode 100644 index 0000000..89fd89b Binary files /dev/null and b/fonts/Asset/Asset.ttf differ diff --git a/fonts/Asset/Asset.woff b/fonts/Asset/Asset.woff new file mode 100644 index 0000000..82d845c Binary files /dev/null and b/fonts/Asset/Asset.woff differ diff --git a/fonts/Asset/OFL.txt b/fonts/Asset/OFL.txt new file mode 100644 index 0000000..b88c0e4 --- /dev/null +++ b/fonts/Asset/OFL.txt @@ -0,0 +1,93 @@ +Copyright (c) 2011 by Sorkin Type Co (www.sorkintype.com), +with Reserved Font Name "Asset". +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/fonts/BlackDahlia.scss b/fonts/BlackDahlia.scss new file mode 100644 index 0000000..32b47f5 --- /dev/null +++ b/fonts/BlackDahlia.scss @@ -0,0 +1,23 @@ +@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("Black Dahlia", "Black Dahlia Kerned", "BlackDahlia-Kerned", "BlackDahlia/BlackDahlia-kerned"); diff --git a/fonts/BlackDahlia/BlackDahlia-kerned.ttf b/fonts/BlackDahlia/BlackDahlia-kerned.ttf new file mode 100644 index 0000000..6b2007f Binary files /dev/null and b/fonts/BlackDahlia/BlackDahlia-kerned.ttf differ diff --git a/fonts/BlackDahlia/BlackDahlia-kerned.woff b/fonts/BlackDahlia/BlackDahlia-kerned.woff new file mode 100644 index 0000000..b245574 Binary files /dev/null and b/fonts/BlackDahlia/BlackDahlia-kerned.woff differ diff --git a/fonts/BlackDahlia/Read_Me.txt b/fonts/BlackDahlia/Read_Me.txt new file mode 100644 index 0000000..1bcc868 --- /dev/null +++ b/fonts/BlackDahlia/Read_Me.txt @@ -0,0 +1,12 @@ +Font usage: Personal use only, no commercial use allowed +Distributed by: Font Monger + +You may not edit this font +You may not rename this font +You may not repackage, distribute, or sale this font +You may not use this font in multimedia, tv, applications, video games, or film. + + +For a commercial use license visit: +http://www.fontmonger.com + diff --git a/fonts/Roboto.scss b/fonts/Roboto.scss new file mode 100644 index 0000000..7b119fa --- /dev/null +++ b/fonts/Roboto.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("Roboto", "Roboto", "Roboto-Regular", "Roboto/Roboto-Regular"); +@include font-face("Roboto", "Roboto Bold", "Roboto-Bold", "Roboto/Roboto-Bold", 700); +@include font-face("Roboto", "Roboto Italic", "Roboto-Italic", "Roboto/Roboto-Italic", 400, italic); +@include font-face("Roboto", "Roboto Bold Italic", "Roboto-BoldItalic", "Roboto/Roboto-BoldItalic", 700, italic); diff --git a/fonts/Roboto/Roboto-Black.eot b/fonts/Roboto/Roboto-Black.eot new file mode 100644 index 0000000..9dc4d47 Binary files /dev/null and b/fonts/Roboto/Roboto-Black.eot differ diff --git a/fonts/Roboto/Roboto-Black.svg b/fonts/Roboto/Roboto-Black.svg new file mode 100644 index 0000000..ae626c0 --- /dev/null +++ b/fonts/Roboto/Roboto-Black.svg @@ -0,0 +1,1811 @@ + + +!"#$%&'()*+,-./0123456789:;å<>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_` abcdefghijklmnopqrstuvwxyz|{}~ \ No newline at end of file diff --git a/fonts/Roboto/Roboto-Black.ttf b/fonts/Roboto/Roboto-Black.ttf new file mode 100644 index 0000000..fbde625 Binary files /dev/null and b/fonts/Roboto/Roboto-Black.ttf differ diff --git a/fonts/Roboto/Roboto-Black.woff b/fonts/Roboto/Roboto-Black.woff new file mode 100644 index 0000000..ec86a42 Binary files /dev/null and b/fonts/Roboto/Roboto-Black.woff differ diff --git a/fonts/Roboto/Roboto-BlackItalic.eot b/fonts/Roboto/Roboto-BlackItalic.eot new file mode 100644 index 0000000..6aeaa67 Binary files /dev/null and b/fonts/Roboto/Roboto-BlackItalic.eot differ diff --git a/fonts/Roboto/Roboto-BlackItalic.svg b/fonts/Roboto/Roboto-BlackItalic.svg new file mode 100644 index 0000000..6fced4c --- /dev/null +++ b/fonts/Roboto/Roboto-BlackItalic.svg @@ -0,0 +1,1811 @@ + + +!"#$%&'()*+,-./0123456789:;å<>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_` abcdefghijklmnopqrstuvwxyz|{}~ \ No newline at end of file diff --git a/fonts/Roboto/Roboto-BlackItalic.ttf b/fonts/Roboto/Roboto-BlackItalic.ttf new file mode 100644 index 0000000..60f7782 Binary files /dev/null and b/fonts/Roboto/Roboto-BlackItalic.ttf differ diff --git a/fonts/Roboto/Roboto-BlackItalic.woff b/fonts/Roboto/Roboto-BlackItalic.woff new file mode 100644 index 0000000..2e8a79b Binary files /dev/null and b/fonts/Roboto/Roboto-BlackItalic.woff differ diff --git a/fonts/Roboto/Roboto-Bold.eot b/fonts/Roboto/Roboto-Bold.eot new file mode 100644 index 0000000..d124c41 Binary files /dev/null and b/fonts/Roboto/Roboto-Bold.eot differ diff --git a/fonts/Roboto/Roboto-Bold.svg b/fonts/Roboto/Roboto-Bold.svg new file mode 100644 index 0000000..82f7844 --- /dev/null +++ b/fonts/Roboto/Roboto-Bold.svg @@ -0,0 +1,1811 @@ + + +!"#$%&'()*+,-./0123456789:;å<>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_` abcdefghijklmnopqrstuvwxyz|{}~ \ No newline at end of file diff --git a/fonts/Roboto/Roboto-Bold.ttf b/fonts/Roboto/Roboto-Bold.ttf new file mode 100644 index 0000000..a355c27 Binary files /dev/null and b/fonts/Roboto/Roboto-Bold.ttf differ diff --git a/fonts/Roboto/Roboto-Bold.woff b/fonts/Roboto/Roboto-Bold.woff new file mode 100644 index 0000000..f6114c0 Binary files /dev/null and b/fonts/Roboto/Roboto-Bold.woff differ diff --git a/fonts/Roboto/Roboto-BoldItalic.eot b/fonts/Roboto/Roboto-BoldItalic.eot new file mode 100644 index 0000000..e89bb0f Binary files /dev/null and b/fonts/Roboto/Roboto-BoldItalic.eot differ diff --git a/fonts/Roboto/Roboto-BoldItalic.svg b/fonts/Roboto/Roboto-BoldItalic.svg new file mode 100644 index 0000000..2fedcba --- /dev/null +++ b/fonts/Roboto/Roboto-BoldItalic.svg @@ -0,0 +1,1811 @@ + + +!"#$%&'()*+,-./0123456789:;å<>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_` abcdefghijklmnopqrstuvwxyz|{}~ \ No newline at end of file diff --git a/fonts/Roboto/Roboto-BoldItalic.ttf b/fonts/Roboto/Roboto-BoldItalic.ttf new file mode 100644 index 0000000..3c9a7a3 Binary files /dev/null and b/fonts/Roboto/Roboto-BoldItalic.ttf differ diff --git a/fonts/Roboto/Roboto-BoldItalic.woff b/fonts/Roboto/Roboto-BoldItalic.woff new file mode 100644 index 0000000..d4a02db Binary files /dev/null and b/fonts/Roboto/Roboto-BoldItalic.woff differ diff --git a/fonts/Roboto/Roboto-Italic.eot b/fonts/Roboto/Roboto-Italic.eot new file mode 100644 index 0000000..cc4db5f Binary files /dev/null and b/fonts/Roboto/Roboto-Italic.eot differ diff --git a/fonts/Roboto/Roboto-Italic.svg b/fonts/Roboto/Roboto-Italic.svg new file mode 100644 index 0000000..b4af789 --- /dev/null +++ b/fonts/Roboto/Roboto-Italic.svg @@ -0,0 +1,1811 @@ + + +!"#$%&'()*+,-./0123456789:;å<>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_` abcdefghijklmnopqrstuvwxyz|{}~ \ No newline at end of file diff --git a/fonts/Roboto/Roboto-Italic.ttf b/fonts/Roboto/Roboto-Italic.ttf new file mode 100644 index 0000000..ff6046d Binary files /dev/null and b/fonts/Roboto/Roboto-Italic.ttf differ diff --git a/fonts/Roboto/Roboto-Italic.woff b/fonts/Roboto/Roboto-Italic.woff new file mode 100644 index 0000000..d668b23 Binary files /dev/null and b/fonts/Roboto/Roboto-Italic.woff differ diff --git a/fonts/Roboto/Roboto-Light.eot b/fonts/Roboto/Roboto-Light.eot new file mode 100644 index 0000000..9e5eb49 Binary files /dev/null and b/fonts/Roboto/Roboto-Light.eot differ diff --git a/fonts/Roboto/Roboto-Light.svg b/fonts/Roboto/Roboto-Light.svg new file mode 100644 index 0000000..e63d892 --- /dev/null +++ b/fonts/Roboto/Roboto-Light.svg @@ -0,0 +1,1811 @@ + + +!"#$%&'()*+,-./0123456789:;å<>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_` abcdefghijklmnopqrstuvwxyz|{}~ \ No newline at end of file diff --git a/fonts/Roboto/Roboto-Light.ttf b/fonts/Roboto/Roboto-Light.ttf new file mode 100644 index 0000000..94c6bcc Binary files /dev/null and b/fonts/Roboto/Roboto-Light.ttf differ diff --git a/fonts/Roboto/Roboto-Light.woff b/fonts/Roboto/Roboto-Light.woff new file mode 100644 index 0000000..5ce77b4 Binary files /dev/null and b/fonts/Roboto/Roboto-Light.woff differ diff --git a/fonts/Roboto/Roboto-LightItalic.eot b/fonts/Roboto/Roboto-LightItalic.eot new file mode 100644 index 0000000..aca2956 Binary files /dev/null and b/fonts/Roboto/Roboto-LightItalic.eot differ diff --git a/fonts/Roboto/Roboto-LightItalic.svg b/fonts/Roboto/Roboto-LightItalic.svg new file mode 100644 index 0000000..598d3db --- /dev/null +++ b/fonts/Roboto/Roboto-LightItalic.svg @@ -0,0 +1,1811 @@ + + +!"#$%&'()*+,-./0123456789:;å<>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_` abcdefghijklmnopqrstuvwxyz|{}~ \ No newline at end of file diff --git a/fonts/Roboto/Roboto-LightItalic.ttf b/fonts/Roboto/Roboto-LightItalic.ttf new file mode 100644 index 0000000..04cc002 Binary files /dev/null and b/fonts/Roboto/Roboto-LightItalic.ttf differ diff --git a/fonts/Roboto/Roboto-LightItalic.woff b/fonts/Roboto/Roboto-LightItalic.woff new file mode 100644 index 0000000..33b86f2 Binary files /dev/null and b/fonts/Roboto/Roboto-LightItalic.woff differ diff --git a/fonts/Roboto/Roboto-Medium.eot b/fonts/Roboto/Roboto-Medium.eot new file mode 100644 index 0000000..818a740 Binary files /dev/null and b/fonts/Roboto/Roboto-Medium.eot differ diff --git a/fonts/Roboto/Roboto-Medium.svg b/fonts/Roboto/Roboto-Medium.svg new file mode 100644 index 0000000..bb26ae4 --- /dev/null +++ b/fonts/Roboto/Roboto-Medium.svg @@ -0,0 +1,1811 @@ + + +!"#$%&'()*+,-./0123456789:;å<>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_` abcdefghijklmnopqrstuvwxyz|{}~ \ No newline at end of file diff --git a/fonts/Roboto/Roboto-Medium.ttf b/fonts/Roboto/Roboto-Medium.ttf new file mode 100644 index 0000000..39c63d7 Binary files /dev/null and b/fonts/Roboto/Roboto-Medium.ttf differ diff --git a/fonts/Roboto/Roboto-Medium.woff b/fonts/Roboto/Roboto-Medium.woff new file mode 100644 index 0000000..08b9815 Binary files /dev/null and b/fonts/Roboto/Roboto-Medium.woff differ diff --git a/fonts/Roboto/Roboto-MediumItalic.eot b/fonts/Roboto/Roboto-MediumItalic.eot new file mode 100644 index 0000000..b9876cb Binary files /dev/null and b/fonts/Roboto/Roboto-MediumItalic.eot differ diff --git a/fonts/Roboto/Roboto-MediumItalic.svg b/fonts/Roboto/Roboto-MediumItalic.svg new file mode 100644 index 0000000..9f8d805 --- /dev/null +++ b/fonts/Roboto/Roboto-MediumItalic.svg @@ -0,0 +1,1811 @@ + + +!"#$%&'()*+,-./0123456789:;å<>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_` abcdefghijklmnopqrstuvwxyz|{}~ \ No newline at end of file diff --git a/fonts/Roboto/Roboto-MediumItalic.ttf b/fonts/Roboto/Roboto-MediumItalic.ttf new file mode 100644 index 0000000..dc743f0 Binary files /dev/null and b/fonts/Roboto/Roboto-MediumItalic.ttf differ diff --git a/fonts/Roboto/Roboto-MediumItalic.woff b/fonts/Roboto/Roboto-MediumItalic.woff new file mode 100644 index 0000000..f58d20e Binary files /dev/null and b/fonts/Roboto/Roboto-MediumItalic.woff differ diff --git a/fonts/Roboto/Roboto-Regular.eot b/fonts/Roboto/Roboto-Regular.eot new file mode 100644 index 0000000..e713ba1 Binary files /dev/null and b/fonts/Roboto/Roboto-Regular.eot differ diff --git a/fonts/Roboto/Roboto-Regular.svg b/fonts/Roboto/Roboto-Regular.svg new file mode 100644 index 0000000..30564b2 --- /dev/null +++ b/fonts/Roboto/Roboto-Regular.svg @@ -0,0 +1,1811 @@ + + +!"#$%&'()*+,-./0123456789:;å<>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_` abcdefghijklmnopqrstuvwxyz|{}~ \ No newline at end of file diff --git a/fonts/Roboto/Roboto-Regular.ttf b/fonts/Roboto/Roboto-Regular.ttf new file mode 100644 index 0000000..8c082c8 Binary files /dev/null and b/fonts/Roboto/Roboto-Regular.ttf differ diff --git a/fonts/Roboto/Roboto-Regular.woff b/fonts/Roboto/Roboto-Regular.woff new file mode 100644 index 0000000..c634952 Binary files /dev/null and b/fonts/Roboto/Roboto-Regular.woff differ diff --git a/fonts/Roboto/Roboto-Thin.eot b/fonts/Roboto/Roboto-Thin.eot new file mode 100644 index 0000000..6433f9e Binary files /dev/null and b/fonts/Roboto/Roboto-Thin.eot differ diff --git a/fonts/Roboto/Roboto-Thin.svg b/fonts/Roboto/Roboto-Thin.svg new file mode 100644 index 0000000..dcd306e --- /dev/null +++ b/fonts/Roboto/Roboto-Thin.svg @@ -0,0 +1,1811 @@ + + +!"#$%&'()*+,-./0123456789:;å<>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_` abcdefghijklmnopqrstuvwxyz|{}~ \ No newline at end of file diff --git a/fonts/Roboto/Roboto-Thin.ttf b/fonts/Roboto/Roboto-Thin.ttf new file mode 100644 index 0000000..d695550 Binary files /dev/null and b/fonts/Roboto/Roboto-Thin.ttf differ diff --git a/fonts/Roboto/Roboto-Thin.woff b/fonts/Roboto/Roboto-Thin.woff new file mode 100644 index 0000000..b608ed3 Binary files /dev/null and b/fonts/Roboto/Roboto-Thin.woff differ diff --git a/fonts/Roboto/Roboto-ThinItalic.eot b/fonts/Roboto/Roboto-ThinItalic.eot new file mode 100644 index 0000000..16068a4 Binary files /dev/null and b/fonts/Roboto/Roboto-ThinItalic.eot differ diff --git a/fonts/Roboto/Roboto-ThinItalic.svg b/fonts/Roboto/Roboto-ThinItalic.svg new file mode 100644 index 0000000..c0778be --- /dev/null +++ b/fonts/Roboto/Roboto-ThinItalic.svg @@ -0,0 +1,1811 @@ + + +!"#$%&'()*+,-./0123456789:;å<>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_` abcdefghijklmnopqrstuvwxyz|{}~ \ No newline at end of file diff --git a/fonts/Roboto/Roboto-ThinItalic.ttf b/fonts/Roboto/Roboto-ThinItalic.ttf new file mode 100644 index 0000000..07172ff Binary files /dev/null and b/fonts/Roboto/Roboto-ThinItalic.ttf differ diff --git a/fonts/Roboto/Roboto-ThinItalic.woff b/fonts/Roboto/Roboto-ThinItalic.woff new file mode 100644 index 0000000..aedb2c6 Binary files /dev/null and b/fonts/Roboto/Roboto-ThinItalic.woff differ diff --git a/fonts/RobotoSlab.scss b/fonts/RobotoSlab.scss new file mode 100644 index 0000000..ec22943 --- /dev/null +++ b/fonts/RobotoSlab.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("Roboto Slab", "Roboto Slab Regular", "RobotoSlab-Regular", "Roboto_Slab/RobotoSlab-Regular"); +@include font-face("Roboto Slab", "Roboto Slab Bold", "RobotoSlab-Bold", "Roboto_Slab/RobotoSlab-Bold", 700); diff --git a/fonts/Roboto_Slab/RobotoSlab-Bold.eot b/fonts/Roboto_Slab/RobotoSlab-Bold.eot new file mode 100644 index 0000000..9e7dca9 Binary files /dev/null and b/fonts/Roboto_Slab/RobotoSlab-Bold.eot differ diff --git a/fonts/Roboto_Slab/RobotoSlab-Bold.svg b/fonts/Roboto_Slab/RobotoSlab-Bold.svg new file mode 100644 index 0000000..be6b0c7 --- /dev/null +++ b/fonts/Roboto_Slab/RobotoSlab-Bold.svg @@ -0,0 +1,1781 @@ + + +!"#$%&'()*+,-./0123456789:;å<>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_` abcdefghijklmnopqrstuvwxyz|{}~ \ No newline at end of file diff --git a/fonts/Roboto_Slab/RobotoSlab-Bold.ttf b/fonts/Roboto_Slab/RobotoSlab-Bold.ttf new file mode 100644 index 0000000..df5d1df Binary files /dev/null and b/fonts/Roboto_Slab/RobotoSlab-Bold.ttf differ diff --git a/fonts/Roboto_Slab/RobotoSlab-Bold.woff b/fonts/Roboto_Slab/RobotoSlab-Bold.woff new file mode 100644 index 0000000..3e2d9c9 Binary files /dev/null and b/fonts/Roboto_Slab/RobotoSlab-Bold.woff differ diff --git a/fonts/Roboto_Slab/RobotoSlab-Light.eot b/fonts/Roboto_Slab/RobotoSlab-Light.eot new file mode 100644 index 0000000..17796bc Binary files /dev/null and b/fonts/Roboto_Slab/RobotoSlab-Light.eot differ diff --git a/fonts/Roboto_Slab/RobotoSlab-Light.svg b/fonts/Roboto_Slab/RobotoSlab-Light.svg new file mode 100644 index 0000000..ab3869c --- /dev/null +++ b/fonts/Roboto_Slab/RobotoSlab-Light.svg @@ -0,0 +1,1781 @@ + + +!"#$%&'()*+,-./0123456789:;å<>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_` abcdefghijklmnopqrstuvwxyz|{}~ \ No newline at end of file diff --git a/fonts/Roboto_Slab/RobotoSlab-Light.ttf b/fonts/Roboto_Slab/RobotoSlab-Light.ttf new file mode 100644 index 0000000..ccb99cd Binary files /dev/null and b/fonts/Roboto_Slab/RobotoSlab-Light.ttf differ diff --git a/fonts/Roboto_Slab/RobotoSlab-Light.woff b/fonts/Roboto_Slab/RobotoSlab-Light.woff new file mode 100644 index 0000000..dd32aed Binary files /dev/null and b/fonts/Roboto_Slab/RobotoSlab-Light.woff differ diff --git a/fonts/Roboto_Slab/RobotoSlab-Regular.eot b/fonts/Roboto_Slab/RobotoSlab-Regular.eot new file mode 100644 index 0000000..d4f01fb Binary files /dev/null and b/fonts/Roboto_Slab/RobotoSlab-Regular.eot differ diff --git a/fonts/Roboto_Slab/RobotoSlab-Regular.svg b/fonts/Roboto_Slab/RobotoSlab-Regular.svg new file mode 100644 index 0000000..aae1f4f --- /dev/null +++ b/fonts/Roboto_Slab/RobotoSlab-Regular.svg @@ -0,0 +1,1781 @@ + + +!"#$%&'()*+,-./0123456789:;å<>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_` abcdefghijklmnopqrstuvwxyz|{}~ \ No newline at end of file diff --git a/fonts/Roboto_Slab/RobotoSlab-Regular.ttf b/fonts/Roboto_Slab/RobotoSlab-Regular.ttf new file mode 100644 index 0000000..eb52a79 Binary files /dev/null and b/fonts/Roboto_Slab/RobotoSlab-Regular.ttf differ diff --git a/fonts/Roboto_Slab/RobotoSlab-Regular.woff b/fonts/Roboto_Slab/RobotoSlab-Regular.woff new file mode 100644 index 0000000..e3b5fab Binary files /dev/null and b/fonts/Roboto_Slab/RobotoSlab-Regular.woff differ diff --git a/fonts/Roboto_Slab/RobotoSlab-Thin.eot b/fonts/Roboto_Slab/RobotoSlab-Thin.eot new file mode 100644 index 0000000..974f37d Binary files /dev/null and b/fonts/Roboto_Slab/RobotoSlab-Thin.eot differ diff --git a/fonts/Roboto_Slab/RobotoSlab-Thin.svg b/fonts/Roboto_Slab/RobotoSlab-Thin.svg new file mode 100644 index 0000000..cf40959 --- /dev/null +++ b/fonts/Roboto_Slab/RobotoSlab-Thin.svg @@ -0,0 +1,1781 @@ + + +!"#$%&'()*+,-./0123456789:;å<>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_` abcdefghijklmnopqrstuvwxyz|{}~ \ No newline at end of file diff --git a/fonts/Roboto_Slab/RobotoSlab-Thin.ttf b/fonts/Roboto_Slab/RobotoSlab-Thin.ttf new file mode 100644 index 0000000..fee11da Binary files /dev/null and b/fonts/Roboto_Slab/RobotoSlab-Thin.ttf differ diff --git a/fonts/Roboto_Slab/RobotoSlab-Thin.woff b/fonts/Roboto_Slab/RobotoSlab-Thin.woff new file mode 100644 index 0000000..db6f7f6 Binary files /dev/null and b/fonts/Roboto_Slab/RobotoSlab-Thin.woff differ diff --git a/fonts/TheDefiler.scss b/fonts/TheDefiler.scss new file mode 100644 index 0000000..8ee09b7 --- /dev/null +++ b/fonts/TheDefiler.scss @@ -0,0 +1,23 @@ +@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("The Defiler", "The Defiler Regular", "TheDefiler-Regular", "TheDefiler/TheDefiler"); diff --git a/fonts/TheDefiler/Read_Me.txt b/fonts/TheDefiler/Read_Me.txt new file mode 100644 index 0000000..1bcc868 --- /dev/null +++ b/fonts/TheDefiler/Read_Me.txt @@ -0,0 +1,12 @@ +Font usage: Personal use only, no commercial use allowed +Distributed by: Font Monger + +You may not edit this font +You may not rename this font +You may not repackage, distribute, or sale this font +You may not use this font in multimedia, tv, applications, video games, or film. + + +For a commercial use license visit: +http://www.fontmonger.com + diff --git a/fonts/TheDefiler/TheDefiler.ttf b/fonts/TheDefiler/TheDefiler.ttf new file mode 100644 index 0000000..670ef0f Binary files /dev/null and b/fonts/TheDefiler/TheDefiler.ttf differ diff --git a/fonts/TheDefiler/TheDefiler.woff b/fonts/TheDefiler/TheDefiler.woff new file mode 100644 index 0000000..aa79788 Binary files /dev/null and b/fonts/TheDefiler/TheDefiler.woff differ diff --git a/fonts/TheGrimRaiders.scss b/fonts/TheGrimRaiders.scss new file mode 100644 index 0000000..80dbb57 --- /dev/null +++ b/fonts/TheGrimRaiders.scss @@ -0,0 +1,23 @@ +@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("The Grim Raiders", "The Grim Raiders Regular", "TheGrimRaiders-Regular", "TheGrimRaiders/TheGrimRaiders-Regular"); diff --git a/fonts/TheGrimRaiders/Read_Me.txt b/fonts/TheGrimRaiders/Read_Me.txt new file mode 100644 index 0000000..382ecfd --- /dev/null +++ b/fonts/TheGrimRaiders/Read_Me.txt @@ -0,0 +1,19 @@ +Font usage: Freeware (Free for personal use only) Non commercial + +For a commercial license visit http://www.chrisvile.com or http://www.fontmonger.com + + +contact: gwizsk@gmail.com + +*** social media *** +http://www.facebook.com/fontmonger +http://www.facebook.com/designsbychris +http://www.twitter.com/fontmonger +http://www.twitter.com/chris_vile + +*** My font sites *** +http://www.chrisvile.com +http://www.fontmonger.com +http://www.type512.com +http://www.fontillery.com + diff --git a/fonts/TheGrimRaiders/TheGrimRaiders-Regular.otf b/fonts/TheGrimRaiders/TheGrimRaiders-Regular.otf new file mode 100644 index 0000000..aff1120 Binary files /dev/null and b/fonts/TheGrimRaiders/TheGrimRaiders-Regular.otf differ diff --git a/fonts/TheGrimRaiders/TheGrimRaiders-Regular.ttf b/fonts/TheGrimRaiders/TheGrimRaiders-Regular.ttf new file mode 100644 index 0000000..6bd4292 Binary files /dev/null and b/fonts/TheGrimRaiders/TheGrimRaiders-Regular.ttf differ diff --git a/fonts/TheGrimRaiders/TheGrimRaiders-Regular.woff b/fonts/TheGrimRaiders/TheGrimRaiders-Regular.woff new file mode 100644 index 0000000..cc9147e Binary files /dev/null and b/fonts/TheGrimRaiders/TheGrimRaiders-Regular.woff differ diff --git a/fonts/ThroughStruggleDEMO.scss b/fonts/ThroughStruggleDEMO.scss new file mode 100644 index 0000000..9a82431 --- /dev/null +++ b/fonts/ThroughStruggleDEMO.scss @@ -0,0 +1,23 @@ +@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("Through Struggle", "Through Struggle Regular", "Through Struggle", "ThroughStruggleDEMO/ThroughStruggleDEMO"); diff --git a/fonts/ThroughStruggleDEMO/READ.txt b/fonts/ThroughStruggleDEMO/READ.txt new file mode 100644 index 0000000..72985b6 --- /dev/null +++ b/fonts/ThroughStruggleDEMO/READ.txt @@ -0,0 +1 @@ +to access contact numbers and symbols luisjara00@gmail.com \ No newline at end of file diff --git a/fonts/ThroughStruggleDEMO/ThroughStruggleDEMO.ttf b/fonts/ThroughStruggleDEMO/ThroughStruggleDEMO.ttf new file mode 100644 index 0000000..e632b42 Binary files /dev/null and b/fonts/ThroughStruggleDEMO/ThroughStruggleDEMO.ttf differ diff --git a/fonts/ThroughStruggleDEMO/ThroughStruggleDEMO.woff b/fonts/ThroughStruggleDEMO/ThroughStruggleDEMO.woff new file mode 100644 index 0000000..0b9a713 Binary files /dev/null and b/fonts/ThroughStruggleDEMO/ThroughStruggleDEMO.woff differ diff --git a/fonts/ThroughStruggleDEMO/cover1.jpg b/fonts/ThroughStruggleDEMO/cover1.jpg new file mode 100644 index 0000000..e554295 Binary files /dev/null and b/fonts/ThroughStruggleDEMO/cover1.jpg differ diff --git a/fonts/ThroughStruggleDEMO/cover2.jpg b/fonts/ThroughStruggleDEMO/cover2.jpg new file mode 100644 index 0000000..4c8a452 Binary files /dev/null and b/fonts/ThroughStruggleDEMO/cover2.jpg differ diff --git a/fonts/ThroughStruggleDEMO/cover3.jpg b/fonts/ThroughStruggleDEMO/cover3.jpg new file mode 100644 index 0000000..cabfd1b Binary files /dev/null and b/fonts/ThroughStruggleDEMO/cover3.jpg differ diff --git a/fonts/Tinos.scss b/fonts/Tinos.scss new file mode 100644 index 0000000..fd5fc35 --- /dev/null +++ b/fonts/Tinos.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("Tinos", "Tinos", "Tinos-Regular", "Tinos/Tinos-Regular"); +@include font-face("Tinos", "Tinos Bold", "Tinos-Bold", "Tinos/Tinos-Bold", 700); +@include font-face("Tinos", "Tinos Italic", "Tinos-Italic", "Tinos/Tinos-Italic", 400, italic); +@include font-face("Tinos", "Tinos Bold Italic", "Tinos-BoldItalic", "Tinos/Tinos-BoldItalic", 700, italic); diff --git a/fonts/Tinos/LICENSE.txt b/fonts/Tinos/LICENSE.txt new file mode 100644 index 0000000..75b5248 --- /dev/null +++ b/fonts/Tinos/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/fonts/Tinos/Tinos-Bold.ttf b/fonts/Tinos/Tinos-Bold.ttf new file mode 100644 index 0000000..c16befb Binary files /dev/null and b/fonts/Tinos/Tinos-Bold.ttf differ diff --git a/fonts/Tinos/Tinos-BoldItalic.ttf b/fonts/Tinos/Tinos-BoldItalic.ttf new file mode 100644 index 0000000..58fc85e Binary files /dev/null and b/fonts/Tinos/Tinos-BoldItalic.ttf differ diff --git a/fonts/Tinos/Tinos-Italic.ttf b/fonts/Tinos/Tinos-Italic.ttf new file mode 100644 index 0000000..64dd43b Binary files /dev/null and b/fonts/Tinos/Tinos-Italic.ttf differ diff --git a/fonts/Tinos/Tinos-Regular.ttf b/fonts/Tinos/Tinos-Regular.ttf new file mode 100644 index 0000000..ae5030d Binary files /dev/null and b/fonts/Tinos/Tinos-Regular.ttf differ diff --git a/fonts/WithinDesctruction.scss b/fonts/WithinDesctruction.scss new file mode 100644 index 0000000..467607b --- /dev/null +++ b/fonts/WithinDesctruction.scss @@ -0,0 +1,23 @@ +@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("Within Destruction", "Within Destruction Regular", "within destruction", "WithinDestruction/WithinDestruction"); diff --git a/fonts/WithinDesctruction/Cover1.jpg b/fonts/WithinDesctruction/Cover1.jpg new file mode 100644 index 0000000..60ae5df Binary files /dev/null and b/fonts/WithinDesctruction/Cover1.jpg differ diff --git a/fonts/WithinDesctruction/Cover2.jpg b/fonts/WithinDesctruction/Cover2.jpg new file mode 100644 index 0000000..41d9e9f Binary files /dev/null and b/fonts/WithinDesctruction/Cover2.jpg differ diff --git a/fonts/WithinDesctruction/Meta-logo.jpg b/fonts/WithinDesctruction/Meta-logo.jpg new file mode 100644 index 0000000..e412f9c Binary files /dev/null and b/fonts/WithinDesctruction/Meta-logo.jpg differ diff --git a/fonts/WithinDesctruction/READ.txt b/fonts/WithinDesctruction/READ.txt new file mode 100644 index 0000000..d167696 --- /dev/null +++ b/fonts/WithinDesctruction/READ.txt @@ -0,0 +1,11 @@ +Personal / non-commercial use. +To enter numbers and symbols please contact luisjara00@gmail.com + +My website: +http://lj-designe.blogspot.com + +Facebook: +https://www.facebook.com/LJDesignStudios + +Instagram: +https://instagram.com/lj.design \ No newline at end of file diff --git a/fonts/WithinDesctruction/Semi-Logo.jpg b/fonts/WithinDesctruction/Semi-Logo.jpg new file mode 100644 index 0000000..462667d Binary files /dev/null and b/fonts/WithinDesctruction/Semi-Logo.jpg differ diff --git a/fonts/WithinDesctruction/WithinDestruction.ttf b/fonts/WithinDesctruction/WithinDestruction.ttf new file mode 100644 index 0000000..2f524f1 Binary files /dev/null and b/fonts/WithinDesctruction/WithinDestruction.ttf differ diff --git a/fonts/WithinDesctruction/WithinDestruction.woff b/fonts/WithinDesctruction/WithinDestruction.woff new file mode 100644 index 0000000..d383a4c Binary files /dev/null and b/fonts/WithinDesctruction/WithinDestruction.woff differ diff --git a/haerte_nach_genre.min.svg b/haerte_nach_genre.min.svg new file mode 100644 index 0000000..8891317 --- /dev/null +++ b/haerte_nach_genre.min.svg @@ -0,0 +1 @@ +1234567Techno/HardcorePopRockBlack/Death MetalMetalRap/Hip−HopPunkElectro/New AgeNeue Deutsche HärteAnderesHärte nach Genre \ No newline at end of file diff --git a/haerte_nach_genre.svg b/haerte_nach_genre.svg new file mode 100644 index 0000000..49d638b --- /dev/null +++ b/haerte_nach_genre.svg @@ -0,0 +1,540 @@ + +image/svg+xml1 +2 +3 +4 +5 +6 +7 +Techno/Hardcore +Pop +Rock +Black/Death Metal +Metal +Rap/Hip−Hop +Punk +Electro/New Age +Neue Deutsche Härte +Anderes +Härte nach Genre + diff --git a/haerte_percussiveEnergy_Gesangsstil.min.svg b/haerte_percussiveEnergy_Gesangsstil.min.svg new file mode 100644 index 0000000..6caaae4 --- /dev/null +++ b/haerte_percussiveEnergy_Gesangsstil.min.svg @@ -0,0 +1 @@ +00.020.040.060.080.10.120.140.16SingenKombinationSprechen /RapKeinerSchreienGrowling / ScreamingPercussive EnergyGesangsstil \ No newline at end of file diff --git a/haerte_percussiveEnergy_Gesangsstil.svg b/haerte_percussiveEnergy_Gesangsstil.svg new file mode 100644 index 0000000..afc95af --- /dev/null +++ b/haerte_percussiveEnergy_Gesangsstil.svg @@ -0,0 +1,1092 @@ + +image/svg+xml0 +0.02 +0.04 +0.06 +0.08 +0.1 +0.12 +0.14 +0.16 +Singen +Kombination +Sprechen /Rap +Keiner +Schreien +Growling / Screaming +Percussive Energy +Gesangsstil + diff --git a/haerte_ts_perc_lowcentroid_khz2-4energy_mit_legende.min.svg b/haerte_ts_perc_lowcentroid_khz2-4energy_mit_legende.min.svg new file mode 100644 index 0000000..b5e313f --- /dev/null +++ b/haerte_ts_perc_lowcentroid_khz2-4energy_mit_legende.min.svg @@ -0,0 +1 @@ +00.020.040.060.080.10.120.140.160.40.450.50.550.60.650.70.750.800.050.10.150.20.250.30.350.4Percussive EnergyLow Centroid Rate2 − 4 kHz EnergyBewertung < 0.25 Quantilmittlere BewertungBewertung > 0.75 Quantil \ No newline at end of file diff --git a/haerte_ts_perc_lowcentroid_khz2-4energy_mit_legende.svg b/haerte_ts_perc_lowcentroid_khz2-4energy_mit_legende.svg new file mode 100644 index 0000000..1ee4cfe --- /dev/null +++ b/haerte_ts_perc_lowcentroid_khz2-4energy_mit_legende.svg @@ -0,0 +1,1884 @@ + +image/svg+xml0 +0.02 +0.04 +0.06 +0.08 +0.1 +0.12 +0.14 +0.16 +0.4 +0.45 +0.5 +0.55 +0.6 +0.65 +0.7 +0.75 +0.8 +0 +0.05 +0.1 +0.15 +0.2 +0.25 +0.3 +0.35 +0.4 +Percussive Energy +Low Centroid Rate +2 − 4 kHz Energy +Bewertung < 0.25 Quantil +mittlere Bewertung +Bewertung > 0.75 Quantil + diff --git a/haerte_ts_perc_lowcentroid_khz2-4energy_mit_legende_neu1.min.svg b/haerte_ts_perc_lowcentroid_khz2-4energy_mit_legende_neu1.min.svg new file mode 100644 index 0000000..a0fb435 --- /dev/null +++ b/haerte_ts_perc_lowcentroid_khz2-4energy_mit_legende_neu1.min.svg @@ -0,0 +1 @@ +00.020.040.060.080.10.120.140.160.40.450.50.550.60.650.70.750.800.050.10.150.20.250.30.350.4Percussive EnergyLow Centroid Rate2 − 4 kHz EnergyBewertung < 0.25 Quantilmittlere BewertungBewertung > 0.75 Quantil \ No newline at end of file diff --git a/haerte_ts_perc_lowcentroid_khz2-4energy_mit_legende_neu1.svg b/haerte_ts_perc_lowcentroid_khz2-4energy_mit_legende_neu1.svg new file mode 100644 index 0000000..d343ac6 --- /dev/null +++ b/haerte_ts_perc_lowcentroid_khz2-4energy_mit_legende_neu1.svg @@ -0,0 +1,1902 @@ + +image/svg+xml0 +0.02 +0.04 +0.06 +0.08 +0.1 +0.12 +0.14 +0.16 +0.4 +0.45 +0.5 +0.55 +0.6 +0.65 +0.7 +0.75 +0.8 +0 +0.05 +0.1 +0.15 +0.2 +0.25 +0.3 +0.35 +0.4 +Percussive Energy +Low Centroid Rate +2 − 4 kHz Energy +Bewertung < 0.25 Quantil +mittlere Bewertung +Bewertung > 0.75 Quantil + \ No newline at end of file diff --git a/haerte_ts_perc_lowcentroid_khz2-4energy_mit_legende_neu2.min.svg b/haerte_ts_perc_lowcentroid_khz2-4energy_mit_legende_neu2.min.svg new file mode 100644 index 0000000..4498b6f --- /dev/null +++ b/haerte_ts_perc_lowcentroid_khz2-4energy_mit_legende_neu2.min.svg @@ -0,0 +1 @@ +00.020.040.060.080.10.120.140.160.40.450.50.550.60.650.70.750.800.050.10.150.20.250.30.350.4Percussive EnergyLow Centroid Rate2 − 4 kHz EnergyBewertung < 0.25 Quantilmittlere BewertungBewertung > 0.75 Quantil \ No newline at end of file diff --git a/haerte_ts_perc_lowcentroid_khz2-4energy_mit_legende_neu2.svg b/haerte_ts_perc_lowcentroid_khz2-4energy_mit_legende_neu2.svg new file mode 100644 index 0000000..cc9c0d7 --- /dev/null +++ b/haerte_ts_perc_lowcentroid_khz2-4energy_mit_legende_neu2.svg @@ -0,0 +1,1898 @@ + +image/svg+xml0 +0.02 +0.04 +0.06 +0.08 +0.1 +0.12 +0.14 +0.16 +0.4 +0.45 +0.5 +0.55 +0.6 +0.65 +0.7 +0.75 +0.8 +0 +0.05 +0.1 +0.15 +0.2 +0.25 +0.3 +0.35 +0.4 +Percussive Energy +Low Centroid Rate +2 − 4 kHz Energy +Bewertung < 0.25 Quantil +mittlere Bewertung +Bewertung > 0.75 Quantil + diff --git a/haerte_ts_perc_lowcentroid_khz2-4energy_mit_legende_neu3.min.svg b/haerte_ts_perc_lowcentroid_khz2-4energy_mit_legende_neu3.min.svg new file mode 100644 index 0000000..6825066 --- /dev/null +++ b/haerte_ts_perc_lowcentroid_khz2-4energy_mit_legende_neu3.min.svg @@ -0,0 +1 @@ +00.020.040.060.080.10.120.140.160.40.450.50.550.60.650.70.750.800.050.10.150.20.250.30.350.4Percussive EnergyLow Centroid Rate2 − 4 kHz EnergyBewertung < 0.25 Quantilmittlere BewertungBewertung > 0.75 Quantil \ No newline at end of file diff --git a/haerte_ts_perc_lowcentroid_khz2-4energy_mit_legende_neu3.svg b/haerte_ts_perc_lowcentroid_khz2-4energy_mit_legende_neu3.svg new file mode 100644 index 0000000..2e8fcc9 --- /dev/null +++ b/haerte_ts_perc_lowcentroid_khz2-4energy_mit_legende_neu3.svg @@ -0,0 +1,1916 @@ + +image/svg+xml0 +0.02 +0.04 +0.06 +0.08 +0.1 +0.12 +0.14 +0.16 +0.4 +0.45 +0.5 +0.55 +0.6 +0.65 +0.7 +0.75 +0.8 +0 +0.05 +0.1 +0.15 +0.2 +0.25 +0.3 +0.35 +0.4 +Percussive Energy +Low Centroid Rate +2 − 4 kHz Energy +Bewertung < 0.25 Quantil +mittlere Bewertung +Bewertung > 0.75 Quantil + \ No newline at end of file diff --git a/index.html.haml b/index.html.haml new file mode 100644 index 0000000..d4ff336 --- /dev/null +++ b/index.html.haml @@ -0,0 +1,308 @@ +- require "base64" +~ "\xEF\xBB\xBF" +- def quellen opts + - etc = opts.key? :etc + - if etc + - opts.delete :etc + - etc = "\n" + - else + - etc = '' + - "#{opts.map {|k, v| "#{k}" }.join "\n"}#{etc}" +- def import_data file + - mime_type = IO.popen(["file", "--brief", "--mime-type", file], in: :close, err: :close) { |io| io.read.chomp } + - content = Base64.urlsafe_encode64 File.read( file) + - "data:#{mime_type};base64,#{content}" +!!! 5 +%html + %head + -#%meta(charset="utf-8") + %title Was macht Musik „hart“? Heavy Metal & Co. aus psychoakustischer Perspektive + %link(rel="stylesheet" href="fonts/Roboto.css") + %link(rel="stylesheet" href="fonts/RobotoSlab.css") + %link(rel="stylesheet" href="fonts/Asset.css") + -#%link(rel="stylesheet" href="fonts/WithinDestruction.css") + -#%link(rel="stylesheet" href="fonts/BlackDahlia.css") + %link(rel="stylesheet" href="fonts/ThroughStruggleDEMO.css") + -#%link(rel="stylesheet" href="fonts/TheDefiler.css") + %link(rel="stylesheet" href="style.css") + + %body + %header(style="padding-top:1em") + %figure.logos + %img(src="uni_logo_transparent.png") + %br + %img(src="DGM_logo_transparent.png" style="float:left") + %div(style="margin-top:0.5em") + Jahrestagung 2016 + %br + Universität Wien + %br + 9.-11. September 2016 + %h1 + Was macht Musik + hart? + Heavy Metal & Co. aus psychoakustischer Perspektive + %p#authors(style="margin-top:0.1em")<> + %span.author(data-mark="1")<> Isabella Czedik-Eysenberg + %span.author(data-mark="2")<> Denis Knauf + %span.author(data-mark="1")<> Christoph Reuter + %p#institutions<> + %span.institution(data-mark="1")<> Institut für Musikwissenschaft, Universität Wien + %span.institution(data-mark="2")<> Informatik, Technische Universität Wien + + %main + #column1 + %section#hintergrund + %h1 Hintergrund + %p + Einige Untersuchungen betrachten sogenannte harte Musik – + meist Heavy Metal – in ihrer musiksoziologischen und + -psychologischen Rolle, etwa in Bezug zu Themen wie + aggressivem Verhalten unter Jugendlichen #{quellen Weindl: 2005} + Persönlichkeit und Emotionsmodulation #{quellen "von Georgi et al." => 2011} + und ihrem subkulturellen Umfeld + #{quellen Weinstein: 1991, Walser: 1993, Cross: 1990, etc: nil}. + + Oft nur am Rande spielt dabei die Frage mit, welche klanglichen + Eigenschaften die betrachtete Musik als hart kennzeichnen. + %p + Als charakterisierende Merkmale genannt werden unter anderem + stark verzerrte Gitarrenklänge + #{quellen Walser: 1993, Berger: 1999}, eine ausgeprägte + Intensität tiefer, bzw. auch hoher Frequenzbereiche + #{quellen Reyes: 2008, "Berger/Fales" => 2005}, hohe Lautheit + in Verbindung mit einem geringen Dynamikumfang + #{quellen Weinstein: 1991, Walser: 1993}, insbesondere eine flache + dynamische Hüllkurve infolge von Klangverzerrungen + #{quellen "Berger/Fales" => 2005}, starke perkussive Klänge + #{quellen Gross: 1990}, ein hoher Geräuschanteil in Bezug + auf das stimmliche Timbre #{quellen "Wallach et al." => 2011}, + unklare Tonalität bzw. harmonische Dissonanzen + #{quellen Berger: 1999} und ein besonders schnelles oder + langsames Tempo #{quellen "Wallach et al." => 2011}. + %p + Dabei wird harte Musik besonders häufig mit dem Genre Metal + assoziiert #{quellen Reyes: 2008}, kann aber auch eine Reihe weiterer + Richtungen wie etwa Hard Rock, Hardcore-Techno oder Neue Deutsche + Härte umfassen. + + Es stellt sich die Frage, inwieweit sich hierbei für die Empfindung + von Härte allgemeine Merkmale feststellen lassen. + + %section#fragestellung + %h1 Ziele und Fragestellungen + %ul + %li + %p + In Bezug auf welche akustischen Signaleigenschaften lässt sich + ein wesentlicher Zusammenhang zu als hart bewerteten + Audio-Stimuli erkennen? + %li + %p + Lassen sich übereinstimmende klangliche Merkmale zwischen Metal + und anderen als hart bezeichneten Musikgenres feststellen? + %li + %p + Inwiefern unterscheiden sich die Bewertungen von Hörern + harter Musik von jenen anderer Probanden? + + %section#methoden + %h1 Methoden + %p + 40 Probanden im Alter von 18 bis 59 Jahren (Durchschnittsalter 31,08; + 15 Frauen, 25 Männer) wurden 62 Musikausschnitte unterschiedlicher + Genres mit einer Dauer von jeweils ca. 10 Sekunden innerhalb einer + Online-Versuchsumgebung (Protrabant) dargeboten. + + Auf einer 7-stufigen Skala bewerteten sie dabei subjektiv die + Härte der jeweiligen Stimuli und wurden zu einer verbalen + Beschreibung relevanter akustischer Kriterien aufgefordert. + %p + Die verwendeten Klangbeispiele wurden Signalanalysen in Matlab unterzogen + #{quellen "Lartillot/Toiviainen" => 2007, Genesis: 2009, "Driedger/Müller" => 2015}. + Im Zuge dieser wurden insbesondere Niederfrequenzanteile, + Inharmonizitäten, Rauigkeit, Lautheit, dynamischer Umfang und + Hüllkurvenverlauf, Tempo sowie perkussive Anteile analysiert. + Die dabei betrachteten Signaleigenschaften wurden anschließend auf + 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") + %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%") + %img{src: "durchschnittsbewertung_nach_praeferenz.svg"} + %p + Jene Hart-Hörer bewerteten Stimuli im Durchschnitt signifikant + als etwas weniger hart als jene mit einer negativen Präferenz. + .clear + + #column2 + %section#ergebnisse2 + %h1 Ergebnisse 2 + %figure.fifty + %img(src="haerte_nach_genre.svg") + %p Die Härte-Urteile wiesen eine starke Abhängigkeit von dem Genre der Stimuli auf. + %p + In der verbalen Beschreibung nannten Versuchspersonen vermehrt + Eigenschaften mit Bezug zu hohem Tempo, speziellem + Gesangsstil, wenig Melodie, hoher Lautheit, + Schlagzeugpräsenz sowie Klangdichte. + %figure#korrelation(style="font-size:0.75em;float:left;margin:1em 1em 1em 0") + :markdown + Klangdeskriptor|r|p + -----|-----|----- + Percussive Energy|0.81|< 0.01 + Spectral Flux (Median)|0.80|< 0.01 + Roughness|0.75|< 0.01 + Number of Onsets|0.68|< 0.01 + High Frequency Ratio|0.59|< 0.01 + Loudness (Sone)|0.54|< 0.01 + Low Centroid Rate|-0.52|< 0.01 + 2-4 kHz Energy|0.51|< 0.01 + Envelope Flatness|0.50|< 0.01 + Low Frequency Ratio|0.48|< 0.01 + Inharmonicity|0.25|< 0.05 + %p(style="margin-top:4.5em") + 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 + geeignet zu sein scheint. + 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%") + %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") + %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") + %img(src="haerte_ts_perc_lowcentroid_khz2-4energy_mit_legende_neu2.svg") + %p() + Aus der Menge der automatisiert extrahierten Signaleigenschaften + wurden mittels partieller Korrelationen die perkussive + Energie, die Intensität der Signalkomponenten zwischen 2 + und 4 kHz sowie der Anteil der Frames, welche einen + unterdurchschnittlichen Spectral Centroid aufweisen, als + geeignete Dimensionen ermittelt und einer multiplen linearen + Regression unterzogen. + 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") + %img(src="metadeskriptor_korr2.svg") + %p(style="clear:right") + Die Auswahl der für die Härtewahrnehmung relevanten akustischen + Eigenschaften ist bei gesonderter Betrachtung der Urteile von + Hart-Hörern und Personen mit negativer Präferenz weitgehend + kongruent. + %p + Auch für verschiedene betrachtete Genres zeigen sich übereinstimmende + akustische Kriterien zur Bildung eines Härte-Metadeskriptors. + Eine Ausnahme bildete hierbei jedoch Techno/Hardcore, bei dem der + Flachheit der Hüllkurve alleine eine deutlich größere Rolle + zuzukommen scheint (r = 0.90, p < 0.01). + .clear + + %section#schlussfolgerungen + %h1 Schlussfolgerungen + %p + Die in der Literatur und seitens der Versuchspersonen genannten + Härte-Beschreibungen ließen sich größtenteils anhand akustischer + Signaleigenschaften nachweisen. + %p + Es zeigten sich (mit der Ausnahme von Techno/Hardcore) + genreübergreifende Kriterien, darunter insbesondere: + %ul + %li + %p + hohe Präsenz perkussiver Instrumente, die sich in Form + spektraler Fluktuationen und hoher Intensität entsprechender + Signalanteile auswirkt (Percussive Energy, + Spectral Flux). + %li + %p spezieller Gesangsstil (Taschenfaltenstimme, Screaming) + %li + %p + flache Hüllkurve in Verbindung mit einem zeitlich + dichten Klangteppich + (Envelope Flatness, Number of Onsets) + %li + %p + hohe Lautheit, mit ausgeprägter Intensität insbesondere + im tiefen und hochfrequenten Spektralbereich + (Loudness (Sone), Low / High + Frequency Ratio, 2-4 kHz Energy) + + %footer + %section#literatur + %h1 Literatur + %ul.literatur + %li + %span.author Berger, H. + %span.year 1999 + %span.title Metal, Rock and Jazz: Perception and the Phenomenology of Musical Experience + %span.herausgeber Hanover, N.H.: Wesleyan University Press/University Press of New England + %li + %span.author Berger, H. & Fales, C. + %span.year 2005 + %span.title 'Heaviness in the Perception of Heavy Metal Guitar Timbres: The Match of Perceptual and Acoustic Features over Time’. Wired for Sound: Engineering and Technologies in Sonic Cultures + %span.herausgeber Middletown, CT: Wesleyan University Press + %li + %span.author Driedger, J., & Müller, M. + %span.year 2015 + %span.title Harmonisch-Perkussiv-Rest Zerlegung von Musiksignalen + %span.herausgeber Proceedings of the Deutsche Jahrestagung für Akustik (DAGA), 1421-1424 + %li + %span.author Genesis + %span.year 2009 + %span.title Loudness toolbox + %span.herausgeber + %a(href="http://www.genesis-acoustics.com/en/index.php?page=32") http://www.genesis-acoustics.com/en/index.php?page=32 + %li + %span.author Gross, R. L. + %span.year 1990 + %span.title Heavy metal music: A new subculture in American society + %span.herausgeber The Journal of Popular Culture, 24(1), 119-130 + %li + %span.author Lartillot, O., & Toiviainen, P. + %span.year 2007 + %span.title A Matlab toolbox for musical feature extraction from audio + %span.herausgeber International Conference on Digital Audio Effects, Bordeaux, S. 237-244 + %li + %span.author Reyes, I. + %span.year 2008 + %span.title Sound, Technology, and interpretation in Subcultures of Heavy Music Production + %span.herausgeber Dissertation – Pittsburgh University + %li + %span.author Wallach, J., Berger, H. M., & Greene, P. D. + %span.year 2011 + %span.title Metal rules the globe: heavy metal music around the world + %span.herausgeber Duke University Press, S. 180ff + %li + %span.author Walser, R. + %span.year 1993 + %span.title Running with the devil: Power, gender, and madness in heavy metal music + %span.herausgeber Wesleyan University Press + %li + %span.author Weindl, D. + %span.year 2005 + %span.title Musik & Aggression. Untersucht anhand des Musikgenres Heavy Metal + %span.herausgeber Peter Lang, Frankfurt a.M. + %li + %span.author Weinstein, D. + %span.year 1991 + %span.title Heavy Metal: A Cultural Sociology + %span.herausgeber New York, N.Y.: Maxwell Macmillan International + %li + %span.author von Georgi, R., Kraus, H., Cimbal, K., & Schütz, M. + %span.year 2011 + %span.title Persönlichkeit und Emotionsmodulation mittels Musik bei Heavy-Metal Fans + %span.herausgeber Musikpsychologie. Jahrbuch der Deutschen Gesellschaft für Musikpsychologie, Bd, 21, 90-118 diff --git a/marduk_envelope.min.svg b/marduk_envelope.min.svg new file mode 100644 index 0000000..da4d566 --- /dev/null +++ b/marduk_envelope.min.svg @@ -0,0 +1 @@ +02468100.050.10.150.20.250.3Envelope Marduk − Slay the Nazarenetime (s)amplitude \ No newline at end of file diff --git a/marduk_envelope.svg b/marduk_envelope.svg new file mode 100644 index 0000000..f0e3630 --- /dev/null +++ b/marduk_envelope.svg @@ -0,0 +1,332 @@ + +image/svg+xml0 +2 +4 +6 +8 +10 +0.05 +0.1 +0.15 +0.2 +0.25 +0.3 +Envelope Marduk − Slay the Nazarenetime (s) +amplitude + diff --git a/metadeskriptor_korr2.min.svg b/metadeskriptor_korr2.min.svg new file mode 100644 index 0000000..c18a929 --- /dev/null +++ b/metadeskriptor_korr2.min.svg @@ -0,0 +1 @@ +012345671234567Automatisierte Extraktion mittels Meta−DeskriptorDurchschnittsbewertung durch Probanden \ No newline at end of file diff --git a/metadeskriptor_korr2.svg b/metadeskriptor_korr2.svg new file mode 100644 index 0000000..6a0f020 --- /dev/null +++ b/metadeskriptor_korr2.svg @@ -0,0 +1,612 @@ + +image/svg+xml0 +1 +2 +3 +4 +5 +6 +7 +1 +2 +3 +4 +5 +6 +7 +Automatisierte Extraktion mittels Meta−Deskriptor +Durchschnittsbewertung durch Probanden + diff --git a/stevens_envelope.min.svg b/stevens_envelope.min.svg new file mode 100644 index 0000000..a8ce134 --- /dev/null +++ b/stevens_envelope.min.svg @@ -0,0 +1 @@ +02468100.020.040.060.080.1Envelope "Cat Stevens − Sad Lisa"time (s)amplitude \ No newline at end of file diff --git a/stevens_envelope.svg b/stevens_envelope.svg new file mode 100644 index 0000000..ca3e988 --- /dev/null +++ b/stevens_envelope.svg @@ -0,0 +1,308 @@ + +image/svg+xml0 +2 +4 +6 +8 +10 +0.02 +0.04 +0.06 +0.08 +0.1 +Envelope "Cat Stevens − Sad Lisa"time (s) +amplitude + diff --git a/style.scss b/style.scss new file mode 100644 index 0000000..ffc162d --- /dev/null +++ b/style.scss @@ -0,0 +1,352 @@ +@media screen { + html { + border: 1px solid red + } +} + +#nurtext { + &, * { + background: inherit !important; + box-shadow: inherit !important; + -webkit-print-color-adjust: inherit !important; + } +} + +#nurhintergrund { + *, & { + &, &:before, &:after { + color: rgba(0, 0, 0, 0) !important; + } + } + + img { + visibility: hidden !important; + } + + th, td { + border-color: rgba(0, 0, 0, 0) !important; + } +} + +html { + width: 841mm; + height: 1189mm; + font-size: 30pt; + box-sizing: border-box; +} + +header { + h1 { + margin: 0 { + bottom: 0.5rem; + }; + padding: 0; + font-size: 3rem; + text-align: center; + } + + padding: 0 1rem 0 1rem; + position: relative; + + &::after { + background: linear-gradient(rgba(256, 256, 256, 0.8) 7cm, rgba(256, 256, 256, 0)); + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + content: ""; + -webkit-print-color-adjust: exact; + -webkit-filter: opacity(1); + z-index: -1; + } + + p { + text-align: center; + margin: 0; + padding: 0; + } +} + +header, main, footer { + clear: both; +} + +footer { + padding-top: 0.5em; +} + +body { + margin: 0; + background: url(brushed-metal.new.svg); + color: black; + font-family: "Roboto"; +} + +/*img + * filter: url("#rauschen") */ +section { + margin: 1rem 0 0 0; + padding: 2.5rem 1rem 0.5rem 1rem; + border-radius: 0 0 0.5rem 0.5rem; + position: relative; + border-radius: 0.5rem 2rem 0.5rem 0.5rem; + + &:first-child { + margin-top: 0; + } + + &:before { + z-index: -1; + background: linear-gradient(rgba(139, 141, 196, 0.8) 2.2rem, rgba(256, 256, 256, 0.8) 2.2rem); + content: ""; + border-radius: 0.5rem 2rem 0.5rem 0.5rem; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + box-shadow: 0 0 1rem #555; + -webkit-print-color-adjust: exact; + -webkit-filter: opacity(1); + } + + h1:first-child { + //border-bottom: 0.3rem solid black + //border-radius: 0.18rem 1.68rem 0 0 + font-size: 1.5rem; + + //border-radius: 0.5rem 2rem 0 0 + padding: 0.1em 0.5rem; + margin: (-2.5rem) -1rem 0.5rem -1rem; + + //background-color: rgba(128,128,256,0.8) + + } +} + +quellen { + color: #333; + + &:before { + content: "("; + } + + &:after { + content: ")"; + } + + quelle, etc { + white-space: nowrap; + } + + quelle { + &:not(:last-child):after { + content: " " attr(jahr) ";"; + } + + &:last-child:after { + content: " " attr(jahr); + } + } + + etc { + &:after { + content: "etc."; + } + } +} + +#column1, #column2 { + display: inline-block; + box-sizing: border-box; + margin: 0; + padding: 0 1em 0.5em 1em; + vertical-align: top; +} + +#column1 { + width: 40%; + padding-right: 0.5em; +} + +#column2 { + float: right; + padding-left: 0.7em; + margin-left: -0.5em; + width: 60%; +} + +.logos { + width: 20em; + float: right; + + img { + height: 4em; + margin: 0.3em; + } +} + +q { + quotes: "„" "“"; +} + +h1 { + font-family: "Tinos"; + //font-weight: normal; +} + +em { + color: #500; +} + +p { + margin: { + top: 0.5em; + bottom: 0.5em; + }; +} + +li p:first-child:last-child { + margin: { + top: 0.25em; + bottom: 0.25em; + }; +} + +feature { + font-family: monospace; + font-size: 0.9em; +} + +header { + figure { + float: right; + display: block; + + //background: white + //box-shadow: 0 0 1em white + //border-radius: 1em + //padding: 1em + padding: 0; + margin: 0; + } +} + +main { + margin-top: 0.7em; + + img { + margin: -0.5em; + } + + figure { + margin: 0; + + img { + width: 100%; + } + + &.fifty { + float: right; + width: 50%; + clear: right; + } + + &.quarterly { + float: right; + width: 30%; + clear: right; + } + } +} + +.clear { + clear: both; +} + +#authors { + .author { + &:not(:first-child):before { + content: ", "; + } + + &:after { + vertical-align: super; + font-size: 0.6em; + content: attr(data-mark); + } + } +} + +#institutions { + .institution { + &:not(:last-child):after { + content: "; "; + } + + &:before { + vertical-align: super; + font-size: 0.6em; + content: attr(data-mark) " "; + } + } +} + +#literatur { + font-size: 0.5em; + margin: 0 2em; +} + +table { + border-collapse: collapse; + border-spacing: 0; + + th, td { + border: 1px solid #aaa; + } +} + +ul { + margin-top: 0; + margin-bottom: 0; +} + +ul.literatur { + a { + text-decoration: inherit !important; + color: inherit !important; + } + + list-style: none; + margin: 0; + padding: 0; + + li { + color: gray; + display: inline; + + .year { + &:before { + content: "("; + } + + &:after { + content: ")"; + } + } + + .title { + color: black; + + &::after { + content: "."; + } + } + + &:not(:last-child):after { + content: " || "; + color: #337; + } + } +} diff --git a/uni_logo_transparent.png b/uni_logo_transparent.png new file mode 100644 index 0000000..f5a1c8e Binary files /dev/null and b/uni_logo_transparent.png differ diff --git a/uni_wien_logo.png b/uni_wien_logo.png new file mode 100644 index 0000000..5fc717d Binary files /dev/null and b/uni_wien_logo.png differ