FooBarWidget-mizuho 0.9.3 → 0.9.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (73) hide show
  1. data/asciidoc/BUGS +3 -3
  2. data/asciidoc/CHANGELOG +112 -63
  3. data/asciidoc/CHANGELOG.txt +50 -0
  4. data/asciidoc/INSTALL +6 -6
  5. data/asciidoc/Makefile.in +21 -5
  6. data/asciidoc/README +3 -3
  7. data/asciidoc/asciidoc.conf +9 -12
  8. data/asciidoc/asciidoc.py +204 -151
  9. data/asciidoc/common.aap +2 -2
  10. data/asciidoc/doc/a2x.1 +4 -3
  11. data/asciidoc/doc/a2x.1.txt +1 -1
  12. data/asciidoc/doc/article.css-embedded.html +13 -12
  13. data/asciidoc/doc/article.html +46 -644
  14. data/asciidoc/doc/article.pdf +0 -0
  15. data/asciidoc/doc/asciidoc.1 +2 -2
  16. data/asciidoc/doc/asciidoc.1.css-embedded.html +14 -13
  17. data/asciidoc/doc/asciidoc.1.css.html +3 -3
  18. data/asciidoc/doc/asciidoc.1.html +3 -3
  19. data/asciidoc/doc/asciidoc.css-embedded.html +238 -225
  20. data/asciidoc/doc/asciidoc.css.html +227 -215
  21. data/asciidoc/doc/asciidoc.dict +10 -1
  22. data/asciidoc/doc/asciidoc.html +181 -164
  23. data/asciidoc/doc/asciidoc.txt +167 -148
  24. data/asciidoc/doc/asciimathml.txt +5 -4
  25. data/asciidoc/doc/book.css-embedded.html +13 -12
  26. data/asciidoc/doc/faq.txt +60 -3
  27. data/asciidoc/doc/music-filter.html +94 -41
  28. data/asciidoc/doc/music-filter.pdf +0 -0
  29. data/asciidoc/doc/source-highlight-filter.html +125 -465
  30. data/asciidoc/doc/source-highlight-filter.pdf +0 -0
  31. data/asciidoc/docbook.conf +8 -2
  32. data/asciidoc/examples/website/CHANGELOG.html +129 -4
  33. data/asciidoc/examples/website/INSTALL.html +6 -6
  34. data/asciidoc/examples/website/README-website.html +3 -3
  35. data/asciidoc/examples/website/README.html +3 -3
  36. data/asciidoc/examples/website/a2x.1.html +4 -4
  37. data/asciidoc/examples/website/asciidoc-docbook-xsl.html +3 -3
  38. data/asciidoc/examples/website/asciidoc-graphviz-sample.txt +1 -0
  39. data/asciidoc/examples/website/downloads.html +7 -7
  40. data/asciidoc/examples/website/faq.html +95 -40
  41. data/asciidoc/examples/website/index.html +34 -13
  42. data/asciidoc/examples/website/index.txt +25 -9
  43. data/asciidoc/examples/website/latex-backend.html +4 -4
  44. data/asciidoc/examples/website/manpage.html +3 -3
  45. data/asciidoc/examples/website/music-filter.html +3 -3
  46. data/asciidoc/examples/website/sample1.png +0 -0
  47. data/asciidoc/examples/website/sample3.png +0 -0
  48. data/asciidoc/examples/website/sample4.png +0 -0
  49. data/asciidoc/examples/website/source-highlight-filter.html +5 -5
  50. data/asciidoc/examples/website/support.html +3 -3
  51. data/asciidoc/examples/website/userguide.html +227 -215
  52. data/asciidoc/examples/website/version9.html +3 -3
  53. data/asciidoc/filters/{code-filter-readme.txt → code/code-filter-readme.txt} +0 -0
  54. data/asciidoc/filters/{code-filter-test.txt → code/code-filter-test.txt} +0 -0
  55. data/asciidoc/filters/{code-filter.conf → code/code-filter.conf} +1 -1
  56. data/asciidoc/filters/{code-filter.py → code/code-filter.py} +0 -0
  57. data/asciidoc/filters/graphviz/asciidoc-graphviz-sample.txt +130 -0
  58. data/asciidoc/filters/graphviz/graphviz-filter.conf +39 -0
  59. data/asciidoc/filters/graphviz/graphviz2png.py +154 -0
  60. data/asciidoc/filters/{music-filter-test.txt → music/music-filter-test.txt} +0 -0
  61. data/asciidoc/filters/{music-filter.conf → music/music-filter.conf} +0 -0
  62. data/asciidoc/filters/{music2png.py → music/music2png.py} +0 -0
  63. data/asciidoc/filters/{source-highlight-filter-test.txt → source/source-highlight-filter-test.txt} +0 -0
  64. data/asciidoc/filters/{source-highlight-filter.conf → source/source-highlight-filter.conf} +2 -1
  65. data/asciidoc/html4.conf +5 -2
  66. data/asciidoc/stylesheets/xhtml11-quirks.css +0 -8
  67. data/asciidoc/stylesheets/xhtml11.css +11 -2
  68. data/asciidoc/vim/syntax/asciidoc.vim +1 -1
  69. data/asciidoc/xhtml11.conf +5 -2
  70. data/lib/mizuho/parser.rb +5 -1
  71. data/mizuho.gemspec +5 -16
  72. data/test/parser_spec.rb +49 -0
  73. metadata +22 -10
@@ -691,12 +691,12 @@ Put \^carets on either^ side of the text to be superscripted, put
691
691
  \~tildes on either side~ of text to be subscripted. For example, the
692
692
  following line:
693
693
 
694
- e^{amp}#960;i^+1 = 0. H~2~O and x^10^. Some ^super text^
694
+ e^πi^+1 = 0. H~2~O and x^10^. Some ^super text^
695
695
  and ~some sub text~
696
696
 
697
697
  Is rendered like:
698
698
 
699
- e^{amp}#960;i^+1 = 0. H~2~O and x^10^. Some ^super text^
699
+ e^πi^+1 = 0. H~2~O and x^10^. Some ^super text^
700
700
  and ~some sub text~
701
701
 
702
702
  Superscripts and subscripts are implemented as <<X52,unconstrained
@@ -1043,16 +1043,17 @@ often used for code and file listings.
1043
1043
 
1044
1044
  Here's an example:
1045
1045
 
1046
- ---------------------------------------
1047
- --------------------------------------
1048
- #include <stdio.h>
1046
+ [listing]
1047
+ ......................................
1048
+ --------------------------------------
1049
+ #include <stdio.h>
1049
1050
 
1050
- int main() {
1051
- printf("Hello World!\n");
1052
- exit(0);
1053
- }
1054
- --------------------------------------
1055
- ---------------------------------------
1051
+ int main() {
1052
+ printf("Hello World!\n");
1053
+ exit(0);
1054
+ }
1055
+ --------------------------------------
1056
+ ......................................
1056
1057
 
1057
1058
  Which will be rendered like:
1058
1059
 
@@ -1114,6 +1115,15 @@ Any AsciiDoc SectionBody element (apart from
1114
1115
  SidebarBlocks) can be placed inside a sidebar.
1115
1116
  ************************************************
1116
1117
 
1118
+ Apply the 'abstract' style to generate an abstract, for example:
1119
+
1120
+ ---------------------------------------------------------------------
1121
+ [abstract]
1122
+ ************************************************
1123
+ In this paper we will attempt to...
1124
+ ************************************************
1125
+ ---------------------------------------------------------------------
1126
+
1117
1127
  [[X26]]
1118
1128
  Comment Blocks
1119
1129
  ~~~~~~~~~~~~~~
@@ -1130,6 +1140,8 @@ asciidoc(1).
1130
1140
 
1131
1141
  See also <<X25,Comment Lines>>.
1132
1142
 
1143
+ NOTE: System macros are executed inside comment blocks.
1144
+
1133
1145
  [[X76]]
1134
1146
  Passthrough Blocks
1135
1147
  ~~~~~~~~~~~~~~~~~~
@@ -1326,17 +1338,36 @@ space or tab character. Bulleted list syntaxes are:
1326
1338
  * List item.
1327
1339
  ...................
1328
1340
 
1329
- Numbered list items start with an optional number or letter followed
1330
- by a period followed by a space or tab character. List numbering is
1331
- optional. Numbered list syntaxes are:
1341
+ There are two numbered list item syntaxes:
1342
+
1343
+ . List items beginning with a single period followed by a space. The
1344
+ period can be preceded by an optional decimal number. The default
1345
+ numbering style is arabic (decimal).
1346
+ . List items beginning with two periods followed by a space. An alpha
1347
+ character or a roman number (upper or lower case) can optionally be
1348
+ used in place of the first period:
1349
+ * An attempt is made to set the number style based on number style
1350
+ of the first list item.
1351
+ * The default numbering style is lowercase alpha.
1352
+
1353
+ You can use the 'style' attribute to specify an alternative numbering
1354
+ style. The numbered list style can be set to one of the following
1355
+ values: 'arabic', 'loweralpha', 'upperalpha', 'lowerroman',
1356
+ 'upperroman'.
1357
+
1358
+ Examples of numbered list items:
1359
+
1332
1360
  .....................................................................
1333
- . Integer numbered list item.
1334
- 1. Integer numbered list item with optional numbering.
1335
- .. Lowercase letter numbered list item.
1336
- a. Lowercase letter numbered list item with optional numbering.
1361
+ . Arabic (decimal) numbered list item.
1362
+ 1. Arabic (decimal) numbered list item.
1363
+ .. Lower case letter numbered list item.
1364
+ a. Lower case letter numbered list item.
1365
+ A. Upper case letter numbered list item.
1366
+ iii. Lower case roman numbered list item.
1367
+ IX. Upper case roman numbered list item.
1337
1368
  .....................................................................
1338
1369
 
1339
- Here are some examples:
1370
+ Here are some examples of bulleted and numbered lists:
1340
1371
  ---------------------------------------------------------------------
1341
1372
  - Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
1342
1373
  * Fusce euismod commodo velit.
@@ -1348,6 +1379,7 @@ Here are some examples:
1348
1379
  - Nulla porttitor vulputate libero.
1349
1380
  . Fusce euismod commodo velit.
1350
1381
  . Vivamus fringilla mi eu lacus.
1382
+ [upperroman]
1351
1383
  .. Fusce euismod commodo velit.
1352
1384
  .. Vivamus fringilla mi eu lacus.
1353
1385
  . Donec eget arcu bibendum nunc consequat lobortis.
@@ -1357,6 +1389,8 @@ Here are some examples:
1357
1389
  b. Vivamus fringilla mi eu lacus.
1358
1390
  c. Donec eget arcu bibendum nunc consequat lobortis.
1359
1391
  2. Vivamus fringilla mi eu lacus.
1392
+ .. Fusce euismod commodo velit.
1393
+ .. Vivamus fringilla mi eu lacus.
1360
1394
  3. Donec eget arcu bibendum nunc consequat lobortis.
1361
1395
  4. Nam fermentum mattis ante.
1362
1396
  ---------------------------------------------------------------------
@@ -1373,6 +1407,7 @@ Which render as:
1373
1407
  - Nulla porttitor vulputate libero.
1374
1408
  . Fusce euismod commodo velit.
1375
1409
  . Vivamus fringilla mi eu lacus.
1410
+ [upperroman]
1376
1411
  .. Fusce euismod commodo velit.
1377
1412
  .. Vivamus fringilla mi eu lacus.
1378
1413
  . Donec eget arcu bibendum nunc consequat lobortis.
@@ -1382,6 +1417,8 @@ Which render as:
1382
1417
  b. Vivamus fringilla mi eu lacus.
1383
1418
  c. Donec eget arcu bibendum nunc consequat lobortis.
1384
1419
  2. Vivamus fringilla mi eu lacus.
1420
+ .. Fusce euismod commodo velit.
1421
+ .. Vivamus fringilla mi eu lacus.
1385
1422
  3. Donec eget arcu bibendum nunc consequat lobortis.
1386
1423
  4. Nam fermentum mattis ante.
1387
1424
 
@@ -1866,12 +1903,12 @@ the `test.py` source file (containing a single callout) using the
1866
1903
 
1867
1904
  .AsciiDoc source
1868
1905
  ---------------------------------------------------------------------
1869
- [source,python]
1870
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1871
- include::test.py[]
1872
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1906
+ [source,python]
1907
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1908
+ \include::test.py[]
1909
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1873
1910
 
1874
- \<1> Print statement.
1911
+ \<1> Print statement.
1875
1912
  ---------------------------------------------------------------------
1876
1913
 
1877
1914
  .Included `test.py` source
@@ -2170,10 +2207,10 @@ See also <<X26,Comment Blocks>>.
2170
2207
 
2171
2208
  System Macros
2172
2209
  ~~~~~~~~~~~~~
2173
- System macros are block macros that perform a predefined task which is
2210
+ System macros are block macros that perform a predefined task and are
2174
2211
  hardwired into the asciidoc(1) program.
2175
2212
 
2176
- - You can't escape system macros with a leading backslash character
2213
+ - You can escape system macros with a leading backslash character
2177
2214
  (as you can with other macros).
2178
2215
  - The syntax and tasks performed by system macros is built into
2179
2216
  asciidoc(1) so they don't appear in configuration files. You can
@@ -2195,7 +2232,7 @@ verbatim embedded CSS or scripts into configuration file headers.
2195
2232
  Example:
2196
2233
 
2197
2234
  ------------------------------------
2198
- include::chapter1.txt[tabsize=4]
2235
+ \include::chapter1.txt[tabsize=4]
2199
2236
  ------------------------------------
2200
2237
 
2201
2238
  .Include macro behavior
@@ -2370,7 +2407,7 @@ a markup template. If `<name>` is omitted then it is the value of the
2370
2407
  regular expression match group named 'name'. The optional
2371
2408
  `[<subslist]` is a comma-separated list of substitution names enclosed
2372
2409
  in `[]` brackets, it sets the default substitutions for passthrough
2373
- text.
2410
+ text, if omitted then no passthrough substitutions are performed.
2374
2411
 
2375
2412
  .Pattern named groups
2376
2413
  The following named groups can be used in macro `<pattern>` regular
@@ -2422,8 +2459,8 @@ There are a wide variety of built-in customizable styles.
2422
2459
  *********************************************************************
2423
2460
  When technical users first start creating documents, tables (complete
2424
2461
  with column spanning and table nesting) are often considered very
2425
- important. important must-have feature. The reality is that tables
2426
- are seldom used, even in technical documentation.
2462
+ important. The reality is that tables are seldom used, even in
2463
+ technical documentation.
2427
2464
 
2428
2465
  Try this exercise: thumb through your library of technical books,
2429
2466
  you'll be surprised just how seldom tables are actually used, even
@@ -2546,11 +2583,11 @@ include::customers.csv[]
2546
2583
  AsciiDoc source:
2547
2584
 
2548
2585
  ---------------------------------------------------------------------
2549
- [format="csv",cols="^1,4*2",options="header"]
2550
- |===================================================
2551
- ID,Customer Name,Contact Name,Customer Address,Phone
2552
- include::customers.csv[]
2553
- |===================================================
2586
+ [format="csv",cols="^1,4*2",options="header"]
2587
+ |===================================================
2588
+ ID,Customer Name,Contact Name,Customer Address,Phone
2589
+ \include::customers.csv[]
2590
+ |===================================================
2554
2591
  ---------------------------------------------------------------------
2555
2592
 
2556
2593
 
@@ -3498,7 +3535,8 @@ named attributes):
3498
3535
  - List attributes take precedence over existing attributes.
3499
3536
  - List attributes can only be referenced in configuration file markup
3500
3537
  templates and tags, they are not available inside the document.
3501
- - Attribute references are allowed inside attribute lists.
3538
+ - Attribute references are allowed inside attribute lists -- this is
3539
+ the only substitution performed on attribute lists.
3502
3540
  - Setting a named attribute to `None` undefines the attribute.
3503
3541
  - Positional attributes are referred to as `\{1}`,`\{2}`,`\{3}`,...
3504
3542
  - Attribute `\{0}` refers to the entire list (excluding the enclosing
@@ -3536,7 +3574,8 @@ AttributeList Element
3536
3574
  An <<X21,attribute list>> on a line by itself constitutes an
3537
3575
  'AttributeList' block element, its attributes apply to the following
3538
3576
  block element. The list attributes are passed to the next block
3539
- element for markup template substitution.
3577
+ element for markup template substitution. Often the first list
3578
+ parameter is used to specify the element's <<X23,style>>.
3540
3579
 
3541
3580
 
3542
3581
  Attribute References
@@ -3922,7 +3961,7 @@ sectionbody::
3922
3961
  The block contents are processed as a SectionBody.
3923
3962
 
3924
3963
  skip::
3925
- The block is treated as a comment (see CommentBlocks).
3964
+ The block is treated as a comment (see <<X26,CommentBlocks>>).
3926
3965
 
3927
3966
  list::
3928
3967
  The block is a <<X29,list block>>.
@@ -4049,19 +4088,25 @@ asciidoc(1) searches for the command:
4049
4088
  - Finally it relies on the executing shell to search the environment
4050
4089
  search path (`$PATH`).
4051
4090
 
4091
+ Sub-directories are also included in the searches -- standard practice
4092
+ is to install each filter in it's own sub-directory with the same name
4093
+ as the filter's style definition. For example the music filter's style
4094
+ name is 'music' so it's configuration and filter files are stored in
4095
+ the `filters/music` directory.
4096
+
4052
4097
  Filter Configuration Files
4053
4098
  ~~~~~~~~~~~~~~~~~~~~~~~~~~
4054
4099
  Filters are normally accompanied by a configuration file containing a
4055
4100
  Paragraph or DelimitedBlock definition along with corresponding markup
4056
4101
  templates.
4057
4102
 
4058
- There are two ways to implement filters:
4059
-
4060
- - As a new Paragraph or DelimitedBlock definition.
4061
- - By styling an existing Paragraph or DelimitedBlock using a 'style'
4062
- configuration entry -- the 'source highlight' and 'music' filters
4063
- use this technique to customize the ListingBlock. By convention the
4064
- style is given the same name as the filter.
4103
+ While it is possible to create new Paragraph or DelimitedBlock
4104
+ definitions the preferred way to implement a filter is to add a
4105
+ <<X23,style>> to an existing Paragraph or DelimitedBlock definition
4106
+ (all filters shipped with AsciiDoc use this technique). The filter is
4107
+ applied to the paragraph or delimited block by preceding it with an
4108
+ attribute list: the first positional attribute is the style name,
4109
+ remaining attributes are normally filter specific parameters.
4065
4110
 
4066
4111
  asciidoc(1) auto-loads all `.conf` files found in the filter search
4067
4112
  paths (see previous section).
@@ -4069,19 +4114,20 @@ paths (see previous section).
4069
4114
  [[X56]]
4070
4115
  Code Filter
4071
4116
  ~~~~~~~~~~~
4072
- AsciiDoc comes with a simple minded for highlighting source code
4073
- keywords and comments. See also the
4074
- `./filters/code-filter-readme.txt` file.
4117
+ AsciiDoc comes with a toy filter for highlighting source code keywords
4118
+ and comments. See also the `./filters/code/code-filter-readme.txt`
4119
+ file.
4075
4120
 
4076
4121
  NOTE: This filter primarily to demonstrate how to write a filter --
4077
4122
  it's much to simplistic to be passed off as a code syntax highlighter.
4078
4123
  If you want a full featured multi-language highlighter use the
4079
4124
  <<X57,Source Code Highlighter Filter>>.
4080
4125
 
4081
- ---------------------------------------------------------------------
4126
+ [listing]
4127
+ .....................................................................
4082
4128
  .Code filter example
4083
4129
  [code,python]
4084
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
4130
+ ----------------------------------------------
4085
4131
  ''' A multi-line
4086
4132
  comment.'''
4087
4133
  def sub_word(mo):
@@ -4091,14 +4137,14 @@ def sub_word(mo):
4091
4137
  return quote + word + quote
4092
4138
  else:
4093
4139
  return word
4094
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
4095
- ---------------------------------------------------------------------
4140
+ ----------------------------------------------
4141
+ .....................................................................
4096
4142
 
4097
4143
  Outputs:
4098
4144
 
4099
4145
  .Code filter example
4100
4146
  [code,python]
4101
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
4147
+ ----------------------------------------------
4102
4148
  ''' A multi-line
4103
4149
  comment.'''
4104
4150
  def sub_word(mo):
@@ -4108,7 +4154,7 @@ def sub_word(mo):
4108
4154
  return quote + word + quote
4109
4155
  else:
4110
4156
  return word
4111
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
4157
+ ----------------------------------------------
4112
4158
 
4113
4159
  [[X57]]
4114
4160
  Source Code Highlighter Filter
@@ -4467,17 +4513,16 @@ highlight clear Search
4467
4513
  " Don't move to matched text while search pattern is being entered.
4468
4514
  set noincsearch
4469
4515
 
4470
- " Q command to reformat paragraphs and list.
4471
- nnoremap Q gq}
4516
+ " Reformat paragraphs and list.
4517
+ nnoremap R gq}
4472
4518
 
4473
- " W command to delete trailing white space and Dos-returns and to expand tabs
4474
- " to spaces.
4475
- nnoremap W :%s/[\r \t]\+$//<CR>:set et<CR>:retab!<CR>
4519
+ " Delete trailing white space and Dos-returns and to expand tabs to spaces.
4520
+ nnoremap S :set et<CR>:retab!<CR>:%s/[\r \t]\+$//<CR>
4476
4521
 
4477
4522
  autocmd BufRead,BufNewFile *.txt,README,TODO,CHANGELOG,NOTES
4478
- \ setlocal autoindent expandtab tabstop=8 softtabstop=2 shiftwidth=2
4523
+ \ setlocal autoindent expandtab tabstop=8 softtabstop=2 shiftwidth=2 filetype=asciidoc
4479
4524
  \ textwidth=70 wrap formatoptions=tcqn
4480
- \ formatlistpat=^\\s*<\\?\\d\\+[\\]:.)}\\t\ >]\\s*
4525
+ \ formatlistpat=^\\s*\\d\\+\\.\\s\\+\\\\|^\\s*<\\d\\+>\\s\\+\\\\|^\\s*[a-zA-Z.]\\.\\s\\+\\\\|^\\s*[ivxIVX]\\+\\.\\s\\+
4481
4526
  \ comments=s1:/*,ex:*/,://,b:#,:%,:XCOMM,fb:-,fb:*,fb:+,fb:.,fb:>
4482
4527
  ---------------------------------------------------------------------
4483
4528
 
@@ -4546,49 +4591,31 @@ Macro attribute lists::
4546
4591
 
4547
4592
  ["Desktop screenshot",width=32]
4548
4593
 
4549
- Combining Separate Documents
4594
+ Combining separate documents
4550
4595
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
4551
4596
  You have a number of stand-alone AsciiDoc documents that you want to
4552
4597
  process as a single document. Simply processing them with a series of
4553
- `include` macros won't work, because instead of starting at level 1
4554
- the section levels of the combined document start at level 0 (the
4555
- document title level).
4556
-
4557
- The solution is to redefine the title underlines so that document and
4558
- section titles are pushed down one level.
4559
-
4560
- . Push the standard title underlines down one level by defining a new
4561
- level 0 underline in a custom configuration file. For example
4562
- `combined.conf`:
4598
+ `include` macros won't work because the documents contain (level 0)
4599
+ document titles. The solution is to create a top level wrapper
4600
+ document that redefines the document underlines, pushing them down one
4601
+ level. For example `combined.txt`:
4563
4602
 
4564
- [titles]
4565
- underlines="__","==","--","~~","^^"
4566
-
4567
- . If you use single line titles you'll need to make corresponding
4568
- adjustments to the `[titles]` section `sect0`...`sect4` entries.
4569
-
4570
- . Create a top level wrapper document. For example `combined.txt`:
4571
- +
4572
4603
  ---------------------------------------------------------------------
4573
- Combined Document Title
4574
- _______________________
4604
+ :titles.underlines: "__","==","--","~~","^^"
4575
4605
 
4576
- include::document1.txt[]
4606
+ Combined Document Title
4607
+ _______________________
4577
4608
 
4578
- include::document2.txt[]
4609
+ \include::document1.txt[]
4579
4610
 
4580
- include::document3.txt[]
4581
- ---------------------------------------------------------------------
4611
+ \include::document2.txt[]
4582
4612
 
4583
- . Process the wrapper document. For example:
4584
-
4585
- $ asciidoc --conf-file=combined.conf combined.txt
4613
+ \include::document3.txt[]
4614
+ ---------------------------------------------------------------------
4586
4615
 
4587
- Actually the `--conf-file` option is unnecessary as asciidoc(1)
4588
- automatically looks for a same-named `.conf` file.
4616
+ The document titles in the included documents will now be processed as
4617
+ level 1 section titles.
4589
4618
 
4590
- - The combined document title uses the newly defined level 0 underline
4591
- (underscore characters).
4592
4619
  - Put a blank line between the `include` macro lines to ensure the
4593
4620
  title of the included document is not seen as part of the last
4594
4621
  paragraph of the previous document.
@@ -4596,60 +4623,51 @@ automatically looks for a same-named `.conf` file.
4596
4623
  included files -- conditionally exclude them if they are necessary
4597
4624
  for stand-alone processing.
4598
4625
 
4599
- Processing Document Sections Separately
4626
+ Processing document sections separately
4600
4627
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
4601
- You have divided your AsciiDoc document into separate files (one per top level
4602
- section) which are combined and processed with the following top level
4603
- document:
4628
+ You have divided your AsciiDoc document into separate files (one per
4629
+ top level section) which are combined and processed with the following
4630
+ top level document:
4604
4631
 
4605
4632
  ---------------------------------------------------------------------
4606
- Combined Document Title
4607
- =======================
4608
- Joe Bloggs
4609
- v1.0, 12-Aug-03
4633
+ Combined Document Title
4634
+ =======================
4635
+ Joe Bloggs
4636
+ v1.0, 12-Aug-03
4610
4637
 
4611
- include::section1.txt[]
4638
+ \include::section1.txt[]
4612
4639
 
4613
- include::section2.txt[]
4640
+ \include::section2.txt[]
4614
4641
 
4615
- include::section3.txt[]
4642
+ \include::section3.txt[]
4616
4643
  ---------------------------------------------------------------------
4617
4644
 
4618
4645
  You also want to process the section files as separate documents.
4619
4646
  This is easy because asciidoc(1) will quite happily process
4620
- `section1.txt`, `section2.txt` and `section3.txt` separately.
4621
-
4622
- If you want to promote the section levels up one level, so the
4623
- document is processed just like a stand-alone document, then pop the
4624
- section underline definition up one level:
4647
+ `section1.txt`, `section2.txt` and `section3.txt` separately -- the
4648
+ resulting output documents contain the section but have no document
4649
+ title.
4625
4650
 
4626
- [titles]
4627
- underlines="--","~~","^^","++","__"
4651
+ Use the `-s` (`--no-header-footer`) command-line option to suppress
4652
+ header and footer output, this is useful if the processed output is to
4653
+ be included in another file. For example:
4628
4654
 
4629
- The last `"__"` underline is a dummy that won't actually be used but
4630
- is necessary to legitimize the underline definition.
4655
+ $ asciidoc -s -b docbook section1.txt
4631
4656
 
4632
- This is just the reverse of the technique used for combining separate
4633
- documents explained in the previous section.
4634
-
4635
- Processing Document Chunks
4636
- ~~~~~~~~~~~~~~~~~~~~~~~~~~
4657
+ Processing document snippets
4658
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
4637
4659
  asciidoc(1) can be used as a filter, so you can pipe chunks of text
4638
4660
  through it. For example:
4639
4661
 
4640
4662
  $ echo 'Hello *World!*' | asciidoc -s -
4641
- <div class="para"><p>Hello <strong>World!</strong></p></div>
4663
+ <div class="paragraph"><p>Hello <strong>World!</strong></p></div>
4642
4664
 
4643
- The `-s` (`--no-header-footer`) command-line option suppresses header
4644
- and footer output and is useful if the processed output is to be
4645
- included in another file.
4646
-
4647
- Badges in HTML Page Footers
4665
+ Badges in HTML page footers
4648
4666
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~
4649
4667
  See the `[footer]` section in the AsciiDoc distribution `xhtml11.conf`
4650
4668
  configuration file.
4651
4669
 
4652
- Pretty Printing AsciiDoc Output
4670
+ Pretty printing AsciiDoc output
4653
4671
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
4654
4672
  If the indentation and layout of the asciidoc(1) output is not to your
4655
4673
  liking you can:
@@ -4658,21 +4676,23 @@ liking you can:
4658
4676
  template sections. The `\{empty}` glossary entry is useful for
4659
4677
  outputting trailing blank lines in markup templates.
4660
4678
 
4661
- 2. Or use Dave Raggett's excellent 'HTML Tidy' program to tidy
4662
- asciidoc(1) output. Example:
4679
+ 2. Use Dave Raggett's http://tidy.sourceforge.net/[HTML Tidy] program
4680
+ to tidy asciidoc(1) output. Example:
4663
4681
 
4664
4682
  $ asciidoc -b docbook -o - mydoc.txt | tidy -indent -xml >mydoc.xml
4665
4683
 
4666
- 'HTML Tidy' can be downloaded from http://tidy.sourceforge.net/
4684
+ 3. Use the `xmllint(1)` format option. Example:
4685
+
4686
+ $ xmllint --format mydoc.xml
4667
4687
 
4668
- Supporting Minor DocBook DTD Variations
4688
+ Supporting minor DocBook DTD variations
4669
4689
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
4670
4690
  The conditional inclusion of DocBook SGML markup at the end of the
4671
4691
  distribution `docbook.conf` file illustrates how to support minor DTD
4672
4692
  variations. The included sections override corresponding entries from
4673
4693
  preceding sections.
4674
4694
 
4675
- Shipping Stand-alone AsciiDoc Source
4695
+ Shipping stand-alone AsciiDoc source
4676
4696
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
4677
4697
  Reproducing presentation documents from someone else's source has one
4678
4698
  major problem: unless your configuration files are the same as the
@@ -4698,14 +4718,14 @@ The `-e` (`--no-conf`) option excludes the use of implicit
4698
4718
  configuration files, ensuring that only entries from the
4699
4719
  `mydoc-html.conf` configuration are used.
4700
4720
 
4701
- Inserting Blank Space
4721
+ Inserting blank space
4702
4722
  ~~~~~~~~~~~~~~~~~~~~~
4703
4723
  Adjust your style sheets to add the correct separation between block
4704
4724
  elements. Inserting blank paragraphs containing a single non-breaking
4705
4725
  space character `\{nbsp}` works but is an ad hoc solution compared
4706
4726
  to using style sheets.
4707
4727
 
4708
- Closing Open Sections
4728
+ Closing open sections
4709
4729
  ~~~~~~~~~~~~~~~~~~~~~
4710
4730
  You can close off section tags up to level `N` by calling the
4711
4731
  `eval::[Section.setlevel(N)]` system macro. This is useful if you
@@ -4714,23 +4734,22 @@ example includes a DocBook glossary division at the top section level
4714
4734
  (level 0):
4715
4735
 
4716
4736
  ---------------------------------------------------------------------
4717
- ifdef::backend-docbook[]
4718
-
4719
- eval::[Section.setlevel(0)]
4720
-
4721
- +++++++++++++++++++++++++++++++
4722
- <glossary>
4723
- <title>Glossary</title>
4724
- <glossdiv>
4725
- ...
4726
- </glossdiv>
4727
- </glossary>
4728
- +++++++++++++++++++++++++++++++
4729
- endif::backend-docbook[]
4737
+ \ifdef::backend-docbook[]
4738
+
4739
+ \eval::[Section.setlevel(0)]
4740
+
4741
+ +++++++++++++++++++++++++++++++
4742
+ <glossary>
4743
+ <title>Glossary</title>
4744
+ <glossdiv>
4745
+ ...
4746
+ </glossdiv>
4747
+ </glossary>
4748
+ +++++++++++++++++++++++++++++++
4749
+ \endif::backend-docbook[]
4730
4750
  ---------------------------------------------------------------------
4731
4751
 
4732
-
4733
- Validating Output Files
4752
+ Validating output files
4734
4753
  ~~~~~~~~~~~~~~~~~~~~~~~
4735
4754
  Use `xmllint(1)` to check the AsciiDoc generated markup is both well
4736
4755
  formed and valid. Here are some examples:
@@ -4813,7 +4832,7 @@ asciidoc(1) `--unsafe` command-line option.
4813
4832
  .Safe mode constraints
4814
4833
  - `eval`, `sys` and `sys2` executable attributes and block macros are
4815
4834
  not executed.
4816
- - `\include::<filename>[]` and `\include1::<filename>[]` block macro
4835
+ - `include::<filename>[]` and `\include1::<filename>[]` block macro
4817
4836
  files must reside inside the parent file's directory.
4818
4837
  - `\{include:<filename>}` executable attribute files must reside
4819
4838
  inside the source document directory.