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

Honor 'toc' and 'num' options, allow empty table heading. #30

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

Honor 'toc' and 'num' options, allow empty table heading. #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
09a1cc7
Honor 'toc' and 'num' options.
jeansch Sep 7, 2018
3ed4b6b
Moved last changes at the right place.
jeansch Sep 7, 2018
026d360
Update.
jeansch Sep 7, 2018
267ca33
Allow empty table heading.
jeansch Sep 7, 2018
9e4b263
Update.
jeansch Sep 7, 2018
ce4dabd
Added status.
jeansch Apr 25, 2019
e56b737
Updated status.
jeansch Apr 25, 2019
4a0c796
Updated status.
jeansch Apr 26, 2019
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
10 changes: 6 additions & 4 deletions lib/org/converter/converter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,8 @@ Converter.prototype = {
this.sectionNumbers.length = thisHeaderLevel; // Collapse
}
this.sectionNumbers[thisHeaderLevel - 1]++;
sectionNumberText = this.sectionNumbers.join(".");
if (this.documentOptions.num)
sectionNumberText = this.sectionNumbers.join(".");
node.sectionNumberText = sectionNumberText; // Can be used in ToC
}

Expand Down Expand Up @@ -172,9 +173,10 @@ Converter.prototype = {
text = this.convertTableRow(node, childText, auxData);
break;
case Node.types.tableCell:
if (node.isHeader)
text = this.convertTableHeader(node, childText, auxData);
else
if (node.isHeader) {
if (childText)
text = this.convertTableHeader(node, childText, auxData);
} else
text = this.convertTableCell(node, childText, auxData);
break;
case Node.types.horizontalRule:
Expand Down
9 changes: 6 additions & 3 deletions lib/org/converter/html.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,12 @@ ConverterHTML.prototype = {
var title = this.orgDocument.title ? this.convertNode(this.orgDocument.title) : this.untitled;
var titleHTML = this.tag("h" + Math.max(Number(this.headerOffset), 1), title);
var contentHTML = this.convertNodes(this.orgDocument.nodes, true /* record headers */);
var toc = this.computeToc(this.documentOptions["toc"]);
var tocHTML = this.tocToHTML(toc);

var toc = '';
var tocHTML = '';
if (this.documentOptions.toc) {
toc = this.computeToc(this.documentOptions["toc"]);
tocHTML = this.tocToHTML(toc);
}
return {
title: title,
titleHTML: titleHTML,
Expand Down
21 changes: 13 additions & 8 deletions org.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

125 changes: 125 additions & 0 deletions status.org
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
* Pull requests on original

- [X] #30 (by me: done in my branch)
- [ ] #25
- [ ] #24
- [ ] #19
- [ ] #9 by fpinard

* Forks

| Fork | State | Age | Comment |
|----------------------------------------------------------+-------------------+-----+-----------------|
| https://github.com/mooz/org-js | original | | |
| https://github.com/coffee-cup/org-js | ehead | 8m | same as jeansch |
| https://github.com/jeansch/org-js | 5 ahead | 8m | my own fork |
| https://github.com/Emacs-Phoenix/org-js | 4 ahead | 9m | |
| https://github.com/mickael-kerjean/org-js | 2 ahead | 1y | |
| https://github.com/whacked/org-js | 7 ahead | 2y | |
| https://github.com/brool/org.js | 22 ehead | 3y | |
| https://github.com/Dushistov/org-js | 1 ahead | 3y | |
| https://github.com/JordanRickman/org-mode-js | 8 ahead | 3y | |
| https://github.com/Kyle-Verhoog/notes | 1 ahead | 4y | renamed only |
| https://github.com/nak2k/org-js | 1 ahead | 4y | |
|----------------------------------------------------------+-------------------+-----+-----------------|
| https://github.com/7696122/org-js | same | | |
| https://github.com/aixiak/org-js | same | | |
| https://github.com/albin-zhu/org-js | same | | |
| https://github.com/anuragpeshne/org-js | same | | |
| https://github.com/azizyemloul/org-js | same | | |
| https://github.com/base698/org-js | same | | |
| https://github.com/blrbiran/org-js | same | | |
| https://github.com/cool-repos-list-for-melioratus/org-js | same | | |
| https://github.com/d53dave/org-js | same | | |
| https://github.com/davidnuon/org-js | same | | |
| https://github.com/dsdstudio/org-js | same | | |
| https://github.com/ebpa/org-js | same | | |
| https://github.com/gaoyaoxin/org-js | same | | |
| https://github.com/h4ck3rm1k3/org-js | same | | |
| https://github.com/HairyRabbit/org-js | same | | |
| https://github.com/hytd/org-js | same | | |
| https://github.com/iMcG33k/org-js | same | | |
| https://github.com/Jasonic/org-js | same | | |
| https://github.com/leinadlime/org-js | same | | |
| https://github.com/leonhe/org-js | same | | |
| https://github.com/lsmag/org-js | same | | |
| https://github.com/lucidbard/org-js | same | | |
| https://github.com/marcosluna/org-js | same | | |
| https://github.com/melioratus/org-js | same | | |
| https://github.com/nio3000/org-js | same | | |
| https://github.com/nmuth/org-js | same | | |
| https://github.com/nomadics/org-js | same | | |
| https://github.com/notetiene/md-js | same | | |
| https://github.com/nunb/org-js | same | | |
| https://github.com/origamidance/org-js | same | | |
| https://github.com/pasoevi/org-js | same | | |
| https://github.com/pawelbx/org-js | same | | |
| https://github.com/PlumpMath/org-js | same | | |
| https://github.com/qyqx/org-js | same | | |
| https://github.com/rong002/org-js | same | | |
| https://github.com/rowhit/org-js | same | | |
| https://github.com/solkaz/org-ts | same | | |
| https://github.com/tfragner/org-js | same | | |
| https://github.com/tokareff/org-js | same | | |
| https://github.com/vuquangtam/org-js | same | | |
| https://github.com/whitemuu/org-js | same | | |
| https://github.com/zhuatw/org-js | same | | |
|----------------------------------------------------------+-------------------+-----+-----------------|
| https://github.com/pinard/org-js | 1 ehead 35 behind | | |
|----------------------------------------------------------+-------------------+-----+-----------------|
| https://github.com/anshulverma/org-js | behind | | |
| https://github.com/creamidea/org-js | behind | | |
| https://github.com/kwsk416/org-js | behind | | |
| https://github.com/priezz/org-js | behind | | |

* Commits

Here are the commits belong to the forks.
Renaming commits are discarded to keep only interesting things.

** Emacs-Phoenix https://github.com/Emacs-Phoenix/org-js

[feature] add class 'outline' to toc items
https://github.com/Emacs-Phoenix/org-js/commit/f47d68b7f83ba17438a68b63d01dbcb2890eb6eb

[FIX BUG] prevent dead loop when diretive un close
https://github.com/Emacs-Phoenix/org-js/commit/0c1ff42e855ab2cbef7e1ee54689dd79001b1568

parse link to image by prefix
https://github.com/Emacs-Phoenix/org-js/commit/c613969091c2019e822ba82c70139912b505f454

** mickael-kerjean https://github.com/mickael-kerjean/org-js

feature (headline property): Add support for headline inline
https://github.com/mickael-kerjean/org-js/commit/8b146edeb8bc82a501801ce7b4d999e26db6b1f9

fix (header keyword): support for more than just the TODO and DONE
https://github.com/mickael-kerjean/org-js/commit/eb7573035441624792f28be006c3597688a4f926a

** whacked https://github.com/whacked/org-js

/A Lot of things !/

** brool https://github.com/brool/org.js

/A Lot of things !/

** DONE Dushistov https://github.com/Dushistov/org-js

/Looks very specific, replace archive: links with static url, won't merge/

add archive: url type handling
https://github.com/Dushistov/org-js/commit/bd3e079553ba898115f7038aaa6d6de0b43b09cf

** DONE JordanRickman https://github.com/JordanRickman/org-mode-js

Renamed, GIT ignore, unfinined intent to use a new model.
Patch about how the parse the title, but looks that it breaks table stuff.

** DONE nak2k https://github.com/nak2k/org-js

No output section number texts
https://github.com/nak2k/org-js/commit/ca732cee4ea85b788373212a69448f682729ea8e

Also handled in my commit
https://github.com/nak2k/org-js/commit/ca732cee4ea85b788373212a69448f682729ea8e