Commit Graph

1191 Commits

Author SHA1 Message Date
Daniel James
57e59f148a Allow block markup in phrase templates.
[SVN r85127]
2013-07-23 08:22:26 +00:00
Daniel James
2b5f23951e Allow block markup inside nested blocks (e.g. tables)
Since this is often indented, does not treat indented blocks as code
blocks. This is inconsistent for lists, so maybe indented blocks in
lists should always be code, or never be code. Or maybe it should be a
bit smarter about nested indented blocks.

[SVN r85126]
2013-07-23 08:21:56 +00:00
Daniel James
786a8b7625 Copy old template tests to new version.
[SVN r85125]
2013-07-23 08:21:32 +00:00
Daniel James
705605b381 Error if phrase element body doesn't parse.
[SVN r85117]
2013-07-22 19:34:32 +00:00
Daniel James
7dcc517949 Error if element used in incorrect context.
Should be less suprising than just not processing them. Needs more tests.

[SVN r85116]
2013-07-22 19:34:03 +00:00
Daniel James
d4905fdd6b Better element handling in syntactic_block_item.
Now all elements are handled within local.common.

[SVN r85115]
2013-07-22 19:33:38 +00:00
Daniel James
de829cab78 Rename some local variables.
Just to reduce confusion between the paragraph rule and the paragraph
action. Should possibly do this for all such local variables. I'll see
how it goes.

[SVN r85114]
2013-07-22 19:33:21 +00:00
Daniel James
dd1d5633e3 Rename a few grammar wide variables.
Partly for clarity, and partly because there are too many things called
'block' and 'phrase'. The grammar names aren't great, but at least they
match. Might rething once I've done a lot of the 1.7 things.

[SVN r85113]
2013-07-22 19:33:05 +00:00
Daniel James
ab6cf3553a Use a value in local for context.
[SVN r85112]
2013-07-22 19:32:43 +00:00
Daniel James
56ecf967ef Use a value in local for still_in_block.
Allows `paragraph_item` and `list_item` to be merged into a single rule.

[SVN r85111]
2013-07-22 19:32:21 +00:00
Daniel James
380efdd3c4 Use a value in local for simple_markup's mark.
Feels a little better to me. Although it isn't as stronly associated with the
rule.

[SVN r85110]
2013-07-22 19:32:05 +00:00
Daniel James
b47ef26a6c Generic 'scoped_no_eols' implementation.
So that it can be reused for other state variables.

[SVN r85109]
2013-07-22 19:31:48 +00:00
Daniel James
202b0f90e7 Merge quickbook. Starting 1.6 alpha, plus some 1.7 development.
[SVN r85050]
2013-07-15 21:45:25 +00:00
Daniel James
8e0047f0fb Don't break out of a list after a block tag.
[SVN r84936]
2013-07-01 19:35:37 +00:00
Daniel James
90ff4dd172 Remove 1.7 test, which won't be relevant.
It's about to break because of a 1.6 change, but that doesn't matter because
it's an obsolete test. I've already removed it from my 1.7 development.

[SVN r84935]
2013-07-01 19:35:12 +00:00
Daniel James
20fc4f2341 Remove duplicate code.
[SVN r84934]
2013-07-01 19:34:52 +00:00
Daniel James
774fe19d0b Check for errors when writing dependencies.
[SVN r84933]
2013-07-01 19:34:33 +00:00
Daniel James
0c69657973 Make nested paragraphs/code blocks in lists an error in 1.6.
They're now a 1.7 feature. Will revert to 1.5 behaviour before 1.6 final.

[SVN r84932]
2013-07-01 19:34:07 +00:00
Daniel James
bed2e3fa89 Remove superfluous code.
The blank lines will have already been matched by the paragraph separator.

[SVN r84931]
2013-07-01 19:33:33 +00:00
Daniel James
32e6a395de 1.6.0 alpha
[SVN r84930]
2013-07-01 19:33:13 +00:00
Daniel James
d4f93121dd Cherry-pick quickbook documentation fix.
[SVN r84890]
2013-06-23 21:20:06 +00:00
Daniel James
671747969e Fix 'doc info macros' id.
[SVN r84637]
2013-06-04 18:57:02 +00:00
Daniel James
7753fe7da3 Fix typo.
[SVN r84606]
2013-06-01 22:30:43 +00:00
Daniel James
919e42eafb Better project names.
[SVN r84564]
2013-05-30 21:47:02 +00:00
Daniel James
24ab5cc5bc Merge quickbook to release.
[SVN r84500]
2013-05-25 15:57:48 +00:00
Daniel James
24988d045c Quickbook version for 1.54
[SVN r84499]
2013-05-25 15:56:24 +00:00
Daniel James
e4ea915cef Fill in more missing quickbook test copyright info.
[SVN r84376]
2013-05-19 18:07:51 +00:00
Daniel James
d8b487499b Merge quickbook to release.
[SVN r84300]
2013-05-16 21:30:01 +00:00
Daniel James
238f0e4779 Use .quickbook extension for all test files.
[SVN r84252]
2013-05-12 14:34:27 +00:00
Daniel James
11fb4ba99c Add copyright comments to python tests.
Keep inspect happy.

[SVN r84251]
2013-05-12 14:33:46 +00:00
Daniel James
73d4d08aab Add trailing newlines.
[SVN r84250]
2013-05-12 14:33:31 +00:00
Daniel James
1cb4d17590 Cleaner unindentation code.
[SVN r84188]
2013-05-07 23:26:07 +00:00
Daniel James
13023a2ed3 Fix unindenting trailing spaces in code blocks.
[SVN r84187]
2013-05-07 23:25:47 +00:00
Daniel James
ac0f8cf92f Fix block example again. Refs #8545.
[SVN r84175]
2013-05-06 20:22:16 +00:00
Daniel James
172ff0f4e3 Macros in docinfo blocks for 1.6. Refs #8543.
[SVN r84153]
2013-05-05 13:47:26 +00:00
Daniel James
7e76b65ed8 C++11 keywords. Refs #8541.
[SVN r84152]
2013-05-05 13:46:57 +00:00
Daniel James
852820778d Only recognise preprocessor statements at the start of the line. Refs #8511.
[SVN r84151]
2013-05-05 13:46:38 +00:00
Daniel James
0e4b7dad31 Clean up mixed tabs/spaces when unindenting.
If the whitespace to be removed when unindenting a block is not
consistent, then replace all the indentation in that block with spaces
(i.e. expand tabs). This fixes some odd results that could happen, e.g.

    ....Line 1
    --->Line 2

(dots = spaces, arrow = tab) would become:

    ...Line 1
    Line 2

Because the first character was removed from each line. This now works
okay.

But I don't expand tabs when the whitespace that isn't removed is
inconsistent, which can have odd results, for example:

    ..Line 1
    ..->Line 2
    ......Line 3

Will just remove the first two spaces, resulting in:

    Line 1
    --->Line 2
    ....Line 3

This should be rare, as tabs after spaces are a bit odd. But maybe I
should convert to spaces more often. Perhaps when indentation is
inconsistent, or perhaps whenever a mixture of tabs and spaces are used,
or even always just do it.

[SVN r84150]
2013-05-05 13:46:23 +00:00
Daniel James
64c854a095 Store start of unindented block, as the original start.
Was storing the position after the removed text, this meant that I had
to use a special case for the first line, but now the algorithm is smart
enough to get it right.

[SVN r84149]
2013-05-05 13:46:07 +00:00
Daniel James
b4bd1cee94 Stop storing indentation in mapped source.
Instead work out the relevant position by finding the start of content
and working from there. It doesn't quite get it right if the position is
in the middle of the indentation, but that's fine.

I'm doing this because I want to be able to change the indentation if
it's a mix of tabs and spaces (which it currently messes up).

[SVN r84148]
2013-05-05 13:45:44 +00:00
Daniel James
770c4ec787 Add comments to location finding code for indented blocks.
[SVN r84147]
2013-05-05 13:45:21 +00:00
Daniel James
228e4a3add Make escaping dependent file names optional.
[SVN r84146]
2013-05-05 13:44:59 +00:00
Daniel James
edb6ddcb9f Escape paths in dependency list - I want to make this optional.
[SVN r84145]
2013-05-05 13:44:33 +00:00
Daniel James
45ff3f2f73 Options class to reduce parameters to parse_document.
[SVN r84144]
2013-05-05 13:44:03 +00:00
Daniel James
e926e24bb7 Support the token pasting operator in C++ code blocks. Refs #8510.
[SVN r84063]
2013-04-28 11:16:11 +00:00
Daniel James
e15daf76b8 Fix the block example.
[SVN r84062]
2013-04-28 10:46:41 +00:00
Daniel James
31580d55a1 Better argument parsing.
[SVN r83134]
2013-02-24 16:18:39 +00:00
Daniel James
dbb843095c Merge quickbook to release.
- Use `boost::string_ref`.
- Improved source map handling, unindent for code blocks.


[SVN r83133]
2013-02-24 14:53:38 +00:00
Daniel James
7b6525c19b Changelog note for quickbook 1.5.9
[SVN r83130]
2013-02-24 13:50:03 +00:00
Daniel James
dbb8192444 Split path normalization from 'add_dependency'.
[SVN r83125]
2013-02-24 11:23:53 +00:00