From 2fe5b5553890c1490e9fc781bac3f6ea5fa38f9b Mon Sep 17 00:00:00 2001 From: Shaun McCance Date: Wed, 20 May 2009 13:55:02 -0500 Subject: [mallard] Changing list.bullet to ulist --- doc/mallard/C/mal_block_cite.xml | 4 ++-- doc/mallard/C/mal_block_code.xml | 4 ++-- doc/mallard/C/mal_block_comment.xml | 4 ++-- doc/mallard/C/mal_block_desc.xml | 4 ++-- doc/mallard/C/mal_block_example.xml | 4 ++-- doc/mallard/C/mal_block_figure.xml | 4 ++-- doc/mallard/C/mal_block_listing.xml | 4 ++-- doc/mallard/C/mal_block_media.xml | 4 ++-- doc/mallard/C/mal_block_note.xml | 4 ++-- doc/mallard/C/mal_block_p.xml | 4 ++-- doc/mallard/C/mal_block_quote.xml | 4 ++-- doc/mallard/C/mal_block_screen.xml | 4 ++-- doc/mallard/C/mal_block_synopsis.xml | 4 ++-- doc/mallard/C/mal_block_ulist.xml | 14 +++++++++----- doc/mallard/C/mal_inline_app.xml | 4 ++-- doc/mallard/C/mal_inline_cmd.xml | 4 ++-- doc/mallard/C/mal_inline_code.xml | 4 ++-- doc/mallard/C/mal_inline_em.xml | 4 ++-- doc/mallard/C/mal_inline_file.xml | 4 ++-- doc/mallard/C/mal_inline_gui.xml | 4 ++-- doc/mallard/C/mal_inline_guiseq.xml | 4 ++-- doc/mallard/C/mal_inline_input.xml | 4 ++-- doc/mallard/C/mal_inline_key.xml | 4 ++-- doc/mallard/C/mal_inline_keyseq.xml | 4 ++-- doc/mallard/C/mal_inline_link.xml | 12 ++++++------ doc/mallard/C/mal_inline_media.xml | 4 ++-- doc/mallard/C/mal_inline_output.xml | 4 ++-- doc/mallard/C/mal_inline_span.xml | 4 ++-- doc/mallard/C/mal_inline_sys.xml | 4 ++-- doc/mallard/C/mal_inline_var.xml | 4 ++-- doc/mallard/C/mal_page.xml | 4 ++-- xslt/mallard/html/mal2html-list.xsl | 30 +++++++++++++++--------------- 32 files changed, 88 insertions(+), 84 deletions(-) diff --git a/doc/mallard/C/mal_block_cite.xml b/doc/mallard/C/mal_block_cite.xml index 528897a..98cf664 100644 --- a/doc/mallard/C/mal_block_cite.xml +++ b/doc/mallard/C/mal_block_cite.xml @@ -49,7 +49,7 @@ element.

Notes - +

The style attribute takes a space-separated list of style hints. Processing tools should adjust their behavior according to those style hints they understand.

 @@ -61,7 +61,7 @@ element.

The href attribute provides a URL to identify the entity being cited. It will frequently be a mailto: URL with a person's email address.

 - +
diff --git a/doc/mallard/C/mal_block_code.xml b/doc/mallard/C/mal_block_code.xml index 32b0b33..8625613 100644 --- a/doc/mallard/C/mal_block_code.xml +++ b/doc/mallard/C/mal_block_code.xml @@ -46,7 +46,7 @@ by the user.

Notes - +

The code element can contain a mixture of text and any general inline elements. Whitespace is interpreted literally.

 @@ -74,7 +74,7 @@ by the user.

listing element to provide a title and description for the code block. This is frequently used to provide the name of the file whose contents are being shown.

- +
diff --git a/doc/mallard/C/mal_block_comment.xml b/doc/mallard/C/mal_block_comment.xml index 5654173..d921935 100644 --- a/doc/mallard/C/mal_block_comment.xml +++ b/doc/mallard/C/mal_block_comment.xml @@ -51,7 +51,7 @@ to provide a date attribute.

Notes - +

The comment element contains an optional title element, a cite element, and any @@ -69,7 +69,7 @@ to provide a date attribute.

The comment element can have attributes from external namespaces. See for more information on external-namespace attributes.

 - +
diff --git a/doc/mallard/C/mal_block_desc.xml b/doc/mallard/C/mal_block_desc.xml index 789e206..577b987 100644 --- a/doc/mallard/C/mal_block_desc.xml +++ b/doc/mallard/C/mal_block_desc.xml @@ -43,7 +43,7 @@ for the formal element.

Notes - +

The desc element can contain a mixture of text and any general inline elements.

 @@ -62,7 +62,7 @@ for the formal element.

The desc element can also be used in an informational context. See for more information.

 - +
diff --git a/doc/mallard/C/mal_block_example.xml b/doc/mallard/C/mal_block_example.xml index 983ac4b..e911329 100644 --- a/doc/mallard/C/mal_block_example.xml +++ b/doc/mallard/C/mal_block_example.xml @@ -40,7 +40,7 @@ paragraphs together.

Notes - +

The example element can contain any general block content.

 @@ -56,7 +56,7 @@ paragraphs together.

The example element can have attributes from external namespaces. See for more information on external-namespace attributes.

 - +
diff --git a/doc/mallard/C/mal_block_figure.xml b/doc/mallard/C/mal_block_figure.xml index 24b937f..45cb6ff 100644 --- a/doc/mallard/C/mal_block_figure.xml +++ b/doc/mallard/C/mal_block_figure.xml @@ -44,7 +44,7 @@ To provide a title for the contents of a file, such as a
Notes - +

The figure element contains an optional title element, an optional desc element, and any @@ -62,7 +62,7 @@ To provide a title for the contents of a file, such as a

The figure element can have attributes from external namespaces. See for more information on external-namespace attributes.

 - +
diff --git a/doc/mallard/C/mal_block_listing.xml b/doc/mallard/C/mal_block_listing.xml index ed3baa7..5b02f9e 100644 --- a/doc/mallard/C/mal_block_listing.xml +++ b/doc/mallard/C/mal_block_listing.xml @@ -46,7 +46,7 @@ element.

Notes - +

The listing element contains an optional title element, an optional desc element, and any @@ -64,7 +64,7 @@ element.

The listing element can have attributes from external namespaces. See for more information on external-namespace attributes.

 - +
diff --git a/doc/mallard/C/mal_block_media.xml b/doc/mallard/C/mal_block_media.xml index fd7ce1a..32ba950 100644 --- a/doc/mallard/C/mal_block_media.xml +++ b/doc/mallard/C/mal_block_media.xml @@ -47,7 +47,7 @@ for details on how fallback elements are handled.

Notes - +

The media element can contain any general block content. The content is only used as a fallback or alternative.

 @@ -70,7 +70,7 @@ for details on how fallback elements are handled.

The media element may also be used in an inline context. See for more information.

 - +
diff --git a/doc/mallard/C/mal_block_note.xml b/doc/mallard/C/mal_block_note.xml index 242b4f6..65e9cbb 100644 --- a/doc/mallard/C/mal_block_note.xml +++ b/doc/mallard/C/mal_block_note.xml @@ -42,7 +42,7 @@ of your document.

Notes - +

The note element contains an optional title element and any general block content.

 @@ -85,7 +85,7 @@ of your document.

The note element can have attributes from external namespaces. See for more information on external-namespace attributes.

 - +
diff --git a/doc/mallard/C/mal_block_p.xml b/doc/mallard/C/mal_block_p.xml index 4898c53..609ad78 100644 --- a/doc/mallard/C/mal_block_p.xml +++ b/doc/mallard/C/mal_block_p.xml @@ -30,7 +30,7 @@ outout.

Notes - +

The p element can contain a mixture of text and any general inline elements.

 @@ -46,7 +46,7 @@ outout.

The p element can have attributes from external namespaces. See for more information on external-namespace attributes.

 - +
diff --git a/doc/mallard/C/mal_block_quote.xml b/doc/mallard/C/mal_block_quote.xml index dd0cf00..c21cd24 100644 --- a/doc/mallard/C/mal_block_quote.xml +++ b/doc/mallard/C/mal_block_quote.xml @@ -41,7 +41,7 @@ and have it automatically formatted by display tools.

Notes - +

The quote element contains an optional title element, a mandatory cite element, and any @@ -70,7 +70,7 @@ and have it automatically formatted by display tools.

The quote element can have attributes from external namespaces. See for more information on external-namespace attributes.

 - +
diff --git a/doc/mallard/C/mal_block_screen.xml b/doc/mallard/C/mal_block_screen.xml index 5e44426..a2ed8c2 100644 --- a/doc/mallard/C/mal_block_screen.xml +++ b/doc/mallard/C/mal_block_screen.xml @@ -51,7 +51,7 @@ by the user.

Notes - +

The screen element can contain a mixture of text and any general inline elements. Whitespace is interpreted literally.

 @@ -85,7 +85,7 @@ by the user.

The screen element can have attributes from external namespaces. See for more information on external-namespace attributes on block elements.

 - +
diff --git a/doc/mallard/C/mal_block_synopsis.xml b/doc/mallard/C/mal_block_synopsis.xml index 3541412..e50dd24 100644 --- a/doc/mallard/C/mal_block_synopsis.xml +++ b/doc/mallard/C/mal_block_synopsis.xml @@ -49,7 +49,7 @@ control element.

Notes - +

The synopsis element contains an optional title element, an optional desc element, and any @@ -67,7 +67,7 @@ control element.

The synopsis element can have attributes from external namespaces. See for more information on external-namespace attributes.

 - +
diff --git a/doc/mallard/C/mal_block_ulist.xml b/doc/mallard/C/mal_block_ulist.xml index f575995..4f0a8e2 100644 --- a/doc/mallard/C/mal_block_ulist.xml +++ b/doc/mallard/C/mal_block_ulist.xml @@ -20,13 +20,17 @@ Bullet Lists -mal_list_bullet = element list { - attribute type { "bullet" } ?, - attribute style { text } ?, +mal_block_ulist = element ulist { + attribute style { xsd:NMTOKENS } ?, + attribute * - (mal:* | local:*) { text } *, + mal_block_title ?, + element item { - mal_block +, - mal_list ? + attribute style { xsd:NMTOKENS } ?, + attribute * - (mal:* | local:*) { text } *, + + mal_block + } + } diff --git a/doc/mallard/C/mal_inline_app.xml b/doc/mallard/C/mal_inline_app.xml index 73d87da..b2715bf 100644 --- a/doc/mallard/C/mal_inline_app.xml +++ b/doc/mallard/C/mal_inline_app.xml @@ -43,7 +43,7 @@ use cmd for this purpose instead.

Notes - +

The app element can contain a mixture of text and any general inline elements.

 @@ -63,7 +63,7 @@ use cmd for this purpose instead.

The app element can have attributes from external namespaces. See for more information on external-namespace attributes.

 - +
diff --git a/doc/mallard/C/mal_inline_cmd.xml b/doc/mallard/C/mal_inline_cmd.xml index e310b2b..103f75e 100644 --- a/doc/mallard/C/mal_inline_cmd.xml +++ b/doc/mallard/C/mal_inline_cmd.xml @@ -55,7 +55,7 @@ by the user.

Notes - +

The cmd element can contain a mixture of text and any general inline elements.

 @@ -89,7 +89,7 @@ by the user.

The cmd element can have attributes from external namespaces. See for more information on external-namespace attributes.

 - +
diff --git a/doc/mallard/C/mal_inline_code.xml b/doc/mallard/C/mal_inline_code.xml index cae5c64..ede7387 100644 --- a/doc/mallard/C/mal_inline_code.xml +++ b/doc/mallard/C/mal_inline_code.xml @@ -53,7 +53,7 @@ by the user.

Notes - +

The code element can contain a mixture of text and any general inline elements.

 @@ -79,7 +79,7 @@ by the user.

The code element may also be used in a block context. See for more information.

 - +
diff --git a/doc/mallard/C/mal_inline_em.xml b/doc/mallard/C/mal_inline_em.xml index 9e8ef08..5cde8cb 100644 --- a/doc/mallard/C/mal_inline_em.xml +++ b/doc/mallard/C/mal_inline_em.xml @@ -42,7 +42,7 @@ display tools.

Notes - +

The em element can contain a mixture of text and any general inline elements.

 @@ -62,7 +62,7 @@ display tools.

The em element can have attributes from external namespaces. See for more information on external-namespace attributes.

 - +
diff --git a/doc/mallard/C/mal_inline_file.xml b/doc/mallard/C/mal_inline_file.xml index 67811b7..a21f577 100644 --- a/doc/mallard/C/mal_inline_file.xml +++ b/doc/mallard/C/mal_inline_file.xml @@ -41,7 +41,7 @@ filenames, such as search paths and file extensions.

Notes - +

The file element can contain a mixture of text and any general inline elements.

 @@ -61,7 +61,7 @@ filenames, such as search paths and file extensions.

The file element can have attributes from external namespaces. See for more information on external-namespace attributes.

 - +
diff --git a/doc/mallard/C/mal_inline_gui.xml b/doc/mallard/C/mal_inline_gui.xml index 3e7c9e1..16f133d 100644 --- a/doc/mallard/C/mal_inline_gui.xml +++ b/doc/mallard/C/mal_inline_gui.xml @@ -43,7 +43,7 @@ control is being marked up.

Notes - +

The gui element can contain a mixture of text and any general inline elements.

 @@ -103,7 +103,7 @@ control is being marked up.

The gui element can have attributes from external namespaces. See for more information on external-namespace attributes.

 - +
diff --git a/doc/mallard/C/mal_inline_guiseq.xml b/doc/mallard/C/mal_inline_guiseq.xml index 8348df1..f319e97 100644 --- a/doc/mallard/C/mal_inline_guiseq.xml +++ b/doc/mallard/C/mal_inline_guiseq.xml @@ -41,7 +41,7 @@ items.

Notes - +

The guiseq element can contain a mixture of text and gui elements.

 @@ -58,7 +58,7 @@ items.

The guiseq element can have attributes from external namespaces. See for more information on external-namespace attributes.

 - +
diff --git a/doc/mallard/C/mal_inline_input.xml b/doc/mallard/C/mal_inline_input.xml index c9bb464..1bc5b2a 100644 --- a/doc/mallard/C/mal_inline_input.xml +++ b/doc/mallard/C/mal_inline_input.xml @@ -42,7 +42,7 @@ or into a text field in a graphical application.

Notes - +

The input element can contain a mixture of text and any general inline elements.

 @@ -67,7 +67,7 @@ or into a text field in a graphical application.

output element, may be used to mark up the contents of a screen element, allowing processing tools to treat them differently.

- +
diff --git a/doc/mallard/C/mal_inline_key.xml b/doc/mallard/C/mal_inline_key.xml index 35c66fb..2512583 100644 --- a/doc/mallard/C/mal_inline_key.xml +++ b/doc/mallard/C/mal_inline_key.xml @@ -54,7 +54,7 @@ these instead.

Notes - +

The key element can contain a mixture of text and any general inline elements.

 @@ -78,7 +78,7 @@ these instead.

The key element can have attributes from external namespaces. See for more information on external-namespace attributes.

 - +
diff --git a/doc/mallard/C/mal_inline_keyseq.xml b/doc/mallard/C/mal_inline_keyseq.xml index da63f2c..049fbbc 100644 --- a/doc/mallard/C/mal_inline_keyseq.xml +++ b/doc/mallard/C/mal_inline_keyseq.xml @@ -45,7 +45,7 @@ key press. You can use text without markup to indicate a class of keys, such as
Notes - +

The keyseq element can contain a mixture of text, key elements, and other keyseq elements.

 @@ -68,7 +68,7 @@ key press. You can use text without markup to indicate a class of keys, such as

The keyseq element can have attributes from external namespaces. See for more information on external-namespace attributes.

 - +
diff --git a/doc/mallard/C/mal_inline_link.xml b/doc/mallard/C/mal_inline_link.xml index 9d47cba..29bff77 100644 --- a/doc/mallard/C/mal_inline_link.xml +++ b/doc/mallard/C/mal_inline_link.xml @@ -48,7 +48,7 @@ the same document.

Notes - +

The link element can contain a mixture of text and any general inline elements.

 @@ -78,7 +78,7 @@ the same document.

The link element can have attributes from external namespaces. See for more information on external-namespace attributes.

 - +
@@ -147,11 +147,11 @@ recommendation. displayed as normal. Otherwise, automatic link text is generated as follows:

- +

If the link element has an xref attribute that points to a page or section in the same document:

- +

If the link element has a role attribute, and that page or section has an informational title with the @@ -168,7 +168,7 @@ recommendation.

Otherwise, the contents of the primary title of that page page or section are used.

 - +

Otherwise, if the link element has an xref @@ -176,7 +176,7 @@ recommendation. tool knows how to generate link contents, that content is used.

Otherwise, the link target is used as text content.

 - + diff --git a/doc/mallard/C/mal_inline_media.xml b/doc/mallard/C/mal_inline_media.xml index 07b391b..3fd1d2a 100644 --- a/doc/mallard/C/mal_inline_media.xml +++ b/doc/mallard/C/mal_inline_media.xml @@ -48,7 +48,7 @@ for details on how fallback elements are handled.

Notes - +

The media element can contain a mixture of text and any general inline elements.

 @@ -74,7 +74,7 @@ for details on how fallback elements are handled.

The media element may also be used in a block context. See for more information.

 - +
diff --git a/doc/mallard/C/mal_inline_output.xml b/doc/mallard/C/mal_inline_output.xml index 149956d..d1eb8fc 100644 --- a/doc/mallard/C/mal_inline_output.xml +++ b/doc/mallard/C/mal_inline_output.xml @@ -49,7 +49,7 @@ differently.

Notes - +

The output element can contain a mixture of text and any general inline elements.

 @@ -88,7 +88,7 @@ differently.

input element, may be used to mark up the contents of a screen element, allowing processing tools to treat them differently.

- +
diff --git a/doc/mallard/C/mal_inline_span.xml b/doc/mallard/C/mal_inline_span.xml index 5749c6b..0bae089 100644 --- a/doc/mallard/C/mal_inline_span.xml +++ b/doc/mallard/C/mal_inline_span.xml @@ -44,7 +44,7 @@ using attributes from external namespaces.

Notes - +

The span element can contain a mixture of text and any general inline elements.

 @@ -64,7 +64,7 @@ using attributes from external namespaces.

The span element can have attributes from external namespaces. See for more information on external-namespace attributes.

 - +
diff --git a/doc/mallard/C/mal_inline_sys.xml b/doc/mallard/C/mal_inline_sys.xml index af9b279..a1be855 100644 --- a/doc/mallard/C/mal_inline_sys.xml +++ b/doc/mallard/C/mal_inline_sys.xml @@ -42,7 +42,7 @@ isn't covered by other elements such as file
Notes - +

The sys element can contain a mixture of text and any general inline elements.

 @@ -62,7 +62,7 @@ isn't covered by other elements such as file

The sys element can have attributes from external namespaces. See for more information on external-namespace attributes.

 - +
diff --git a/doc/mallard/C/mal_inline_var.xml b/doc/mallard/C/mal_inline_var.xml index d662719..1ddbf91 100644 --- a/doc/mallard/C/mal_inline_var.xml +++ b/doc/mallard/C/mal_inline_var.xml @@ -45,7 +45,7 @@ an indicated argument.

Notes - +

The var element can contain a mixture of text and any general inline elements.

 @@ -68,7 +68,7 @@ an indicated argument.

See and for examples using var.

 - +
diff --git a/doc/mallard/C/mal_page.xml b/doc/mallard/C/mal_page.xml index 012892e..3d53bf7 100644 --- a/doc/mallard/C/mal_page.xml +++ b/doc/mallard/C/mal_page.xml @@ -39,11 +39,11 @@ mal_page_topic = element page {
Notes - +

The type attribute takes the values "guide" and "topic". Guide pages and topic pages are discussed below.

 - +
diff --git a/xslt/mallard/html/mal2html-list.xsl b/xslt/mallard/html/mal2html-list.xsl index d6ff1e9..e964e19 100644 --- a/xslt/mallard/html/mal2html-list.xsl +++ b/xslt/mallard/html/mal2html-list.xsl @@ -36,27 +36,27 @@ REMARK: Describe this template --> -ul.list-bullet { +ul.ulist { margin: 0; padding: 0; } -ul.list-bullet li { +ul.ulist li { margin-left: 1.44em; } -ul.list-tree { +ul.tree { margin: 0; padding: 0; list-style-type: none; } -ul.list-tree li { +ul.tree li { margin: 0; padding: 0; } .item-tree { margin: 0; padding: 0; } -ul.list-tree ul.list-tree { +ul.tree ul.tree { margin-left: 1.44em; } -div.list-tree-lines ul.list-tree ul.list-tree { +div.tree-lines ul.tree ul.tree { margin-left: 0.2em; } -div.list-tree-lines ul.list-tree ul.list-tree ul.list-tree { +div.tree-lines ul.tree ul.tree ul.tree { margin-left: 1.44em; } @@ -65,15 +65,15 @@ div.list-tree-lines ul.list-tree ul.list-tree ul.list-tree { - +
- list list-bullet + ulist first-child -
    +
@@ -97,19 +97,19 @@ div.list-tree-lines ul.list-tree ul.list-tree ul.list-tree { - +
- list list-tree + tree - list-tree-lines + tree-lines first-child -
    +
      @@ -135,7 +135,7 @@ div.list-tree-lines ul.list-tree ul.list-tree ul.list-tree { select="*[not(self::mal:item)]"/>
-
    +
      -- cgit v1.2.1