Skip to content

Commit c431e57

Browse files
authored
Merge pull request #273 from mathjax/issue207
remove speech-rule-engine integration
2 parents 9ce2c29 + 461e60e commit c431e57

23 files changed

+103
-462
lines changed

bin/am2html

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,9 @@ var argv = require("yargs")
3030
.usage("Usage: am2html [options] 'math' > file.html",{
3131
speech: {
3232
boolean: true,
33+
default: true,
3334
describe: "include speech text"
3435
},
35-
speechrules: {
36-
default: "mathspeak",
37-
describe: "ruleset to use for speech text (chromevox or mathspeak)"
38-
},
39-
speechstyle: {
40-
default: "default",
41-
describe: "style to use for speech text (default, brief, sbrief)"
42-
},
4336
linebreaks: {
4437
boolean: true,
4538
describe: "perform automatic line-breaking"
@@ -75,8 +68,6 @@ mjAPI.typeset({
7568
format: "AsciiMath",
7669
html:true, css: argv.css,
7770
speakText: argv.speech,
78-
speakRuleset: argv.speechrules.replace(/^chromevox$/i,"default"),
79-
speakStyle: argv.speechstyle,
8071
ex: argv.ex, width: argv.width,
8172
linebreaks: argv.linebreaks
8273
}, function (data) {

bin/am2htmlcss

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,9 @@ var argv = require("yargs")
3030
.usage("Usage: am2htmlcss [options] 'math' > file.html",{
3131
speech: {
3232
boolean: true,
33+
default: true,
3334
describe: "include speech text"
3435
},
35-
speechrules: {
36-
default: "mathspeak",
37-
describe: "ruleset to use for speech text (chromevox or mathspeak)"
38-
},
39-
speechstyle: {
40-
default: "default",
41-
describe: "style to use for speech text (default, brief, sbrief)"
42-
},
4336
linebreaks: {
4437
boolean: true,
4538
describe: "perform automatic line-breaking"
@@ -71,8 +64,6 @@ mjAPI.typeset({
7164
format: "AsciiMath",
7265
html:true, css: true,
7366
speakText: argv.speech,
74-
speakRuleset: argv.speechrules.replace(/^chromevox$/i,"default"),
75-
speakStyle: argv.speechstyle,
7667
ex: argv.ex, width: argv.width,
7768
linebreaks: argv.linebreaks
7869
}, function (data) {

bin/am2mml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,9 @@ var argv = require("yargs")
3030
.usage("Usage: am2mml [options] 'math' > file.mml",{
3131
speech: {
3232
boolean: true,
33+
default: true,
3334
describe: "include speech text"
3435
},
35-
speechrules: {
36-
default: "mathspeak",
37-
describe: "ruleset to use for speech text (chromevox or mathspeak)"
38-
},
39-
speechstyle: {
40-
default: "default",
41-
describe: "style to use for speech text (default, brief, sbrief)"
42-
},
4336
semantics: {
4437
boolean: true,
4538
describe: "add AsciiMath code in <semantics> tag"
@@ -64,9 +57,7 @@ mjAPI.start();
6457
mjAPI.typeset({
6558
math: argv._[0],
6659
format: "AsciiMath", mml:true,
67-
speakText: argv.speech,
68-
speakRuleset: argv.speechrules.replace(/^chromevox$/i,"default"),
69-
speakStyle: argv.speechstyle
60+
speakText: argv.speech
7061
}, function (data) {
7162
if (!data.errors) {console.log(data.mml)}
7263
});

bin/am2stree

Lines changed: 0 additions & 62 deletions
This file was deleted.

bin/am2svg

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,13 @@ var argv = require("yargs")
3030
.usage("Usage: am2svg [options] 'math' > file.svg",{
3131
linebreaks: {
3232
boolean: true,
33+
default: true,
3334
describe: "perform automatic line-breaking"
3435
},
3536
speech: {
3637
boolean: true,
3738
describe: "include speech text"
3839
},
39-
speechrules: {
40-
default: "mathspeak",
41-
describe: "ruleset to use for speech text (chromevox or mathspeak)"
42-
},
43-
speechstyle: {
44-
default: "default",
45-
describe: "style to use for speech text (default, brief, sbrief)"
46-
},
4740
font: {
4841
default: "TeX",
4942
describe: "web font to use"
@@ -72,8 +65,6 @@ mjAPI.typeset({
7265
format: "AsciiMath",
7366
svg:true,
7467
speakText: argv.speech,
75-
speakRuleset: argv.speechrules.replace(/^chromevox$/i,"default"),
76-
speakStyle: argv.speechstyle,
7768
ex: argv.ex, width: argv.width,
7869
linebreaks: argv.linebreaks
7970
}, function (data) {

bin/mml2html

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,9 @@ var argv = require("yargs")
3030
.usage("Usage: mml2html [options] 'math' > file.html",{
3131
speech: {
3232
boolean: true,
33+
default: true,
3334
describe: "include speech text"
3435
},
35-
speechrules: {
36-
default: "mathspeak",
37-
describe: "ruleset to use for speech text (chromevox or mathspeak)"
38-
},
39-
speechstyle: {
40-
default: "default",
41-
describe: "style to use for speech text (default, brief, sbrief)"
42-
},
4336
linebreaks: {
4437
boolean: true,
4538
describe: "perform automatic line-breaking"
@@ -75,8 +68,6 @@ mjAPI.typeset({
7568
format: "MathML",
7669
html:true, css: argv.css,
7770
speakText: argv.speech,
78-
speakRuleset: argv.speechrules.replace(/^chromevox$/i,"default"),
79-
speakStyle: argv.speechstyle,
8071
ex: argv.ex, width: argv.width,
8172
linebreaks: argv.linebreaks
8273
}, function (data) {

bin/mml2htmlcss

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,9 @@ var argv = require("yargs")
3030
.usage("Usage: mml2htmlcss [options] 'math' > file.html",{
3131
speech: {
3232
boolean: true,
33+
default: true,
3334
describe: "include speech text"
3435
},
35-
speechrules: {
36-
default: "mathspeak",
37-
describe: "ruleset to use for speech text (chromevox or mathspeak)"
38-
},
39-
speechstyle: {
40-
default: "default",
41-
describe: "style to use for speech text (default, brief, sbrief)"
42-
},
4336
linebreaks: {
4437
boolean: true,
4538
describe: "perform automatic line-breaking"
@@ -71,8 +64,6 @@ mjAPI.typeset({
7164
format: "MathML",
7265
html:true, css: true,
7366
speakText: argv.speech,
74-
speakRuleset: argv.speechrules.replace(/^chromevox$/i,"default"),
75-
speakStyle: argv.speechstyle,
7667
ex: argv.ex, width: argv.width,
7768
linebreaks: argv.linebreaks
7869
}, function (data) {

bin/mml2mml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,9 @@ var argv = require("yargs")
3131
.usage("Usage: mml2mml [options] 'math' > file.mml",{
3232
speech: {
3333
boolean: true,
34+
default: true,
3435
describe: "include speech text"
3536
},
36-
speechrules: {
37-
default: "mathspeak",
38-
describe: "ruleset to use for speech text (chromevox or mathspeak)"
39-
},
40-
speechstyle: {
41-
default: "default",
42-
describe: "style to use for speech text (default, brief, sbrief)"
43-
},
4437
extensions: {
4538
default: "",
4639
describe: "extra MathJax extensions e.g. 'Safe,TeX/noUndefined'"
@@ -54,9 +47,7 @@ mjAPI.start();
5447
mjAPI.typeset({
5548
math: argv._[0],
5649
format: "MathML", mml:true,
57-
speakText: argv.speech,
58-
speakRuleset: argv.speechrules.replace(/^chromevox$/i,"default"),
59-
speakStyle: argv.speechstyle
50+
speakText: argv.speech
6051
}, function (data) {
6152
if (!data.errors) {console.log(data.mml)}
6253
});

bin/mml2stree

Lines changed: 0 additions & 62 deletions
This file was deleted.

bin/mml2svg

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,9 @@ var argv = require("yargs")
3434
},
3535
speech: {
3636
boolean: true,
37+
default: true,
3738
describe: "include speech text"
3839
},
39-
speechrules: {
40-
default: "mathspeak",
41-
describe: "ruleset to use for speech text (chromevox or mathspeak)"
42-
},
43-
speechstyle: {
44-
default: "default",
45-
describe: "style to use for speech text (default, brief, sbrief)"
46-
},
4740
font: {
4841
default: "TeX",
4942
describe: "web font to use"
@@ -72,8 +65,6 @@ mjAPI.typeset({
7265
format: "MathML",
7366
svg:true,
7467
speakText: argv.speech,
75-
speakRuleset: argv.speechrules.replace(/^chromevox$/i,"default"),
76-
speakStyle: argv.speechstyle,
7768
ex: argv.ex, width: argv.width,
7869
linebreaks: argv.linebreaks
7970
}, function (data) {

0 commit comments

Comments
 (0)