diff options
author | wlemb <wlemb> | 2002-03-29 16:41:33 +0000 |
---|---|---|
committer | wlemb <wlemb> | 2002-03-29 16:41:33 +0000 |
commit | 4451752f38555e3846bb8ce1b2122272dd2eeee9 (patch) | |
tree | 72f5451d9b1c05d41b1a804112b5a53002df32c6 | |
parent | ea73dc4b396b8aea506153fb5e4780fd57a5abf5 (diff) | |
download | groff-4451752f38555e3846bb8ce1b2122272dd2eeee9.tar.gz |
* doc/gnu.xpm: New image contributed by Emily Mulley.
* doc/Makefile (gnu.eps, gnu.png): Use pnmdepth.
(homepage.html): Be dependent on gnu.eps.
* doc/homepage.ms: Updated to new image.
* src/devices/grohtml/post-html.cc (html_printer): New member
`sbuf_prev_hpos'.
(html_printer::flush_sbuf, html_printer::set_char): Set it.
(html_printer::sbuf_continuation): Use it.
-rw-r--r-- | ChangeLog | 12 | ||||
-rwxr-xr-x | doc/Makefile | 6 | ||||
-rw-r--r-- | doc/gnu.xpm | 324 | ||||
-rwxr-xr-x | doc/homepage.ms | 4 | ||||
-rw-r--r-- | src/devices/grohtml/post-html.cc | 13 |
5 files changed, 221 insertions, 138 deletions
@@ -1,3 +1,15 @@ +2002-03-28 Gaius Mulley <gaius@glam.ac.uk> + + * doc/gnu.xpm: New image contributed by Emily Mulley. + * doc/Makefile (gnu.eps, gnu.png): Use pnmdepth. + (homepage.html): Be dependent on gnu.eps. + * doc/homepage.ms: Updated to new image. + + * src/devices/grohtml/post-html.cc (html_printer): New member + `sbuf_prev_hpos'. + (html_printer::flush_sbuf, html_printer::set_char): Set it. + (html_printer::sbuf_continuation): Use it. + 2002-03-28 Werner LEMBERG <wl@gnu.org> * src/libs/libgroff/getopt.c: Updated to latest version. diff --git a/doc/Makefile b/doc/Makefile index 57626c66..7f3ae138 100755 --- a/doc/Makefile +++ b/doc/Makefile @@ -90,11 +90,11 @@ groff: groff.texinfo makeinfo groff.texinfo gnu.eps: gnu.xpm - xpmtoppm gnu.xpm | pnmtops -noturn > gnu.eps + xpmtoppm gnu.xpm | pnmdepth 15 | pnmtops -noturn > gnu.eps gnu.png: gnu.xpm - xpmtoppm gnu.xpm | pnmtopng > gnu.png + xpmtoppm gnu.xpm | pnmdepth 15 | pnmtopng > gnu.png -homepage.html: homepage.ms gnu.png +homepage.html: homepage.ms gnu.eps GROFF_BIN_PATH=$(groff_bin_path); \ export GROFF_BIN_PATH; \ sed -e "s;@VERSION@;$(version)$(revision);" $< \ diff --git a/doc/gnu.xpm b/doc/gnu.xpm index 6b764305..bc549343 100644 --- a/doc/gnu.xpm +++ b/doc/gnu.xpm @@ -1,138 +1,198 @@ /* XPM */ static char *noname[] = { /* width height ncolors chars_per_pixel */ -"129 122 9 1", +"213 177 14 1", /* colors */ -" c #000", -". c #FFF", -"X c #AAA", -"o c #666", -"O c #222", -"+ c #CCC", -"@ c #888", -"# c #444", -"$ c None", +"` c #FFF", +"a c #DDD", +"b c #BBB", +"c c #999", +"d c #777", +"e c #555", +"f c #333", +"g c #EEE", +"h c #CCC", +"i c #AAA", +"j c #888", +"k c #666", +"l c #444", +"m c #222", /* pixels */ -".................................................................................................................................", -".................................................................................................................................", -"..................................+..............................................................................................", -"...........................+@o@o#######oX+...............................................................+X@@@@X+................", -"........................X##@+..++.......X@oo..........................................................+o #@@XXXoOOX..............", -"......................@oXX+..+XXX@o@@@+X@+.+@@+.....................................................Xo#@+.X.X....Xo#+............", -"....................+oX...@@@###O#ooX@O# ##..+o@..................................................X#o.+@o#ooo@oo@++XO@...........", -"..................XoX++@o@X##ooO#o#o@oOOOO #o+.+oo+...++...............................+X......Xo##@#OOO##oo@@#o#oXX.X#@.........", -"................oO+..+#O##o##O@##oooooO#@# #oOOX+.##ooX#...............................X.@#o###XO O#O####X@@o@X#@@#@X+X#@........", -"...............@o..++#@O#@o#O#XXX#@o@o@@+@o@o# oo+++..Xo...............................XX.++XX@o O#@oX+XoX@oo#o# #o@#oX#X.......", -"..............X@...#XX##O#oX#X+X++X@@#@X++X+@@oXo+X+.@o.................................@+.XX##oo@@+XXX+XXX+X@X #o#O@+++O.......", -".............X@..+XXX@@o oX@o..Xo#OO OO@@.X.@X+++X#o+...................................XoX+@#X@X+X+X+X@XXXXoo OO#Xo Xo@......", -"............+@+..+XX@++oo oX++X##@XX....+X@@Xo@@oo@........................................@oo#@ooooo#o@X@@X@XO#O#@o #oooXO......", -"............#+..X+O#@Xo.+OoXX##+.......................................................................@#O@o@#+X@@O OO #o.oo.....", -"..........+o...+@oX@XX++++Xoo+............................................................................@@Xo@Xo## OO##@.#.....", -"..........o...+XXXOX++@+.+O+...............................................................................+o@@OXX#O@o#OoX.X@....", -".........X@..++oXXXX++X@X#..................................................................................Xo#@+XX#OO##@o+.O....", -".........O..+.@XX#XX+++X#....................................................................................@#@X++o o@o#X+.#X...", -"........oX..@@X+o+#oX++#.............................@#O#O##@.................................................Oo+X#X@ ####@.oo...", -".......+O..+++@@XXXoX+@..........................+o@@+....+Xo##@...........+XX+X+.............................Xo.#@X ##X++#...", -".......Xo...+X+X@X@+ooX.........................@O+.........+..o#........+o #o## o+...........................@+Ooo+#@@o@@+.O...", -".......o.....+X+XXoX@o.......................+@oX..X.+@++ooXO@o++o@....+oOo#@oX@@..oOo+........................XooX+XO##OO@X.#...", -".......o...++X@X+XXo@X......................Xo+...XXX@#@ #O#Oo@..#.@ooo #@##@# OXX@X#o........................#++Xo@# #X+#...", -"......Xo..X@@@@oXo#+o......................+#+...@O#@o#O@ OO OOoX+. # O O O## O ###O@@#+......................o+XXo##ooXXo.#...", -"......@X..++.@#@@X#.#......................o...+Xoo #O @ O O ##o@+##O O## O#O+@OX.....................@.o#+@X@o#O#.o...", -"......#+.+.+XXooOO@@@.....................#+.Xo@ooOO #OO O #Ooo o# # XX.#@....................XXo@X+o@+X@oXo+..", -"......#......+X@ooO#X....................oX.X@@O##OO o# O OOO O##OOoO O ##+Xo@...................X@+++oo@@XXX+@+..", -"......o..+XXXX@o@oo#X...................o@.+@o@ O O O O O+O# OO O O Oo.oX..................X+XX#O #X@+XX..", -"......o...+.+oOO##+#+..................@@.+# O #@o+ ##@ O #@.@X.................@+XXX@O##O##.@+..", -".....+o..X+++X#ooX+#+.................Xo.+@o O O O@+@oO@+#o @.@.................o..++ooXXX+XX@...", -".....X@+X@o#o@ooOo.#+................+o.X@## # O O O O o# o XX#@####+# OX+o................#.X@o####o@+@@...", -".....+@.+.+X@o@+@X.#+................#+@X#oO ## # O O @OXXoo#X.o.o O O OO@.+@..............Xo+X#OO oXo@++@...", -"......o..++Xooo#oX.@X...............@+XoO O#O # # #@oO@o+o@oXOOXoo O O#O O O @X@@.............@+o ##O#@X.@...", -"......@.++@O#X@oOX.+@..............XXX@O Oo# O O O+...O@X+XXo+XO##O O#O O O##+@+............o.o#OOXo@@@@X.@...", -"......o.+XX+@+@#@o..o.............+@+.#o O O #@o+.+Xo###@X.....o@@++X.XX+##@@+Xo O Oo ##.#+..........#+.@O##@#Ooo.+.@...", -"......o.+.+@X@@+@@o.@+...........@X@##O OO O#oo++..........+........#@#@@Xo#O#X+...+XX++XooO O##X@+........@XXOO##@oo@O@@+oX...", -"......#...++@o@oooX@+@..........o@X@#OoO#O#+..............+..........+o##o O#.......o+.....+o#@@@O@oX......@XX#O OO#o#@@X@.#+...", -"......#+.+X+oXOO oXo.X+.......X#X#@O O# Oo+..............X+.............@o+ oX+.......@.......@O#@oOo@ oXX@#X+O@ O@ XXoX.XX@....", -"......oX++.X####o#Oo@.#@.....o+o#Oo # OX..............+oo X.......X@.X....o#@@@.......@@.......+#@@OooX+@oX#Oo#o#oO#+O@#+X+X+....", -"......@@.+Xo#ooX# o#XXO@XX@X++# O o+............+O#@O O+.......XXXX....++@O@...+@@+.oX.......X#@##O##XO# O#@ ##OoooXX+@o.....", -"......+#+.Xo@@XO @##o#O@XX.+o## #.............+##.# #..........X@......@ @...o #+..#........X @o#o#@ # OoOoO#O +XXX+@X.....", -".......#+.++.@@ o#o X#Oo..X@ #..............##+XO X............++..+O@X...+ #@...XX........o@@# #o @O# OoO#@OO#X+XXo......", -".......o+...X.o###X#o## O@@@#O #O#+.............+#@X. @........................@ o.....o........+##@o#X X## ###@o@#o+X.oX......", -".......+#++.+X@#O#ooo# @#O#O Oo..............XO@o..#@....+X++Xo.....++........OoXX++..@.........@@@O#oOX#o ##Xo@@+XX+X@.......", -"........XX+X+X@@X+#@o##OO@# oO##O...............oo++.++....X@....#+....++........ Oo..X..X..........#@#oo#oooooo+@o@.X+Xo+.......", -".........#+++++++#X##o# OOO ##O #+..............o.+......+X......XO+....#+......+ #.....@+..........ooXXOo@oo@Xo.+@+XX+o+........", -"..........o+.++@#o@oX@ OOoO oo@O+.............+X..X.......+.......@.....XX......X +.....o............OX+#oX@o@X@X+@++ooX.........", -"..........XXX+oX@@o+XoOXO#@O@@##.............++...+.......o..Xo@#@X+......+.....+#.X@ooXX............o#Xooo+@@@++X+X+OX..........", -"...........@X@X@XX+XX@o+# @#@XO...................X......@### O##.....+.......#o@@O OX+..........+ ooXo+X@X++@.o#+...........", -"............oX@+++X+@#+Xo@+@+#@...................X......@ OOoO @.+X.....+......@@.# OO +...........oXo+XX+@X+.+@o.............", -".............@..X@+X+o.XX@.++ ....................X......oO@.X # +.......+.......#o O#.#+...........+OX+..+.XXX@+..............", -"..............o.X+o+Xo++X..+X ....................+......@++.@ O.X...............# o...............+ ###oX..................", -"..............+o.+..X@XX@+++@o...................++......+#X..o O..X...............+ o@.Xo@.............o#.......................", -"...............+@+.X@X@@X.+.X@...................@.........o@X.....X................+@+@@@..............XX+......................", -".................oo@++.+++.+@+...................o..........+.@@@@...X...............ooX#@...............XX......................", -"..................+#o..X....X...................+#..................X.................@.+XX...............o+.....................", -"....................+X@#X++X@...................@X+.................+.................@+.oXX...............X.....................", -".......................+@@o#@...................@X+...................................+@.X@o+..............X.....................", -"...........................@...................X@X+....................................@X.o.o..............@+....................", -"...........................@...................o.X+.....................................#.@..@+.............o.@o.................", -"...........................o..................X+.X+.....................................@+X@..@o+...........@###.................", -"...........................@................++@...+.....................................+oXo....o###...X+....# @.................", -"..........................o@.................@....X.....................+XoX.............oXo......+@OOo+X@XX+O#..................", -".........................o@................Xo+....+...................+o@@X@##............#o.........Xoo@@XX@+...................", -"........................XX................+#+......+.................@@......+@+..........Xo...+XX...............................", -"........................X+..............+Xo.........................@X.X+.......X+.........+#X#o++#..............................", -"........................X+............+@@o..........................#.OOXX+.....+O X.........X....@X.............................", -"........................o+..........+X+#@X..........................@@ X..+......+#OoX............+#.............................", -".......................@o.......+..+#@o.+@..........................X@ ............X#O@............#.............................", -"......................#X......+#oOOO@...X@..........................@X#..@ oo+.......+X+...........o+............................", -".....................@X....+XX#.Xo+.....+@..........................X++..# #+@X.......+++..........X+............................", -"....................XX....X@#@X@#........X+..............+X+.........X...+# O@@X.......+...........XX............................", -"....................X..+o#@@X..X@........+@..............+X..................+@@X..................XX............................", -"....................X.X##o#o...XX........@+..........................+........X@#..................#.............................", -"....................@oX..X+....@........+@o..................XXX....+.........X+o+...............X#X.............................", -"...............................@........@Xo....................@....+.........X.+X............++o @..............................", -"...............................@........XXo.....................X..+.............+...........X#@ @...............................", -"...............................X.........XoX....................@..X.......................+X##OX................................", -"...............................X...........@+...................+X++.....................X@o###+.................................", -"...............................X...........@X....................oX.....................@#@oo#X..................................", -"...............................@...........+X.....................#X...................+@oX++#+..................................", -"...............................@...........X@+....................Xo..........................oX.................................", -"...............................X...........X+@@....................@+..........................#@................................", -"...............................+X..........+++.@X...................#...........................oo...............................", -"...............................+o.............@++X..................XO+.........................#+...............................", -"................................o.............o..XX..................o#+...................+++X@@................................", -"................................X+.............++X+X..................X@+........+.X@#O OO #X.................................", -"................................XX................XXX..................+# O#@@o.XOOXX+XX@oO X...................................", -".................................o...............@@++....................@#@X@o#o+.........+o....................................", -".................................O..............+X+X........................XX+.............o....................................", -".................................XX.............+@X.........................................@+...................................", -"..................................@.............X.+.........................................X+...................................", -"..................................@..............@X+........................................@+...................................", -"..................................+@..............XXX@X......................+.+............#+...................................", -"...................................X...............+X.Xo..............++....+.++@# O##OOOX....................................", -"...................................XX...............+X.@X.............+X..+.X@O O oX..++.....................................", -"....................................#.................X.@............++..oO#o #O X...........................................", -".....................................@.................+o.....+........++#XoOOO#O@o#o............................................", -".....................................@X................X....+++.........+++@@oo#..X#.............................................", -"......................................@+..............X+.+..XX..............+.X...X#+............................................", -".......................................@+............X..+.+.@X.+.++.........X.X....@o............................................", -"........................................XX.............+.+..#.+.++...........+X.....#............................................", -".........................................oo...........+X.+..#XX.@............+.X..+.X+...........................................", -".........................................+oX............X.+.+OX.o..............X..+.XX...........................................", -"..........................................+X+............+++.X@.X..............X+.+.#+...........................................", -"...........................................+o............+XX..XX.o............+@+++XO............................................", -"............................................+...............+..X.@X...........@X.X+#+............................................", -".............................................................+++++@o+........@oXX@X+.............................................", -".............................................................++..+X+@+....+X#@@@X................................................", -"............................................................X.X..XX.++...+@#XXo..++++............................................", -"..........................................................+X.X....@XXX..XXo+@@..+X...+...........................................", -".........................................................+++X....+@@++.+XXXXoX.+X.....+..........................................", -".........................................................X.+.....Xo@X.+XXX.oO..XXX+...+.+........................................", -".........................................................+X......XX+X.++XXXOo.+#oO@+X.X@+........................................", -".........................................................+X.....+++XX.++++oOX.oX##O@o@#@o........................................", -"...........................................................++...+..XO++XXX@ +.#O# O #XXX........................................", -"................................................................+...o#@+X+X +.o.@#oX@o...........................................", -".................................................................X....X.@#.OX.+X#O X...........................................", -"..................................................................++...+.XXXo+.+XoOoX............................................", -".......................................................................++..+X@+..+XXX@@XX........................................", -".........................................................................++..XXX+................................................", -"................................................................................................................................." +"`````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````", +"`````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````", +"``````````````````````````````````````````gaahiibaag`````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````", +"``````````````````````````````````````acjjdddldjjkleeekdjia``````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````", +"```````````````````````````````````abbicli`hbjkdbelldddkdelldh```````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````", +"`````````````````````````````````iibkcjellcaeaklcelfljllkekdeeejba````````````````````````````````````````````````````````````````````````````````````````````gha````````````````````````````````````````````````````", +"```````````````````````````````bcagjcldkleljcdaelillfcdllfedeeelffc`````````````````````````````````````````````````````````````````````````````````````acdjddjccjjjch```````````````````````````````````````````````", +"`````````````````````````````hch```jflleeeelkkcbljdlfliellldeeeeeflkh````````````````````````````````````````````````````````````````````````````````hjkch`ah`ic`gaiicjja````````````````````````````````````````````", +"````````````````````````````cb``aeigjlefleellelhdlblllldllllcllekkeelcg``````````g``````````````````````````````````````````````````````````````gjcddiabjjdldkleklllliggcc```````````````````````````````````````````", +"`````````````````````````ggjag`accdehilefelelllehldjllleellleellekllleejb```````dki```````````````````````````````````````````````````````````gjlljbiiekkelllllllefedcdg`hjb`````````````````````````````````````````", +"````````````````````````gdhg`cdhadkdejilelelelekdelbllelelellkleelkfjeehiiihaaidbai``````````````````````````````````````````abg`````````````addijkdellelllelllllljckllkg``hcg```````````````````````````````````````", +"```````````````````````gjgdejijlcghkeljjllllkdhjklkdcleklklllllleleeededg`hidjb``ig`````````````````````````````````````````akdei````````ggacdkkkkjllllflllflflllleekddjcji``big`````````````````````````````````````", +"``````````````````````hdcjjceeekeei`hklkklledg`adebeclljelleleellelclkdlgg`aagg`ai``````````````````````````````````````````cg`bklkklllllllllkkeejlllfflekflellfleeelfllech```gcg````````````````````````````````````", +"`````````````````````cihdckkjkleelldggiklejca``````aahkkceedkekjekkjllclhghbikkhjg``````````````````````````````````````````ij`g`ghbcjekddbkeeeljlllflfleflklfflekledjccccjg````ia```````````````````````````````````", +"````````````````````hd``g``beedeeelkeb`gddhh```ghhhbbiekjhca`gjig`bgajab`gg``acc`````````````````````````````````````````````edagg`jeelleleeeeekeflfffleflefflelflklllelllledc```ba``````````````````````````````````", +"```````````````````gc``aga``gdllelkecec``bg`gckdibbbhahbcdddjccciiihhgg```gbjca```````````````````````````````````````````````clkdcaccklleleeeekcikekklflefflllflllllllllllllekj``bg`````````````````````````````````", +"```````````````````c``heledb``cllelebadj``gcdig`````````````gaaahhbhhhhhhgag```````````````````````````````````````````````````gcklflkjcaeekkjkjjddejdldkekdelllllfffffllleedjch```ig````````````````````````````````", +"``````````````````caagikelllkcgjekekdg`hgbca```````````````````````````````````````````````````````````````````````````````````````aidelllebag````````hkea`gelllfffffffffffffllkg``gb````````````````````````````````", +"`````````````````jbhdeecbbjefleckdciic`gca`````````````````````````````````````````````````````````````````````````````````````````````````````````````gikjgakffffffffflllekdkelkda`i````````````````````````````````", +"```````````````adllkchbklkbabkflecgg``ajg`````````````````````````````````````````````````````````````````````````````````````````````````````````````````hdhaffffllllejjdelfflleda`hh```````````````````````````````", +"```````````````jckllllejjeledahlfkhg`bjg````````````````````````````````````````````````````````````````````````````````````````````````````````````````````jiblleffffffffflekdkkelagb```````````````````````````````", +"``````````````hj``gbdlllleellljcebg`bc```````````````````````````````````````````````````````````````````````````````````````````````````````````````````````bjhcelffffllllllledddkc`i```````````````````````````````", +"`````````````gdhbbhihabklllleekkk``bc`````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````bj`hlfffffffffllleeekjhi```````````````````````````````", +"````````````gdgeeelllekcidllleeja`aj```````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````id`befffllfffffledibbgbg``````````````````````````````", +"````````````cb`hchgidellekjjeeaijbjg````````````````````````````````````````gabbiiiibhg`````````````````````````````````````````````````````````````````````````cdgkfffffffledjjkeekcah``````````````````````````````", +"```````````gd````gg```aclleddkg``da`````````````````````````````````````gbjkddjcccjddjddjia`````````````````````hbhag````````````````````````````````````````````iieffflfflfflkca`````b``````````````````````````````", +"```````````ca```hbiiibhggbeekh``ib````````````````````````````````````gdkchgabbccjjiicibbijjh````````````````gijccjjjcia``````````````````````````````````````````ddflleeeleellllkdh``i``````````````````````````````", +"``````````gj``clllffllllki`bcg`hj````````````````````````````````````hkcijccibag`gghbijkkjiidjh````````````bcibicjjiba`hba````````````````````````````````````````hjdleeelllffflllej``b``````````````````````````````", +"``````````cahjekdjcicjdella```gd```````````````````````````````````adldia```````````````ghjddkkda```````gcdjjdcbhgabicjighb````````````````````````````````````````daiefffffffflllekg`b``````````````````````````````", +"``````````j`ccjjjddkeekdcddb``ia``````````````````````````````````iejg```````ah`g```hg``````gbjelc````acckjhg``bebgh```hjcg````````````````````````````````````````chjeffffffllffllkdchg`````````````````````````````", +"`````````iiallllllekjiijkedka`c``````````````````````````````````ijg`````g````chjjeagkdh``ghcb`ajljaaibcjg````gdeleld````gjc```````````````````````````````````````ac`kleiiklflkcklleghg`````````````````````````````", +"`````````kkkellekekellejaghcb`c`````````````````````````````````cb```````chjacciicljeckdggkdkkh`chkebgjjbg`ahijallldflcig``ajh``````````````````````````````````````dallffldcjlfljkjlgaa`````````````````````````````", +"````````bjjjiiijjddkeeeelhg``ab```````````````````````````````gjh`````hcbciiibkcbdlbkcejkjkeekebikadjkbdeecheakllcleiflkeaicgijg````````````````````````````````````djkllfflflkjefleb`bh`````````````````````````````", +"````````kg`aabcjkeeellleekc``ig```````````````````````````````jg``````jjdbjijhedhkkjjdldejdeldklkeeijkcgkllekkaeljifclffffffebada```````````````````````````````````cillfffflllldcllb`bi`````````````````````````````", +"```````gd``hellllleeeeekkkka`j```````````````````````````````jh`bgijkgieeakcdgekaedeielklejelkeelfeeiklbilellfcbflhlelfflffffleidb``````````````````````````````````caelleeelffllebkeabi`````````````````````````````", +"```````bigcellllllllllleldgggc``````````````````````````````chaacbhkebaeeakdd`ekgedlhlelleckleellflekjeeaeeekeladfjkleffllefffflbcc`````````````````````````````````ibllllfleelfleljjeic`````````````````````````````", +"```````jacllledjbcbhbidefekgch`````````````````````````````ci``dkj`elcgeeijed`eealkfblllleceldklelleekeeibejljllifdjlklfkfdllfffebbj````````````````````````````````biillflllfleelllljgc`````````````````````````````", +"```````d`becbbijdelllllejag`j`````````````````````````````bhgc`iek`klj`keccek`eealdlclllllikedjlekfleeclebkeclblelkhfelfkfjelfffflcbc```````````````````````````````ibilfffleefffllflkgc`````````````````````````````", +"```````d``bjelflkdjjdjdekchgc````````````````````````````gj``ddkee`kle`dekilkgeeildldllellbekkildeleelillkjlkldcjklilelfefdelflflflcch``````````````````````````````jadklffffekjkflllkai`````````````````````````````", +"```````j``jlejcjdkeeekdkkihac```````````````````````````gdggccbllegdelgclecle`elhejlkelellbeddhlkleleljekklejieaehfjklllkelelflflflljkg`````````````````````````````d`jihdffffflddlllk`ig````````````````````````````", +"```````j`gedkellleekkkekdihgc```````````````````````````jabbkicellajelaileilk`klaejleelkllhedkhljejeelkeedjj`gjbjlldjllelklllleflflllkda```````````````````````````gjgeellfffffleedeelhba````````````````````````````", +"```````i`hedeeekkkkeekellljaj``````````````````````````jh``kljcdfehjelbheehekgelaejlleljllhedjaljeikdeelffildh`cklleblleldfellklllfllleka``````````````````````````iigedfffffffffeejelgba````````````````````````````", +"```````a`cilledjiabcjelleb``j`````````````````````````ci```kljjiflhceliaelakkgllalcllllkeebkdcalieheckkkhchlleb`bflfbeleeefkllkellfllllekg`````````````````````````jg`aelfffffffffeeilhbg````````````````````````````", +"`````````kdba`gikelkcjjkeeh`j````````````````````````iia``eeljdhflhcelcallhdkhllblielleelkcdebhliealieea`ahffflelflfddfeeeflllekllflllfllk`````````````````````````d``ilfleffffffffldhgbg````````````````````````````", +"```````h`c`bjelekjdeelffleh`j```````````````````````ij`bcallljkgflidelchleakkileclillllllkkjehildkcljlligegeflkeeelfkjflelfllleelelellffllkg```````````````````````d`aeffflkfflfffflea`bg````````````````````````````", +"```````b`gieejdellllkcdked``j``````````````````````ic``geglllkk`leideejblegedkfkclbllelledlakhcedkeekfldglabdldhiellkjflllflleellellelfefllkg`````````````````````akelflffflklfllffljc`b`````````````````````````````", +"```````iggjjdelllecbjelljh`ach````````````````````ci````ebelekegeljkeldjldalklljkkjllefeledilcec`gcikellaei``blljkjkkjflllflllkllellklfdlllkjg````````````````````cejblffffffklfflfld``i`````````````````````````````", +"```````iahcjelecaiefldjledjiaj```````````````````jb``bb`djllekk`eljeeleeljjllllkljefelfklkkck`gahahjlilkeeeg``ielfeleblllllflldllklleeldkleiadih``````````````````dlaelfffffffelfflfi``b`````````````````````````````", +"```````bcbiekhgceflddelllecj`d`````````````````gdh```he`ckeleek`keeleellejlkideddieekeddb`dddjeeeldidbkjfjfkihggkfleehellellllkledlfkelljledgaci`````````````````bjkkfffffffffflfflfk``i`````````````````````````````", +"```````gjgaigcllllellkellebagib```````````````gda``ghgegbeeelkk`eeeldli`accajliiiceledjjjdlleigahlb`jididkkffleeffebdbjljdllklldicllklllelllj``cc```````````````gdgjflfflfflfffflfflfi`b`````````````````````````````", +"````````dgghekbklflkellleekkhgc``````````````gda````dhdbieekeekkljdjjlckflkkeekddjjjdkkkdjcbg````keacfejhejeleeceliajhdflleefleekklllllfflellh`gkc``````````````dballfflfffflffffffla`bg`````````````````````````````", +"````````dhclddllleelllelllebg`jh````````````gja`````ijjdblkklljjkghdlejig```````````````gg```````gljghefecljlfdcej`cekkibjdabg`ghiickdkdeedledjagkc````````````jdbkfffffffffffffffflg`c``````````````````````````````", +"````````icdbbkllllllejellkllc``jb``````````gdg````ighdbkhlkelebadedch`````````````````````````````hedahkffefklelfiejg`````bdc````````ahbjkeedleeh`cdh``aag``gieeklclffflffffffflffli`ai``````````````````````````````", +"````````hcghklllllljdelldefle```jc````````hjg```gikbhkbljlcecjkkig`````````````````````````````````gdlejjellffflelc`````````bkg``````````abkjeeelb`hkellekbjldgdgkfflffflffffffflfk``cg``````````````````````````````", +"````````gdikllkeleceklljeflklh```jja````acc`````hckcgececedlkig```````````````````g`````````````````gilelejcfffkjla````ag````hk`````````````ieeekfeh`ghjkkjig``dklelmfffflfffffffflb`c```````````````````````````````", +"`````````dakejelkjedlldklldlleg```bcjjjjca``````jcedgekllecg`````````````````gicekj``````````````````ggabjleffcadeb```hed`````bd`````````````ggkllffjgba`bccgihefffeefffffffffffflkdhh```````````````````````````````", +"`````````ibdielkdlkeedkllddellbch``````````aghaieaekglfda````````````````ghiiiaifeg`````````````ggg```ggagblfkgdljd``cijdg`````ci`````````````haeelffllljelfllfffffflffflffffffllldic````````````````````````````````", +"`````````hcgclkklkeedkllejldfleehg`````````ccbjdeadejfj`````````````````hllkkeeffc`````````````gdlleg````g`ceebfflkghjklkg````g`ka````````````abcllfffffffffflfffffffffffffffffflj`gc````````````````````````````````", +"``````````d`cdkleekkklledlklfleedd`aa`````gilildeajlfl`````````````````illlflfffk```````````````ajllig``g```aeefffj`clffi`````h`bd`````````````baelfflfffffffflffllfffffflffffllfa`ia````````````````````````````````", +"``````````jagbledjkklfdkeedffelflecbkd````icldejlbjfed````````````````glfffllffkg````````````````gilkh``g``hkllfejagklfla````gb``k`````````````gccllfffffffffffffffffffffflmffflfhgi`````````````````````````````````", +"``````````bb`bkkckclleeeljlflkfleeljke`igabkleeclikfcg````````````````cflfflffj```````````adeeja```iiih````blfkjia`gkffja`````h``dg`````````````hjllffffffffflflfffffffflfffffffegcg`````````````````````````````````", +"``````````gc`beakbellkeleellleflellkje`ddgdklekdlele`````````````````alffeffdh``````````beffeklk`````hjbb``gijig``gadffiibiiaga``jg``````````````jelfffffffffffflffffffffffffllldbb``````````````````````````````````", +"```````````jheajckeldellklllllflleeeie`dehkkelkklljc`````````````````kffelfjb``````````clkig``dlg`````aej````g`````iclfkja`hjhh``d```````````````bllfffffffffffffffffffffffflldeic```````````````````````````````````", +"```````````ikagjdekedlekllelelllfkelbk`ekikdelelfba`````````````````blfkdlkcb````````hkeh`````jlc`````bkc``````````jjffedh`ggb``gk```````````````akelfffffffflllffflffffffffefiahh```````````````````````````````````", +"```````````gj``idekjekeellklkfllleeeiegekidjleefe``````````````````hefd`ai`e````````ifj```````allg`````iig`````````cjfflb```````bd```````````````bklfflfffffffllffflfffffflfekkgc````````````````````````````````````", +"````````````cg`deckjeledleellfelleeedebleidkellfb`````````````````hedi````hk````````ed`````````cfa`````hejg````````iefffcg`g````jb````````````````jlfflfffffffllffffflffflffb`djh````````````````````````````````````", +"````````````hb`bedcelekjljllllllleeeeljeeckdelfl`````````````````acbi`````ki```````hea```hbcjdkkfc`````gelb````````hefffekddcb``ja`````````````````hllfeffffffllllffffllfklk`gji`````````````````````````````````````", +"`````````````j`gicclejceejlefllllcekledleckkllfd``````````````````gjg````gla```````ifj`beffflffffeh`````hlb````````gcfffffffffecdb``````````````````dlfeflffffflllfflfefeeec`gj``````````````````````````````````````", +"`````````````bi```jkdjhlklllflllehekleellbkkkllb``````````````````gg`````ik````````aflefffflfffjclb``````kb`````````alfellekjdellc``````````````````hlflfffffffllllelfefdhb`ajg``````````````````````````````````````", +"``````````````jg```khjcldlllllllkbekleeeebkdellg`````````````````````````di````````gefffflfffffjbcd``````gia`````````klkleleeeddllg``````````````````effflfffflfffleffek```bkg```````````````````````````````````````", +"``````````````gjg``jgidelldflleljjkelleeebekklj``````````````````````````lg`````````effejlffleffjida``````dc`````````glkcffflfedddh``````````````````kllleffffffllkkkecg`idda````````````````````````````````````````", +"```````````````aca`hgbkeeceffjllieceelekeieeelg`````````````````````````gk`````````glebahlfflllfkgag``````kd`````````gdldfflffldjcg``````````````````blllkfffflllejgkkbdejg``````````````````````````````````````````", +"`````````````````jg`ggkkcilfljlejeblkedklclefh``````````````````````````ci``````````lh``affffflfeaig`````gea````````gghefffffffkb````````````````````akcbklfflejdlbakfkb`````````````````````````````````````````````", +"`````````````````gc```icbkflieldkjiebeeeecelc```````````````````````````dg``````````jj`g`efffffldde``````ji``````````ggblfffffekdkj```````````````````hc`bjdah`gajdkia```````````````````````````````````````````````", +"``````````````````hb``bigjkeclddeakkjleldkee````````````````````````````k```````````gddhahlffflkiek`````````````````````jfffffddjle````````````````````ekkjjddddjba````````````g``a`a````````g```````````````````````", +"```````````````````aigg```aieeblibejkeelcelb```````````````````````````hlg`````````ggailc`ajjcjcbec`````````````````````alleekchclh````````````````````bagagg```````````ag``gejb``kgk````gbagecdbabg`````````````````", +"`````````````````````iba```hbblcgkb`dkeljel````````````````````````````ceg`````````````akdiibdeeej```````````````````````clekkcjeca`````````````````````j```````````````ilh``dfj`gedc`hb`gdkabelcbkeddi``````````````", +"```````````````````````hih`hcliidc`akjeeedj````````````````````````````ecg````````````gg`acjcibag`````````````````````````clddedai``````````````````````ca```````````````bea``ek`alegblja`ieeajlcblkbkg``````````````", +"`````````````````````````gbibg`gh``hagjhaea```````````````````````````gkig```````````````gg```gg```````````````````````````kla```h``````````````````````gj````````````````akg`ajggeaalfkb``jlkaljhlhkg```````````````", +"````````````````````````````bbbbhg``````ge````````````````````````````cjhh``````````````````g`a````````````````````````````aej```cd``````````````````````j`````````````````ik`````ghecfejjdkllklkdeejig``````````````", +"````````````````````````````````ghbhhg``kc````````````````````````````eh`ihg````````````````````````````````````````````````ilh``bej`````````````````````bh`````````````hiiceddkkkklkdjjjcbag``c`````gb``````````````", +"`````````````````````````````````````ahclg```````````````````````````afg`bha`````````````````````````````````````````````````dd``glka`````````````````````c`````````````dbhhjcbhg``````````````i``````b``````````````", +"```````````````````````````````````````ck````````````````````````````dfh`gaa`````````````````````````````````````````````````bla``idjg````````````````````ai````````````j```h``````````````````i`````gb``````````````", +"```````````````````````````````````````lh```````````````````````````aelg```g``````````````````````````````````````````````````cj```eadgg```````````````````cg```````````c``gi`````````gaabbicccdibdciab``````````````", +"``````````````````````````````````````hk````````````````````````````dceka`````````````````````````````````````````````````````geg``djgda```````````````````gc``````````adjdkejicjddkelledjedckijaaeeich``````````````", +"``````````````````````````````````````di```````````````````````````he`bd```````````````````````````````````````````````````````ek``ce`gch```````````````````ab`````````gcidkjlbbbckjadlb``dj`c`ga`cda````````````````", +"`````````````````````````````````````glg```````````````````````````dj`ce````````````````````````````````ga`````````````````````aea`ilg``iig``````````````````ba```````````cbae```gki`cli``dd`c``g`gda````````````````", +"`````````````````````````````````````bk```````````````````````````hlg`bkjg```````````````````````````gggblig``gh````````````````jj`hli```gjcg`````````````````ig``````````jbbe````ki`ilc``dd`c`````da````````````````", +"`````````````````````````````````````di``````````````````````````gec``ajegg`````````````````````````ckkdjcecaaaa````````````````gkbaec`````accig```````````````cjg````````kbhe````ei`ilj``jk`j``g``da````````````````", +"`````````````````````````````````````lg``````````````````````````dd````hkkj```````````````````````````````hjkkdjdjjjjb```````````bkhec````````acjbg`````````````gjg```````diak```gei`blc``de`j`````da````````````````", +"````````````````````````````````````he``````````````````````````ikg`````dela````````````````````````````ghbhhhaaggg```````````````kjei```````````bdjiag```````gbiig```````dbak````lb`bli``de`j`````da````````````````", +"````````````````````````````````````jc````````````````````````gdk````````bkb`````````````````````````akkdjddkeleja````````````````ilkh``````````````hcjjccccjcbg``````````dbhd````ei`hec``dk`j`````ka````````````````", +"````````````````````````````````````eg```````````````````````geea`````````ib`````````````````````````ei````````gbjejg`````````````aelg````````````````````````````````````jbhd```gli`hei``dd`j`````kg````````````````", +"```````````````````````````````````be```````````````````````hlla``````````g`````````````````````````cj````````````adlb`````````````hlbg```````````````````````````````````dbbd```gli`ali``jd`j`````kg````````````````", +"```````````````````````````````````kb``````````````````````allh````````````````````````````````````hla``````````````bejg````````````dla`gahjji````````````````````````````dbbd```glc`glb``dj`d`````kg````````````````", +"``````````````````````````````````be``````````````````````beeh`````````````````````````````````````kh`bklljg``````````iei```````````ckelleedddka``````````````````````````dbbd```glc`glh``dj`j`````kg````````````````", +"`````````````````````````````````geh```````````````````gikejg`````````````````````````````````````gk`jfeddeea``````````akkb````````````g``````aeg`````````````````````````dbij```glc`glh``jj`d`````kg````````````````", +"`````````````````````````````````ec`````````````````gbdledi```````````````````````````````````````ijifd````hg````````````ieda``````````````````ij`````````````````````````dbbj```ali`gla``jc`d`````kg````````````````", +"````````````````````````````````jk````````````ghijdkkdjhha````````````````````````````````````````daefb```````````````````gdeb``````````````````e`````````````````````````dhbj```ali`glh``ih`j`````k`````````````````", +"```````````````````````````````ilg`````````bdelkjbg``gcabcg```````````````````````````````````````kajlg`````````````````````jei`````````````````ka````````````````````````khbj```hlb`bla``jh`d`````e`````````````````", +"``````````````````````````````ila````````cedccb````````ijib```````````````````````````````````````kahe````hdledcg````````````i``````````````````jb````````````````````````khic```hlb`blh``jh`d`````e`````````````````", +"`````````````````````````````ilh````````jlg`gc`````````gjdb```````````````````````````````````````bg`a````deahikeg``````````````````````````````ic````````````````````````kaic```hlb`blh``jb`d`````e`````````````````", +"````````````````````````````dfb````````alb``ca``````````hlg```````````````````````````````````````ah`````glfklfekd``````````````````````````````ic````````````````````````khcc```blb`blh``jh`d`````e`````````````````", +"```````````````````````````cfc`````````kk```d````````````k``````````````````````````````hg```````````````glfffffekcia`````````````````````````abdh````````````````````````eacc```bliiefc``dh`d`````e`````````````````", +"```````````````````````````ed`````````blb```d````````````db```````````````````````````gag````````````````gkffffffbelkg```````````````````````gjde`````````````````````````kaic```bldcahkb`kh`d`````e`````````````````", +"```````````````````````````lg``gikcghjlc```gj````````````je````````````````````````gjkka``````````````````gkfffflaeefi```````````````````````dedd`````````````````````````eabj```blk``ghegkh`d`````e`````````````````", +"```````````````````````````ddjkfeddflda````bc````````````ceb``````````````````````akig``````````````````````bjig``eblk``````````````````````jflld`````````````````````````kghj```bli```cflllcd````ge`````````````````", +"```````````````````````````gccib```ga``````ib````````````jhc``````````````````````ea``````````````````````````````khbfg````````````````````jlfflh`````````````````````````egbc```bfj``glkdleid```gbk`````````````````", +"```````````````````````````````````````````ca````````````j`j``````````````````````````````big`````````````````````ehgli``````````````````gdlfffd``````````````````````````egbj```ile``ge``kh`dgiaaik`````````````````", +"```````````````````````````````````````````ja````````````j`j````````````````````````````helkli`````g`````````````gk``ed````````````````gbklffleg``````````````````````````lgbj```cllh`jj``eb`difdbik`````````````````", +"```````````````````````````````````````````ch````````````cgd````````````````````````````iga`geb``ag``````````````````cc`````````````ggadlffflkb```````````````````````````labc```jlka`ec``kb`difehid`````````````````", +"```````````````````````````````````````````ch````````````ihja````````````````````````````````hla`j```````````````````````````````````hklffffdj````````````````````````````lhic```kfcggjli`eb`djflbcd`````````````````", +"```````````````````````````````````````````ib`````````````ijeg````````````````````````````````dcgj`````````````````````````````````gjefffffekg````````````````````````````laieejelledecieieb`dhkcbcd`````````````````", +"```````````````````````````````````````````bc```````````````cd````````````````````````````````akii````````````````````````````````gdlflffflka`````````````````````````````laijeggabijkellllb`dga`bcd`````````````````", +"```````````````````````````````````````````aj```````````````gkh````````````````````````````````cki```````````````````````````````gdlflffflkg``````````````````````````````eajkkjihg``````geb`dg``hcd`````````````````", +"```````````````````````````````````````````gd````````````````jc````````````````````````````````gej```````````````````````````ggagdllllfflka```````````````````````````````dadlklekeeekkkkjeb`d```acj`````````````````", +"````````````````````````````````````````````d```````````````gbj`````````````````````````````````be``````````````````````````````hjjcdeelecg```````````````````````````````khjeeeb`````ghejeb`d```aij`````````````````", +"````````````````````````````````````````````d```````````````baj``````````````````````````````````kh`````````````````````````````gg``gabi`ajg```ggga``````````````````````gkckecd`g``````aeeb`k```gic`````````````````", +"````````````````````````````````````````````dg``````````````abch`````````````````````````````````bj````````````````````````````````````````bkdkekdklkkka```````````````ajllflkejibhgggghbkli`k```gij`````````````````", +"````````````````````````````````````````````cb```````````````chj``````````````````````````````````dg````````````````````````````````````````hh```gbg`gdi```````````````jkiicjcccijdkllllfkli`k```gic`````````````````", +"````````````````````````````````````````````bi```````````````gceih````````````````````````````````aj`````````````````````````````````````````ba`cdhhgggkg`````````````bjkellkkeekdeclkkkllligk```aci`````````````````", +"````````````````````````````````````````````aj`````````````````bhbjjg``````````````````````````````aj````````````````````````````````````````gcgblfjkg`hd``````````````gbdklcedihbedekellklcae```aji`````````````````", +"`````````````````````````````````````````````d`````````````````hb``ajjg`````````````````````````````hc```````````````````````````````````````adgaelfcg``ji````````````````ge`dig`gkghabaahejak```hji`````````````````", +"`````````````````````````````````````````````d``````````````````biih`adh`````````````````````````````hc```````````````````````````````g``gbiikfjgjeld```aea```````````````ge`kiaghejaggbbiedgk```bji`````````````````", +"`````````````````````````````````````````````ih```````````````````gbch`da`````````````````````````````jkh`````````````````````hckkeeeekdcjkdlielbieeeh```hka`````````````gbebdkeellleekcidfj`k```ijjhhhha````````````", +"`````````````````````````````````````````````ac``````````````````````ibjki````````````````````````````gdlcg``ghbhgg```ggacckelfflllllffffflbagbfkilelddcbghkjg``````````bkllllllllllelllekligk```ajeeeelleka`````````", +"``````````````````````````````````````````````k``````````````````````gccgd``````````````````````````````ileeefflkchahabklfffffffffffffffflc````dflfelkcdkkddlkjjjcjjccccklllleeeeeleeeeeleli`k````jklellllljci```````", +"``````````````````````````````````````````````ja`````````````````````cgj`j```````````````````````````````hllebahabcdelffffffffffflllffllfj`````aleejllkdjba`aihgbiibibibijcccccccccccccjddeh`eg```djbbhbiiiibdd``````", +"``````````````````````````````````````````````aj`````````````````````jacih````````````````````````````````gefllllflfffffffffllfflekkeelfd``````glkkjedghifdbgjdjjdkdjjjjjjddjdccccjiiibbbiebheg```djccjkkkejjkc``````", +"```````````````````````````````````````````````d`````````````````````cjgjg`````````````````````````````````hdlffffflkjjjjdibhbiig`g`agaci```````ljjkkk`gafldhlcaahbbiibbbideilkchjehhhahhbdabeh``gdh```jbak``ch``````", +"```````````````````````````````````````````````d`````````````````````dj`j`````````````````````````````````````gahaaag``````````````````aj```````edbejea`glldhlb```````````jkglcg`id```````jggeh``ada```jhgk``ca``````", +"```````````````````````````````````````````````ja````````````````````djhi``````````````````````````````````````````h```````````````````gd``````gejhkclc`geecbla```````````id`lj`gcc```````j``ea``gka```chgk``ca``````", +"```````````````````````````````````````````````bi````````````````````ckhi``````````````````````````````````````````````````````````````bj``````gejajcee``kehbk````````````ckgej``jj``````adggea```ka```jhad``cg``````", +"````````````````````````````````````````````````d`````````````````````dcj``````````````````````````````````````````````````````````````ka``````aejgddkeg`kkgcd````````````ck`ed``cj``````ad``eg```ka```jaaj``jg``````", +"````````````````````````````````````````````````bi`````````````````````kkh````````````````````````````````````````````````````````````hk```````akcgkkjebgkk`jj````````````ck`ec``cc``````gj`gk````eg```jghc``d```````", +"`````````````````````````````````````````````````d`````````````````````gjd```a```````````````````````````````````````````````````````gda```````hei`kdcfjakd`ki````````````ieaec``jc```````c`gd````eg```j`bi``d```````", +"`````````````````````````````````````````````````ch``````````````````````bb``d`````````````````````````````````````````````````````ajjg````````behgkdcfeadjgeg````````````cehlc``jc```````c`gd````eg```j`ib``k```````", +"`````````````````````````````````````````````````aj```````````````````````iggj```````````````````````````````````````````````g`gbjjig``````````blghjicllbdiae`````````````ckhlc``di```````c`gd````e````j`ca``d```````", +"``````````````````````````````````````````````````dg```````````````````````ihc``a`````````````````````````````````abckdkkeeeedjjh``````````````blgbjakdejdhcd`````````````jkalc`gdi```````c`gd````k````j`jg`gk```````", +"``````````````````````````````````````````````````bj```````````````````````ihc``a```````````````````````````````bklffffflffflg`````````````````ce`iigkiekkadc`````````````jkalc`gki``````gj`gj````k````j`j``ae```````", +"```````````````````````````````````````````````````cb`````````````````````hbbc`gj````````````````````````````gclffffffffffffd``````````````````jk`ji`dakeeaea`````````````jkali``ei``````gd`gj````d````d`d``be```````", +"````````````````````````````````````````````````````dg````````````````````iahc`ia```````````````````````````bellffffflffflfla``````````````````dk`db`cdkekge``````````````ckgfb``lh```````c`gj````d```gj`d``hj```````", +"````````````````````````````````````````````````````ac````````````````````higd`j`g``````````````````````````jffffffffffflffc```````````````````kj`ka`hecldhe``````````````iegfh``liiicdjccj`aj```hlc``gj`d``hb```````", +"`````````````````````````````````````````````````````ih````````````````````dgjhd````````````````````````````chkkekeelkcagkfi```````````````````ec`k``glbljhlkkkdddkkdjddkkekalh``lcbbbiccdj`hd```gelkabj`d``hi```````", +"``````````````````````````````````````````````````````jg```````````````````gjcdd```h``````````````````````````hejgdiach`gjklh`````````````````gec`k``gddkchkggggaaagaagg``heglh`ala``````bc`ad````ihkldjgj``hi```````", +"``````````````````````````````````````````````````````gdg````````````````````ilea``h```abg`a```ig``````````````dhak``hb``b`jk`````````````````bkcgk```alkbalcg````````````hk`fh`glg``````hh`gc```gc``hkdac``bb```````", +"```````````````````````````````````````````````````````gdh```````````````````gdli``h`h`gjhg```bk```````````````icijg`gc````ala````````````````bkhad````eeaijdda```````````bkala`alg``````aa``c```gc```ichi``ia```````", +"`````````````````````````````````````````````````````````cb``````````````````gclk``b`b`bhgb```eh```````````````gjgji`gc`ha``dk````````````````jegcc````jegeiahkcg`````````aklfeeel```````gb``j```gj```jiibg`i````````", +"``````````````````````````````````````````````````````````ic```````````````````cla`b`hgja`c``bii````````````````a`jicbb`aj``bd````````````````aekeh````jkakejggdlc``````````ghbihg```````gj`ge```gc```kkekjckh```````", +"```````````````````````````````````````````````````````````hda`````````````````alkgb`aachbjg`jhh`````````````````ga`cd```d``cj```````````````````ig```gjcgkgjec`adeb``````````````````````ekij```gb```ha`gaaklja`````", +"````````````````````````````````````````````````````````````gjh`````````````````cdhj`gbhkchi`j`b````````````````````ik``gd``kh````````````````````````heigd``helb`gdkddddkkeeeeekdcjjjcciijkleeeediiiiibibbbbckc`````", +"``````````````````````````````````````````````````````````````jg`````````````````cccigigekgj`j`b```````````````````ajcb`bi`bj`````````````````````````ieihc```aefkhglhgagggghbcciichaahhbbbbiiccicjiiiiiiiicjcjc`````", +"``````````````````````````````````````````````````````````````ga``````````````````ckgii`jecbid`ha`````````````````gb`hb`dg`kg`````````````````````````cldji````gcefllg````````````````````````````````````````aj`````", +"```````````````````````````````````````````````````````````````````````````````````abbc`ajeaikb`i```````````````````gcghj`dh```````````````````````````hdeb```````aefjccibhhhhhhbbibbibiiibhaggahbcjjjjccciccjdi`````", +"````````````````````````````````````````````````````````````````````````````````````iiac``ckgjkgah``````````````````caadgjh``````````````````````````````g`````````gadjdkkkeekkdddjjjjjccccjdkkddjcbhhhhhhhagg```````", +"```````````````````````````````````````````````````````````````````````````````````aab`acjgkdgdd`i`````````````````chadgba```````````````````````````````````````````````````````````````````````````````````````````", +"```````````````````````````````````````````````````````````````````````````````````bi````ghajbiciab``````````````gcbhdgbb````````````````````````````````````````````````````````````````````````````````````````````", +"``````````````````````````````````````````````````````````````````````````````````bha`````g`bdgjj`bg``````````gahbggdgih`````````````````````````````````````````````````````````````````````````````````````````````", +"`````````````````````````````````````````````````````````````````````````````````gbc`````gghadgcj``i`````````jeda`gdgcg```ghiccg`````````````````````````````````````````````````````````````````````````````````````", +"`````````````````````````````````````````````````````````````````````````````````i`j``````hcgjgjcg`gc```````gdkh``jajh`acjia`bbjhg```````````````````````````````````````````````````````````````````````````````````", +"`````````````````````````````````````````````````````````````````````````````````c`j````abgdhichig``j```````jik``chjhgjdeg``gg``jba``````````````````````````````````````````````````````````````````````````````````", +"`````````````````````````````````````````````````````````````````````````````````c`c``gih`cgcgdgia`bb```````kid`hcch`dhdlkhildb`gjb``````````````````````````````````````````````````````````````````````````````````", +"`````````````````````````````````````````````````````````````````````````````````igb`ab`gia`jgj`cg`c````````kij`jci`gddlllbjlcj``db``````````````````````````````````````````````````````````````````````````````````", +"`````````````````````````````````````````````````````````````````````````````````aaa`b`bcg``jbc`j`ab````````ehjgkj``celfffjklldjkei``````````````````````````````````````````````````````````````````````````````````", +"````````````````````````````````````````````````````````````````````````````````````hgcg````chj`c`ba`````g``k`dbeg``klfflflefelfkjj``````````````````````````````````````````````````````````````````````````````````", +"````````````````````````````````````````````````````````````````````````````````````gcg`````ibkhabcg`````a``k`jbl```kllfllfdllffleb``````````````````````````````````````````````````````````````````````````````````", +"````````````````````````````````````````````````````````````````````````````````````ab``````gjci`iba`````aa`jbhidb``jflfklfllfflkk```````````````````````````````````````````````````````````````````````````````````", +"````````````````````````````````````````````````````````````````````````````````````bg```````cbkhbgi`g````i`be`g`cb`hfecajfllffecj```````````````````````````````````````````````````````````````````````````````````", +"``````````````````````````````````````````````````````````````````````````````````````````````chj``b``g```jggej```ccgeljdjllffleeg```````````````````````````````````````````````````````````````````````````````````", +"```````````````````````````````````````````````````````````````````````````````````````````````hh`````````bc`iji```bddlfffffffeljg```````````````````````````````````````````````````````````````````````````````````", +"```````````````````````````````````````````````````````````````````````````````````````````````i```````````ikjjejg```hjdlffffffekelc`````````````````````````````````````````````````````````````````````````````````", +"``````````````````````````````````````````````````````````````````````````````````````````````gb````````````bccidkcg````ahidekjg``gkci```````````````````````````````````````````````````````````````````````````````", +"``````````````````````````````````````````````````````````````````````````````````````````````h````````````````g``hdg`````````g```bkji```````````````````````````````````````````````````````````````````````````````", +"```````````````````````````````````````````````````````````````````````````````````````````````````````````````````ga````````````gklei```````````````````````````````````````````````````````````````````````````````", +"`````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````", +"`````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````", +"`````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````````" }; diff --git a/doc/homepage.ms b/doc/homepage.ms index 1dcf9776..a04c4502 100755 --- a/doc/homepage.ms +++ b/doc/homepage.ms @@ -31,8 +31,8 @@ Home of Groff (GNU Troff). . .HTML-IMAGE-LEFT -.PSPIC -L gnu.eps 1i 1i -\v'-0.5i'\h'1.5i'\s[50]\*[GNU] Troff\s0 +.PSPIC -L gnu.eps 2i 2i +\v'-0.75i'\h'2.0i'\s[70]\*[GNU] Troff\s0 .HTML-IMAGE-END . .HnS 1 diff --git a/src/devices/grohtml/post-html.cc b/src/devices/grohtml/post-html.cc index 22c6820e..9843f513 100644 --- a/src/devices/grohtml/post-html.cc +++ b/src/devices/grohtml/post-html.cc @@ -1160,6 +1160,7 @@ class html_printer : public printer { int sbuf_start_hpos; int sbuf_vpos; int sbuf_end_hpos; + int sbuf_prev_hpos; int sbuf_kern; style sbuf_style; int last_sbuf_length; @@ -2344,6 +2345,7 @@ void html_printer::flush_sbuf() output_hpos = sbuf_end_hpos; output_vpos = sbuf_vpos; last_sbuf_length = 0; + sbuf_prev_hpos = sbuf_end_hpos; overstrike_detected = FALSE; sbuf.clear(); } @@ -2496,8 +2498,15 @@ void html_printer::add_to_sbuf (unsigned char code, const string &s) int html_printer::sbuf_continuation (unsigned char code, const char *name, const environment *env, int w) { - if (sbuf_end_hpos == env->hpos) { + /* + * lets see whether the glyph is closer to the end of sbuf + */ + if ((sbuf_end_hpos == env->hpos) + || ((sbuf_prev_hpos < sbuf_end_hpos) + && (env->hpos < sbuf_end_hpos) + && ((sbuf_end_hpos-env->hpos < env->hpos-sbuf_prev_hpos)))) { add_to_sbuf(code, name); + sbuf_prev_hpos = sbuf_end_hpos; sbuf_end_hpos += w + sbuf_kern; return TRUE; } else { @@ -2509,6 +2518,7 @@ int html_printer::sbuf_continuation (unsigned char code, const char *name, if (env->hpos-sbuf_end_hpos < space_width) { add_to_sbuf(code, name); + sbuf_prev_hpos = sbuf_end_hpos; sbuf_end_hpos = env->hpos + w; return TRUE; } @@ -2599,6 +2609,7 @@ void html_printer::set_char(int i, font *f, const environment *env, int w, const add_to_sbuf(code, name); sbuf_end_hpos = env->hpos + w; sbuf_start_hpos = env->hpos; + sbuf_prev_hpos = env->hpos; sbuf_vpos = env->vpos; sbuf_style = sty; sbuf_kern = 0; |