Font family (#15)

plainlab · Apr 3, 2022 · 83ee072 · 83ee072
1 parent c6666a3
commit 83ee072
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -19,7 +19,6 @@ A manual written in Bookless (WIP): https://bookless.github.io
 - [x] Export books to PDF / ePub / HTML
 - [x] Cross-platform: Windows, macOS, Linux
 - [ ] Multilingual spelling check
-- [ ] Beautiful book template
 
 ## Installation
 

diff --git a/release/app/package-lock.json b/release/app/package-lock.json
diff --git a/release/app/package.json b/release/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bookless",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Hassle-free book-writing app",
   "main": "./dist/main/main.js",
   "author": {

diff --git a/src/main/export.ts b/src/main/export.ts
@@ -7,13 +7,13 @@ import { JSON, Meta } from '../renderer/state/AppState';
 import { bookless2pandoc, loadConfig } from './config';
 
 const exportFormats = [
-  { name: 'PDF (pdf)', extensions: ['pdf'] },
-  { name: 'EPUB (epub)', extensions: ['epub'] },
-  { name: 'HTML (html)', extensions: ['html'] },
+  { name: 'PDF', extensions: ['pdf'] },
+  { name: 'EPUB', extensions: ['epub'] },
+  { name: 'HTML', extensions: ['html'] },
 ];
 
 const markdownExt =
-  'markdown+header_attributes+footnotes+tex_math_dollars+implicit_figures+link_attributes+grid_tables';
+  'markdown+header_attributes+footnotes+tex_math_dollars+implicit_figures+link_attributes+grid_tables+yaml_metadata_block';
 
 interface ExportOptions {
   dir: string;
@@ -39,6 +39,7 @@ const buildOut = (exp: ExportOptions, conf: Meta): Out => {
   // Default args
   out.output = exp.outputPath;
   out.from = markdownExt;
+  out['data-dir'] = exp.dir;
   out['resource-path'] = exp.dir;
   out.standalone = true;
   out.katex = true;

diff --git a/src/renderer/components/Config/Config.tsx b/src/renderer/components/Config/Config.tsx
@@ -72,19 +72,14 @@ const metaKvs: Kv[] = [
 
 const layoutKvs: Kv[] = [
   {
-    name: ConfigKey.font,
-    label: 'Font',
-    type: 'select',
-    options: [
-      '',
-      'Georgia, serif',
-      'Helvetica, Arial, sans-serif',
-      'Palatino, Palatino Linotype, serif',
-    ],
+    name: ConfigKey.fontFamily,
+    label: 'Font family',
+    type: 'string',
+    placeholder: 'mathpazo',
   },
   {
     name: ConfigKey.fontSize,
-    label: 'Font size',
+    label: 'Font size (px)',
     type: 'number',
     step: 1,
     onLoad: (s) => (s ? parseInt(s, 10).toString() : ''),

diff --git a/src/renderer/state/AppState.ts b/src/renderer/state/AppState.ts
@@ -33,7 +33,7 @@ export const ConfigKey = {
   author: 'variables.author',
   date: 'variables.date',
   lang: 'variables.lang',
-  font: 'variables.mainfont',
+  fontFamily: 'variables.fontfamily',
   fontSize: 'variables.fontsize',
   lineHeight: 'variables.linestretch',
   headerIncludes: 'variables.headerIncludes',