diff --git a/app/css/app.css b/app/css/app.css index da0e1f95..8f4f12fa 100644 --- a/app/css/app.css +++ b/app/css/app.css @@ -23,6 +23,12 @@ h1, h2, h3, h4, h5 { -ms-user-select: none; user-select: none; } +.hasselect { + -webkit-user-select: text; + -moz-user-select: text; + -ms-user-select: text; + user-select: text; +} a { cursor: pointer; } @@ -1075,7 +1081,6 @@ a.im_dialog_selected .im_dialog_date { .im_history_scrollable_wrap { outline: none ! important; - -webkit-user-select: text; position: relative; } .im_history_to_bottom { @@ -1600,6 +1605,14 @@ div.im_message_body { overflow: hidden; } +.im_message_meta, +.im_message_body { + -webkit-user-select: text; + -moz-user-select: text; + -ms-user-select: text; + user-select: text; +} + a.im_message_fwd_photo { position: absolute; margin-top: 1px; diff --git a/app/css/desktop.css b/app/css/desktop.css index a5b820f8..7ebbe082 100644 --- a/app/css/desktop.css +++ b/app/css/desktop.css @@ -18,6 +18,7 @@ .tg_head_btn { display: block; + font-weight: bold; padding: 16px 19px; color: #b9cfe3; font-size: 13px; @@ -139,7 +140,13 @@ background: url(../img/icons/General.png) no-repeat -10px -193px; background-size: 40px 678px; } - +.is_1x .icon-new-group, +.is_1x .icon-contacts, +.is_1x .icon-settings, +.is_1x .icon-faq, +.is_1x .icon-about { + background-image: url(../img/icons/General_1x.png); +} .tg_head_connecting_text { color: #b9cfe3; @@ -155,6 +162,9 @@ .tg_head_peer_dropdown { float: right; } +.tg_head_peer_status { + font-weight: normal; +} .tg_head_peer_dropdown .dropdown-menu { max-width: 100%; border-radius: 0; @@ -231,6 +241,12 @@ margin-right: 12px; vertical-align: top; } +.is_1x .icon-filter-photos, +.is_1x .icon-filter-video, +.is_1x .icon-filter-documents, +.is_1x .icon-filter-audio { + background-image: url(../img/icons/General_1x.png); +} .icon-filter-photos { width: 18px; height: 18px; @@ -839,7 +855,7 @@ a.im_panel_peer_photo .peer_initials { opacity: 0.8; } .is_1x .icon-emoji { - background-image: url(../img/icons/IconsetW_1x.png); + background-image: url(../img/icons/General_1x.png); } .im_emoji_btn:hover .icon-emoji { opacity: 1; @@ -896,7 +912,7 @@ a.im_panel_peer_photo .peer_initials { margin: 0; } .is_1x .icon-paperclip { - background-image: url(../img/icons/IconsetW_1x.png); + background-image: url(../img/icons/General_1x.png); } .im_attach:hover .icon-paperclip { opacity: 1; @@ -929,7 +945,7 @@ a.im_panel_peer_photo .peer_initials { opacity: 0.8; } .is_1x .icon-camera { - background-image: url(../img/icons/IconsetW_1x.png); + background-image: url(../img/icons/General_1x.png); } .im_media_attach:hover .icon-camera { opacity: 1; diff --git a/app/css/font.css b/app/css/font.css new file mode 100644 index 00000000..2809b869 --- /dev/null +++ b/app/css/font.css @@ -0,0 +1,49 @@ +/* From http://fonts.googleapis.com/css?family=Open+Sans:400&subset=latin,cyrillic */ + +/* cyrillic */ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url(../fonts/400c.woff2) format('woff2'); + unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; +} +/* latin */ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url(../fonts/400l.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; +} + +/* cyrillic */ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 600; + src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url(../fonts/600c.woff2) format('woff2'); + unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; +} +/* latin */ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 600; + src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url(../fonts/600l.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; +} + + +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + src: local('Open Sans'), local('OpenSans'), url(../fonts/400.woff2) format('woff2'), url(../fonts/400.woff) format('woff'), url(../fonts/400.ttf) format('truetype'), url(../fonts/400.svg#OpenSans) format('svg'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 600; + src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url(../fonts/600.woff2) format('woff2'), url(../fonts/600.woff) format('woff'), url(../fonts/600.ttf) format('truetype'), url(../fonts/600.svg#OpenSans) format('svg'); +} \ No newline at end of file diff --git a/app/fonts/400.svg b/app/fonts/400.svg new file mode 100644 index 00000000..930c4208 --- /dev/null +++ b/app/fonts/400.svg @@ -0,0 +1,1881 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/fonts/400.ttf b/app/fonts/400.ttf new file mode 100644 index 00000000..495dcc4e Binary files /dev/null and b/app/fonts/400.ttf differ diff --git a/app/fonts/400.woff b/app/fonts/400.woff new file mode 100644 index 00000000..28b94581 Binary files /dev/null and b/app/fonts/400.woff differ diff --git a/app/fonts/400.woff2 b/app/fonts/400.woff2 new file mode 100644 index 00000000..61604a6e Binary files /dev/null and b/app/fonts/400.woff2 differ diff --git a/app/fonts/400c.woff2 b/app/fonts/400c.woff2 new file mode 100644 index 00000000..61604a6e Binary files /dev/null and b/app/fonts/400c.woff2 differ diff --git a/app/fonts/400l.woff2 b/app/fonts/400l.woff2 new file mode 100644 index 00000000..34cbbf88 Binary files /dev/null and b/app/fonts/400l.woff2 differ diff --git a/app/fonts/600.svg b/app/fonts/600.svg new file mode 100644 index 00000000..80c8b5a8 --- /dev/null +++ b/app/fonts/600.svg @@ -0,0 +1,1881 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/fonts/600.ttf b/app/fonts/600.ttf new file mode 100644 index 00000000..0d3d55a6 Binary files /dev/null and b/app/fonts/600.ttf differ diff --git a/app/fonts/600.woff b/app/fonts/600.woff new file mode 100644 index 00000000..29eed515 Binary files /dev/null and b/app/fonts/600.woff differ diff --git a/app/fonts/600.woff2 b/app/fonts/600.woff2 new file mode 100644 index 00000000..78f42b0d Binary files /dev/null and b/app/fonts/600.woff2 differ diff --git a/app/fonts/600c.woff2 b/app/fonts/600c.woff2 new file mode 100644 index 00000000..78f42b0d Binary files /dev/null and b/app/fonts/600c.woff2 differ diff --git a/app/fonts/600l.woff2 b/app/fonts/600l.woff2 new file mode 100644 index 00000000..18047e20 Binary files /dev/null and b/app/fonts/600l.woff2 differ diff --git a/app/index.html b/app/index.html index 15bd0ada..f750f4e0 100644 --- a/app/index.html +++ b/app/index.html @@ -13,7 +13,9 @@ - + + + diff --git a/app/js/directives.js b/app/js/directives.js index 9ccd1111..7922ce78 100644 --- a/app/js/directives.js +++ b/app/js/directives.js @@ -647,12 +647,17 @@ angular.module('myApp.directives', ['myApp.filters']) if (!dialogsColWrap || !dialogsColWrap.offsetHeight) { dialogsColWrap = $('.im_dialogs_col_wrap')[0]; } + var footerHeight = footer ? footer.offsetHeight : 0; + if (footerHeight) { + footerHeight++; // Border bottom + } $(element).css({ height: $($window).height() - - (footer ? footer.offsetHeight : 0) - - (headWrap ? headWrap.offsetHeight : 44) - + footerHeight - + (headWrap ? headWrap.offsetHeight : 48) - (panelWrap ? panelWrap.offsetHeight : 58) - - parseInt($(dialogsColWrap).css('paddingBottom') || 0) + parseInt($(dialogsColWrap).css('paddingBottom') || 0) - + 1 // border bottom }); updateScroller(); @@ -1000,7 +1005,11 @@ angular.module('myApp.directives', ['myApp.filters']) if (!footer || !footer.offsetHeight) { footer = $('.footer_wrap')[0]; } - var historyH = $($window).height() - bottomPanelWrap.offsetHeight - (headWrap ? headWrap.offsetHeight : 44) - (footer ? footer.offsetHeight : 0); + var footerHeight = footer ? footer.offsetHeight : 0; + if (footerHeight) { + footerHeight++; // Border bottom + } + var historyH = $($window).height() - bottomPanelWrap.offsetHeight - (headWrap ? headWrap.offsetHeight : 48) - footerHeight; $(historyWrap).css({ height: historyH }); diff --git a/app/partials/desktop/im.html b/app/partials/desktop/im.html index a68984a8..12b5d230 100644 --- a/app/partials/desktop/im.html +++ b/app/partials/desktop/im.html @@ -4,7 +4,7 @@
-
+
@@ -86,7 +86,7 @@
-
+
diff --git a/app/webogram.appcache b/app/webogram.appcache index 267177ac..4178e5a2 100644 --- a/app/webogram.appcache +++ b/app/webogram.appcache @@ -1,6 +1,6 @@ CACHE MANIFEST -# 44 +# 51 NETWORK: * diff --git a/scripts/google_fonts_download.sh b/scripts/google_fonts_download.sh new file mode 100644 index 00000000..73bb201b --- /dev/null +++ b/scripts/google_fonts_download.sh @@ -0,0 +1,169 @@ +#!/usr/bin/env bash +# vim:noet:sts=4:ts=4:sw=4:tw=120 + +#======================================================================================================================= +# (c) 2014 Clemens Lang, neverpanic.de +# See https://neverpanic.de/blog/2014/03/19/downloading-google-web-fonts-for-local-hosting/ for details. +# +# With modifications by +# - Chris Jung, campino2k.de, and +# - Robert, github.com/rotx. +# +# Changelog: +# Version 1.1, 2014-06-21 +# - Remove colons and spaces from file names for Windows compatibility +# - Add check for Bash version, 4.x is required +# - Correctly handle fonts without a local PostScript name +# - Change format('ttf') to format('truetype') in CSS output +# - Add license header and comments +# - Added sed extended regex flag detection +# Version 1.0, 2014-03-19 +# +# License: +# Copyright (c) 2014, Clemens Lang +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, are permitted provided that the +# following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following +# disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the +# following disclaimer in the documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, +# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#======================================================================================================================= + +#======================================================================================================================= +# Place this script in the directory where you want the font files to be downloaded and a font.css file using the fonts +# to be created. Adjust the list of fonts in the $families variable below with the names of the Google fonts you want to +# use. If you like, you can adjust the $css variable to write the generated CSS to a different file. Not that this file +# will be created and overwritten if it exists. +#======================================================================================================================= + +declare -a families +families+=('Open+Sans:400') +families+=('Open+Sans:600') + +# Adjust this is you want the created file to have a different name. Note that this file will be overwritten! +css="font.css" +url="http://fonts.googleapis.com/css?family=Open+Sans:400,600" + +#======================================================================================================================= +# No user-serviceable parts below this line. If you just want to use this script, you can stop reading here. +# +# If you made modifications you'd like to see merged into this script, please mail me a patch to 'cl' at 'clang' dot +# 'name' or leave a comment at https://neverpanic.de/blog/2014/03/19/downloading-google-web-fonts-for-local-hosting/. +#======================================================================================================================= + +# Ensure the bash version is new enough. If it isn't error out with a helpful error message rather than crashing later. +# if [ ${BASH_VERSINFO[0]} -lt 4 ]; then +# echo "Error: This script needs Bash 4.x to run." >&2 +# exit 1 +# fi + +# Check whether sed is GNU or BSD sed, or rather, which parameter enables extended regex support. Note that GNU sed does +# have -E as an undocumented compatibility option on some systems. +if [ "$(echo "test" | sed -E 's/([st]+)$/xx\1/' 2>/dev/null)" == "texxst" ]; then + ESED="sed -E" +elif [ "$(echo "test" | sed -r 's/([st]+)$/xx\1/' 2>/dev/null)" == "texxst" ]; then + ESED="sed -r" +else + echo "Error: $(which sed) seems to lack extended regex support with -E or -r." >&2 + exit 2 +fi + +# Store the useragents we're going to use to trick Google's servers into serving us the correct CSS file. +declare -A useragent +useragent[eot]='Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)' +useragent[woff]='Mozilla/5.0 (Windows NT 6.1; WOW64; rv:27.0) Gecko/20100101 Firefox/27.0' +useragent[svg]='Mozilla/4.0 (iPad; CPU OS 4_0_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/4.1 Mobile/9A405 Safari/7534.48.3' +useragent[ttf]='Mozilla/5.0 (Windows NT 6.1) AppleWebKit/534.54.16 (KHTML, like Gecko) Version/5.1.4 Safari/534.54.16' + +# Clear the output file +>"$css" + +# Loop over the fonts, and download them one-by-one +for family in "${families[@]}"; do + echo -n "Downloading ${family}... " + printf "@font-face {\n" >>"$css" + + # Extract name, Windows-safe filename, font style and font weight from the font family name + fontname=$(echo "$family" | awk -F : '{print $1}') + fontnameescaped=$(echo "$family" | $ESED 's/( |:)/_/g') + fontstyle=$(echo "$family" | awk -F : '{print $2}') + fontweight=$(echo "$fontstyle" | $ESED 's/italic$//g') + + printf "\tfont-family: '%s';\n" "$fontname" >>"$css" + + # $fontstyle could be bolditalic, bold, italic, normal, or nothing. + case "$fontstyle" in + *italic) + printf "\tfont-style: italic;\n" >>"$css" + ;; + *) + printf "\tfont-style: normal;\n" >>"$css" + ;; + esac + + # Either bold, a number, or empty. If empty, default to "normal". + printf "\tfont-weight: %s;\n" "${fontweight:-normal}" >>"$css" + + printf "\tsrc:\n" >>"$css" + + # Determine the local names for the given fonts so we can use a locally-installed font if available. + local_name=$(curl -sf --get --data-urlencode "family=$family" "$url" | grep -E "src:" | $ESED "s/^.*src: local\\('([^']+)'\\),.*$/\\1/g") + local_postscript_name=$(curl -sf --get --data-urlencode "family=$family" "$url" | grep -E "src:" | $ESED "s/^.*, local\\('([^']+)'\\),.*$/\\1/g") + + # Some fonts don't have a local PostScript name. + printf "\t\tlocal('%s'),\n" "$local_name" >>"$css" + if [ -n "$local_postscript_name" ]; then + printf "\t\tlocal('%s'),\n" "$local_postscript_name" >>"$css" + fi + + # For each font format, download the font file and print the corresponding CSS statements. + for uakey in eot woff ttf svg; do + echo -n "$uakey " + + # Download Google's CSS and throw some regex at it to find the font's URL + if [ "$uakey" != "svg" ]; then + pattern="http:\\/\\/[^\\)]+\\.$uakey" + else + pattern="http:\\/\\/[^\\)]+" + fi + file=$(curl -sf -A "${useragent[$uakey]}" --get --data-urlencode "family=$family" "$url" | grep -Eo "$pattern" | sort -u) + printf "\t\t/* from %s */\n" "$file" >>"$css" + if [ "$uakey" == "svg" ]; then + # SVG fonts need the font after a hash symbol, so extract the correct name from Google's CSS + svgname=$(echo "$file" | $ESED 's/^[^#]+#(.*)$/\1/g') + fi + # Actually download the font file + curl -sfL "$file" -o "${fontnameescaped}.$uakey" + + # Generate the CSS statements required to include the downloaded file. + case "$uakey" in + eot) + printf "\t\turl('%s?#iefix') format('embedded-opentype'),\n" "${fontnameescaped}.$uakey" >>"$css" + ;; + woff) + printf "\t\turl('%s') format('woff'),\n" "${fontnameescaped}.$uakey" >>"$css" + ;; + ttf) + printf "\t\turl('%s') format('truetype'),\n" "${fontnameescaped}.$uakey" >>"$css" + ;; + svg) + printf "\t\turl('%s#%s') format('svg');\n" "${fontnameescaped}.${uakey}" "$svgname" >>"$css" + ;; + esac + done + + printf "}\n" >>"$css" + echo +done \ No newline at end of file