Commit Graph

376 Commits

Author SHA1 Message Date
Daniel James
672caeec17 Quickbook: Code block callouts.
[SVN r75897]
2011-12-11 11:16:01 +00:00
Daniel James
d3d03dd760 Quickbook: Stateful actions class for syntax highlighter.
[SVN r75896]
2011-12-11 11:15:09 +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
55fdc226c3 Quickbook: Rejig path interpretation for include/import/xinclude.
I'd like all path and url handling to be more consistent, making it a
semantic error to use the wrong one in the wrong place. This starts to
move in that direction.

[SVN r75893]
2011-12-11 11:12:46 +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
09972edcae Quickbook: Fix glob when parent path is empty.
[SVN r75847]
2011-12-07 09:43:43 +00:00
Daniel James
4c2ad1f909 Quickbook: Merge from trunk to quickbook-dev.
[SVN r75846]
2011-12-07 09:40:30 +00:00
Daniel James
f1d9efd4b7 Quickbook: Merge from trunk to quickbook-dev.
[SVN r75779]
2011-12-03 09:26:25 +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
b8fc2c7db7 Quickbook: Merge from trunk to quickbook-dev.
[SVN r75763]
2011-12-01 18:07:38 +00:00
Rene Rivera
bceab2ece7 Implement glob multi-file includes.
[SVN r75761]
2011-12-01 04:29:54 +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
cc34500587 Quickbook: Merge from trunk to quickbook-dev
[SVN r75739]
2011-11-30 01:35:25 +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
a30b43f166 Quickbook: Windows compile fixes.
I really need to use either a custom string class or a custom stream class to
avoid this.


[SVN r75729]
2011-11-29 21:56:15 +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
cf6b21e786 Quickbook: Update version.
[SVN r75698]
2011-11-27 21:48:00 +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
e1a8323497 Quickbook: Fix contexts.
[SVN r75633]
2011-11-23 00:01:25 +00:00
Daniel James
73f76e778e Quickbook: Allow block elements in lists.
[SVN r75632]
2011-11-22 23:50:48 +00:00
Daniel James
c518701be9 Quickbook: Allocate correctly sized buffer for cygwin.
[SVN r75631]
2011-11-22 23:50:32 +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
16fe2e20e0 Quickbook: Remove incorrect line number.
There's no pressing need to have a line number here. Could possibly
create an error per duplicate attribute with the correct line numbers.

I have half a plan to integrate the docinfo grammar with the main
grammar, this would involve arranging the action calls so that the full
position info is available. Would probably also process the document
attributes before the docinfo attributes.

[SVN r75629]
2011-11-22 23:49:58 +00:00
Daniel James
0cc4910fc4 Quickbook: Quickbook values are always references now.
And store an intrusive pointer to they maintain the lifetime of the
text they refer to.

[SVN r75628]
2011-11-22 23:49:43 +00:00
Daniel James
44cdb88eec Quickbook: Deal with unbalanced code snippets.
[SVN r75627]
2011-11-22 23:49:26 +00:00
Daniel James
6be3b71545 Quickbook: Clean up starting and ending snippets.
[SVN r75626]
2011-11-22 23:48:54 +00:00
Daniel James
395526a447 Quickbook: Check that code snippet grammars always succeed.
[SVN r75625]
2011-11-22 23:48:39 +00:00
Daniel James
32721bd39e Quickbook: Deal with invalid command line macros.
[SVN r75624]
2011-11-22 23:48:25 +00:00
Daniel James
ffd808966e Quickbook: Replace id/dirname TODO with a new TODO.
[SVN r75623]
2011-11-22 23:48:09 +00:00
Daniel James
0f4dcb961f Quickbook: Swallow up doc info fallback value.
[SVN r75622]
2011-11-22 23:47:52 +00:00
Daniel James
b8cb0d4f4d Quickbook: Extract image attribute printer.
[SVN r75621]
2011-11-22 23:47:34 +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
7e6f023689 Quickbook: Add static check that Scanner is what the code assumes.
[SVN r75618]
2011-11-22 23:46:45 +00:00
Daniel James
537513de13 Quickbook: Add note about how import/include works.
[SVN r75617]
2011-11-22 23:46:31 +00:00
Daniel James
23e168a340 Quickbook: Use intrusive_ptr for files.
[SVN r75616]
2011-11-22 23:46:13 +00:00
Daniel James
1a32f82bdb Quickbook: Remove qbk_value.
[SVN r75615]
2011-11-22 23:45:53 +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
7ff2843d9f Quickbook: No need to save phrase for syntax highlighter.
I pushes the phrase collector whenever it parses escaped quickbook, and
stores its generated code in a separate collector.

[SVN r75611]
2011-11-22 23:44:32 +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