snapshot of project "lynx", label v2-8-6dev_12

4 files changed, 267 insertions, 220 deletions

diff --git a/samples/blue-background.lss b/samples/blue-background.lss
index f5d93b0b..7bc256b7 100644
--- a/samples/blue-background.lss
+++ b/samples/blue-background.lss
@@ -2,83 +2,96 @@
 # Notes:
 # I use this in OS/2 VIO window, and occasionally on Linux console. 
  
-normal:normal:default:blue 
-em:bold:brightgreen:blue 
-strong:bold:brightred:blue 
-b:bold:white:blue 
-i:bold:yellow:blue 
-alink:reverse:white:cyan 
-a:bold:cyan:blue 
-img:dim:gray:blue 
-status:reverse:white:green 
-fig:normal:gray:blue 
-caption:reverse:brown:blue 
-hr:normal:yellow:blue 
-blockquote:normal:brightblue:blue 
-#ul:normal:brown:blue 
-address:normal:magenta:blue 
-#title:normal:magenta:blue 
-tt:dim:gray:blue 
-h1:bold:yellow:blue 
-label:normal:magenta:blue 
-value:normal:green:blue 
-high:bold:brightmagenta:blue 
-q:normal:yellow:magenta 
-small:dim:gray:blue 
-big:bold:yellow:blue 
-sup:bold:yellow:blue 
-sub:dim:gray:blue 
-lh:bold:yellow:magenta 
+# Setting the normal and default types lets us keep (almost) the same colors
+# whether the terminal's default colors are white-on-black or black-on-white.
+# It is not exact since the default "white" is not necessarily the same color
+# as the ANSI lightgray, but is as close as we can get in a standard way.
+#
+# If you really want the terminal's default colors, and if lynx is built using
+# ncurses' default-color support, remove these two lines:
+normal:		normal:			lightgray:	blue
+default:	normal:			white:		blue
+
+# Normal type styles correspond to HTML tags.
+#
+# The next line (beginning with "em") means:  use bold if mono, otherwise
+# brightblue on <defaultbackground>
+em:		bold:			brightgreen:	blue 
+strong:		bold:			brightred:	blue 
+b:		bold:			white:		blue 
+i:		bold:			yellow:		blue 
+alink:		reverse:		white:		cyan 
+a:		bold:			cyan:		blue 
+img:		dim:			gray:		blue 
+status:		reverse:		white:		green 
+fig:		normal:			gray:		blue 
+caption:	reverse:		brown:		blue 
+hr:		normal:			yellow:		blue 
+blockquote:	normal:			brightblue:	blue 
+#ul:normal:	brown:blue 
+address:	normal:			magenta:	blue 
+#title:	normal:magenta:blue 
+tt:		dim:			gray:		blue 
+h1:		bold:			yellow:		blue 
+label:		normal:			magenta:	blue 
+value:		normal:			green:		blue 
+high:		bold:			brightmagenta:	blue 
+q:		normal:			yellow:		magenta 
+small:		dim:			gray:		blue 
+big:		bold:			yellow:		blue 
+sup:		bold:			yellow:		blue 
+sub:		dim:			gray:		blue 
+lh:		bold:			yellow:		magenta 
  
 # glitch fixes 
-area:normal:default:blue 
-body:normal:default:blue 
-br:normal:default:blue 
-center:normal:default:blue 
-center.header:normal:default:blue 
-div:normal:default:blue 
-font:normal:default:blue 
-font.letter:normal:default:blue 
-h2:normal:default:blue 
-h3:normal:default:blue 
-h4:normal:default:blue 
-h5:normal:default:blue 
-h6:normal:default:blue 
-head:normal:default:blue 
-link:normal:default:blue 
-map:normal:default:blue 
-meta:normal:default:blue 
-p:normal:default:blue 
-table:normal:default:blue 
-td:normal:default:blue 
-tr:normal:default:blue 
-title:normal:default:blue 
+area:		normal:			lightgray:	blue 
+body:		normal:			lightgray:	blue 
+br:		normal:			lightgray:	blue 
+center:		normal:			lightgray:	blue 
+center.header:	normal:			lightgray:	blue 
+div:		normal:			lightgray:	blue 
+font:		normal:			lightgray:	blue 
+font.letter:	normal:			lightgray:	blue 
+h2:		normal:			lightgray:	blue 
+h3:		normal:			lightgray:	blue 
+h4:		normal:			lightgray:	blue 
+h5:		normal:			lightgray:	blue 
+h6:		normal:			lightgray:	blue 
+head:		normal:			lightgray:	blue 
+link:		normal:			lightgray:	blue 
+map:		normal:			lightgray:	blue 
+meta:		normal:			lightgray:	blue 
+p:		normal:			lightgray:	blue 
+table:		normal:			lightgray:	blue 
+td:		normal:			lightgray:	blue 
+tr:		normal:			lightgray:	blue 
+title:		normal:			lightgray:	blue 
  
-form:normal:default:blue 
-input:normal:default:blue 
-input.submit:normal:cyan:blue 
-select:normal:default:blue 
-option:normal:default:blue 
+form:		normal:			lightgray:	blue 
+input:		normal:			lightgray:	blue 
+input.submit:	normal:			cyan:		blue 
+select:		normal:			lightgray:	blue 
+option:		normal:			lightgray:	blue 
  
-pre:normal:default:blue 
-dd:normal:default:blue 
-dt:normal:default:blue 
-ul:normal:default:blue 
-li:normal:default:blue 
+pre:		normal:			lightgray:	blue 
+dd:		normal:			lightgray:	blue 
+dt:		normal:			lightgray:	blue 
+ul:		normal:			lightgray:	blue 
+li:		normal:			lightgray:	blue 
  
-base:normal:default:blue 
-iframe:normal:default:blue 
-cite:normal:yellow:blue 
+base:		normal:			lightgray:	blue 
+iframe:		normal:			lightgray:	blue 
+cite:		normal:			yellow:		blue 
 
-span.htmlsrc_comment:normal:green:blue 
-span.htmlsrc_tag:normal:brightgreen:blue 
-span.htmlsrc_attrib:normal:brightcyan:blue 
-span.htmlsrc_attrval:normal:white:blue 
-span.htmlsrc_abracket:normal:brightgreen:blue 
-span.htmlsrc_entity:normal:white:blue 
+span.htmlsrc_comment:normal:		green:		blue 
+span.htmlsrc_tag:normal:		brightgreen:	blue 
+span.htmlsrc_attrib:normal:		brightcyan:	blue 
+span.htmlsrc_attrval:normal:		white:		blue 
+span.htmlsrc_abracket:normal:		brightgreen:	blue 
+span.htmlsrc_entity:normal:		white:		blue 
 ##span.htmlsrc_href:
 ##span.htmlsrc_entire:
-span.htmlsrc_badseq:normal:red:blue 
-span.htmlsrc_badtag:normal:red:blue 
-span.htmlsrc_badattr:normal:red:blue 
-span.htmlsrc_sgmlspecial:normal:yellow:blue 
+span.htmlsrc_badseq:normal:		red:		blue 
+span.htmlsrc_badtag:normal:		red:		blue 
+span.htmlsrc_badattr:normal:		red:		blue 
+span.htmlsrc_sgmlspecial:normal:	yellow:		blue 
diff --git a/samples/bright-blue.lss b/samples/bright-blue.lss
index 888dc4e4..534e9c19 100644
--- a/samples/bright-blue.lss
+++ b/samples/bright-blue.lss
@@ -10,58 +10,68 @@
 # Normal type styles correspond to HTML tags.
 #
 # default should be the *last* line
-#
-# The next line (beginning with "h1") means:  use bold if mono, otherwise
-# yellow on black (use 'default' for <defaultbackground>/<defaultforeground>)
-default:normal:brightcyan:blue
+normal:  	normal:  		brightcyan:	blue
+default:	normal:			brightcyan:	blue
+
 # match "link":
-input:normal:green
-input.type.submit:normal:blue:black
-textarea:normal:white:cyan
+input:		normal:			green
+textarea:	normal:			white:		cyan
+
+input.type.submit:normal:		blue:		black
 # type-less input is the same as type=text (similar to textarea)
-input.type.:normal:white:cyan
-input.type.text:normal:white:cyan
-input.type.password:normal:white:cyan
-input.type.file:normal:brightred:cyan
+input.type.:	normal:			white:		cyan
+input.type.text:normal:			white:		cyan
+input.type.password:normal:		white:		cyan
+input.type.file:normal:			brightred:	cyan
+
 # Shows gray on black?!
-edit.current:normal:yellow:lightgray
+edit.current:normal:			yellow:		lightgray
 #edit.current:normal:yellow:white
-edit.active:normal:black:white
-edit.active.marked:normal:white:black
-edit.prompt:normal:white:gray
-edit.prompt.marked:normal:black:white
-edit.active.arrow:normal:red:white
-edit.prompt.arrow:normal:red:gray
-edit.active.pad:normal:red:lightgray
-edit.prompt.pad:normal:white:black
-option:normal:red:black
+edit.active:normal:			black:		white
+edit.active.marked:normal:		white:		black
+edit.prompt:normal:			white:		gray
+edit.prompt.marked:normal:		black:		white
+edit.active.arrow:normal:		red:		white
+edit.prompt.arrow:normal:		red:		gray
+edit.active.pad:normal:			red:		lightgray
+edit.prompt.pad:normal:			white:		black
+
+option:normal:				red:		black
 #alink:normal:red:green
-scroll.arrow:bold:white:default
-scroll.noarrow:normal:black:default
-scroll.bar:bold:white
+
+scroll.arrow:	bold:			white:		default
+scroll.noarrow:	normal:			black:		default
+scroll.bar:	bold:			white
 #scroll.back:reverse:green:red
-status:reverse:yellow:black
-h1:bold:yellow:black
-em:bold:white
-em.a:reverse:black:blue
-em.b:reverse:white:black
-font.letter:normal:default:black
-link.blue:bold:white:brightblue
-link.blue.prev:bold:yellow:brightblue
-title:normal:magenta:black
-forwbackw.arrow:bold:red:default
-i:bold:white
-table:normal:white
-blockquote:normal:white
-li.blue:bold:blue:black
-link.blue.next:bold:blue:black
-normal:normal:default:default
-menu.bg:normal:black:lightgray
-menu.frame:normal:black:lightgray
-menu.entry:normal:white:gray
-menu.n:normal:white:gray
-menu.active:normal:white:black
-menu.sb:normal:brightred:lightgray
-hot.paste:normal:brightred:gray
+
+status:		reverse:		yellow:		black
+h1:		bold:			yellow:		black
+em:		bold:			white
+title:		normal:			magenta:	black
+i:		bold:			white
+table:		normal:			white
+blockquote:	normal:			white
+
+menu.bg:	normal:			black:		lightgray
+menu.frame:	normal:			black:		lightgray
+menu.entry:	normal:			white:		gray
+menu.n:		normal:			white:		gray
+menu.active:	normal:			white:		black
+menu.sb:	normal:			brightred:	lightgray
+
+forwbackw.arrow:bold:			red:		default
+hot.paste:	normal:			brightred:	gray
+
+# FIXME: what are these?
+em.a:		reverse:		black:		blue
+em.b:		reverse:		white:		black
+font.letter:	normal:			default:	black
+link.blue:	bold:			white:		brightblue
+link.blue.prev:	bold:			yellow:		brightblue
+li.blue:	bold:			blue:		black
+link.blue.next:	bold:			blue:		black
+
 INCLUDE:lynx.lss
-default:normal:brightcyan:blue
+
+# default should be the *last* line
+#?default:	normal:			brightcyan:	blue
diff --git a/samples/lynx.lss b/samples/lynx.lss
index 9c6477e6..9349de72 100644
--- a/samples/lynx.lss
+++ b/samples/lynx.lss
@@ -1,40 +1,47 @@
-# It's best to put these in a .lss file and use "lynx -lss=file.lss whatever"
-# for now.
+# Setting the normal and default types lets us keep (almost) the same colors
+# whether the terminal's default colors are white-on-black or black-on-white.
+# It is not exact since the default "white" is not necessarily the same color
+# as the ANSI lightgray, but is as close as we can get in a standard way.
 #
+# If you really want the terminal's default colors, and if lynx is built using
+# ncurses' default-color support, remove these two lines:
+normal:		normal:			lightgray:black
+default:	normal:			white:black
+
 # Normal type styles correspond to HTML tags.
 #
 # The next line (beginning with "em") means:  use bold if mono, otherwise
 # brightblue on <defaultbackground>
-em:bold:brightblue
-strong:bold:brightred
-b:bold:red
-i:bold:brightblue
-a:bold:green
-img:dim:brown
-fig:normal:gray
-caption:reverse:brown
-hr:normal:yellow
-blockquote:normal:brightblue
-ul:normal:brown
-address:normal:magenta
-title:normal:magenta
-tt:dim:brightmagenta:default
-h1:bold:yellow:blue
-label:normal:magenta
-q:normal:yellow:magenta
-small:dim:default
-big:bold:yellow
-sup:bold:yellow
-sub:dim:gray
-lh:bold:yellow:magenta
-li:normal:magenta
-code:normal:cyan
-cite:normal:cyan
+em:		bold:			brightblue
+strong:		bold:			brightred
+b:		bold:			red
+i:		bold:			brightblue
+a:		bold:			green
+img:		dim:			brown
+fig:		normal:			gray
+caption:	reverse:		brown
+hr:		normal:			yellow
+blockquote:	normal:			brightblue
+ul:		normal:			brown
+address:	normal:			magenta
+title:		normal:			magenta
+tt:		dim:			brightmagenta:	black
+h1:		bold:			yellow:		blue
+label:		normal:			magenta
+q:		normal:			yellow:		magenta
+small:		dim:			default
+big:		bold:			yellow
+sup:		bold:			yellow
+sub:		dim:			gray
+lh:		bold:			yellow:		magenta
+li:		normal:			magenta
+code:		normal:			cyan
+cite:		normal:			cyan
 
-table:normal:brightcyan
-tr:bold:brown
-td:normal:default
-br:normal:default
+table:		normal:			brightcyan
+tr:		bold:			brown
+td:		normal:			default
+br:		normal:			default
 
 # Special styles - not corresponding directly to HTML tags
 #	alert	- status bar, when message begins "Alert".
@@ -44,58 +51,67 @@ br:normal:default
 #	whereis	- whereis search target
 #
 #normal:normal:default:blue
-alink:reverse:yellow:black
-status:reverse:yellow:blue
-alert:bold:yellow:red
-whereis:reverse+underline:magenta:cyan
+alink:		reverse:		yellow:		black
+status:		reverse:		yellow:		blue
+alert:		bold:			yellow:		red
+whereis:	reverse+underline:	magenta:	cyan
 # currently not used
 #value:normal:green
 #high:bold:brightmagenta
+
+menu.bg:	normal:			black:		lightgray
+menu.frame:	normal:			black:		lightgray
+menu.entry:	normal:			lightgray:	black
+menu.n:		normal:			red:		gray
+menu.active:	normal:			yellow:		black
+menu.sb:	normal:			brightred:	lightgray
+
 forwbackw.arrow:reverse
+hot.paste:	normal:			brightred:	gray
 
 # Styles with classes - <ul class=red> etc.
-ul.red:underline:brightred
-ul.blue:bold:brightblue
-li.red:reverse:red:yellow
-li.blue:bold:blue
-strong.a:bold:black:red
-em.a:reverse:black:blue
-strong.b:bold:white:red
-em.b:reverse:white:blue
-strong.debug:reverse:green
-font.letter:normal:default:blue
-input.submit:normal:cyan
-tr.baone:bold:yellow
-tr.batwo:bold:green
-tr.bathree:bold:red
+ul.red:		underline:		brightred
+ul.blue:	bold:			brightblue
+li.red:		reverse:		red:		yellow
+li.blue:	bold:			blue
+strong.a:	bold:			black:		red
+em.a:		reverse:		black:		blue
+strong.b:	bold:			white:		red
+em.b:		reverse:		white:		blue
+strong.debug:	reverse:		green
+font.letter:	normal:			white:		blue
+input.submit:	normal:			cyan
+tr.baone:	bold:			yellow
+tr.batwo:	bold:			green
+tr.bathree:	bold:			red
 #
 # Special handling for link.
-link:normal:white
-link.green:bold:brightgreen
-link.red:bold:black:red
-link.blue:bold:white:blue
-link.toc:bold:black:white
+link:		normal:			white
+link.green:	bold:			brightgreen
+link.red:	bold:			black:		red
+link.blue:	bold:			white:		blue
+link.toc:	bold:			black:		white
 # Special cases for link - the rel or title is appended after the class.
 # <link rel=next class=red href="1">
-link.red.next:bold:red
-link.red.prev:bold:yellow:red
-link.blue.prev:bold:yellow:blue
-link.blue.next:bold:blue
-link.green.toc:bold:white:green
+link.red.next:	bold:			red
+link.red.prev:	bold:			yellow:		red
+link.blue.prev:	bold:			yellow:		blue
+link.blue.next:	bold:			blue
+link.green.toc:	bold:			white:		green
 #
 # Define styles that will be used when syntax highlighting is requested
 # (commandline option -prettysrc). 
-span.htmlsrc_comment:normal:white
-span.htmlsrc_tag:normal:white
+span.htmlsrc_comment:normal:		white
+span.htmlsrc_tag:normal:		white
 #If you don't like that the tag name and attribute name are displayed 
 #in different colors, comment the following line. 
-span.htmlsrc_attrib:normal:cyan
-span.htmlsrc_attrval:normal:magenta
-span.htmlsrc_abracket:normal:white
-span.htmlsrc_entity:normal:white
+span.htmlsrc_attrib:normal:		cyan
+span.htmlsrc_attrval:normal:		magenta
+span.htmlsrc_abracket:normal:		white
+span.htmlsrc_entity:normal:		white
 ##span.htmlsrc_href:
 ##span.htmlsrc_entire:
-span.htmlsrc_badseq:normal:red
-span.htmlsrc_badtag:normal:red
-span.htmlsrc_badattr:normal:red
-span.htmlsrc_sgmlspecial:normal:yellow
+span.htmlsrc_badseq:normal:		red
+span.htmlsrc_badtag:normal:		red
+span.htmlsrc_badattr:normal:		red
+span.htmlsrc_sgmlspecial:normal:	yellow
diff --git a/samples/mild-colors.lss b/samples/mild-colors.lss
index db9fb048..8f352ce5 100644
--- a/samples/mild-colors.lss
+++ b/samples/mild-colors.lss
@@ -1,41 +1,49 @@
 # From: Vlad Harchev <hvv@hippo.ru> 
+# Setting the normal and default types lets us keep (almost) the same colors
+# whether the terminal's default colors are white-on-black or black-on-white.
+# It is not exact since the default "white" is not necessarily the same color
+# as the ANSI lightgray, but is as close as we can get in a standard way.
+#
+# If you really want the terminal's default colors, and if lynx is built using
+# ncurses' default-color support, remove these two lines:
+normal:		normal:			lightgray:black
+default:	normal:			white:black
+
 # Notes:
 # better for eyes - it sets black background with mild colors that
 # have approximately the same intensity.
 #
 # grey normal text on black background with green links and brightgreen  
 # highlighted links. 
-#it's best to put these in a .lss file and use  
-#"lynx -lss=file.lss whatever" for now. 
-em:bold:cyan
-strong:bold:cyan
-dt:bold:cyan
-var:bold:cyan
-samp:bold:cyan
-b:bold:cyan
-i:bold:cyan
-alink:reverse:brightgreen:default
-a:bold:green
-img:dim:cyan:default
-status:reverse:cyan:default
-fig:normal:gray
-caption:reverse:cyan
-hr:normal:gray
-blockquote:normal:cyan:default
-address:normal:cyan
-title:normal:cyan:default
-tt:normal:white:default
-h1:bold:cyan:default
-label:normal:cyan
-value:normal:cyan
-high:bold:cyan
-q:normal:cyan
-small:dim:cyan
-big:bold:cyan
-sup:bold:cyan
-sub:dim:cyan
-lh:bold:cyan
-code:normal:cyan
+em:		bold:			cyan
+strong:		bold:			cyan
+dt:		bold:			cyan
+var:		bold:			cyan
+samp:		bold:			cyan
+b:		bold:			cyan
+i:		bold:			cyan
+alink:		reverse:		brightgreen:	black
+a:		bold:			green
+img:		dim:			cyan:		black
+status:		reverse:		cyan:		black
+fig:		normal:			gray
+caption:	reverse:		cyan
+hr:		normal:			gray
+blockquote:	normal:			cyan:		black
+address:	normal:			cyan
+title:		normal:			cyan:		black
+tt:		normal:			white:		black
+h1:		bold:			cyan:		black
+label:		normal:			cyan
+value:		normal:			cyan
+high:		bold:			cyan
+q:		normal:			cyan
+small:		dim:			cyan
+big:		bold:			cyan
+sup:		bold:			cyan
+sub:		dim:			cyan
+lh:		bold:			cyan
+code:		normal:			cyan
 
 span.htmlsrc_comment:normal:white
 span.htmlsrc_tag:normal:cyan