updated release version
This commit is contained in:
parent
445dd05319
commit
a30ee8c2bd
4 changed files with 148 additions and 2 deletions
|
@ -1,4 +1,4 @@
|
||||||
Marginalia 0.7.1
|
Marginalia 0.8.0
|
||||||
================
|
================
|
||||||
|
|
||||||
**[Marginalia has a new home](http://blog.fogus.me/2013/08/12/marginalia-has-a-new-home/)**
|
**[Marginalia has a new home](http://blog.fogus.me/2013/08/12/marginalia-has-a-new-home/)**
|
||||||
|
|
130
README.md~
Normal file
130
README.md~
Normal file
|
@ -0,0 +1,130 @@
|
||||||
|
Marginalia 0.7.1
|
||||||
|
================
|
||||||
|
|
||||||
|
**[Marginalia has a new home](http://blog.fogus.me/2013/08/12/marginalia-has-a-new-home/)**
|
||||||
|
|
||||||
|
![marginalia](http://farm8.staticflickr.com/7057/6828224448_32b51e5784_z_d.jpg "Marginalia")
|
||||||
|
|
||||||
|
*Ultra-lightweight literate programming[1] for [Clojure](http://clojure.org) and ClojureScript inspired by [docco](http://jashkenas.github.com/docco/)*
|
||||||
|
|
||||||
|
Marginalia is a source code documentation tool that parses Clojure and ClojureScript code and outputs a side-by-side source view with appropriate comments and docstrings aligned.
|
||||||
|
|
||||||
|
To get a quick look at what the Marginalia output looks like, [visit the official site](http://gdeer81.github.io/marginalia/).
|
||||||
|
|
||||||
|
**[View the release notes for this version of Marginalia](https://github.com/gdeer81/marginalia/blob/master/docs/release-notes/marginalia-v0.7.1-release-notes.markdown)**
|
||||||
|
|
||||||
|
Usage
|
||||||
|
-----
|
||||||
|
|
||||||
|
Currently Marginalia can be used in a number of ways as described below.
|
||||||
|
|
||||||
|
### Leiningen
|
||||||
|
|
||||||
|
[http://github.com/gdeer81/lein-marginalia](http://github.com/gdeer81/lein-marginalia)
|
||||||
|
|
||||||
|
To use Marginalia with Leiningen add the following code to the project's `project.clj` file:
|
||||||
|
|
||||||
|
With Leiningen 1.x, add `[lein-marginalia "0.7.1"]` to your project.clj's `:dev-dependencies` argument of the `defproject` function, then run `lein deps`.
|
||||||
|
With Leiningen 2.x, add `[[lein-marginalia "0.7.1"]]` to the `:plugins` entry in either your project.clj file or your `:user` profile.
|
||||||
|
See the [lein-marginalia](http://github.com/gdeer81/lein-marginalia) page for more details.
|
||||||
|
|
||||||
|
Once installed, you can generate your complete source documentation with the command:
|
||||||
|
|
||||||
|
lein marg <options> <files>
|
||||||
|
|
||||||
|
Marginalia accepts options as described below:
|
||||||
|
|
||||||
|
* -d --dir Directory into which the documentation will be written (default `docs`)
|
||||||
|
* -f --file File into which the documentation will be written (default `uberdoc.html`)
|
||||||
|
* -n --name Project name (if not given will be taken from `project.clj`)
|
||||||
|
* -v --version Project version (if not given will be taken from `project.clj`)
|
||||||
|
* -D --desc Project description (if not given will be taken from `project.clj`)
|
||||||
|
* -a --deps Project dependencies in the form `<group1>:<artifact1>:<version1>;<group2>...` (if not given will be taken from `project.clj`)
|
||||||
|
* -c --css Additional css resources `<resource1>;<resource2>;...` (if not given will be taken from `project.clj`)
|
||||||
|
* -j --js Additional javascript resources `<jsfile1>;<jsfile2>;...` (if not given will be taken from `project.clj`)
|
||||||
|
* -m --multi Generate each namespace documentation as a separate file
|
||||||
|
|
||||||
|
### Maven
|
||||||
|
|
||||||
|
The [zi plugin](https://github.com/pallet/zi) supports Marginalia.
|
||||||
|
|
||||||
|
Add this code to the project's `pom.xml` file, and run the command `mvn zi:marginalia`.
|
||||||
|
|
||||||
|
```xml
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.cloudhoist.plugin</groupId>
|
||||||
|
<artifactId>zi</artifactId>
|
||||||
|
<version>0.5.0</version>
|
||||||
|
<configuration>
|
||||||
|
<marginaliaTargetDirectory>autodoc/marginalia</marginaliaTargetDirectory>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
```
|
||||||
|
|
||||||
|
And the following to the project's `settings.xml` file.
|
||||||
|
|
||||||
|
```xml
|
||||||
|
<pluginGroups>
|
||||||
|
<pluginGroup>org.cloudhoist.plugin</pluginGroup>
|
||||||
|
</pluginGroups>
|
||||||
|
|
||||||
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<id>clojure-dev</id>
|
||||||
|
<pluginRepositories>
|
||||||
|
<pluginRepository>
|
||||||
|
<id>sonatype-snapshots</id>
|
||||||
|
<url>http://oss.sonatype.org/content/repositories/releases</url>
|
||||||
|
</pluginRepository>
|
||||||
|
</pluginRepositories>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
|
|
||||||
|
<activeProfiles>
|
||||||
|
<activeProfile>clojure-dev</activeProfile>
|
||||||
|
</activeProfiles>
|
||||||
|
```
|
||||||
|
|
||||||
|
Contributors and thanks
|
||||||
|
-----------------------
|
||||||
|
|
||||||
|
I would like to thank Zachary Kim for taking a pile of incoherent code and making it something worth using. Marginalia would be nothing without his hard work and vision.
|
||||||
|
|
||||||
|
I would also like to thank Justin Balthrop and Brenton Ashworth for their support and code contributions.
|
||||||
|
|
||||||
|
Notes
|
||||||
|
-----
|
||||||
|
|
||||||
|
[1] While the phrase *ultra-lightweight literate programming* is used to describe Marginalia, it is in no way a tool for classical literate programming. That is, Marginalia is a linear documentation generator allowing no out-of-order reassembly of source.
|
||||||
|
|
||||||
|
Marginalia is...
|
||||||
|
----------------
|
||||||
|
|
||||||
|
*sorted by first commit*
|
||||||
|
|
||||||
|
- [Fogus](http://fogus.me/fun/)
|
||||||
|
- [Zachary Kim](https://github.com/zk)
|
||||||
|
- [Justin Balthrop](https://github.com/ninjudd)
|
||||||
|
- [Brenton Ashworth](https://github.com/brentonashworth)
|
||||||
|
- [Nicolas Buduroi](https://github.com/budu)
|
||||||
|
- [Michael Harrison](https://github.com/goodmike)
|
||||||
|
- [Anthony Grimes](https://github.com/Raynes)
|
||||||
|
- [Sam Ritchie](https://github.com/sritchie)
|
||||||
|
- [Hugo Duncan](https://github.com/hugoduncan)
|
||||||
|
- [Vadim](https://github.com/dm3)
|
||||||
|
- [Meikel Brandmeyer](https://github.com/kotarak)
|
||||||
|
- [Paul Dorman](https://github.com/pauldorman)
|
||||||
|
- [Deepak Giridharagopal](https://github.com/grimradical)
|
||||||
|
- [Tero Parviainen](https://github.com/teropa)
|
||||||
|
- [MerelyAPseudonym](https://github.com/MerelyAPseudonym)
|
||||||
|
- [Ivan](https://github.com/ivantm)
|
||||||
|
- [benjamin bader] (https://github.com/benjamin-bader)
|
||||||
|
|
||||||
|
If I've missed your name then please ping me.
|
||||||
|
|
||||||
|
License
|
||||||
|
-------
|
||||||
|
|
||||||
|
Copyright (C) 2010-2013 Fogus and contributors.
|
||||||
|
|
||||||
|
Distributed under the Eclipse Public License, the same as Clojure.
|
|
@ -1,4 +1,4 @@
|
||||||
(defproject marginalia "0.8.0-SNAPSHOT"
|
(defproject marginalia "0.8.0"
|
||||||
:description "lightweight literate programming for clojure -- inspired by [docco](http://jashkenas.github.com/docco/)"
|
:description "lightweight literate programming for clojure -- inspired by [docco](http://jashkenas.github.com/docco/)"
|
||||||
;; :main marginalia.main
|
;; :main marginalia.main
|
||||||
:dependencies
|
:dependencies
|
||||||
|
|
16
project.clj~
Normal file
16
project.clj~
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
(defproject marginalia "0.8.0-SNAPSHOT"
|
||||||
|
:description "lightweight literate programming for clojure -- inspired by [docco](http://jashkenas.github.com/docco/)"
|
||||||
|
;; :main marginalia.main
|
||||||
|
:dependencies
|
||||||
|
[[org.clojure/clojure "1.5.1"]
|
||||||
|
[org.clojure/clojurescript "0.0-2138"]
|
||||||
|
[org.clojure/tools.namespace "0.1.1"]
|
||||||
|
[org.clojure/tools.cli "0.2.1"]
|
||||||
|
[org.markdownj/markdownj "0.3.0-1.0.2b4"]
|
||||||
|
[de.ubercode.clostache/clostache "1.3.1"]]
|
||||||
|
|
||||||
|
:resource-paths ["vendor"]
|
||||||
|
|
||||||
|
;;Needed for testing Latex equation formatting. You must download
|
||||||
|
;;and install MathJax in you doc directory.
|
||||||
|
:marginalia {:javascript ["mathjax/MathJax.js"]})
|
Loading…
Reference in a new issue