Skip to content

Allow to import character subsets other than Latin #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
erykpiast wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow to import character subsets other than Latin #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0edfcdf
Allow to import character subset other than Latin
Dec 6, 2017
112d263
Revert baseurl change
Dec 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 82 additions & 54 deletions scripts/create-package-from-google-font-id.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const { packageJson, fontFace, readme } = require(`./templates`)
const download = require(`./download-file`)
const commonWeightNameMap = require(`./common-weight-name-map`)

//const baseurl = `https://google-webfonts-helper.herokuapp.com/api/fonts/`
// const baseurl = `https://google-webfonts-helper.herokuapp.com/api/fonts/`
const baseurl = `http://localhost:9000/api/fonts/`
const id = process.argv[2]
if (!id) {
Expand All @@ -27,9 +27,18 @@ const dirs = p =>
const packagesCount = dirs(`./packages`).length

const res = requestSync(`GET`, baseurl + id)
const typeface = JSON.parse(res.getBody(`UTF-8`))
const defSubsetTypeface = JSON.parse(res.getBody(`UTF-8`))
const subsetsWithoutDefault = defSubsetTypeface.subsets.filter((subset) => subset !== defSubsetTypeface.defSubset)

const typefaceDir = `packages/${typeface.id}`
const subsets = [[
defSubsetTypeface.defSubset,
defSubsetTypeface
]].concat(subsetsWithoutDefault.map((subset) => {
const subsetRes = requestSync(`GET`, baseurl + id + '?subsets=' + defSubsetTypeface.defSubset + ',' + subset)
return [subset, JSON.parse(subsetRes.getBody(`UTF-8`))]
}))

const typefaceDir = `packages/${defSubsetTypeface.id}`

// Create the directories for this typeface.
fs.ensureDirSync(typefaceDir)
Expand All @@ -40,42 +49,50 @@ fs.writeFileSync(typefaceDir + `/.gitignore`, "/files")
fs.writeFileSync(typefaceDir + `/.npmignore`, "")
fs.writeFileSync(typefaceDir + `/files/.gitignore`, "")

const makeFontFilePath = (item, extension) => {
const makeFontFilePath = (item, subset, extension) => {
let style = ""
if (item.fontStyle !== `normal`) {
style = item.fontStyle
}
return `./files/${typeface.id}-${typeface.defSubset}-${item.fontWeight}${style}.${extension}`
return `./files/${defSubsetTypeface.id}-${subset}-${item.fontWeight}${style ? '-' + style : ''}.${extension}`
}

// Download all font files.
async.map(
typeface.variants,
(item, callback) => {
// Download woff, and woff2 in parallal.
const downloads = [`woff`, `woff2`].map(extension => {
const dest = path.join(typefaceDir, makeFontFilePath(item, extension))
const url = item[extension]
return {
extension,
url,
dest,
}
})
item.errored = false
subsets,
([subset, typeface], callback) => {
// Download all font files.
async.map(
downloads,
(d, downloadDone) => {
const { url, dest, extension } = d
download(url, dest, err => {
if (err) {
console.log("error downloading", typeface.id, url, err)
// Track if a download errored.
item.errored = true
typeface.variants,
(item, callback) => {
// Download woff, and woff2 in parallal.
const downloads = [`woff`, `woff2`].map(extension => {
const dest = path.join(typefaceDir, makeFontFilePath(item, subset, extension))
const url = item[extension]
return {
extension,
url,
dest,
subset,
}
// log(`Finished downloading "${url}" to "${dest}"`)
downloadDone()
})

item.errored = false
async.map(
downloads,
(d, downloadDone) => {
const { url, dest, extension, subset } = d
download(url, dest, err => {
if (err) {
console.log("error downloading", typeface.id, url, err)
// Track if a download errored.
item.errored = true
}
// log(`Finished downloading "${url}" to "${dest}"`)
downloadDone()
})
},
callback
)
},
callback
)
Expand Down Expand Up @@ -111,52 +128,63 @@ async.map(

// Write out the README.md
const packageReadme = readme({
typefaceId: typeface.id,
typefaceName: typeface.family,
typefaceId: defSubsetTypeface.id,
typefaceName: defSubsetTypeface.family,
count: packagesCount,
})

fs.writeFileSync(`${typefaceDir}/README.md`, packageReadme)

// Write out package.json file
const packageJSON = packageJson({
typefaceId: typeface.id,
typefaceName: typeface.family,
typefaceId: defSubsetTypeface.id,
typefaceName: defSubsetTypeface.family,
})

fs.writeFileSync(`${typefaceDir}/package.json`, packageJSON)

// Write out index.css file
const variants = _.sortBy(typeface.variants, item => {
const variants = _.sortBy(defSubsetTypeface.variants, item => {
let sortString = item.fontWeight
if (item.fontStyle === `italic`) {
sortString += item.fontStyle
}
return sortString
})
css = variants.map(item => {
if (item.errored) {
return false
}
let style = ""
if (item.fontStyle !== `normal`) {
style = item.fontStyle
}
return fontFace({
typefaceId: typeface.id,
typefaceName: typeface.family,
style,
styleWithNormal: item.fontStyle,
weight: item.fontWeight,
commonWeightName: commonWeightNameMap(item.fontWeight),
woffPath: makeFontFilePath(item, "woff"),
woff2Path: makeFontFilePath(item, "woff2"),
defSubsetTypeface.subsets.forEach((subset, _, subsets) => {
css = variants.map(item => {
if (item.errored) {
return false
}
let style = ""
if (item.fontStyle !== `normal`) {
style = item.fontStyle
}
return fontFace({
typefaceId: defSubsetTypeface.id,
typefaceName: defSubsetTypeface.family,
typefaceLocalName: item.local[0],
typefaceLocalName2: item.local[1],
style,
subset,
styleWithNormal: item.fontStyle,
weight: item.fontWeight,
commonWeightName: commonWeightNameMap(item.fontWeight),
woffPath: makeFontFilePath(item, subset, "woff"),
woff2Path: makeFontFilePath(item, subset, "woff2"),
})
})

const fileContent = css.join("")
const cssPath = `${typefaceDir}/${subset}.css`
console.log(`writing file ${cssPath}...`)
fs.writeFileSync(cssPath, fileContent)
if (subset === 'latin' || (subsets.length === 1)) {
fs.writeFileSync(`${typefaceDir}/index.css`, fileContent)
}
})

const cssPath = `${typefaceDir}/index.css`
fs.writeFileSync(`${typefaceDir}/index.css`, css.join(""))
console.log("finished downloading", typeface.family)
console.log("finished downloading", defSubsetTypeface.family)
})
}
)
15 changes: 13 additions & 2 deletions scripts/templates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ exports.fontFace = _.template(
font-display: swap;
font-weight: <%= weight %>;
src:
local('<%= typefaceName %> <%= commonWeightName %> <%= style %>'),
local('<%= typefaceName %>-<%= commonWeightName %><%= style %>'),
local('<%= typefaceLocalName %>'),
local('<%= typefaceLocalName2 %>'),
url('<%= woff2Path %>') format('woff2'), /* Super Modern Browsers */
url('<%= woffPath %>') format('woff'); /* Modern Browsers */
}
Expand Down Expand Up @@ -65,6 +65,17 @@ To use, simply require the package in your project’s entry file e.g.
require('typeface-<%= typefaceId %>')
\`\`\`

By default only basic subset of characters is included in the font file (it's Latin in most cases).
To add another one along the default, import specific CSS file.

\`\`\`javascript
// Load <%= typefaceName %> typeface with Latin plus Latin Extended subset
require('typeface-<%= typefaceId %>/latin-ext.css')

// Default subset is Latin
require('typeface-<%= typefaceId %>/latin.css') === require('typeface-<%= typefaceId %>')
\`\`\`

## About the Typefaces project.

Our goal is to add all open source fonts to NPM to simplify using great fonts in
Expand Down