Commit Graph

1191 Commits

Author SHA1 Message Date
Daniel James
7676f00765 Fix standalone images in quickbook.
[SVN r85431]
2013-08-22 20:50:08 +00:00
Daniel James
99c2746329 Remove 'not ready' notes about block markup in lists.
The recent improvements to list generation have left me feeling more confident
about this.

[SVN r85430]
2013-08-22 20:49:50 +00:00
Daniel James
faca522959 A little copy editting for the 1.7 description.
[SVN r85429]
2013-08-22 20:49:31 +00:00
Daniel James
50c4cab88f Add a quick guide on upgrading to 1.6
[SVN r85428]
2013-08-22 20:49:05 +00:00
Daniel James
dd1abc0e5c Merge quickbook to release.
Just documentation changes for 1.6.


[SVN r85409]
2013-08-20 17:22:58 +00:00
Daniel James
4fefa013a9 Add new elements in 1.6 to the main documentation.
[SVN r85407]
2013-08-20 08:57:49 +00:00
Daniel James
c58e64af03 Add note about xmlbase.
[SVN r85406]
2013-08-20 08:57:29 +00:00
Daniel James
0f37ec4da2 Add explicit ids to heading documentation.
[SVN r85405]
2013-08-20 08:57:13 +00:00
Daniel James
1adc92593c Update version meta-data documentation.
[SVN r85404]
2013-08-20 08:56:56 +00:00
Daniel James
09005dc2b4 Update the import and include documentation.
This is a bit incoherent at the moment. It needs to be rearranged so
that there's a tutorial that introduces the concepts in a more logical
order. But I want to press on with some of the other updates.

[SVN r85403]
2013-08-20 08:56:39 +00:00
Daniel James
6c412da094 Fix inaccurate heading id generation documentation.
All headings have ids generated, not just `h1`, `h2` and `h3`.

[SVN r85402]
2013-08-20 08:56:24 +00:00
Daniel James
67256b3527 Merge quickbook to release.
[SVN r85390]
2013-08-18 10:04:46 +00:00
Daniel James
3db7767853 Start to document quickbook 1.6 include.
[SVN r85382]
2013-08-17 19:01:46 +00:00
Daniel James
d1d87511a9 Quickbook 1.6 alpha 1.
[SVN r85381]
2013-08-17 19:01:27 +00:00
Daniel James
9e16e89438 Merge quickbook from trunk.
From the change log:

- Improved markup for lists.
- Make escaping templates with a punctuation identifier illegal.
  Escaping templates with an alphanumeric identifier is still fine.
- 1.7 changes:
  - Make it an error to use an element in the wrong context.
  - Error if the body of a phrase element doesn't parse.
  - List markup in nested blocks.
  - Allow block elements in phrase templates.
  - Make it an error to put a paragraph break (i.e. a blank line)
    in a phrase template.
- Internal changes:
  - Clean up the id manager implementation.



[SVN r85369]
2013-08-17 09:46:47 +00:00
Daniel James
e98b64269f Simpler, less efficient, id generation.
I noticed a bug for an edge case in the id generator. Wouldn't be too
hard to fix, but the implementation was too complicated with some really
pointless optimizations, so I rewrote it using a simpler brute force
method. Will be fine for now unless something has a lot of duplicate ids.

[SVN r85368]
2013-08-16 17:31:26 +00:00
Daniel James
d829f1e251 Add note about hack.
[SVN r85367]
2013-08-16 17:31:08 +00:00
Daniel James
10899c08d3 Hard-code which collector is written to.
[SVN r85366]
2013-08-16 17:30:49 +00:00
Daniel James
aabaaf9699 Revert and clean up some of the list changes.
Now that I've fixed my mistakes I can clean up a lot of the rubbish.

[SVN r85342]
2013-08-13 22:22:47 +00:00
Daniel James
968d8f01a0 Fix bug where list tags were confused with markup lists.
[SVN r85341]
2013-08-13 22:22:28 +00:00
Daniel James
d4c1fbc9d4 More consistent markup for lists in templates in lists.
[SVN r85340]
2013-08-13 22:22:06 +00:00
Daniel James
8e8635dc79 Make list generation state part of the output state.
Which sounds obvious when it's put like that. But I originally did this
in the parser because the parser was tracking lists anyway. But that
made a mess of handling `[ordered_list]` and `[itemized_list]`, I tried
fixing that but made a pig's ear of it.

The code for handling 'explicit lists' will still be a bit messy because
the generator is currently oblivious to what type of block element it's
generating markup for, and it needs to be aware for lists.

[SVN r85339]
2013-08-13 22:21:39 +00:00
Daniel James
850458074a Stop saving phrase and block output separately.
[SVN r85338]
2013-08-13 22:21:17 +00:00
Daniel James
6f06a8d7a6 Remove incorrect note about document id.
The document id has never been generated from the filename. It comes
from the docinfo `id` attribute, or if that doesn't exist, it's
generated from the document title. Although, thanks to bugs, it's a bit
more complicated than that.

[SVN r85328]
2013-08-12 21:42:20 +00:00
Daniel James
55d7447469 Fix single entity source mode notes.
[SVN r85327]
2013-08-12 21:42:01 +00:00
Daniel James
25e37cd618 Generate simpara for ordered_list and itemized_list.
Also fixes block elements nested in lists.

[SVN r85326]
2013-08-12 21:35:29 +00:00
Daniel James
2de3a59944 Stop mismatched brackets causing an error with old quickbook.
Mismatched brackets are only an error for quickbook 1.6+.

[SVN r85289]
2013-08-10 19:19:02 +00:00
Daniel James
29ee34d4b7 Split up the language version chapter.
[SVN r85288]
2013-08-10 19:18:25 +00:00
Daniel James
c784dcbc44 Some notes about recent quickbook changes.
[SVN r85287]
2013-08-10 19:17:51 +00:00
Daniel James
bd3be26138 Be a little smarter about skipping escaped templates.
Only possible since I made escaping punctuation templates illegal.

[SVN r85286]
2013-08-10 19:17:21 +00:00
Daniel James
80e2754a01 Make escaped punctuation templates illegal in 1.6.
There's a minor bug with escaped templates in 1.6 and I don't have time to
fix it, this will help limit its effect. As far as I'm aware no one uses
escaped templates with punctuation templates. Escaped templates are an
undocumented feature anyway.

[SVN r85285]
2013-08-10 19:16:46 +00:00
Daniel James
8dd38db6bd Add tests for escaped template calls.
[SVN r85284]
2013-08-10 19:16:01 +00:00
Daniel James
be7a77711b Split up the id manager file.
[SVN r85270]
2013-08-10 09:07:55 +00:00
Daniel James
c92356d7ef Make entity data const where possible.
[SVN r85269]
2013-08-10 09:07:31 +00:00
Daniel James
2851da15a8 Mark up const use of id_state and id_placeholder.
[SVN r85268]
2013-08-10 09:07:15 +00:00
Daniel James
23bebbecca Improve the handling of file ids.
Instead of messing around with the section's id, leave it alone and
check for a file id whenever looking up the current id.

[SVN r85267]
2013-08-10 09:06:59 +00:00
Daniel James
05879218c5 Stop storing generated ids in id_placeholder.
Placeholders are now completely constant.

[SVN r85266]
2013-08-10 09:06:36 +00:00
Daniel James
0b981780c3 Pull the resolved state from id_placeholder.
[SVN r85265]
2013-08-10 09:06:18 +00:00
Daniel James
2d52fa9d71 Combine 'child' and 'unresolved' id states.
[SVN r85264]
2013-08-10 09:06:02 +00:00
Daniel James
224711c244 Extract id_data from id_placeholder.
[SVN r85263]
2013-08-10 09:05:45 +00:00
Daniel James
89677768e9 Extract 'order' from id_placeholder.
[SVN r85262]
2013-08-10 09:05:28 +00:00
Daniel James
31f96e632b Clean final id generation.
[SVN r85261]
2013-08-10 09:05:11 +00:00
Daniel James
c7db08a00c Clean header id generation.
[SVN r85260]
2013-08-10 09:04:53 +00:00
Daniel James
de35add4e5 Improve some id_manager comments.
[SVN r85259]
2013-08-10 09:04:25 +00:00
Daniel James
b29fa77158 Remove old forward declaration.
[SVN r85258]
2013-08-10 09:04:05 +00:00
Daniel James
e75a070a0a Attempt at better list markup.
Doesn't work for: templates in lists or explicit list block elements
(because it detects when it's in a list based on the parser), but it is
usually at least as good as the older version.

This kind of thing would be much easier if I represented the lists in
data rather than translating them as they are parsed. Not sure if I'll
do that soon though.

[SVN r85247]
2013-08-08 21:22:52 +00:00
Daniel James
c76625f66e Fix skipping template body containing an escaped template call.
[SVN r85216]
2013-08-05 22:16:01 +00:00
Daniel James
8dfd18abd4 Expand all phrase templates inline, even if they contain blocks.
Hopefully more intuitive than turning what looks like a phrase into
a block.

[SVN r85130]
2013-07-23 08:23:29 +00:00
Daniel James
c5e77194c0 Single state saver.
It's always okay to save `template_depth` and `min_section_level`
because they only change at template calls, and template calls are
always cleanly nested.

[SVN r85129]
2013-07-23 08:23:07 +00:00
Daniel James
0394e8ff48 Disallow paragraph/list markup in phrase templates.
Can still use block tags.

[SVN r85128]
2013-07-23 08:22:49 +00:00