Skip to content

Commit

Permalink
Merge pull request #198 from aphillips/gh-pages
Browse files Browse the repository at this point in the history
Fix web fonts so that we have consistent display. This is more comple…
  • Loading branch information
aphillips committed Jan 29, 2019
2 parents a692312 + cca8c67 commit ae51764
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 8 deletions.
4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -359,9 +359,9 @@ <h3>Terminology and Notation</h3>
</p>
<p>Most users would identify this word as containing four units of text. Each of the first three graphemes consists of two characters: a syllable and a modifying vowel character. So the word contains seven Unicode characters, but only four graphemes:</p>

<table>
<table style="width: 70%; margin-left: 15%; margin-right: 15%">
<tr>
<td>Word</td>
<td style="width: 30%">Word</td>
<td colspan=7 class="bigtext">&#x92f;&#x942;&#x928;&#x93f;&#x915;&#x94b;&#x921;</td>
</tr>
<tr>
Expand Down
40 changes: 34 additions & 6 deletions local.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,33 @@
src: url('W3CCharmodNormSubset-Regular.woff2') format('woff2');
}

@font-face {
font-family: 'noto_devanagari';
src: url('notosansdevanagari-bold-webfont.woff2') format('woff2'),
url('notosansdevanagari-bold-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;

}

@font-face {
font-family: 'noto_regular';
src: url('notosans-regular-webfont.woff2') format('woff2'),
url('notosans-regular-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;

}

@font-face {
font-family: 'noto_symbols';
src: url('notosanssymbols-regular-webfont.woff2') format('woff2'),
url('notosanssymbols-regular-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;

}

@font-face {
font-family: Khmer;
font-style: normal;
Expand Down Expand Up @@ -183,7 +210,7 @@ td.b-clear {
width: 20%;
text-align: center;
font-size: 36pt;
font-family: serif;
font-family: "Khmer", "noto_devanagari", "noto_symbols", "noto_regular", "NoToFu", "Palatino", "Times", "Times New Roman", "Verdana", sans-serif;
}

.tableSub {
Expand All @@ -201,6 +228,7 @@ td.b-clear {
td.bigtext {
font-size: 36pt;
text-align: center;
font-family: "Khmer", "noto_devanagari", "noto_symbols", "noto_regular", "NoToFu", "Palatino", "Times", "Times New Roman", "Verdana", sans-serif;
width: 20%;
}

Expand All @@ -214,19 +242,19 @@ div.exampleBox {

.exampleChar {
font-size: 36pt;
font-family: "Khmer", "NoToFu", "Palatino", "Times", "Times New Roman", "Verdana", serif;
font-family: "Khmer", "noto_devanagari", "noto_symbols", "noto_regular", "NoToFu", "Palatino", "Times", "Times New Roman", "Verdana", sans-serif;
}

.bidiExample {
font-size: 60pt;
font-family: "Naskh", "Palatino", "Times", "Times New Roman", "Verdana", "NoToFu", serif;
font-family: "Naskh", "Palatino", "Times", "Times New Roman", "Verdana", "noto_arabic", "noto_devanagari", "noto_symbols", "noto_regular", "NoToFu", serif;
text-align: center;
margin: 15px 15px 15px 15px;
padding: 2px;
}

.markup {
font-family: Lucida Console,NoToFu, monospace;
font-family: Lucida Console, "noto_devanagari", "noto_symbols", "noto_regular", NoToFu, monospace;
}

.shakespeare {
Expand All @@ -246,7 +274,7 @@ div.exampleBox {
}

.sampleCharacter {
font-family: "NoToFu", "Code2000", "Lucida Console", sans-serif;
font-family: "noto_devanagari", "noto_symbols", "noto_regular", "NoToFu", "Code2000", "Lucida Console", sans-serif;
}

p.quote {
Expand Down Expand Up @@ -283,7 +311,7 @@ div.terminologyExample {
margin-left: -15px;
font-size: 75%;
color: gray;
font-family: Lucida Console,NoToFu,monospace;
font-family: "Lucida Console", "noto_devanagari", "noto_symbols", "noto_regular", NoToFu,monospace;
}

p.syntaxExample {
Expand Down
Binary file added notosans-regular-webfont.woff
Binary file not shown.
Binary file added notosans-regular-webfont.woff2
Binary file not shown.
Binary file added notosansdevanagari-bold-webfont.woff
Binary file not shown.
Binary file added notosansdevanagari-bold-webfont.woff2
Binary file not shown.
Binary file added notosanssymbols-regular-webfont.woff
Binary file not shown.
Binary file added notosanssymbols-regular-webfont.woff2
Binary file not shown.

0 comments on commit ae51764

Please sign in to comment.