Skip to content
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

typographic switch #573

Closed
wants to merge 3 commits into from
Closed

typographic switch #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
12439e1
add typographic modules
Apr 9, 2015
55a39f3
swap old smartypants with new one
Apr 9, 2015
bd2b85b
update tests to new typographic replacements
Apr 9, 2015
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
15 changes: 2 additions & 13 deletions lib/marked.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,19 +710,8 @@ InlineLexer.prototype.outputLink = function(cap, link) {

InlineLexer.prototype.smartypants = function(text) {
if (!this.options.smartypants) return text;
return text
// em-dashes
.replace(/--/g, '\u2014')
// opening singles
.replace(/(^|[-\u2014/(\[{"\s])'/g, '$1\u2018')
// closing singles & apostrophes
.replace(/'/g, '\u2019')
// opening doubles
.replace(/(^|[-\u2014/(\[{\u2018\s])"/g, '$1\u201c')
// closing doubles
.replace(/"/g, '\u201d')
// ellipses
.replace(/\.{3}/g, '\u2026');
var smartypants = require('./smartypants');
return smartypants(text);
};

/**
Expand Down
21 changes: 21 additions & 0 deletions lib/smartypants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
var compose = require('fn-compose');

var ellipses = require('typographic-ellipses');
var singleSpaces = require('typographic-single-spaces');

var apostrophes = require('typographic-apostrophes');
var quotes = require('typographic-quotes');
var apostrophesForPlurals = require('typographic-apostrophes-for-possessive-plurals');

var endashes = require('typographic-en-dashes');
var emdashes = require('typographic-em-dashes');

module.exports = compose(
apostrophes,
quotes,
apostrophesForPlurals,
endashes,
emdashes,
ellipses,
singleSpaces
);
10 changes: 10 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,15 @@
"showdown": "*",
"robotskirt": "*"
},
"dependencies": {
"fn-compose": "^1.0.0",
"typographic-apostrophes": "^1.0.0",
"typographic-apostrophes-for-possessive-plurals": "^1.0.0",
"typographic-ellipses": "^1.0.8",
"typographic-em-dashes": "^1.0.0",
"typographic-en-dashes": "^1.0.0",
"typographic-quotes": "^1.0.2",
"typographic-single-spaces": "^1.0.0"
},
"scripts": { "test": "node test", "bench": "node test --bench" }
}
4 changes: 2 additions & 2 deletions test/new/text.smartypants.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<p>Hello world ‘how’ “are” you — today…</p>
<p>Hello world “how” “are” you — today…</p>

<p>“It’s a more ‘challenging’ smartypants test…”</p>

<p>‘And,’ as a bonus — “one
<p>“And,” as a bonus — “one
multiline” test!</p>
4 changes: 2 additions & 2 deletions test/tests/text.smartypants.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<p>Hello world ‘how’ “are” you — today…</p>
<p>Hello world “how” “are” you — today…</p>

<p>“It’s a more ‘challenging’ smartypants test…”</p>

<p>‘And,’ as a bonus — “one
<p>“And,” as a bonus — “one
multiline” test!</p>