Commit graph

210 commits

Author SHA1 Message Date
Josh Tilles
a337c36ae9 Remove dependency on contrib.java-utils
When I tried to do a `lein2 test` it broke. Uh oh. Time to go debug the tests… `delete-file-recursively` wasn't even in 1.2's `java-utils`, it was in `contrib.io`. Weird.
2013-05-22 08:31:11 -04:00
Fogus
f849fd342c Merge pull request #110 from wjlroe/fix-typo
Fix typo. prabably -> probably
2013-04-17 10:49:02 -07:00
Fogus
d0a0da4f83 Update project.clj 2013-03-05 08:13:43 -05:00
William Roe
a045171377 Fix typo. prabably -> probably 2012-08-09 21:32:41 +01:00
fogus
3566400ca3 Merge branch 'master' of github.com:fogus/marginalia 2012-06-09 08:40:57 -04:00
fogus
220db0a23a absorbing hiccup as a temp fix 2012-06-09 08:40:45 -04:00
Fogus
129dced020 Merge pull request #104 from x3n0n/master
Typo in documentation: s/Ouput/Output/
2012-06-08 11:28:06 -07:00
x3n0n
eb713b744f Update master 2012-06-08 10:54:47 -05:00
fogus
817be1685c Final v0.7.1 version 2012-06-08 11:33:53 -04:00
fogus
da861e5bcc Final v0.7.1 version 2012-06-08 11:31:59 -04:00
fogus
18d5b3560a Final v0.7.1 version 2012-06-08 11:30:10 -04:00
Fogus
ea83f4faa6 Update README.md 2012-04-12 15:59:11 -03:00
Fogus
0e0b4e414e Merge pull request #98 from teropa/master
Support for parsing symbol, char, boolean, regex, and nil inline literals
2012-04-12 11:57:12 -07:00
Tero Parviainen
1b944180de Support for parsing literal symbols, chars, booleans, regexes and nil 2012-04-12 17:20:56 +03:00
Fogus
a83216f37c Update README.md 2012-03-11 21:09:27 -03:00
fogus
faf31e5696 def form fix 2012-03-06 13:35:46 -05:00
fogus
bea17308e6 Closes #89 2012-03-06 13:06:43 -05:00
fogus
910c76d7cf Update to #88. LInk to release notes. 2012-03-06 13:01:38 -05:00
fogus
dcaa66116b Work for #88. First cut at README and release notes doc. 2012-03-06 13:00:28 -05:00
fogus
660e640f6c Closes #90. 2012-03-06 12:42:39 -05:00
fogus
678387cfc0 Fixes #90. Only string thing is docstring in ns form. 2012-03-06 12:37:10 -05:00
fogus
59394183f9 Fixes #90 2012-03-06 11:46:18 -05:00
fogus
bb2cb58bae Fixed #87. First, the if comparison in read-keyword was never true because a Character and an int were compared. Second, the call to readToken was passing in an int instead of a char and causing an IllegalArgExc 2012-03-06 10:54:42 -05:00
Fogus
bb036ffc91 Merge pull request #85 from grimradical/issue-0050-code-block-in-comments
Comment lines should preserve intermediate whitespace where possible.
2012-02-08 12:36:36 -08:00
fogus
94cc8e2ffe Removed floating TOC (for now) as it was very inconsistent 2012-02-08 14:27:20 -05:00
fogus
8780370415 Fixed metadoc on ns. Added a line number reporting error on parse problem. 2012-02-08 11:04:40 -05:00
Deepak Giridharagopal
699ebe460f Transforming comment lines to strings should preserve intermediate whitespace where possible.
Preserving whitespace allows for indentation-sensitive markdown constructs,
like code block, within comments.

Signed-off-by: Deepak Giridharagopal <deepak@puppetlabs.com>
2012-01-21 09:27:51 -08:00
fogus
7efe1c4666 Do not dispatch as a named thing if it's not a named thing. This was problematic on something like this (#{1 2 3} a) 2011-12-19 09:02:00 -05:00
fogus
8b01a596ad Keep an eye out for docstrings for def forms. Was causing issue with the likes of (def foo "not a docstring") 2011-12-19 08:24:00 -05:00
fogus
1b97660357 Fixed parsing of ns and vars that couldn't be resolved. Added processing of CLJS files. More thought around presentation of CLJS v CLJ is needed. 2011-12-16 09:35:26 -05:00
Michał Marczyk
36aecf7cdf Comment out margin: 0 in SH's css, fixes 61
Apparently this rule was preventing underscores from being displayed
(tested in recent versions of Chrome and Opera). Amusingly, searching
for a phrase including an underscore would cause it magically to
appear (in the same two browsers)...
2011-12-05 08:10:00 +01:00
zkim
7e8bb8a63d [#66] Replace Clojure brush for SH with new implementation. 2011-11-25 01:22:23 -07:00
Michał Marczyk
54103496a4 Revert ae296b3e6b
This prevents me from running tests, presumably because test projects
& namespaces are not on the classpath. We could add them to the
classpath, but at least at first glance it seems useful to be able to
parse ns-defining code blocks which are not present on the
classpath (such as those in test/marginalia/test/parse.clj).
2011-11-24 22:41:23 +01:00
Michał Marczyk
d507a3eb4e Remove duplicate filenames before generating the docs, fixes #45 2011-11-24 22:10:13 +01:00
zkim
ca3eda5594 [#68] Fix white background showing on RHS. 2011-11-23 14:59:19 -07:00
Fogus
47eeae750c Merge pull request #67 from fogus/newmain
Move application stuff out of core.clj
2011-11-23 05:00:30 -08:00
Anthony Grimes
d8cc9878bc Move application stuff out of core.clj. 2011-11-22 21:57:21 -06:00
Fogus
cb21d5921a Merge pull request #65 from budu/master
Convertion to Clojure 1.3 and some fixes.
2011-11-14 07:07:19 -08:00
Nicolas Buduroi
582972f777 Fixed section-to-html to correctly put code sections into the second cell. 2011-11-13 19:15:57 -05:00
Nicolas Buduroi
e3b54c8695 Converted the project to use Clojure 1.3.0 and got rid of contrib. 2011-11-13 19:11:55 -05:00
Nicolas Buduroi
ae296b3e6b Removed try-catch from extract-common-docstring function. 2011-11-13 13:36:11 -05:00
Fogus
52b8b2c587 Merge pull request #59 from fogus/manual-parse
Manual parse
2011-10-12 12:53:14 -07:00
Anthony Grimes
cedbcee434 Get rid of old cake plugin stuff. Newer versions of cake will have a slightly different plugin arch that breaks this. Will work on a better way to do this later. 2011-10-11 16:52:34 -05:00
Anthony Grimes
ffa1fbe793 Don't automatically try to parse a project file if the user can do it better. 2011-10-11 16:10:55 -05:00
Anthony Grimes
51acb7f3a7 New version of hiccup because the old one is breaking. 2011-10-11 16:10:21 -05:00
Fogus
4e10942dd0 Adding pauldorman 2011-10-06 09:18:45 -03:00
Fogus
32dec92b5c Merge pull request #58 from pauldorman/master
A few minor changes to the README
2011-10-06 05:17:11 -07:00
Paul Dorman
b460acf47a Hopefully improved the README. 2011-10-06 18:06:51 +13:00
Michał Marczyk
0374c221d9 Really fix handling of ::keywords using aliases
With this patch, Marginalia installs a custom keyword reader during
parsing.

This reader reuses clojure.lang.LispReader's readToken and matchSymbol
methods to read in either the whole keyword (when faced with a
single-colon keyword) or the part following the first colon (a
single-colon keyword, if we get to this case). Single-colon keywords
may have arbitrary namespace parts, so no aliasing issues arise.

The object returned depends on the type of keyword being read in:

* :foo, :foo/bar => just the keyword

* ::foo/bar => (DoubleColonKeyword. :foo/bar)

DCK's print-method writes out a single colon followed by the string
representation of the DCK's contents, for the genuine double-colon
keyword look.

Note that readToken and matchSymbol are private; this patch uses
clojure.contrib.reflect/call-method to call them.
2011-09-19 05:05:12 +02:00
Michał Marczyk
f7f63b1149 Reverting "Fix handling of ::keywords using aliases"
Evaluating ns forms which :use some symbols gets as in trouble unless
we also evaluate the relevant definitions in the other namespace. This
leads to the issue of loading the namespaces in the correct order etc.
So, if we want to be able to generate docs without compiling the whole
project, the "eval ns forms" approach is a no-go. :-(
2011-09-19 05:05:12 +02:00