akkartik/wardley.love - Change 4GXHYH5IYHUBCNQVJMXYJMVU5BF6C6TEOQEMGFFYYAL7GRCZX4XQC

ripple widths down the hierarchy sometimes

compute_layout now has the following responsibilities:

render backgrounds as separate rectangles
compute x/y/w/h of each text node based on type (rows/cols) and width
compute width of some nodes based on widths higher up the tree

Created by Kartik K. Agaram on December 24, 2022

4GXHYH5IYHUBCNQVJMXYJMVU5BF6C6TEOQEMGFFYYAL7GRCZX4XQC

Dependencies

In channels

main

Change contents

Replacement in head at line 1 [3.10815]
B:BD[3.10815] → [2.12:15]
```
338
```
[3.10815]
```
349
```

File addition: 0349-manifest (----------)

[4.2]

{"on.mouse_press":179,"font":228,"on.mouse_release":178,"initialize_editor":338,"on.update":315,"box_height":345,"on.keychord_press":311,"compute_layout":349,"Cursor_node":172,"to_text":180,"Page":344,"on.text_input":177,"Surface":196,"clip":236,"on.code_change":306,"on.draw":346,"on":1,"vx":5,"parent":348,"Viewport":303,"on.initialize":304,"clip_all":265,"vy":8,"A":309,"scale":7,"B":316}

File addition: 0349-compute_layout (----------)

[4.2]

compute_layout = function(node, x,y, nodes_to_render)
	-- append to nodes_to_render flattened instructions to render a hierarchy of nodes
	-- return x,y rendered until (surface coordinates)
	if node.type == 'text' then
		-- leaf node containing raw text
		node.x = x
		node.y = y
		-- render background if necessary
		local node_to_render
		if node.bg then
			node_to_render = {type='rectangle', r=node.bg.r, g=node.bg.g, b=node.bg.b, x=node.x, y=node.y}
			table.insert(nodes_to_render, node_to_render)
		end
		-- render contents
		if node.width then
			node.w = node.width
		else
			node.w = 0
			for i,s in ipairs(node.data) do
				local text = love.graphics.newText(font(20), node.data)
				local width = text:getWidth()
				print(node.data[i], 'has width', width)
				if node.w < width then node.w = width end
			end
		end
		initialize_editor(node)
	    node.h = box_height(node)
		table.insert(nodes_to_render, node)
		if node_to_render then
			node_to_render.w = node.w
			node_to_render.h = node.h
		end
	elseif node.type == 'rows' then
		node.x = x
		node.y = y
		local node_to_render
		if node.bg then
			node_to_render = {type='rectangle', r=node.bg.r, g=node.bg.g, b=node.bg.b, x=node.x, y=node.y}
			table.insert(nodes_to_render, node_to_render)
		end
		-- lay out children top to bottom
		local subx,suby = x,y
		local w,h = 0,0
		local subnodes
		for _,child in ipairs(node.data) do
			if child.margin then
				suby = suby+child.margin
				h = h+child.margin
			end
			if not child.width then
				child.width = node.width  -- HACK: should we set child.w or child.width? Neither is quite satisfactory.
			end
			subx,suby = compute_layout(child, x,suby, nodes_to_render)
			if w < child.w then
				w = child.w
			end
			h = h+child.h
		end
		node.w = w
		node.h = h
		if node_to_render then
			node_to_render.w = w
			node_to_render.h = h
		end
	elseif node.type == 'cols' then
		node.x = x
		node.y = y
		-- lay out children left to right
		local node_to_render
		if node.bg then
			node_to_render = {type='rectangle', r=node.bg.r, g=node.bg.g, b=node.bg.b, x=node.x, y=node.y}
			table.insert(nodes_to_render, node_to_render)
		end
		local subx,suby = x,y
		local w,h = 0,0
		for _,child in ipairs(node.data) do
			if child.margin then
				subx = subx+child.margin
				w = w+child.margin
			end
			subx,suby = compute_layout(child, subx,y, nodes_to_render)
			w = w + child.w
			if h < child.h then
				h = child.h
			end
		end
		node.w = w
		node.h = h
		if node_to_render then
			node_to_render.w = w
			node_to_render.h = h
		end
	end
	return x+node.w,y+node.h
end

File addition: 0348-manifest (----------)

[4.2]

{"on.mouse_press":179,"font":228,"on.mouse_release":178,"initialize_editor":338,"on.update":315,"box_height":345,"on.keychord_press":311,"compute_layout":348,"Cursor_node":172,"to_text":180,"Page":344,"on.text_input":177,"Surface":196,"clip":236,"on.code_change":306,"on.draw":346,"on":1,"vx":5,"parent":347,"Viewport":303,"on.initialize":304,"clip_all":265,"vy":8,"A":309,"scale":7,"B":316}

File addition: 0348-compute_layout (----------)

[4.2]

compute_layout = function(node, x,y, nodes_to_render)
	-- append to nodes_to_render flattened instructions to render a hierarchy of nodes
	-- return x,y rendered until (surface coordinates)
	if node.type == 'text' then
		-- leaf node containing raw text
		node.x = x
		node.y = y
		-- render background if necessary
		local node_to_render
		if node.bg then
			node_to_render = {type='rectangle', r=node.bg.r, g=node.bg.g, b=node.bg.b, x=node.x, y=node.y}
			table.insert(nodes_to_render, node_to_render)
		end
		-- render contents
		if node.width then
			node.w = node.width
		else
			node.w = 0
			for i,s in ipairs(node.data) do
				local text = love.graphics.newText(font(20), node.data)
				local width = text:getWidth()
				print(node.data[i], 'has width', width)
				if node.w < width then node.w = width end
			end
		end
		initialize_editor(node)
	    node.h = box_height(node)
		table.insert(nodes_to_render, node)
		if node_to_render then
			node_to_render.w = node.w
			node_to_render.h = node.h
		end
	elseif node.type == 'rows' then
		node.x = x
		node.y = y
		local node_to_render
		if node.bg then
			node_to_render = {type='rectangle', r=node.bg.r, g=node.bg.g, b=node.bg.b, x=node.x, y=node.y}
			table.insert(nodes_to_render, node_to_render)
		end
		-- lay out children top to bottom
		local subx,suby = x,y
		local w,h = 0,0
		local subnodes
		for _,child in ipairs(node.data) do
			if child.margin then
				suby = suby+child.margin
				h = h+child.margin
			end
			if node.width and not child.width then
				child.width = node.width  -- HACK: should we set child.w or child.width? Neither is quite satisfactory.
			end
			subx,suby = compute_layout(child, x,suby, nodes_to_render)
			if w < child.w then
				w = child.w
			end
			h = h+child.h
		end
		node.w = w
		node.h = h
		if node_to_render then
			node_to_render.w = w
			node_to_render.h = h
		end
	elseif node.type == 'cols' then
		node.x = x
		node.y = y
		-- lay out children left to right
		local node_to_render
		if node.bg then
			node_to_render = {type='rectangle', r=node.bg.r, g=node.bg.g, b=node.bg.b, x=node.x, y=node.y}
			table.insert(nodes_to_render, node_to_render)
		end
		local subx,suby = x,y
		local w,h = 0,0
		for _,child in ipairs(node.data) do
			if child.margin then
				subx = subx+child.margin
				w = w+child.margin
			end
			subx,suby = compute_layout(child, subx,y, nodes_to_render)
			w = w + child.w
			if h < child.h then
				h = child.h
			end
		end
		node.w = w
		node.h = h
		if node_to_render then
			node_to_render.w = w
			node_to_render.h = h
		end
	end
	return x+node.w,y+node.h
end

File addition: 0347-manifest (----------)

[4.2]

{"on.mouse_press":179,"font":228,"on.mouse_release":178,"initialize_editor":338,"on.update":315,"box_height":345,"on.keychord_press":311,"compute_layout":335,"Cursor_node":172,"to_text":180,"Page":344,"on.text_input":177,"Surface":196,"clip":236,"on.code_change":306,"on.draw":346,"on":1,"vx":5,"parent":346,"Viewport":303,"on.initialize":304,"clip_all":265,"vy":8,"A":309,"scale":7,"B":316}

File addition: 0347-Box_heights (----------)
[4.2]

File addition: 0346-on.draw (----------)

[4.2]

on.draw = function()
	love.graphics.setColor(1,0,0)
	for y=0,1000,100 do
		love.graphics.line(vx(-5),vy(y), vx(5),vy(y))
	end
	for x=0,1000,100 do
		love.graphics.line(vx(x),vy(-5), vx(x),vy(5))
	end
	for _,obj in ipairs(Surface) do
		love.graphics.setColor(obj.r or 0, obj.g or 0, obj.b or 0)
		if obj.type == 'rectangle' then
			love.graphics.rectangle(obj.drawmode or 'fill', vx(obj.x),vy(obj.y), scale(obj.w),scale(obj.h))
		elseif obj.type == 'line' then
			love.graphics.line(unpack(obj.zdata))
		elseif obj.type == 'circle' then
			love.graphics.circle(obj.drawmode or 'fill', vx(obj.x), vy(obj.y), scale(obj.radius))
		elseif obj.type == 'arc' then
			love.graphics.arc(obj.drawmode or 'line', obj.arctype or 'open', vx(obj.x), vy(obj.y), scale(obj.radius), obj.angle1, obj.angle2, obj.segments)
		elseif obj.type == 'ellipse' then
			love.graphics.ellipse(obj.drawmode or 'fill', vx(obj.x), vy(obj.y), scale(obj.radiusx), scale(obj.radiusy))
		elseif obj.type == 'bezier' then
			love.graphics.line(unpack(obj.zdata))
		elseif obj.type == 'text' then
			if obj.w == nil then
				love.graphics.draw(obj.text, vx(obj.x), vy(obj.y))
			else
				edit.draw(obj.editor, obj.fg or {r=0,g=0,b=0}, not obj.show_cursor)
			end
		end
	end
end

File addition: 0346-manifest (----------)

[4.2]

{"on.mouse_press":179,"font":228,"on.mouse_release":178,"initialize_editor":338,"on.update":315,"box_height":345,"on.keychord_press":311,"compute_layout":335,"Cursor_node":172,"to_text":180,"Page":344,"on.text_input":177,"Surface":196,"clip":236,"on.code_change":306,"on.draw":346,"on":1,"vx":5,"parent":345,"Viewport":303,"on.initialize":304,"clip_all":265,"vy":8,"A":309,"Box_heights":277,"scale":7,"B":316}

File addition: 0345-manifest (----------)

[4.2]

{"on.mouse_press":179,"font":228,"on.mouse_release":178,"initialize_editor":338,"on.update":315,"box_height":345,"on.keychord_press":311,"compute_layout":335,"Cursor_node":172,"to_text":180,"Page":344,"on.text_input":177,"Surface":196,"clip":236,"on.code_change":306,"on.draw":310,"on":1,"vx":5,"parent":344,"Viewport":303,"on.initialize":304,"clip_all":265,"vy":8,"A":309,"Box_heights":277,"scale":7,"B":316}

File addition: 0345-box_height (----------)

[4.2]

box_height = function(node)
	-- return the height of a node. The result is scaled.
  local y = 0
  for i=1,#node.editor.lines do
    local line = node.editor.lines[i]
    if node.editor.line_cache[i] == nil then
      node.editor.line_cache[i] = {}
    end
    node.editor.line_cache[i].fragments = nil
    node.editor.line_cache[i].screen_line_starting_pos = nil
    Text.compute_fragments(node.editor, i)
    Text.populate_screen_line_starting_pos(node.editor, i)
    y = y + node.editor.line_height*#node.editor.line_cache[i].screen_line_starting_pos
    Text.clear_screen_line_cache(node.editor, i)
  end
  return y
end

File addition: 0344-manifest (----------)

[4.2]

{"Page":344,"on.text_input":177,"Surface":196,"A":309,"on.draw":310,"vx":5,"to_text":180,"on.initialize":304,"compute_layout":335,"Viewport":303,"B":316,"on.code_change":306,"vy":8,"scale":7,"Cursor_node":172,"clip":236,"on.mouse_press":179,"clip_all":265,"font":228,"on.mouse_release":178,"initialize_editor":338,"on.update":315,"box_height":317,"on.keychord_press":311,"on":1,"parent":343,"Box_heights":277}

File addition: 0344-Page (----------)

[4.2]

Page = {
    -- page
	type='cols', x=0, y=0,
    width=800, data={
      -- editor covering left side
      {
		type='text',
        name='editor',
        doc='prose goes here, on the left half of the window',
        margin=Margin_left,
        data={
			"Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.",
			'1',
			'2',
			'3',
			'mno',
			'Acb',
			'g',
			'hij',
			'klm',
			'nop',
		},
        width=400, bg={r=1,g=1,b=0}
      },
      -- a table on the right
      { type='rows', name='searches', margin=50, data={
        { type='text', data={''},},
        { type='cols', data={
          { type='text', data={'search:'},},
          { type='text', name='search', bg={r=0.8,g=0.8,b=0.8}, data={''}, width=90,},
        }},
		{ type='text', data={'table:'},},
        { type='cols', bg={r=0.8,g=0.8,b=0.8}, data={
            { type='rows', width=90, data={
              {type='text', data={'abc'},},
              {type='text', data={'abc'},},
            }},
            { type='rows', width=90, data={
              {type='text', data={'def'},},
              {type='text', data={'def'},},
            }},
        }},
      }},
    },
}

File addition: 0343-manifest (----------)

[4.2]

{"Page":343,"on.text_input":177,"Surface":196,"A":309,"on.draw":310,"vx":5,"to_text":180,"on.initialize":304,"compute_layout":335,"Viewport":303,"B":316,"on.code_change":306,"vy":8,"scale":7,"Cursor_node":172,"clip":236,"on.mouse_press":179,"clip_all":265,"font":228,"on.mouse_release":178,"initialize_editor":338,"on.update":315,"box_height":317,"on.keychord_press":311,"on":1,"parent":342,"Box_heights":277}

File addition: 0343-Page (----------)

[4.2]

Page = {
    -- page
	type='cols', x=0, y=0,
    width=800, data={
      -- editor covering left side
      {
		type='text',
        name='editor',
        doc='prose goes here, on the left half of the window',
        margin=Margin_left,
        data={
--			"Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.",
			'1',
			'2',
			'3',
			'mno',
			'Acb',
			'g',
			'hij',
			'klm',
			'nop',
		},
        width=400, bg={r=1,g=1,b=0}
      },
      -- a table on the right
      { type='rows', name='searches', margin=50, data={
        { type='text', data={''},},
        { type='cols', data={
          { type='text', data={'search:'},},
          { type='text', name='search', bg={r=0.8,g=0.8,b=0.8}, data={''}, width=90,},
        }},
		{ type='text', data={'table:'},},
        { type='cols', bg={r=0.8,g=0.8,b=0.8}, data={
            { type='rows', width=90, data={
              {type='text', data={'abc'},},
              {type='text', data={'abc'},},
            }},
            { type='rows', width=90, data={
              {type='text', data={'def'},},
              {type='text', data={'def'},},
            }},
        }},
      }},
    },
}

File addition: 0342-manifest (----------)

[4.2]

{"Page":342,"on.text_input":177,"Surface":196,"A":309,"on.draw":310,"vx":5,"to_text":180,"on.initialize":304,"compute_layout":335,"Viewport":303,"B":316,"on.code_change":306,"vy":8,"scale":7,"Cursor_node":172,"clip":236,"on.mouse_press":179,"clip_all":265,"font":228,"on.mouse_release":178,"initialize_editor":338,"on.update":315,"box_height":317,"on.keychord_press":311,"on":1,"parent":341,"Box_heights":277}

File addition: 0342-Page (----------)

[4.2]

Page = {
    -- page
	type='cols', x=0, y=0,
    width=800, data={
--[[
      -- editor covering left side
      {
		type='text',
        name='editor',
        doc='prose goes here, on the left half of the window',
        margin=Margin_left,
        data={
--			"Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.",
			'1',
			'2',
			'3',
			'mno',
			'Acb',
			'g',
			'hij',
			'klm',
			'nop',
		},
        width=400, bg={r=1,g=1,b=0}
      },
]]
      -- a table on the right
      { type='rows', name='searches', margin=50, data={
        { type='text', data={''},},
        { type='cols', data={
          { type='text', data={'search:'},},
          { type='text', name='search', bg={r=0.8,g=0.8,b=0.8}, data={''}, width=90,},
        }},
		{ type='text', data={'table:'},},
        { type='cols', bg={r=0.8,g=0.8,b=0.8}, data={
            { type='rows', width=90, data={
              {type='text', data={'abc'},},
              {type='text', data={'abc'},},
            }},
            { type='rows', width=90, data={
              {type='text', data={'def'},},
              {type='text', data={'def'},},
            }},
        }},
      }},
    },
}

File addition: 0341-manifest (----------)

[4.2]

{"Page":341,"on.text_input":177,"Surface":196,"A":309,"on.draw":310,"vx":5,"to_text":180,"on.initialize":304,"compute_layout":335,"Viewport":303,"B":316,"on.code_change":306,"vy":8,"scale":7,"Cursor_node":172,"clip":236,"on.mouse_press":179,"clip_all":265,"font":228,"on.mouse_release":178,"initialize_editor":338,"on.update":315,"box_height":317,"on.keychord_press":311,"on":1,"parent":340,"Box_heights":277}

File addition: 0341-Page (----------)

[4.2]

Page = {
    -- page
	type='cols', x=0, y=0,
    width=800, data={
--[[
      -- editor covering left side
      {
		type='text',
        name='editor',
        doc='prose goes here, on the left half of the window',
        margin=Margin_left,
        data={
--			"Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.",
			'1',
			'2',
			'3',
			'mno',
			'Acb',
			'g',
			'hij',
			'klm',
			'nop',
		},
        width=400, bg={r=1,g=1,b=0}
      },
]]
      -- a table on the right
      { type='rows', name='searches', margin=50, data={
--        { type='text', data={''},},
        { type='cols', data={
          { type='text', data={'search:'},},
          { type='text', name='search', bg={r=0.8,g=0.8,b=0.8}, data={''}, width=90,},
        }},
		{ type='text', data={'table:'},},
        { type='cols', bg={r=0.8,g=0.8,b=0.8}, data={
            { type='rows', width=90, data={
              {type='text', data={'abc'},},
              {type='text', data={'abc'},},
            }},
            { type='rows', width=90, data={
              {type='text', data={'def'},},
              {type='text', data={'def'},},
            }},
        }},
      }},
    },
}

File addition: 0340-manifest (----------)

[4.2]

{"Page":340,"on.text_input":177,"Surface":196,"A":309,"on.draw":310,"vx":5,"to_text":180,"on.initialize":304,"compute_layout":335,"Viewport":303,"B":316,"on.code_change":306,"vy":8,"scale":7,"Cursor_node":172,"clip":236,"on.mouse_press":179,"clip_all":265,"font":228,"on.mouse_release":178,"initialize_editor":338,"on.update":315,"box_height":317,"on.keychord_press":311,"on":1,"parent":339,"Box_heights":277}

File addition: 0340-Page (----------)

[4.2]

Page = {
    -- page
	type='cols', x=0, y=0,
    width=800, data={
--[[
      -- editor covering left side
      {
		type='text',
        name='editor',
        doc='prose goes here, on the left half of the window',
        margin=Margin_left,
        data={
--			"Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.",
			'1',
			'2',
			'3',
			'mno',
			'Acb',
			'g',
			'hij',
			'klm',
			'nop',
		},
        width=400, bg={r=1,g=1,b=0}
      },
]]
      -- a table on the right
      { type='rows', name='searches', margin=50, data={
--        { type='text', data={''},},
--[[
        { type='cols', data={
          { type='text', data={'search:'},},
          { type='text', name='search', bg={r=0.8,g=0.8,b=0.8}, data={''}, width=90,},
        }},
]]
		{ type='text', data={'table:'},},
        { type='cols', bg={r=0.8,g=0.8,b=0.8}, data={
            { type='rows', width=90, data={
              {type='text', data={'abc'},},
              {type='text', data={'abc'},},
            }},
            { type='rows', width=90, data={
              {type='text', data={'def'},},
              {type='text', data={'def'},},
            }},
        }},
      }},
    },
}

File addition: 0339-manifest (----------)

[4.2]

{"Page":339,"on.text_input":177,"Surface":196,"A":309,"on.draw":310,"vx":5,"to_text":180,"on.initialize":304,"compute_layout":335,"Viewport":303,"B":316,"on.code_change":306,"vy":8,"scale":7,"Cursor_node":172,"clip":236,"on.mouse_press":179,"clip_all":265,"font":228,"on.mouse_release":178,"initialize_editor":338,"on.update":315,"box_height":317,"on.keychord_press":311,"on":1,"parent":338,"Box_heights":277}

File addition: 0339-Page (----------)

[4.2]

Page = {
    -- page
	type='cols', x=0, y=0,
    width=800, data={
--[[
      -- editor covering left side
      {
		type='text',
        name='editor',
        doc='prose goes here, on the left half of the window',
        margin=Margin_left,
        data={
--			"Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.",
			'1',
			'2',
			'3',
			'mno',
			'Acb',
			'g',
			'hij',
			'klm',
			'nop',
		},
        width=400, bg={r=1,g=1,b=0}
      },
]]
      -- a table on the right
      { type='rows', name='searches', margin=50, data={
--        { type='text', data={''},},
--[[
        { type='cols', data={
          { type='text', data={'search:'},},
          { type='text', name='search', bg={r=0.8,g=0.8,b=0.8}, data={''}, width=90,},
        }},
]]
--		{ type='text', data={'table:'},},
        { type='cols', bg={r=0.8,g=0.8,b=0.8}, data={
--[[
            { type='rows', width=90, data={
              {type='text', data={'abc'},},
              {type='text', data={'abc'},},
            }},
]]
            { type='rows', width=90, data={
              {type='text', data={'def'},},
              {type='text', data={'def'},},
            }},
        }},
      }},
    },
}

ripple widths down the hierarchy sometimes

Dependencies

In channels

Change contents

Replacement in head at line 1 [3.10815]

File addition: 0349-manifest (----------)

File addition: 0349-compute_layout (----------)

File addition: 0348-manifest (----------)

File addition: 0348-compute_layout (----------)

File addition: 0347-manifest (----------)

File addition: 0347-Box_heights (----------)

File addition: 0346-on.draw (----------)

File addition: 0346-manifest (----------)

File addition: 0345-manifest (----------)

File addition: 0345-box_height (----------)

File addition: 0344-manifest (----------)

File addition: 0344-Page (----------)

File addition: 0343-manifest (----------)

File addition: 0343-Page (----------)

File addition: 0342-manifest (----------)

File addition: 0342-Page (----------)

File addition: 0341-manifest (----------)

File addition: 0341-Page (----------)

File addition: 0340-manifest (----------)

File addition: 0340-Page (----------)

File addition: 0339-manifest (----------)

File addition: 0339-Page (----------)