Commit Graph

237 Commits

Author SHA1 Message Date
Daniel James
291df92b92 Quickbook: Trim trailing whitespace in code blocks.
[SVN r75224]
2011-11-01 19:00:21 +00:00
Daniel James
3c39fbca2e Quickbook: Clean up whitespace prior to programlisting.
[SVN r75223]
2011-11-01 19:00:02 +00:00
Daniel James
7cfb29d18c Quickbook: Fix a test.
[SVN r75222]
2011-11-01 18:59:39 +00:00
Daniel James
77694a9ce4 Quickbook: Close any open sections at end of document.
[SVN r75220]
2011-11-01 18:59:08 +00:00
Daniel James
7ca05863ad Quickbook: Fully qualify footnote and callout ids.
[SVN r75219]
2011-11-01 18:58:47 +00:00
Daniel James
e88f608707 Quickbook: Heading tests for quickbook 1.1
And make the other consistent.

[SVN r75218]
2011-11-01 18:58:28 +00:00
Daniel James
fb279b6fb2 Quickbook: Remove accidental commit.
[SVN r75215]
2011-11-01 18:57:04 +00:00
Daniel James
4a6dd9e97a Quickbook: Port Rene's sort code inclusion to quickbook-dev.
[SVN r75175]
2011-10-30 09:29:56 +00:00
Daniel James
4012b1f753 Quickbook: Merge to quickbook-dev.
[SVN r73983]
2011-08-21 13:27:52 +00:00
Daniel James
a2b3c3aa04 Quickbook: Merge from trunk to quickbook-dev.
[SVN r73365]
2011-07-25 21:41:36 +00:00
Daniel James
9b1eed66f4 Quickbook: Merge from trunk to quickbook-dev.
[SVN r73239]
2011-07-19 07:35:49 +00:00
Daniel James
09165188f1 Quickbook: merge from trunk to dev.
[SVN r72762]
2011-06-26 11:07:04 +00:00
Daniel James
2f3d468aa6 Quickbook: Change the anchor markup for headers.
Use a phrase with an id inside the header.

Using an anchor before the heading was causing problems when the heading
wasn't inside a section.

We can't use an anchor inside the header when it links to itself, as it
messes up getting the title for the link. Using an empty phrase means
that it will just get the empty title for the phrase. Thanks to John
Maddock for the idea.

This does generate slightly odd markup. We could possibly use the old
style markup whenever section depth > 0, since we would know that we're
inside a section, but that seems like an unnecessary complication.

[SVN r72723]
2011-06-23 17:46:05 +00:00
Daniel James
bf1d753dba Merge tools directory from trunk.
[SVN r72698]
2011-06-20 19:19:56 +00:00
Daniel James
40821d55d8 Quickbook: Don't use null node in symbol table.
Since it isn't using a union for the value/middle pointer, there's no
need to have special terminating nodes.

[SVN r71063]
2011-04-07 00:15:38 +00:00
Daniel James
d4344ed435 Quickbook: Remove most of process suppression stuff.
Imports were failing because doc info expected values. The process_state
stuff is too fragile, so instead just process the contents of a
conditional phrase and discard them afterwards. Still suppresses all
elements.

[SVN r71062]
2011-04-06 23:59:24 +00:00
Daniel James
ce96819bb5 Quickbook: Avoid empty simple markups.
[SVN r71061]
2011-04-06 23:59:02 +00:00
Daniel James
d72d923f2e Quickbook: Write out blocks smuggled into phrases.
Pretty clumsy, but it's a dodgy thing to do. Maybe the values could
include whether they're blocks or phrases and actions could react
accordingly.

[SVN r71060]
2011-04-06 23:58:44 +00:00
Daniel James
2553e0e878 Quickbook: If a phrase template turns out to be a block template, treat it as a complete block.
[SVN r71059]
2011-04-06 23:58:25 +00:00
Daniel James
8bdaab2f37 Quickbook: Detab
[SVN r71014]
2011-04-05 20:06:11 +00:00
Daniel James
d90650a679 Quickbook: In 1.6, override document id with id from include element.
[SVN r71013]
2011-04-05 20:03:18 +00:00
Daniel James
de2fc3754c Quickbook: Overwrite duplicate macros in 1.6
[SVN r70977]
2011-04-04 22:10:45 +00:00
Daniel James
a615a0a6e3 Quickbook: Nested documents in 1.6.
If an included file has a docinfo block, use that docinfo. I'm not
entirely sure if the nested file be treated as if it's completely
standalone - i.e. should macros and templates defined in the parent be
used?

Also, there's some odd behaviour in quickbook if the docinfo block in an
included file has a parse error. It just goes back to the start and
parses as a file without a docinfo block. I think it would be better if
this was a hard error, but what should happen in someone has defined a
template with the same name as a docinfo block? That's actually valid in
existing quickbook, so the dodgy docinfo block might just be a template
call.

[SVN r70963]
2011-04-03 21:15:14 +00:00
Daniel James
85e8c03d70 Quickbook: Include code file in 1.6.
[SVN r70960]
2011-04-03 19:19:07 +00:00
Daniel James
9489385464 Quickbook: Import templates+macros from quickbook file in 1.6
[SVN r70959]
2011-04-03 19:18:38 +00:00
Daniel James
02406bf553 Quickbook: Scope templates in include in 1.6
[SVN r70958]
2011-04-03 19:18:12 +00:00
Daniel James
87d71d0633 Quickbook: Alternative tst that's cheaper to copy.
[SVN r70871]
2011-04-02 17:45:09 +00:00
Daniel James
100766d570 Quickbook: New tests. Mostly state tracking.
[SVN r70868]
2011-04-02 17:43:52 +00:00
Daniel James
bbea15be1e Quickbook: Remove accidentally commited test result.
[SVN r70864]
2011-04-02 17:42:37 +00:00
Daniel James
dc47dcbdc9 Quickbook: Don't require newlines at end of grammar.
[SVN r70617]
2011-03-27 10:31:13 +00:00
Daniel James
abb793e3b6 Quickbook: Iterator tests. Equality operator for values.
The equality operator is pretty inefficient. Just for testing really.

[SVN r70565]
2011-03-26 11:13:07 +00:00
Daniel James
1c9648e21d Quickbook: Clean up anchor stuff.
[SVN r70564]
2011-03-26 11:12:45 +00:00
Daniel James
352a9ca028 Quickbook: Release lists from list builder.
[SVN r70562]
2011-03-26 11:11:58 +00:00
Daniel James
f6c565eddb Quickbook: explicit list markup. Refs #1193.
[SVN r70232]
2011-03-20 21:46:10 +00:00
Daniel James
86d40a07a9 Quickbook: Rewrite relative path.
- Do the normalization ourselves, so we don't use a deprecated function.
  Refs #2923
- Move more of the logic into `path_difference` and try to make it
  easier to read, because I found it a bit difficult.

[SVN r70231]
2011-03-20 21:41:42 +00:00
Daniel James
85cb554400 Quickbook: use relative paths in errors and __FILENAME__.
This is more consistent than it is at the moment. For the __FILENAME__
macro, use the path relative to the original file or the location last
matched on the include path. This ensures that the macro is consistent
no matter which directory you call quickbook from.

Also enable `__FILENAME__` in debug mode - so I can test this.

[SVN r70230]
2011-03-20 21:41:18 +00:00
Daniel James
345f0a2648 Quickbook: pass-thru comments.
[SVN r70207]
2011-03-19 19:22:45 +00:00
Daniel James
4caec51e26 Quickbook: better anchor placement for lists.
[SVN r70206]
2011-03-19 19:18:51 +00:00
Daniel James
35cae039f4 Quickbook: support escapes in simple markup.
[SVN r70204]
2011-03-19 19:13:38 +00:00
Daniel James
ec6300c841 Quickbook: further improvements for simple markup.
[SVN r70196]
2011-03-19 16:28:49 +00:00
Daniel James
88b61e52b2 Quickbook: clean up the value stuff.
[SVN r70192]
2011-03-19 15:42:08 +00:00
Daniel James
96e19b221a Quickbook: Go back to using invalid markup for lists.
[SVN r70191]
2011-03-19 15:27:51 +00:00
Daniel James
97c2a337ea Quickbook: nestable elements. Refs #1193
[SVN r70189]
2011-03-19 15:19:09 +00:00
Daniel James
3b09b15f55 Quickbook: A couple of hidden flags for testing.
[SVN r70187]
2011-03-19 15:09:54 +00:00
Daniel James
7b35846ec8 Quickbook: Tweak doc info for empty attributes.
Maybe these should fail.


[SVN r70186]
2011-03-19 14:53:10 +00:00
Daniel James
f7c5e244e8 Quickbook: merge further 'value' development.
[SVN r70185]
2011-03-19 14:43:12 +00:00
Daniel James
6758230e52 Quickbook: fix simple markup.
[SVN r70184]
2011-03-19 14:33:47 +00:00
Daniel James
f977003c85 Richer copyright syntax.
[SVN r70178]
2011-03-19 11:58:26 +00:00
Daniel James
de6a388a35 Quickbook: merge 'values' from quickbook-filenames branch.
[SVN r70177]
2011-03-19 11:45:49 +00:00
Daniel James
1ffd3ed233 Quickbook: doc info improvements.
- Fix handling empty category attributes.
- Quickbook 1.6: Scope source mode changes to the file they're made in.



[SVN r70176]
2011-03-19 10:47:02 +00:00