townforge/quickbook
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,426 Commits 1 Branch 0 Tags 5.7 MiB
cc
Commit Graph

449 Commits

Author SHA1 Message Date
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
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
Daniel James
6500170f49 Pass-thru comments. 
[SVN r70018]
 2011-03-16 09:12:01 +00:00
Daniel James
704e3e7217 Don't require newlines at end of grammars. 
[SVN r69888]
 2011-03-12 10:08:00 +00:00
Daniel James
7f3980b107 Cherry pick adding ids to bridgeheads. 
[SVN r69824]
 2011-03-10 18:50:46 +00:00
Daniel James
ffade9f2bb Cherry pick quickbook test improvements. 
- Encode the full paths into `quickbook-testing.jam` so it can be used from
  other locations.
- Turn off debug symbols on Visual C++, they cause the build system to do
  something odd to the tests.


[SVN r69823]
 2011-03-10 18:41:20 +00:00
Daniel James
fddc8c896c Explicit list markup. Refs #1193 
I don't think paragraph markup would be very useful right now, because
it wouldn't be usable in a phrase context.

These can't be templates because templates are implicitly wrapped in
paragraphs.

[SVN r69438]
 2011-03-01 09:15:09 +00:00
Daniel James
7983810c39 Better anchor support for lists. 
[SVN r69437]
 2011-03-01 09:14:28 +00:00
Daniel James
661fd200ae Support escapes in simple markup. 
[SVN r69332]
 2011-02-27 15:37:47 +00:00
Daniel James
ab5cc3fb0c Make post_process a little less crashy. 
[SVN r69318]
 2011-02-27 10:09:53 +00:00
Daniel James
c5292a1349 Use a phoenix closure to inline the simple markup parser. 
[SVN r69310]
 2011-02-26 18:32:31 +00:00
Daniel James
a4b2852551 Fail if boostbook escape isn't closed. 
[SVN r69309]
 2011-02-26 18:31:58 +00:00
Daniel James
cb26921203 Don't include escaped boostbook or code in simple markup. 
[SVN r69308]
 2011-02-26 18:31:17 +00:00
Daniel James
e4ddb668de Clean up the value consumer interface. 
[SVN r69288]
 2011-02-25 23:06:16 +00:00
Daniel James
a86f19d7bf Invalid list markup again. 
[SVN r69287]
 2011-02-25 23:05:36 +00:00
Daniel James
d245a87966 More nestable elements. Refs #1193 
[SVN r69189]
 2011-02-22 21:28:49 +00:00
Daniel James
f8635bcb41 Another testing flag to allow testing xinclude. 
Not ideal, since not testing normal use. But at least it would have
caught the error fixed in [68308].

[SVN r69181]
 2011-02-22 20:47:15 +00:00
Daniel James
e4bddcebe5 Flag for testing errors. 
quickbook-fail-test couldn't distinguish between correctly handled
errors and bugs, so add quickbook-error-test which will only succeed for
quickbook errors.

[SVN r69180]
 2011-02-22 20:45:26 +00:00
Daniel James
acaf0a9689 Tweak doc info for empty attributes. Maybe these should fail. 
[SVN r69179]
 2011-02-22 20:43:10 +00:00
Daniel James
a6606bdba6 Use values for lists. 
[SVN r69178]
 2011-02-22 20:41:36 +00:00
Daniel James
4b9254f3a4 Clean up the grammars a bit. 
[SVN r69177]
 2011-02-22 20:40:08 +00:00
Daniel James
b4001fe672 Deal with some simple markup edge cases. 
[SVN r68943]
 2011-02-16 08:28:59 +00:00
Daniel James
a336eda585 Only use debug-symbols=off for msvc. 
[SVN r68942]
 2011-02-16 08:28:16 +00:00
Daniel James
00e7131448 Improve the simple markup parser. 
[SVN r68926]
 2011-02-15 20:41:04 +00:00
Daniel James
7d96722034 Missing copyright tests. 
[SVN r68925]
 2011-02-15 20:39:59 +00:00
Daniel James
843dad17de Richer copyright syntax. 
Year ranges and multiple copyrights per copyright attribute (comma
separated).

[SVN r68890]
 2011-02-15 00:26:26 +00:00
Daniel James
d92609023f A value type for quickbook data. 
[SVN r68882]
 2011-02-15 00:20:10 +00:00
Daniel James
262a10b812 Save source mode when including file in 1.6 
[SVN r68880]
 2011-02-15 00:18:45 +00:00
Daniel James
d24e78acac Move other doc-info tests into subdirectory. 
[SVN r68879]
 2011-02-15 00:17:45 +00:00
Daniel James
46d1d1447c Some tests for duplicate docinfo attributes. 
[SVN r68878]
 2011-02-15 00:16:43 +00:00
Daniel James
fb36de29cb Fix empty category. 
[SVN r68877]
 2011-02-15 00:15:55 +00:00
Daniel James
adaa57c8e3 Get the quickbook test tool working from other directories. 
[SVN r68875]
 2011-02-15 00:07:50 +00:00
Daniel James
6d4dec6803 Add ids to bridgeheads. 
Prevents docbook from making up ever changing ids. It would be nice to
use the heading's anchor. But that causes docbook to complain that it
can't generate a title for the link.

[SVN r68595]
 2011-02-01 09:21:25 +00:00
Daniel James
adece17fc6 Turn debug symbols off when testing quickbook. 
Fixes an odd error with the Boost Build Visual C++ tool.

[SVN r68562]
 2011-01-30 11:36:07 +00:00
Daniel James
bd8c0894b0 Place section anchors inside the section title. 
Generates better html.

[SVN r68559]
 2011-01-30 10:52:35 +00:00
Daniel James
aea4163f6c Use a single symbol table for all elements. 
[SVN r67855]
 2011-01-09 12:01:15 +00:00
Daniel James
d626f30cd5 Allow include, import and xinclude in conditional macros. 
[SVN r67637]
 2011-01-03 22:15:41 +00:00
Daniel James
3e075a122b Make the newline after block markup optional. 
[SVN r67636]
 2011-01-03 22:13:54 +00:00
Daniel James
29c97dc3f3 Add an option to turn off all quickbook actions, and use it to implement conditional phrase. 
[SVN r67635]
 2011-01-03 22:12:58 +00:00
Daniel James
fff43d6853 Make the scoped parser more generic and use it for conditional phrases. 
[SVN r67632]
 2011-01-03 22:09:10 +00:00
Daniel James
c51e3add8f Smarter anchor support. 
[SVN r67324]
 2010-12-19 13:26:55 +00:00
Daniel James
d1f14e2aed Implement lang attribute in quickbook/boostbook. 
[SVN r67090]
 2010-12-07 20:44:23 +00:00
Daniel James
d55ea7699b Use a different feature name for quickbook-define in the tests. 
Something was going wrong, this is the easiest fix.

[SVN r67089]
 2010-12-07 20:42:59 +00:00
Daniel James
34d049361b Support more quickbook options in boost build. 
[SVN r66431]
 2010-11-07 14:45:43 +00:00
Daniel James
ed9733296b Some extra quickbook table tests. 
[SVN r66430]
 2010-11-07 14:45:01 +00:00
Daniel James
6c3f05ca9d Restore \n support to quickbook. 
[SVN r66292]
 2010-10-30 23:16:21 +00:00
Daniel James
53fec6d3f1 Nested blocks in document info comments. 
[SVN r65448]
 2010-09-18 17:56:15 +00:00
Daniel James
17adae094e More link tests. 
[SVN r65422]
 2010-09-14 20:50:51 +00:00
Daniel James
d165ef3a67 An extra test for lists. 
[SVN r65421]
 2010-09-14 20:47:16 +00:00
Daniel James
0544468ad9 Don't match words that start with tip, note etc. 
[SVN r65419]
 2010-09-14 20:45:47 +00:00
Daniel James
bd0b01578b Add biblioid support to quickbook. 
[SVN r65370]
 2010-09-09 22:45:39 +00:00
Daniel James
a74d3d4979 Fix a bug in nested template support. 
[SVN r65360]
 2010-09-09 00:11:35 +00:00
Daniel James
d67b0e3931 Fix argument position in break_arguments. 
And some small code_snippet improvements.

[SVN r65280]
 2010-09-05 08:14:16 +00:00
Daniel James
810642f159 Restore 1.43 style document fields. 
Only xml encoding the fields, and supporting escapes with a 1.6 version
switch.

[SVN r65113]
 2010-08-29 21:11:02 +00:00
Daniel James
c2b5212d49 Only stack macros when necessary. 
Pushing and popping symbol containers is pretty expensive, so try to do
it less.

[SVN r65102]
 2010-08-29 11:18:51 +00:00
Daniel James
aafa5d83d2 Move the source files into a source directory. 
[SVN r65030]
 2010-08-26 20:56:37 +00:00
Daniel James
c65adc378a Don't generate empty document info tags. 
[SVN r65011]
 2010-08-26 08:04:08 +00:00
Daniel James
8eeff84ac5 Don't escape docinfo fields for quickbook <= 1.2 
[SVN r65005]
 2010-08-25 20:28:15 +00:00
Daniel James
23d910d7a3 Fix xml escaping for the license in quickbook 1.2 and less. 
[SVN r64990]
 2010-08-24 23:12:10 +00:00
Daniel James
351442d050 Escapes in doc info fields. 
[SVN r64988]
 2010-08-24 19:47:46 +00:00
Daniel James
1dc08fd09c Nested code snippets. 
[SVN r64976]
 2010-08-23 21:51:53 +00:00
Daniel James
4b41d22c87 Merge multiple listitems in varlistentry. 
Docbook only allows a single `listitem` in a `varlistentry` so combine
multiple items into a single item.

[SVN r64831]
 2010-08-15 16:48:10 +00:00
Daniel James
aa69438440 Overhaul some of the template code. 
* Store the location along with the contents of the template body, so
  the location should usually be correct now. Exceptions are code
  snippets, because they get rewritten, and the extra newlines added to
  block template.
* Store if a template is a block template at the time of creation. Using
  spirit to decide, rather than handwritten C++.
* Fix callout list markup.
* Fix the `skip_initial_spaces` stuff in `block.hpp`. This never really
  worked before. No longer have to skip spaces in `parse_template` in
  `actions.cpp`.

[SVN r64830]
 2010-08-15 16:47:21 +00:00
Daniel James
e641698536 Better parser for code blocks. 
* A line containing a comment with no identation will now end a code
  block.
* Code blocks no longer need to be followed by a blank line.

[SVN r64829]
 2010-08-15 16:46:18 +00:00
Daniel James
7101c28eba Don't put nested lists inside a list item's paragraph. 
[SVN r64828]
 2010-08-15 16:45:27 +00:00
Daniel James
b622d1d6ee Trim space after element ids. 
[SVN r64827]
 2010-08-15 16:44:33 +00:00
Daniel James
6b6aad78a6 Ids for headings. 
[SVN r64826]
 2010-08-15 16:43:40 +00:00
Daniel James
8fe8e33699 Fix command line macros in quickbook. 
[SVN r64825]
 2010-08-15 16:41:54 +00:00
Daniel James
54938aef15 Restore the invalid doc info attributes. 
Removing them breaks the release notes, there's still a warning that
they're invalid. Refs #1281

[SVN r63896]
 2010-07-11 23:15:18 +00:00
Daniel James
230a211767 Check the quickbook version is valid. 
[SVN r63814]
 2010-07-10 15:03:45 +00:00
Daniel James
c6d769cf0d Make repeated quickbook image attributes a warning rather than an error. 
[SVN r63813]
 2010-07-10 15:03:07 +00:00
Daniel James
1bc916f41f Generate different ids when reusing code snippets. 
Generates the ids during template expansion instead of when parsing the
code snippet - so that different ids are used for different exapnsions.
Refs #4416

[SVN r63809]
 2010-07-10 11:24:54 +00:00
Daniel James
26030cc220 Copy tests from spirit 2 branch. 
The only remaining difference is the invalid output for callouts.

[SVN r63736]
 2010-07-08 07:14:35 +00:00
Daniel James
f3a52f99ee Fix duplicate image attribute detection. 
[SVN r63735]
 2010-07-08 07:14:03 +00:00
Daniel James
9d9721f79e Fix xml encoding in a few places. 
[SVN r63734]
 2010-07-08 07:13:26 +00:00
Daniel James
db2cfd0d79 Fix documentation info handling in included files. Refs #3907. 
[SVN r63733]
 2010-07-08 07:12:43 +00:00
Daniel James
3127d2fd1b Fix identifier generation for headings. Refs #1436. 
[SVN r63732]
 2010-07-08 07:11:58 +00:00
Daniel James
93fb714dac Backport improved paragraphs from spirit 2 version 
Templates are no longer expanded inside paragraphs, although callout
lists still are. Refs #4302.

[SVN r63713]
 2010-07-06 23:10:10 +00:00
Daniel James
3dfcf5ef14 Don't output empty paragraphs. 
[SVN r63621]
 2010-07-04 18:52:05 +00:00
Daniel James
5dd58732a1 Test some empty templates. 
[SVN r63612]
 2010-07-04 16:56:28 +00:00
Daniel James
c8cdcd075e Don't match empty paragraphs. 
[SVN r63611]
 2010-07-04 16:55:58 +00:00
Daniel James
e3e2018a45 Allow empty document bodies. 
[SVN r63610]
 2010-07-04 16:55:24 +00:00
Daniel James
a47a09e259 Clear template_info before parsing a template. 
Sometimes template_info contains values from a previous failed parse. I
think this makes the last change unnecessary, but I'm going to leave it
in as I feel like it improved the grammar.

[SVN r63609]
 2010-07-04 16:54:44 +00:00
Daniel James
1cde9f5cfe Only store template name after correct match. 
Fixes a bug where a failed template expansion would leave the template
name in template_info.

[SVN r63608]
 2010-07-04 16:53:54 +00:00
Daniel James
f4834d5c6a Make author parsing a little stricter. 
[SVN r63607]
 2010-07-04 16:53:25 +00:00
Daniel James
7e299228fe Don't require commas between authors. 
Makes the author grammar more consistent with the rest of quickbook.

[SVN r63342]
 2010-06-26 12:09:56 +00:00
Daniel James
e410b371fc Update list_test.gold. 
[SVN r62823]
 2010-06-11 23:00:56 +00:00
Daniel James
52a5504cb4 Nested lists inside <simplepara>. 
Not valid, but generates better html. Maybe I should use `<para>` inside
list items, and remove the margin using CSS.

[SVN r62701]
 2010-06-10 00:15:41 +00:00
Daniel James
38275cb119 Fix paragraph mark up. 
* Require an eol after comments, so that an eol with content after it is
  interpreted as a paragraph.
* 'eol >> eol' => 'eol >> *blank_p >> eol_p' so that lines containing
  only a comment aren't interpreted as paragraph breaks.
* +eol after 'inside paragraphs' so that all the whitespace following
  a paragraph is swallowed up. If it wasn't then it'd create lots of
  empty paragraphs when there's a lot of whitespace.

[SVN r62700]
 2010-06-10 00:14:56 +00:00
Daniel James
796b9eb078 Support multiple categories. Refs #1200. 
[SVN r62471]
 2010-06-06 07:23:44 +00:00
Daniel James
d61eb528cf Deal with invalid docinfo details. Refs #1281. 
Warn when boostbook attributes are used for docbook document types and
don't output them.

[SVN r62470]
 2010-06-06 07:23:09 +00:00
Daniel James
b363dedac4 Valid lists. Refs #1281 
[SVN r62469]
 2010-06-06 07:22:40 +00:00
Daniel James
a2f0b2a06d Avoid extra space around footnotes. 
[SVN r62468]
 2010-06-06 07:22:08 +00:00
Daniel James
4c7808b4f7 Avoid double <para> in <blockquote>. Refs #1281. 
[SVN r62467]
 2010-06-06 07:21:38 +00:00
Daniel James
b91264f959 Don't wrap <co> in a <phrase>. Refs #1281. 
[SVN r62466]
 2010-06-06 07:21:10 +00:00
Daniel James
b572a6291a Fix the DOCTYPE generated by quickbook. Refs #1281 
[SVN r62465]
 2010-06-06 07:20:37 +00:00
Daniel James
13e2a24f71 Test spaces around inline code. Fixes #1176 
This was fixed some time ago, just confirming.

[SVN r62464]
 2010-06-06 07:19:46 +00:00
Daniel James
d112cf35e3 Some of the tests from the spirit2 branch. 
[SVN r62462]
 2010-06-06 07:18:56 +00:00
Daniel James
d2c6ff1175 Fix some inspect errors. 
[SVN r61057]
 2010-04-05 07:24:27 +00:00
Daniel James
2fe5e11ec2 32 bit unicode characters. 
[SVN r60387]
 2010-03-09 20:58:01 +00:00
Daniel James
c81003891a Make unicode escapes strictly 4 digits. 
[SVN r60147]
 2010-03-04 07:17:14 +00:00
Daniel James
3b407222b9 Actually just pass through escaped unicoded characters as entities. 
[SVN r60054]
 2010-03-01 19:40:30 +00:00
Daniel James
bd7ab855b3 Add a unicode escape sequence. 
[SVN r60053]
 2010-03-01 19:40:15 +00:00
Daniel James
a126dcf0fd Don't allow '[' in simple_markup. Fixes #1844. 
[SVN r59711]
 2010-02-16 22:34:09 +00:00
Daniel James
876c08b3e8 Deal with mismatched section tags in templates. 
[SVN r59710]
 2010-02-16 22:33:49 +00:00
Daniel James
ea57bed3d3 Support UTF-8 BOM if present. 
I'm not sure if the utf-16/32 checks are the right thing to do, but as
quickbook only supports utf-8 for now, they'll work okay. Hopefully if
it ever support other encodings this should be offloaded to an
appropriate library.

[SVN r59677]
 2010-02-14 13:09:52 +00:00
Daniel James
baec926449 Add to the include test. 
[SVN r59544]
 2010-02-07 08:56:41 +00:00
Daniel James
34683b6ac9 Change include test to demonstrate quickbook's slightly odd behaviour. 
[SVN r59532]
 2010-02-06 21:18:15 +00:00
Daniel James
856691d124 Simple include test. 
[SVN r59527]
 2010-02-06 15:12:55 +00:00
Daniel James
09d287b369 Adjust the block elements in the post-processor. 
- 'replaceable' is an inline element.
 - Add some missing block elements.
 - Put the callout elements into order.

[SVN r59526]
 2010-02-06 15:12:14 +00:00
Daniel James
538d75710e Add a newline after callout bodies, to avoid confusing the quickbook parser. 
[SVN r58040]
 2009-11-29 21:06:23 +00:00
Daniel James
df40ab1e37 Merge some non-spirit 2 changes from the spirit 2 branch. 
Mostly administrative, but also disable xinclude test as it fails on some
platforms due to the different paths used by boost build, I'm not sure how to
fix it.


[SVN r58034]
 2009-11-29 19:16:42 +00:00
Daniel James
84bcb02298 Use qualified ids in tables, and fix a bug generating ids when there isn't a section. 
[SVN r56715]
 2009-10-11 16:18:04 +00:00
Daniel James
724da46536 Support image attributes. Refs #1157. 
[SVN r55917]
 2009-08-31 11:38:47 +00:00
Daniel James
7e39c930c2 Add missing table tests. 
[SVN r55916]
 2009-08-31 11:38:33 +00:00
Daniel James
52a56c1233 Don't use seperators that are in brackets, or are escaped. Refs #2036. 
[SVN r55915]
 2009-08-31 11:38:20 +00:00
Daniel James
e9e100e881 Table ids. Refs #1194. 
[SVN r55913]
 2009-08-31 11:37:59 +00:00
Daniel James
3b839f1eb0 Ignore spaces after 'section:' for quickbook 1.5+ Refs #2712 
And warn when section id is empty after colon.

[SVN r55911]
 2009-08-31 11:37:32 +00:00
Daniel James
b23d6a9de7 In quickbook 1.5 don't mix '..' and whitespace seperators for template arguments. Refs #1174 
[SVN r55909]
 2009-08-31 11:37:04 +00:00
Daniel James
d2e0488349 Implement static/lexical scoping for 1.5. Refs #2034. 
[SVN r55908]
 2009-08-31 11:36:47 +00:00
Daniel James
0ef306d485 Make sure that a template expansion ends with a ']'. 
{{{
[template foo 1]
[fool]
}}}

was generating `1[fool]` - the template would be expanded but then when it
didn't match the `]` it would fail and just get copied to the output. This
change checks for `]` before expanding the template. So it now generates
`[fool]` which is an improvement.

I'm not including a version switch as I see this as a plain bug fix - I can't
imagine this change ever being anything but beneficial.

[SVN r54816]
 2009-07-08 21:41:00 +00:00
Daniel James
a087316841 Teletype source mode. Refs #1202. 
[SVN r54815]
 2009-07-08 21:40:46 +00:00
Daniel James
7c7c1a1765 Add a couple of tests for quickbook 1.4 behaviour to try to preserve it. 
[SVN r54812]
 2009-07-08 21:40:14 +00:00
Daniel James
177b47c57f Use the correct source type for snippets. 
[SVN r53020]
 2009-05-15 06:12:59 +00:00
Daniel James
d86a2fe747 Use our own escape character parser. 
We're currently using the spirit escaped character parser. This is a
strict C parser and causes parse errors for code that we probably should
accept, such as any hexadecimal encoded characters with a value greater
than the maximum value of the current platform's 'char'.  This is \x7F
on some platforms so it rejects '\x80' upwards. As well as rejecting
characters that might be valid, it also means that quickbook will act
differently on different platforms.

In python strings, '\xaaa' is equivalent to '\xaa' + 'a', but the spirit
parser interprets this as a character with value '0xaaa'. So we probably
should accept these.

I also think we should be liberal about what we accept. IMO it isn't our
job to enforce correct C++/python, just to create a reasonable
rendering of our input. So rather than write a parser which understands
the various types of escapes, I just wrote one that ignores any
character following a backslash.

Refs #2860.

[SVN r51949]
 2009-03-24 08:34:09 +00:00
Daniel James
43504cb0b4 Revert r51403. 
[SVN r51883]
 2009-03-21 15:48:55 +00:00
Daniel James
630f5f1e9f Fix syntax error in tests. 
There was a failing test caused by a syntax error in a test. The
solution is probably to improve the syntax in a new version and issue a
warning in older versions.

[SVN r51801]
 2009-03-16 20:19:00 +00:00
Daniel James
003d80629b Accept space between 'section:' and the section id. 
Ref #2712.

[SVN r51403]
 2009-02-22 23:48:51 +00:00
Daniel James
84adcfe135 Generate slightly more valid boostbook. 
For document types other than library:
* Don't generate name or dirname for document types.
* Put title before document info.

Ref #2771

[SVN r51402]
 2009-02-22 23:48:37 +00:00
Daniel James
ae54194c43 Since I accidently added a quickbook fail tests to the Jamfile in the last checkin, I might as well add them. 
[SVN r50211]
 2008-12-08 23:20:26 +00:00
Daniel James
5d51d43801 Hard fail on quickbook post process errors. 
[SVN r50210]
 2008-12-08 23:14:23 +00:00
Daniel James
a6b8f8aac4 Fail on a mismatched '' in the python and c++ syntax highlighters. And then ignore the rest of the code block to avoid further errors and warnings. 
[SVN r50207]
 2008-12-08 21:51:56 +00:00
Daniel James
f677418c29 Use new include paths for classic spirit in quickbook text_diff utility. 
[SVN r50193]
 2008-12-08 16:17:13 +00:00
Daniel James
0c651ef0e1 Fix processing of unmatched escape characters in code - and issue a warning for unexpected characters. 
[SVN r50175]
 2008-12-07 12:37:07 +00:00
John Maddock
6860c334ab Added dependency to the test file. 
[SVN r50109]
 2008-12-04 10:14:19 +00:00
Daniel James
313bd8fcc6 Keep a count of errors in quickbook, and return an error code when appropriate. Refs #1399. 
[SVN r50091]
 2008-12-03 19:14:42 +00:00
John Maddock
be7b4d637e Added quickbook-fail-test rule and two tests that make use of it: note that these currently fail. 
[SVN r50084]
 2008-12-03 09:42:52 +00:00
John Maddock
30eeeb0952 Fix Jamfile by adding <preserve-test-targets>on to test requirements. 
[SVN r50068]
 2008-12-02 13:13:57 +00:00
Joel de Guzman
c2c1a8d55b tweak for the failure tests 
[SVN r48158]
 2008-08-15 12:17:28 +00:00
Douglas Gregor
e327a65ab5 Add mime-type and eol-style properties as needed 
[SVN r46445]
 2008-06-17 13:54:46 +00:00
Joel de Guzman
e3d132e111 - doc updates 
- rudementary template debugging
- template bug! added in test

[SVN r45598]
 2008-05-21 06:29:33 +00:00
Joel de Guzman
a8797c9f8f updated tests 
[SVN r45594]
 2008-05-21 04:01:31 +00:00
Joel de Guzman
962d30ec9e Fix Ticket Ticket #1235 
(http://svn.boost.org/trac/boost/ticket/1235)

[SVN r39291]
 2007-09-15 00:19:44 +00:00
Joel de Guzman
e6f6fd357c fix line endings 
[SVN r38547]
 2007-08-09 02:07:16 +00:00
Joel de Guzman
5d627698cb bugfix: for code imports when we have an empty space (blank) immediately after the /*` markup. 
[SVN r38491]
 2007-08-07 01:51:05 +00:00
Joel de Guzman
e78baa608f code import bug fix: inhibit generation of empty code snips. 
[SVN r38347]
 2007-08-01 23:46:50 +00:00
Joel de Guzman
7dd1716599 fix variablelist bug not accepting paragraphs 
[SVN r38316]
 2007-07-31 01:46:12 +00:00
Joel de Guzman
eb95fcf480 - fix bug in paragraphs inside tables where there's an empty line with some space 
- adjusted the tests to new code changes
- doc updates


[SVN r38264]
 2007-07-21 04:56:36 +00:00
Joel de Guzman
8ce093b190 update gold tests 
[SVN r38263]
 2007-07-20 23:31:36 +00:00
Joel de Guzman
4a127206d9 make all characters significant in marked-up comments in imported code (previously, initial white spaces are ignored). 
[SVN r38133]
 2007-07-03 14:05:00 +00:00
Joel de Guzman
a150aa8a9c Added ignored import code feature 
[SVN r37153]
 2007-03-07 01:29:25 +00:00
Joel de Guzman
ea2e18c0b4 callouts refinement 
[SVN r37112]
 2007-02-28 10:20:50 +00:00
Joel de Guzman
a8f83194fc * Simple markups can now span a whole block. 
* __blurbs__, __admonitions__ and table cells (see __tables__) may now
  contain paragraphs.
* `\n` and `[br]` are now deprecated.


[SVN r37107]
 2007-02-27 15:24:20 +00:00
Joel de Guzman
fd11e3edb8 added callouts 
[SVN r37025]
 2007-02-21 00:48:30 +00:00
Joel de Guzman
16fe1f3638 import facility updates 
[SVN r36476]
 2006-12-21 04:55:45 +00:00
Joel de Guzman
4819a6657e first shot at code "import". more tweaks to come. 
[SVN r36467]
 2006-12-20 15:41:53 +00:00
Joel de Guzman
0f41df252c fix postprocessor self-closed tag processing 
[SVN r36459]
 2006-12-19 13:05:08 +00:00
Joel de Guzman
407de2250d updates 
[SVN r36182]
 2006-11-26 23:39:48 +00:00
Joel de Guzman
5cb7a9ebce Comments are passed through to XML 
[SVN r36058]
 2006-11-16 11:57:45 +00:00
Joel de Guzman
d9f596cabc Escape bug fix 
[SVN r36054]
 2006-11-16 10:52:13 +00:00
Joel de Guzman
3b75f88a67 title bug fix 
[SVN r35573]
 2006-10-12 09:28:14 +00:00
Gennaro Prota
57b1d75952 fixed typos reported in http://bugs.debian.org/378016 
[SVN r34631]
 2006-07-20 13:29:26 +00:00
Joel de Guzman
84a9414f99 infrastructure changes: template_stack(s) 
[SVN r34257]
 2006-06-09 03:16:04 +00:00
Joel de Guzman
ec8c5baa27 ready for prime time 
[SVN r34173]
 2006-06-05 01:09:56 +00:00
Joel de Guzman
c019d918ef *** empty log message *** 
[SVN r34150]
 2006-06-03 04:27:08 +00:00
Joel de Guzman
761943e1ab more tests from john's experiment 
[SVN r34141]
 2006-06-02 17:14:10 +00:00
Joel de Guzman
2d67d18740 Fix post processing: 
1) xml escapes don't print newlines anymore
2) reversed the logic of is_flow_tag by checking against a set of block_tags instead of phrase_tags. that way, unknown tags are always considered as flow tags.


[SVN r34139]
 2006-06-02 16:48:36 +00:00
Joel de Guzman
af7a7212a2 Templates!!! :) 
[SVN r34054]
 2006-05-22 09:00:17 +00:00
Joel de Guzman
d9174fe68b fix </>: empty end tag is not valid XML. 
[SVN r32574]
 2006-02-04 23:39:17 +00:00
Joel de Guzman
6d3e037a59 escaped xml post processing fix + replaceable markup 
[SVN r32523]
 2006-02-03 09:42:17 +00:00
Joel de Guzman
d26823247e escape regression test 
[SVN r32499]
 2006-02-01 17:17:17 +00:00
João Abecasis
cacbb35ffc adding smaller self-contained tests (test1 renamed to quickbook-manual). 
[SVN r32437]
 2006-01-27 14:03:53 +00:00
João Abecasis
42c7964189 restructuring 
[SVN r32436]
 2006-01-27 14:02:07 +00:00
Joel de Guzman
24168e8943 fix nbsp handling 
[SVN r32355]
 2006-01-19 06:11:02 +00:00
Joel de Guzman
55154fd1f0 Allow phrase markups in section titles + misc maintenance. 
[SVN r31366]
 2005-10-18 03:53:28 +00:00
Joel de Guzman
dcbc6afce1 Allow phrase markups in section titles + misc maintenance. 
[SVN r31365]
 2005-10-18 03:51:39 +00:00
João Abecasis
4b00f227ba synchronize test to recent changes in the code. 
[SVN r31355]
 2005-10-16 23:42:22 +00:00
Joel de Guzman
9ef063b9bf allow block tags to terminate a paragraph 
[SVN r31161]
 2005-10-02 02:35:14 +00:00
Joel de Guzman
a63c967930 Doc sync to Joao's recent changes 
[SVN r30968]
 2005-09-14 02:20:06 +00:00
Joel de Guzman
608ec47faf Proper quickbook versioning + postprocessor cleanup 
[SVN r30915]
 2005-09-12 03:18:45 +00:00
Joel de Guzman
f0ec0ca933 Quotes + bugfix for correct handling of spaces after tags in the post-processor. 
[SVN r30909]
 2005-09-11 17:10:15 +00:00
Joel de Guzman
5e5feebc5c Allow versioning. Now Qbk is at version 1.3 
[SVN r30903]
 2005-09-11 05:23:03 +00:00
Joel de Guzman
9260466153 some cleanup + disabled __FILENAME_ macro on debug mode 
[SVN r30902]
 2005-09-11 04:27:57 +00:00
Joel de Guzman
7a5478db38 some cleanup + disabled __FILENAME_ macro on debug mode 
[SVN r30901]
 2005-09-11 04:22:15 +00:00
Joel de Guzman
e99c6075de --debug mode for quickbook developers 
[SVN r30890]
 2005-09-09 16:27:27 +00:00
João Abecasis
303069a71b resolve conflict between test types defined for QuickBook and types for 
production.
make subtests build in the same subdirectory.


[SVN r30878]
 2005-09-08 19:37:57 +00:00
João Abecasis
9350d67090 change file extension .qbk -> .quickbook. 
make quickbook-testing.jam independent of quickbook.jam toolset.
compile text_diff and quickbook only once when there are multiple tests.


[SVN r30876]
 2005-09-08 14:09:23 +00:00
João Abecasis
5f0d81886e add missing import. 
remove bogus variables.


[SVN r30868]
 2005-09-07 22:34:52 +00:00
João Abecasis
8ea2b63ef3 initial import of regression testing mechanism for quickbook. 
(Note: has known annoyances and limitations)


[SVN r30806]
 2005-09-05 01:50:41 +00:00