Commit Graph

449 Commits

Author SHA1 Message Date
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
8fa09072c2 Remove whitespace only leading lines from indented blocks.
[SVN r83123]
2013-02-24 11:23:15 +00:00
Daniel James
4ff7f3a9fb Fix mapped position when breaking up indented code.
[SVN r83122]
2013-02-24 11:23:02 +00:00
Daniel James
75842c4f5d Clean up poorly overloaded 'add' method.
[SVN r83120]
2013-02-24 11:22:33 +00:00
Daniel James
f34940b3a7 Store indentation change in source map.
Used to infer it when required, which could go wrong.

[SVN r83118]
2013-02-24 11:22:03 +00:00
Daniel James
a586cd7822 Source map tests.
[SVN r83117]
2013-02-24 11:21:50 +00:00
Daniel James
b2a5262c81 Convert to use boost::string_ref
[SVN r83116]
2013-02-24 11:21:31 +00:00
Daniel James
80e65f66fe Quickbook: Deal with checked paths that aren't present. Refs #6691.
I think that the dependencies should just be files that were loaded, so
I changed it to do that, but added an extra (hidden for now) option to
list all paths that were checked, staring with a `+` for files that are
present, and `-` for files that are absent.

Also fixed a bug with the path resolver.

[SVN r77973]
2012-04-14 17:33:14 +00:00
Daniel James
818aeade78 Quickbook: Use container forwarding for gcc/darwin.
It's usually safe. Especially since we're controlling the build.

[SVN r77830]
2012-04-08 15:27:48 +00:00
Daniel James
23fbf1a714 Quickbook: Further dependencies development. Refs #6691
- Include relevant locations on path where file wasn't found.
- Improve `include_search` while I'm at it.
- Normalize paths for non-existent files.
- Tests, not integrated with Boost.Build yet. Needs to check that
  python is available then run the script with the location of the
  quickbook executable.

[SVN r77598]
2012-03-27 23:00:48 +00:00
Daniel James
0463a93263 Quickbook: Merge from trunk.
Includes blocks in lists fixes, and some documentation changes.


[SVN r77347]
2012-03-16 08:48:10 +00:00
Daniel James
a883a5b13c Quickbook: Initial implementation of templates in link values.
[SVN r76647]
2012-01-22 23:08:21 +00:00
Daniel James
0c0795fcff Quickbook: Escaped markup in docinfo blocks.
[SVN r76645]
2012-01-22 23:07:26 +00:00
Daniel James
69c735145f Quickbook: Merge to quickbook-dev
[SVN r76636]
2012-01-22 17:28:46 +00:00
Daniel James
672caeec17 Quickbook: Code block callouts.
[SVN r75897]
2011-12-11 11:16:01 +00:00
Daniel James
3ed6415296 Quickbook: Support single entity source mode marker.
[SVN r75895]
2011-12-11 11:14:17 +00:00
Daniel James
47eb39d0bc Quickbook: Use values for code blocks.
Also better error report for unclosed code block.

[SVN r75894]
2011-12-11 11:13:24 +00:00
Daniel James
13ce9e9fdb Quickbook: Use 1.7 for everything on dev branch.
Might promote them to 1.6 later.

[SVN r75892]
2011-12-11 11:11:50 +00:00
Daniel James
4c2ad1f909 Quickbook: Merge from trunk to quickbook-dev.
[SVN r75846]
2011-12-07 09:40:30 +00:00
Daniel James
b12549faa9 Quickbook: Spelling correction.
[SVN r75770]
2011-12-02 08:33:46 +00:00
Daniel James
2f1ab31350 Quickbook: More error checking for file handling.
[SVN r75769]
2011-12-02 08:28:57 +00:00
Daniel James
3d27c1c360 Quickbook: Fix xmlbase and xinclude path handling.
[SVN r75766]
2011-12-02 00:05:17 +00:00
Daniel James
7dad879e3d Quickbook: Fix paragraph separator at end of string.
[SVN r75759]
2011-11-30 21:22:41 +00:00
Daniel James
0f051efd8c Quickbook: Allow a single newline at the end of an explicit code block.
Again, less gratuitous changes from older versions (although it's still
different). Also more consistent with generated markup from indented code
blocks.


[SVN r75732]
2011-11-29 22:57:23 +00:00
Daniel James
e94940c9ec Quickbook: Use version switch for image alt text change.
Was comparing the output of different versions of the quickbook executable and
the change seemed gratuitous.


[SVN r75731]
2011-11-29 22:41:10 +00:00
Daniel James
9d4fa2a2fa Quickbook: Fix command line error on windows.
I think it might be a bug that the test was incorrectly failing, but not a
serious one. I'll get back to it later.


[SVN r75730]
2011-11-29 22:15:39 +00:00
Daniel James
cc3ec7f700 Quickbook: Fix list processing bug.
[SVN r75700]
2011-11-28 00:13:10 +00:00
Daniel James
46cd4c2dba Quickbook: Fix error with empty macro defines.
[SVN r75699]
2011-11-27 22:45:55 +00:00
Daniel James
684e03c894 Quickbook: Remove files left over after merge.
[SVN r75697]
2011-11-27 21:41:42 +00:00
Daniel James
ef6628f851 Quickbook: Merge from quickbook-dev to trunk.
[SVN r75696]
2011-11-27 21:34:56 +00:00
Daniel James
73f76e778e Quickbook: Allow block elements in lists.
[SVN r75632]
2011-11-22 23:50:48 +00:00
Daniel James
e779bb6f08 Quickbook: Avoid expanding macros that are now invalid.
The macro syntax has been tightened up in 1.6, so that fewer characters
are available for macro identifiers. But macros can still be defined
using the older quickbook versions When such macros are defined, prevent
them from expanding in a quickbook 1.6 document.

[SVN r75630]
2011-11-22 23:50:17 +00:00
Daniel James
44cdb88eec Quickbook: Deal with unbalanced code snippets.
[SVN r75627]
2011-11-22 23:49:26 +00:00
Daniel James
32721bd39e Quickbook: Deal with invalid command line macros.
[SVN r75624]
2011-11-22 23:48:25 +00:00
Daniel James
1165c7a147 Quickbook: Only use explicit alt text.
[SVN r75620]
2011-11-22 23:47:19 +00:00
Daniel James
a7de315f0c Quickbook: Better string names for value.
`value` doesn't track what a string is encoded as, and sometimes it's
plain text not boostbook. It would be nice to track the encoding and
automatically do the right thing, but I'm not sure if it's worth the
effort just now.

[SVN r75619]
2011-11-22 23:47:02 +00:00
Daniel James
23e168a340 Quickbook: Use intrusive_ptr for files.
[SVN r75616]
2011-11-22 23:46:13 +00:00
Daniel James
650c3088c2 Quickbook: Track position in code blocks and snippets.
[SVN r75614]
2011-11-22 23:45:37 +00:00
Daniel James
a26a70fc7b Quickbook: Don't unindent code blocks in code snippets.
Because code blocks are added in sections, a nested section could be
unindented too far. Code is unindented in the main quickbook actions, so
there's actually no need to do it when extracting code snippets.

But this lead to left over whitespace that would have been stripped. So
change the `start_snippet` and `end_snippet` grammars to swallow up the
line they're on.

I also added a newline before the end of the snippet, this cleaned up
the occasional syntax error.

But due to these changes there is more leading and trailing whitespace
in the generated code blocks, so I just changed the code block grammar
to strip them out. This means there are no newlines at the beginning or
end of code blocks, but that should be fine.

[SVN r75613]
2011-11-22 23:45:16 +00:00
Daniel James
43f9288487 Quickbook: Fix SVG handling.
- Fixes extension check.
- Looks for images relative to quickbook file instead of the current
  working directory, so that it will work when run from another
  directory.
- Allow user to specify the image location.
- Use `bbk_value` for synthesized attributes rather than `qbk_value`.
  It's the right thing to do, but doesn't make any practical difference.

Still not happy with image path handling. I feel that they should be
relative to the quickbook file and be rewritten - in a similar manner to
`xinclude`.

[SVN r75612]
2011-11-22 23:44:57 +00:00
Daniel James
48d023522b Quickbook: Some id_manager clean up.
Tweak the id handling for using 1.5- compatibility mode inside 1.6
documents (you can't see this in the tests).

[SVN r75610]
2011-11-22 23:44:16 +00:00
Daniel James
caf01e40e7 Quickbook: Prevent 'endsect' from ending an include id.
[SVN r75539]
2011-11-17 21:07:16 +00:00
Daniel James
a041edab9c Quickbook: Fail gracefully if document info is missing.
I also tweaked `pre` and `post` a bit while I was at it.

[SVN r75538]
2011-11-17 21:07:01 +00:00
Daniel James
317704c7b7 Quickbook: Fix issue with unbalanced sections.
[SVN r75537]
2011-11-17 21:06:44 +00:00
Daniel James
ad0d5cd69b Quickbook: Another id_manager rewrite.
Now separates file and section tracking, since sections aren't
necessarily cleanly nested in files, and files have some local state.

[SVN r75534]
2011-11-17 21:05:53 +00:00
Daniel James
edc0060910 Quickbook: Empty ids and titles.
[SVN r75532]
2011-11-17 21:05:17 +00:00
Daniel James
d125ab418c Quickbook: Trim trailing space from document title.
[SVN r75529]
2011-11-17 21:04:27 +00:00
Daniel James
476e11c3ab Quickbook: Make source mode a document attribute and fix implementation.
In quickbook 1.6, nested documents default to C++, regardless of the
parent's source mode so that they are interpreted as if they are
standalone documents.

[SVN r75528]
2011-11-17 21:04:02 +00:00
Daniel James
506310c682 Quickbook: Fix the preformatted parser for 1.6.
In the old parser, the `eol` never matched anything because the `space`
would gobble up any newlines, so I'm pretty sure the intent was to use
`blank` to remove any leading spaces. So do that in 1.6.

[SVN r75521]
2011-11-17 21:01:55 +00:00
Daniel James
9711cead8b Quickbook: Parse lists with paragraphs.
Quite a big change. I moved the list logic into the grammar so that it's
easier to tell how to parse different blocks. Also reworked some of the
block vs. phrase stuff - it's a lot cleaner now which helped implement
this.  It generates terrible markup at the moment, but at least the
parser is in place.

[SVN r75446]
2011-11-10 18:17:00 +00:00
Daniel James
5f5c526ea3 Quickbook: Better table titles.
[SVN r75445]
2011-11-10 18:16:37 +00:00
Daniel James
952b3b6550 Quickbook: Support version info outside of document info blocks.
[SVN r75442]
2011-11-10 18:15:49 +00:00
Daniel James
34c053f833 Quickbook: Parse version as for any other docinfo attribute.
[SVN r75441]
2011-11-10 18:15:30 +00:00
Daniel James
0e7874bfb6 Quickbook: Fix some tests.
I use compatibility mode to decide whether to link headers to
themselves. I'm not sure about that.

[SVN r75437]
2011-11-10 18:14:08 +00:00
Daniel James
1e3a88f440 Quickbook: Support escapes in links, anchors, images, includes, imports and exports.
[SVN r75360]
2011-11-06 22:22:42 +00:00
Daniel James
1531b4f348 Quickbook: Move more phrase parsing into local.common.
This change has two side effects: anchors are placed slightly better and
non-element/template square brackets are terminated by the end of a
paragraph.

[SVN r75357]
2011-11-06 22:21:32 +00:00
Daniel James
febcb14e01 Quickbook: Some anchor placement tests.
[SVN r75356]
2011-11-06 22:21:17 +00:00
Daniel James
b9f3b68580 Quickbook: No point in using hard_space here.
The difference between `hard_space` and `space` is that `hard_space`
won't have a zero-width match in certain places. But in the `-` part of
a classic spirit rule, zero-width matches don't count so there's
effectively no difference.

[SVN r75354]
2011-11-06 22:20:44 +00:00
Daniel James
e48ed3afe7 Quickbook: xmlbase docinfo attributes.
Useful for escaped `xi:include`.

(does this break horribly if it's given an absolute path?).

[SVN r75352]
2011-11-06 22:20:14 +00:00
Daniel James
4e411e96ce Quickbook: Better punctuation support for various elements.
[SVN r75351]
2011-11-06 22:19:53 +00:00
Daniel James
cdcd5349f6 Quickbook: Better parser for hr.
The old version had issues with multi-line comments.

[SVN r75350]
2011-11-06 22:19:25 +00:00
Daniel James
1058b13396 Quickbook: Compatibility mode to make upgrading easier.
[SVN r75347]
2011-11-06 22:18:32 +00:00
Daniel James
a2fe7199c9 Quickbook: Better encoded template support.
- Detect encoded templates in `call_template` so they're handled if
  anything calls it or `call_code_snippet` directly.
- Handle any paragraphs that comebefore a encoded block template.
- Escaped templates should always be inline, it isn't block content.
- Try to support escaped encoded templates. It's a bit of a weird case
  so I wasn't sure what to do. Just wrote out the boostbook in a phrase
  which seems the best option.
- Escapes now override the template type. This should happen as the user
  explictly asks for an escaped template.

[SVN r75270]
2011-11-02 08:52:05 +00:00
Daniel James
af4ea5b066 Quickbook: Deal with blocks following anchors.
Turn anchors into a special type of element that can either be a block
or a phrase, so that when immediately followed by block content, the
parser will do the right thing.

`xinclude` and conditional phrases might need similar treatment,
although they're trickier.

[SVN r75269]
2011-11-02 08:51:41 +00:00
Daniel James
1aede8bf77 Quickbook: Make windows paths an error in 1.6
[SVN r75267]
2011-11-02 08:50:53 +00:00
Daniel James
0ee79fe849 Quickbook: Move escaped phrase handling to the main grammar.
Note there's no need to check for the end of the escapse as the
intersection (`&`) rule only passes the content within the esapse.

[SVN r75264]
2011-11-02 08:49:33 +00:00
Daniel James
5be4962caf Quickbook: Fix issue with mixed version templates.
If a 1.5 template called a 1.4 template, its parent would be its
'dynamic' parent (the 1.5 template), whose parent would be its lexical
parent - breaking the dynamic lookup. I've changed it so that when
using a dynamic lookup, 1.5+ templates are skipped over. That means
they can use whatever variable names they wish without issues.

It does mean that if a 1.4- template was specifically written to use
dynamic lookup, then it wouldn't be callable from 1.5. So it might
be better if they didn't skip over 1.5+ templates.

Alternatively if might be better to always lexical scoping, even for
older versions, on the assumption that it was a bug.

[SVN r75263]
2011-11-02 08:48:52 +00:00
Daniel James
0f28f2da9c Quickbook: Store template_body as just a value.
[SVN r75261]
2011-11-02 08:47:01 +00:00
Daniel James
3ee432e250 Quickbook: Parse templates using the version they were defined for.
Needs to store the version in the file object, since it's only known
after the file is read in, had to make files non-const. Put some checks
in to make sure this isn't abused but pretty messy.

[SVN r75260]
2011-11-02 08:46:38 +00:00
Daniel James
f627c79f88 Quickbook: Add 'block' element.
[SVN r75259]
2011-11-02 08:46:05 +00:00
Daniel James
2fb0330405 Quickbook: Trim leading underscores in normalized ids.
[SVN r75257]
2011-11-02 07:59:12 +00:00
Daniel James
ea063efe1f Quickbook: role tag for 1.6. Refs #5860.
This implements the markup `[role red Some red text]`. Although I'm not
sure I like it that much. It would be pretty easy to use a template for
the same effect.

This is just the quickbook part of supporting coloured text, to complete
the ticket there needs to be css support for html pages and xsl support
for pdfs.

[SVN r75255]
2011-11-02 07:58:32 +00:00
Daniel James
4dea2a8ad5 Quickbook: Keep files in memory, stop tracking position in iterators.
Files are now permanently loaded. Quickbook substrings are stored as
references into the file. Now positions are stored as iterators into
the original file, the line and column is calculated when messages are
output.

This doesn't have much effect on efficiency but it simplifies a few
things.

[SVN r75253]
2011-11-02 07:57:47 +00:00
Daniel James
3ae7265139 Quickbook: New version of id_manager. Fixes #1221.
This encapsulates more in the id and section handling code. Fixes a few
edge cases and separates implementation of the new and old section
handling code. Always normalizes and truncates generated ids in quickbook
1.6.

[SVN r75251]
2011-11-02 07:49:22 +00:00
Daniel James
3ab3116ee4 Quickbook: Reset section info for nested documents.
So when including a document inside a section, the section's id is not
used. Also cleans up the messy handling of section.min_leveln.

[SVN r75245]
2011-11-02 07:43:03 +00:00
Daniel James
39e3a6e670 Quickbook: Fix including from inside a section.
It's a bit of a crazy edge case which creates invalid docbook in 1.6.

[SVN r75236]
2011-11-01 19:21:36 +00:00
Daniel James
152fe4fa5d Quickbook: Rename and rearrange some tests.
- More consistent names.
- Not using `.` in basename.
- Run the quickbook manual test last (as when there's an error, the more
  specific tests are more informative).
- Combine some of the code tests.

[SVN r75235]
2011-11-01 19:20:46 +00:00
Daniel James
2e7921057b Quickbook: New id include test.
[SVN r75233]
2011-11-01 19:17:22 +00:00
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
e2a1114fb3 Quickbook: Trim trailing whitespace in code blocks.
[SVN r74349]
2011-09-11 17:00:18 +00:00
Daniel James
79ed68b360 Quickbook: Clean up whitespace prior to programlisting.
[SVN r74348]
2011-09-11 16:59:36 +00:00
Daniel James
ec22c9d052 Quickbook: Fix a test.
[SVN r74347]
2011-09-11 16:58:45 +00:00
Daniel James
bf0a45d4cb 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 r74346]
2011-09-11 16:58:14 +00:00
Daniel James
62a69acf85 Quickbook: Close any open sections at end of document.
[SVN r74345]
2011-09-11 16:57:23 +00:00
Daniel James
d59a0ccc3b Quickbook: Fully qualify footnote and callout ids.
[SVN r74344]
2011-09-11 16:56:49 +00:00
Daniel James
8e2707b9d4 Quickbook: Heading tests for quickbook 1.1
[SVN r74209]
2011-09-03 15:52:13 +00:00
Daniel James
418b4ff3f5 Quickbook: Remove accidental commit.
[SVN r74107]
2011-08-28 15:37:32 +00:00
Daniel James
4012b1f753 Quickbook: Merge to quickbook-dev.
[SVN r73983]
2011-08-21 13:27:52 +00:00
Daniel James
2abf117c95 Unordered: Don't 'pass thru' comment if = is repeated.
[SVN r73982]
2011-08-21 13:19:08 +00:00
Daniel James
9cd67492dc Quickbook: Don't normalize parent ids.
[SVN r73981]
2011-08-21 11:57:42 +00:00
Daniel James
4ab9f46757 Quickbook: Prioritize different generated ids.
[SVN r73980]
2011-08-21 11:56:49 +00:00
Daniel James
bd4de66c67 Quickbook: Better id generation for duplicates.
- Replaces repeated underscores with single underscores
- Truncates if they're too long.
- If the result ends with if a number, adds an underscore to separate
  that from the duplicate number.

Only doing this for the duplicate ids, so that the main generated id
doesn't change for existing documentation. Will do something similar for
all generated ids in quickbook 1.6.

[SVN r73974]
2011-08-20 23:35:20 +00:00
Daniel James
9a97c0fe91 Quickbook: Fix C style pass-thru comments.
[SVN r73571]
2011-08-06 12:42:52 +00:00
Daniel James
4ec6f56314 Quickbook: Simplify table a bit more.
Was crashing on darwin 4.0 in release mode.

[SVN r73418]
2011-07-28 22:34:32 +00:00
Daniel James
85fa462ef1 Quickbook: Clean id placeholder replacement.
And fix some bugs.

[SVN r73407]
2011-07-27 23:50:41 +00:00
Daniel James
a2b3c3aa04 Quickbook: Merge from trunk to quickbook-dev.
[SVN r73365]
2011-07-25 21:41:36 +00:00
Daniel James
36e788ec84 Quickbook: Use an id generator to aviod collisions.
[SVN r73337]
2011-07-24 20:40:38 +00:00
Daniel James
143bef8987 Quickbook: Add ids to tables for 1.4-.
[SVN r73263]
2011-07-20 20:28:15 +00:00
Daniel James
9b1eed66f4 Quickbook: Merge from trunk to quickbook-dev.
[SVN r73239]
2011-07-19 07:35:49 +00:00
Daniel James
9b65b96e29 Quickbook: Add id to legalnotice.
[SVN r73223]
2011-07-18 23:49:27 +00:00
Daniel James
a02a3f687b Quickbook: Add ids to footnotes.
[SVN r73222]
2011-07-18 23:48:53 +00:00
Daniel James
09165188f1 Quickbook: merge from trunk to dev.
[SVN r72762]
2011-06-26 11:07:04 +00:00
Daniel James
c72d4029c0 Quickbook: xml encode escaped punctuation.
[SVN r72760]
2011-06-26 10:44:00 +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
2811b30b7b Quickbook: remove escape character support from simple markup.
It breaks the regex documentation. Will probably implement this for quickbook
1.6.


[SVN r72695]
2011-06-20 18:52:03 +00:00
Daniel James
6d126acb44 Quickbook: Don't use double marks for simple markup.
[SVN r72393]
2011-06-04 16:18:14 +00:00
Daniel James
43486c773a Quickbook: End file with newline.
[SVN r72389]
2011-06-04 16:12:15 +00:00
Daniel James
21436b0415 Quickbook: Nest escapes in syntax highlighted comments.
[SVN r71144]
2011-04-09 11:29:22 +00:00
Daniel James
b403a2434d Quickbook: update tests.
[SVN r71111]
2011-04-08 06:16:00 +00:00
Daniel James
4713c1e211 Quickbook: Escapes in syntax highlighted comments.
Not great since it closes the comments around the escaped code. But to
nest it properly will require a bigger change. Would also be nice to
deal with escape in other contexts - such as strings.

[SVN r71098]
2011-04-08 00:09:59 +00:00
Daniel James
3de8d6b4f3 Quickbook: Don't add whitespace after anchors.
Tends to push anchors to the following word.

[SVN r71088]
2011-04-07 19:51:26 +00:00
Daniel James
0fe014b9ed Quickbook: Detab
[SVN r71087]
2011-04-07 19:50:50 +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
99b81b1fbf Quickbook: Avoid empty simple markups.
[SVN r71057]
2011-04-06 23:42:51 +00:00
Daniel James
d31276a383 Quickbook: Write out blocks smuggled into phrases.
Pretty clumsy, but it's a dodgy thing for the user to do. Maybe the
values could include whether they're blocks or phrases and actions could
react accordingly.

[SVN r71056]
2011-04-06 23:42:31 +00:00
Daniel James
9cb1f04aeb Quickbook: If a phrase template turns out to be a block template, treat it as a complete block.
[SVN r71055]
2011-04-06 23:42:09 +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
d53ac4b7e5 Quickbook: Clean up pass_thru tests.
[SVN r70926]
2011-04-03 10:56:56 +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
70a29a9fc3 Quickbook: Another missing copyright.
[SVN r70615]
2011-03-27 10:26:37 +00:00
Daniel James
5d465edfe8 Quickbook: Add missing copyright.
[SVN r70614]
2011-03-27 10:24:56 +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