diff options
| author | Kelly Campbell <kellyc@apache.org> | 2001-02-23 06:00:29 +0000 |
|---|---|---|
| committer | Kelly Campbell <kellyc@apache.org> | 2001-02-23 06:00:29 +0000 |
| commit | ddaf8b2ad8b8241641d9406805319709e17b2f0d (patch) | |
| tree | fb9ec046012a7514c4ba31826468f717a577f39a /docs/bugtests | |
| parent | 20eb35ecb4511689c56bdf21c73eb03591e37d67 (diff) | |
| download | xmlgraphics-fop-ddaf8b2ad8b8241641d9406805319709e17b2f0d.tar.gz xmlgraphics-fop-ddaf8b2ad8b8241641d9406805319709e17b2f0d.zip | |
Patch for list-block to support body-start and label-end
PR: 682
Obtained from:
Submitted by: Peter S. Housel <housel@acm.org>
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@194086 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs/bugtests')
| -rw-r--r-- | docs/bugtests/list-mountjoy.fo | 52 | ||||
| -rw-r--r-- | docs/bugtests/list-nested-breaks.fo | 80 | ||||
| -rw-r--r-- | docs/bugtests/list-nested.fo | 62 |
3 files changed, 97 insertions, 97 deletions
diff --git a/docs/bugtests/list-mountjoy.fo b/docs/bugtests/list-mountjoy.fo index a050c0e10..6ee1fa5ae 100644 --- a/docs/bugtests/list-mountjoy.fo +++ b/docs/bugtests/list-mountjoy.fo @@ -53,11 +53,11 @@ <!-- list item --> <fo:list-item> <!-- insert a bullet --> - <fo:list-item-label> + <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> <!-- list text --> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block> attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or </fo:block> @@ -67,11 +67,11 @@ <!-- list item --> <fo:list-item> <!-- insert a bullet --> - <fo:list-item-label> + <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> <!-- list text --> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block> entities (other than amp, lt, gt, apos, quot), if references to those entities appear in the document, or </fo:block> @@ -81,11 +81,11 @@ <!-- list entry --> <fo:list-item> <!-- insert a bullet --> - <fo:list-item-label> + <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> <!-- list text --> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block> attributes with values subject to normalization, where the attribute appears in the document with a value which will </fo:block> @@ -95,11 +95,11 @@ <!-- list entry --> <fo:list-item> <!-- insert a bullet --> - <fo:list-item-label> + <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> <!-- list text --> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block> change as a result of normalization, or </fo:block> @@ -109,11 +109,11 @@ <!-- list entry --> <fo:list-item> <!-- insert a bullet --> - <fo:list-item-label> + <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> <!-- list text --> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block> element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white spaceadsfadsfsssssssssssssss thin any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white spaceadsfadsfssssssssthin any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white spaceadsfadsfssssssssthin any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white spaceadsfadsfssssssssthin any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white spaceadsfadsfssssssss @@ -126,18 +126,18 @@ <fo:list-item> - <fo:list-item-label> <fo:block/></fo:list-item-label> - <fo:list-item-body> + <fo:list-item-label end-indent="label-end()"> <fo:block/></fo:list-item-label> + <fo:list-item-body start-indent="body-start()"> <fo:list-block> <!-- list item --> <fo:list-item> <!-- insert a bullet --> - <fo:list-item-label> + <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> <!-- list text --> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block> attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or </fo:block> @@ -146,11 +146,11 @@ <!-- list item --> <fo:list-item> <!-- insert a bullet --> - <fo:list-item-label> + <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> <!-- list text --> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block> attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or </fo:block> @@ -159,11 +159,11 @@ <!-- list item --> <fo:list-item> <!-- insert a bullet --> - <fo:list-item-label> + <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> <!-- list text --> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block> attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or </fo:block> @@ -172,11 +172,11 @@ <!-- list item --> <fo:list-item> <!-- insert a bullet --> - <fo:list-item-label> + <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> <!-- list text --> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block> attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or </fo:block> @@ -190,11 +190,11 @@ <!-- list entry --> <fo:list-item> <!-- insert a bullet --> - <fo:list-item-label> + <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> <!-- list text --> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block> element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. elementtance of those types. </fo:block> @@ -203,11 +203,11 @@ <!-- list entry --> <fo:list-item> <!-- insert a bullet --> - <fo:list-item-label> + <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> <!-- list text --> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block> element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. elementtance of those types. </fo:block> @@ -216,11 +216,11 @@ <!-- list entry --> <fo:list-item> <!-- insert a bullet --> - <fo:list-item-label> + <fo:list-item-label end-indent="label-end()"> <fo:block>•</fo:block> </fo:list-item-label> <!-- list text --> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block> element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. element types with element content, if white space occurs directly within any instance of those types. elementtance of those types. </fo:block> diff --git a/docs/bugtests/list-nested-breaks.fo b/docs/bugtests/list-nested-breaks.fo index 92826fecc..1e7742d89 100644 --- a/docs/bugtests/list-nested-breaks.fo +++ b/docs/bugtests/list-nested-breaks.fo @@ -9,8 +9,8 @@ margin-bottom="2cm" margin-left="2.5cm" margin-right="2.5cm"> - <fo:region-before extent="3cm"/> <fo:region-body margin-top="3cm"/> + <fo:region-before extent="3cm"/> <fo:region-after extent="1.5cm"/> </fo:simple-page-master> </fo:layout-master-set> @@ -53,11 +53,11 @@ <!-- list item --> <fo:list-item> <!-- insert a bullet --> - <fo:list-item-label> - <fo:block><fo:inline-sequence font-family="Symbol">·</fo:inline-sequence></fo:block> + <fo:list-item-label end-indent="label-end()"> + <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block> attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or </fo:block> @@ -67,11 +67,11 @@ <!-- list item --> <fo:list-item> <!-- insert a bullet --> - <fo:list-item-label> - <fo:block><fo:inline-sequence font-family="Symbol">·</fo:inline-sequence></fo:block> + <fo:list-item-label end-indent="label-end()"> + <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block> entities (other than amp, lt, gt, apos, quot), if references to those entities appear in the document, or </fo:block> @@ -81,11 +81,11 @@ <!-- list entry --> <fo:list-item> <!-- insert a bullet --> - <fo:list-item-label> - <fo:block><fo:inline-sequence font-family="Symbol">·</fo:inline-sequence></fo:block> + <fo:list-item-label end-indent="label-end()"> + <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block> attributes with values subject to normalization, where the attribute appears in the document with a value which will </fo:block> @@ -95,11 +95,11 @@ <!-- list entry --> <fo:list-item> <!-- insert a bullet --> - <fo:list-item-label> - <fo:block><fo:inline-sequence font-family="Symbol">·</fo:inline-sequence></fo:block> + <fo:list-item-label end-indent="label-end()"> + <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block> change as a result of normalization, or </fo:block> @@ -109,75 +109,75 @@ <!-- list entry --> <fo:list-item> <!-- insert a bullet --> - <fo:list-item-label> - <fo:block><fo:inline-sequence font-family="Symbol">·</fo:inline-sequence></fo:block> + <fo:list-item-label end-indent="label-end()"> + <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block> element types with element content, if white space occurs directly within any instance of those types. <fo:list-block> <fo:list-item> - <fo:list-item-label> - <fo:block><fo:inline-sequence font-family="Symbol">·</fo:inline-sequence></fo:block> + <fo:list-item-label end-indent="label-end()"> + <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> </fo:list-item-label> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block>This is the first item of a nested list</fo:block> </fo:list-item-body> </fo:list-item> <fo:list-item> - <fo:list-item-label> - <fo:block><fo:inline-sequence font-family="Symbol">·</fo:inline-sequence></fo:block> + <fo:list-item-label end-indent="label-end()"> + <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> </fo:list-item-label> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block>This is the second item of a nested list</fo:block> </fo:list-item-body> </fo:list-item> <fo:list-item> - <fo:list-item-label> - <fo:block><fo:inline-sequence font-family="Symbol">·</fo:inline-sequence></fo:block> + <fo:list-item-label end-indent="label-end()"> + <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> </fo:list-item-label> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block>This is the third item of a nested list. The next list item's block will have a page break-after</fo:block> </fo:list-item-body> </fo:list-item> <fo:list-item> - <fo:list-item-label> - <fo:block><fo:inline-sequence font-family="Symbol">·</fo:inline-sequence></fo:block> + <fo:list-item-label end-indent="label-end()"> + <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> </fo:list-item-label> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block break-after="page">This is the fourth item of a nested list</fo:block> </fo:list-item-body> </fo:list-item> <fo:list-item> - <fo:list-item-label> - <fo:block><fo:inline-sequence font-family="Symbol">·</fo:inline-sequence></fo:block> + <fo:list-item-label end-indent="label-end()"> + <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> </fo:list-item-label> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block>This is the fifth item of a nested list</fo:block> </fo:list-item-body> </fo:list-item> <fo:list-item> - <fo:list-item-label> - <fo:block><fo:inline-sequence font-family="Symbol">·</fo:inline-sequence></fo:block> + <fo:list-item-label end-indent="label-end()"> + <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> </fo:list-item-label> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block>This is the sixth item of a nested list. The next list-item-body's block contains a page break-before.</fo:block> </fo:list-item-body> </fo:list-item> <fo:list-item> - <fo:list-item-label> - <fo:block><fo:inline-sequence font-family="Symbol">·</fo:inline-sequence></fo:block> + <fo:list-item-label end-indent="label-end()"> + <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> </fo:list-item-label> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block break-before="page">This is the seventh item of a nested list</fo:block> </fo:list-item-body> </fo:list-item> <fo:list-item> - <fo:list-item-label> - <fo:block><fo:inline-sequence font-family="Symbol">·</fo:inline-sequence></fo:block> + <fo:list-item-label end-indent="label-end()"> + <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> </fo:list-item-label> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block>This is the eigth item of a nested list</fo:block> </fo:list-item-body> </fo:list-item> diff --git a/docs/bugtests/list-nested.fo b/docs/bugtests/list-nested.fo index 746c50b25..c7f5c7057 100644 --- a/docs/bugtests/list-nested.fo +++ b/docs/bugtests/list-nested.fo @@ -9,8 +9,8 @@ margin-bottom="2cm" margin-left="2.5cm" margin-right="2.5cm"> - <fo:region-before extent="3cm"/> <fo:region-body margin-top="3cm"/> + <fo:region-before extent="3cm"/> <fo:region-after extent="1.5cm"/> </fo:simple-page-master> </fo:layout-master-set> @@ -53,11 +53,11 @@ <!-- list item --> <fo:list-item> <!-- insert a bullet --> - <fo:list-item-label> - <fo:block><fo:inline-sequence font-family="Symbol">·</fo:inline-sequence></fo:block> + <fo:list-item-label end-indent="label-end()"> + <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block> attributes with default values, if elements to which these attributes apply appear in the document without specifications of values for these attributes, or </fo:block> @@ -67,11 +67,11 @@ <!-- list item --> <fo:list-item> <!-- insert a bullet --> - <fo:list-item-label> - <fo:block><fo:inline-sequence font-family="Symbol">·</fo:inline-sequence></fo:block> + <fo:list-item-label end-indent="label-end()"> + <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block> entities (other than amp, lt, gt, apos, quot), if references to those entities appear in the document, or </fo:block> @@ -81,11 +81,11 @@ <!-- list entry --> <fo:list-item> <!-- insert a bullet --> - <fo:list-item-label> - <fo:block><fo:inline-sequence font-family="Symbol">·</fo:inline-sequence></fo:block> + <fo:list-item-label end-indent="label-end()"> + <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block> attributes with values subject to normalization, where the attribute appears in the document with a value which will </fo:block> @@ -95,11 +95,11 @@ <!-- list entry --> <fo:list-item> <!-- insert a bullet --> - <fo:list-item-label> - <fo:block><fo:inline-sequence font-family="Symbol">·</fo:inline-sequence></fo:block> + <fo:list-item-label end-indent="label-end()"> + <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block> change as a result of normalization, or </fo:block> @@ -109,51 +109,51 @@ <!-- list entry --> <fo:list-item> <!-- insert a bullet --> - <fo:list-item-label> - <fo:block><fo:inline-sequence font-family="Symbol">·</fo:inline-sequence></fo:block> + <fo:list-item-label end-indent="label-end()"> + <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> </fo:list-item-label> <!-- list text --> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block> element types with element content, if white space occurs directly within any instance of those types. <fo:list-block> <fo:list-item> - <fo:list-item-label> - <fo:block><fo:inline-sequence font-family="Symbol">·</fo:inline-sequence></fo:block> + <fo:list-item-label end-indent="label-end()"> + <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> </fo:list-item-label> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block>This is the first item of a nested list</fo:block> </fo:list-item-body> </fo:list-item> <fo:list-item> - <fo:list-item-label> - <fo:block><fo:inline-sequence font-family="Symbol">·</fo:inline-sequence></fo:block> + <fo:list-item-label end-indent="label-end()"> + <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> </fo:list-item-label> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block>This is the second item of a nested list</fo:block> </fo:list-item-body> </fo:list-item> <fo:list-item> - <fo:list-item-label> - <fo:block><fo:inline-sequence font-family="Symbol">·</fo:inline-sequence></fo:block> + <fo:list-item-label end-indent="label-end()"> + <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> </fo:list-item-label> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block>This is the third item of a nested list</fo:block> </fo:list-item-body> </fo:list-item> <fo:list-item> - <fo:list-item-label> - <fo:block><fo:inline-sequence font-family="Symbol">·</fo:inline-sequence></fo:block> + <fo:list-item-label end-indent="label-end()"> + <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> </fo:list-item-label> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block>This is the fourth item of a nested list</fo:block> </fo:list-item-body> </fo:list-item> <fo:list-item> - <fo:list-item-label> - <fo:block><fo:inline-sequence font-family="Symbol">·</fo:inline-sequence></fo:block> + <fo:list-item-label end-indent="label-end()"> + <fo:block><fo:inline font-family="Symbol">·</fo:inline></fo:block> </fo:list-item-label> - <fo:list-item-body> + <fo:list-item-body start-indent="body-start()"> <fo:block>This is the fifth item of a nested list</fo:block> </fo:list-item-body> </fo:list-item> |