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.

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

Add mkdocs. #10

Merged
merged 1 commit into from
Jan 11, 2016
Merged

Add mkdocs. #10

merged 1 commit into from
Jan 11, 2016

Conversation

hayd
Copy link
Contributor

@hayd hayd commented Jan 10, 2016

This also adds two static files to the build:

  • mathjaxhelper.js (determine what mathjax sees as latex)
  • Lapidary.css (for the moment this fixes a small annoyance which I have with mathjax rendering of LHS nav, but potentially could do some other julia-specific tweaks).


<a href='#Main.Lapidary-1'> # </a>**Constant**

A documentation generator for Julia.
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The alternative is to stick a copy of the README in here (Note: the index.md is required on mkdocs). I definitely like how that's generated in the rewrite branch!

@MichaelHatherly
Copy link
Member

Thanks! Looks like I've been using 0.5-only features so travis is going to keep failing. For the moment probably best to just focus on getting this all working on 0.5 and do some compat fixes later on.

@hayd hayd mentioned this pull request Jan 10, 2016
Add assets directory of static files:
- Lapidary.css (small tweak to readthedocs LHS nav)
- mathjaxhelper.js (add latex support)
@hayd
Copy link
Contributor Author

hayd commented Jan 11, 2016

I've updated the branch with your change. It's much cleaner (which is great)!

We should move discussion of readme generation being circular to #12.

This works with mkdocs, but you have to turn it on at readthedocs (as I'm sure you know)!

http://lapidaryjl.readthedocs.org/en/latest/

MichaelHatherly added a commit that referenced this pull request Jan 11, 2016
@MichaelHatherly MichaelHatherly merged commit db52b67 into JuliaDocs:master Jan 11, 2016
@MichaelHatherly
Copy link
Member

Thanks!

@hayd hayd deleted the mkdocs branch January 11, 2016 06:54
@MichaelHatherly
Copy link
Member

RTDs appears to be a bit confused https://lapidaryjl.readthedocs.org/en/latest/. Or maybe I am... is this perhaps because the docs are in docs/build rather than docs?

@MichaelHatherly
Copy link
Member

Ah, looks like it's in https://lapidaryjl.readthedocs.org/en/latest/build/index.html. I guess that's not too bad.

@hayd
Copy link
Contributor Author

hayd commented Jan 11, 2016

I think doc is the more usual naming convention. Perhaps we need to move to that.

Dang it looks terrible!! Is that with mkdocs checked?

@hayd
Copy link
Contributor Author

hayd commented Jan 11, 2016

Eurgh, why can't everyone follow the CommonMark spec for fenced blocks. Sigh.

@hayd
Copy link
Contributor Author

hayd commented Jan 11, 2016

Crap. That's probably my fault lol! Ok!!

It get's made plain to (ok, well github don't follow spec either! should be able to start a new fenced block with 4 `):

```
```julia
julia> a = 1
1

julia> b = 2;

julia> a + b
3
```
```

Hmmmmmmmm

@hayd
Copy link
Contributor Author

hayd commented Jan 11, 2016

The solution is for plain to look in code block for the max ``` sequence and do one more that that. Since:

````
```julia
julia> a = 1
1

julia> b = 2;

julia> a + b
3
```
````

is valid (and parsed correctly by mkdocs!!).

@MichaelHatherly
Copy link
Member

I think doc is the more usual naming convention. Perhaps we need to move to that.

Fine with me. The main Julia repo names it doc so matching that would probably be for the best.

Dang it looks terrible!! Is that with mkdocs checked?

There wasn't an option to check for mkdocs that I saw. I think it gets detected automatically, maybe?

The solution is for plain to look in code block for the max ``` sequence and do one more that that.

If that looks alright everywhere then it's fine by me.

@hayd
Copy link
Contributor Author

hayd commented Jan 11, 2016

Posting a fix on julia shortly.

The option for mkdocs is in the admin/settings, it may be selected by default nowadays. You can also set the language (though I'm unsure if that does anything).

@hayd
Copy link
Contributor Author

hayd commented Jan 13, 2016

the "build" in https://lapidaryjl.readthedocs.org/en/latest/build/index.html I think means RTD is not reading the mkdocs file correctly... the LHS menu is not populated (it is with mkdocs serve), so I think there is something left to twiddle on their site.

@hayd
Copy link
Contributor Author

hayd commented Jan 13, 2016

In fact at the bottom of the page it says:

Built with Sphinx using a theme provided by Read the Docs.

when it should say MkDocs. http://lightgraphsjl.readthedocs.org/en/latest/

@MichaelHatherly
Copy link
Member

Yes, mkdocs serve works for me too locally. Perhaps a RTDs/mkdocs combo problem.

@hayd
Copy link
Contributor Author

hayd commented Jan 13, 2016

you have to select mkdocs in the settings...

@MichaelHatherly
Copy link
Member

I was sure that was selected when I created the site. Wasn't when I check just now. Looks much better now though, thanks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants