csstidy-news Mailing List for CSSTidy
Status: Inactive
Brought to you by:
floele
This list is closed, nobody may subscribe to it.
2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
---|---|---|---|---|---|---|---|---|---|---|---|---|
2006 |
Jan
|
Feb
|
Mar
(4) |
Apr
|
May
(4) |
Jun
(4) |
Jul
(2) |
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
|
2007 |
Jan
|
Feb
|
Mar
(3) |
Apr
(2) |
May
|
Jun
(2) |
Jul
(4) |
Aug
(27) |
Sep
(1) |
Oct
|
Nov
|
Dec
(2) |
2008 |
Jan
(13) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
From: LEOPARD C. <leo...@gm...> - 2010-09-18 23:59:47
|
From: <edw...@us...> - 2008-01-12 04:48:04
|
Revision: 102 http://csstidy.svn.sourceforge.net/csstidy/?rev=102&view=rev Author: edwardzyang Date: 2008-01-11 20:47:55 -0800 (Fri, 11 Jan 2008) Log Message: ----------- Extra documentation for CSSTidy testing suite. Modified Paths: -------------- trunk/testing/unit-tests/class.Text_Diff_Renderer_parallel.php trunk/testing/unit-tests/class.csstidy_csst.php trunk/testing/unit-tests/class.csstidy_harness.php trunk/testing/unit-tests/class.csstidy_reporter.php trunk/testing/unit-tests/test.csst.php Modified: trunk/testing/unit-tests/class.Text_Diff_Renderer_parallel.php =================================================================== --- trunk/testing/unit-tests/class.Text_Diff_Renderer_parallel.php 2008-01-06 16:02:41 UTC (rev 101) +++ trunk/testing/unit-tests/class.Text_Diff_Renderer_parallel.php 2008-01-12 04:47:55 UTC (rev 102) @@ -1,10 +1,16 @@ <?php +/** + * Parallel diff renderer for HTML tables with original text on left, + * new text on right, and changed text highlighted with appropriate classes. + */ class Text_Diff_Renderer_parallel extends Text_Diff_Renderer { + /** String header for left column */ var $original = 'Original'; + /** String header for right column */ var $final = 'Final'; - var $_leading_context_lines = 10000; + var $_leading_context_lines = 10000; // these are big to ensure entire string is output var $_trailing_context_lines = 10000; function _blockHeader() {} function _startDiff() { Modified: trunk/testing/unit-tests/class.csstidy_csst.php =================================================================== --- trunk/testing/unit-tests/class.csstidy_csst.php 2008-01-06 16:02:41 UTC (rev 101) +++ trunk/testing/unit-tests/class.csstidy_csst.php 2008-01-12 04:47:55 UTC (rev 102) @@ -2,6 +2,9 @@ require_once 'class.Text_Diff_Renderer_parallel.php'; +/** + * CSSTidy CSST expectation, for testing CSS parsing. + */ class csstidy_csst extends SimpleExpectation { /** Filename of test */ @@ -26,7 +29,8 @@ var $actual; /** - * Loads this class from a file + * Loads this class from a file. + * @param $filename String filename to load */ function load($filename) { $this->filename = $filename; @@ -63,8 +67,12 @@ fclose($fh); } - function test($filename) { - $this->load($filename); + /** + * Implements SimpleExpectation::test(). + * @param $filename Filename of test file to test. + */ + function test($filename = false) { + if ($filename) $this->load($filename); $css = new csstidy(); $css->set_cfg($this->settings); $css->parse($this->css); @@ -78,13 +86,16 @@ return $this->expect === $this->actual; } + /** + * Implements SimpleExpectation::testMessage(). + */ function testMessage() { $message = $this->test . ' test at '. htmlspecialchars($this->filename); return $message; } /** - * Renders the test + * Renders the test with an HTML diff table. */ function render() { $message = '<pre>'. htmlspecialchars($this->css) .'</pre>'; Modified: trunk/testing/unit-tests/class.csstidy_harness.php =================================================================== --- trunk/testing/unit-tests/class.csstidy_harness.php 2008-01-06 16:02:41 UTC (rev 101) +++ trunk/testing/unit-tests/class.csstidy_harness.php 2008-01-12 04:47:55 UTC (rev 102) @@ -1,7 +1,14 @@ <?php +/** + * Base test harness for CSSTidy, please make all tests inherit from this. + */ class csstidy_harness extends UnitTestCase { + /** + * Modified testing algorithm that allows a single test method to be + * prefixed with __only in order to make it the only one run. + */ function getTests() { // __onlytest makes only one test get triggered foreach (get_class_methods(get_class($this)) as $method) { Modified: trunk/testing/unit-tests/class.csstidy_reporter.php =================================================================== --- trunk/testing/unit-tests/class.csstidy_reporter.php 2008-01-06 16:02:41 UTC (rev 101) +++ trunk/testing/unit-tests/class.csstidy_reporter.php 2008-01-12 04:47:55 UTC (rev 102) @@ -1,5 +1,9 @@ <?php +/** + * Custom test reporter for CSSTidy, adds appropriate CSS declarations + * for diffs. + */ class csstidy_reporter extends HTMLReporter { Modified: trunk/testing/unit-tests/test.csst.php =================================================================== --- trunk/testing/unit-tests/test.csst.php 2008-01-06 16:02:41 UTC (rev 101) +++ trunk/testing/unit-tests/test.csst.php 2008-01-12 04:47:55 UTC (rev 102) @@ -13,7 +13,8 @@ $expectation = new csstidy_csst(); $result = $this->assert($expectation, $filename, '%s'); // this is necessary because SimpleTest doesn't support - // HTML messages; this probably should be in the reporter + // HTML messages; this probably should be in the reporter. + // This is *not* compatible with XmlReporter if (!$result) echo $expectation->render(); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fl...@us...> - 2008-01-06 16:02:42
|
Revision: 101 http://csstidy.svn.sourceforge.net/csstidy/?rev=101&view=rev Author: floele Date: 2008-01-06 08:02:41 -0800 (Sun, 06 Jan 2008) Log Message: ----------- One more test and bugfix Modified Paths: -------------- trunk/NEWS trunk/class.csstidy_optimise.php trunk/testing/unit-tests/csst/values/number-leadingzero.csst Added Paths: ----------- trunk/testing/unit-tests/csst/values/important.csst Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2008-01-06 13:14:13 UTC (rev 100) +++ trunk/NEWS 2008-01-06 16:02:41 UTC (rev 101) @@ -21,3 +21,4 @@ - Fixed bug with bad hexadecimal syntax recovery - At-selectors optimized by removing unnecessary url() - Fixed optimisation: 1.0 was not optimised to 1 +- Fixed incorrect parsing of !imporant close to numbers Modified: trunk/class.csstidy_optimise.php =================================================================== --- trunk/class.csstidy_optimise.php 2008-01-06 13:14:13 UTC (rev 100) +++ trunk/class.csstidy_optimise.php 2008-01-06 16:02:41 UTC (rev 101) @@ -378,7 +378,6 @@ */ function compress_numbers($subvalue) { - $units =& $GLOBALS['csstidy']['units']; $unit_values =& $GLOBALS['csstidy']['unit_values']; $color_values =& $GLOBALS['csstidy']['color_values']; @@ -393,10 +392,11 @@ } for ($l = 0; $l < count($temp); $l++) { - // continue if no numeric value - if (!(strlen($temp[$l]) > 0 && ( is_numeric($temp[$l]{0}) || $temp[$l]{0} === '+' || $temp[$l]{0} === '-' ) )) + // if we are not dealing with a number at this point, do not optimise anything + $number = $this->AnalyseCssNumber($temp[$l]); + if ($number === false) { - continue; + return $subvalue; } // Fix bad colors @@ -405,44 +405,64 @@ $temp[$l] = '#'.$temp[$l]; continue; } - - if (floatval($temp[$l]) == 0) - { - $temp[$l] = '0'; - } - else - { - $unit_found = false; - for ($m = 0, $size_4 = count($units); $m < $size_4; $m++) - { - if (strpos(strtolower($temp[$l]),$units[$m]) !== false) - { - $temp[$l] = floatval($temp[$l]).$units[$m]; - $unit_found = true; - break; - } - } - if (!$unit_found && in_array($this->property,$unit_values,true)) - { - $temp[$l] = floatval($temp[$l]).'px'; - } - else if (!$unit_found) - { - $temp[$l] = floatval($temp[$l]); - } - // Remove leading zero - if (abs(floatval($temp[$l])) < 1) { - if (floatval($temp[$l]) < 0) { - $temp[$l] = '-' . substr($temp[$l], 2); - } else { - $temp[$l] = substr($temp[$l], 1); - } - } - } + + if (abs($number[0]) > 0) { + if ($number[1] == '' && in_array($this->property,$unit_values,true)) + { + $number[1] = 'px'; + } + } else { + $number[1] = ''; + } + + $temp[$l] = $number[0] . $number[1]; } return ((count($temp) > 1) ? $temp[0].'/'.$temp[1] : $temp[0]); } + + /** + * Checks if a given string is a CSS valid number. If it is, + * an array containing the value and unit is returned + * @param string $string + * @return array ('unit' if unit is found or '' if no unit exists, number value) or false if no number + */ + function AnalyseCssNumber($string) + { + // most simple checks first + if (strlen($string) == 0 || ctype_alpha($string{0})) { + return false; + } + + $units =& $GLOBALS['csstidy']['units']; + $return = array(0, ''); + + $return[0] = floatval($string); + if (abs($return[0]) > 0 && abs($return[0]) < 1) { + if ($return[0] < 0) { + $return[0] = '-' . ltrim(substr($return[0], 1), '0'); + } else { + $return[0] = ltrim($return[0], '0'); + } + } + + // Look for unit and split from value if exists + foreach ($units as $unit) + { + $expectUnitAt = strlen($string) - strlen($unit); + $actualPosition = strpos($string, stristr( $string, $unit )); + if ($expectUnitAt === $actualPosition) + { + $return[1] = $unit; + $string = substr($string, 0, - strlen($unit)); + break; + } + } + if (!is_numeric($string)) { + return false; + } + return $return; + } /** * Merges selectors with same properties. Example: a{color:red} b{color:red} -> a,b{color:red} Added: trunk/testing/unit-tests/csst/values/important.csst =================================================================== --- trunk/testing/unit-tests/csst/values/important.csst (rev 0) +++ trunk/testing/unit-tests/csst/values/important.csst 2008-01-06 16:02:41 UTC (rev 101) @@ -0,0 +1,19 @@ +--TEST-- +Tests !important +--CSS-- +a { + color:red !important; + size:2 ! important; + foo:2! important; + bar:2!important; +} +--EXPECT-- +array ( + 'a' => + array ( + 'color' => 'red!important', + 'size' => '2!important', + 'foo' => '2!important', + 'bar' => '2!important', + ), +) Modified: trunk/testing/unit-tests/csst/values/number-leadingzero.csst =================================================================== --- trunk/testing/unit-tests/csst/values/number-leadingzero.csst 2008-01-06 13:14:13 UTC (rev 100) +++ trunk/testing/unit-tests/csst/values/number-leadingzero.csst 2008-01-06 16:02:41 UTC (rev 101) @@ -1,11 +1,14 @@ --TEST-- Tests numeric values: Leading zeros --CSS-- -a { font-size:0001em } +a { font-size:0001em; foo:00.1em; line-height:00.1; bar:-00.1;} --EXPECT-- array ( 'a' => array ( 'font-size' => '1em', + 'foo' => '.1em', + 'line-height' => '.1', + 'bar' => '-.1', ), ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fl...@us...> - 2008-01-06 13:14:15
|
Revision: 100 http://csstidy.svn.sourceforge.net/csstidy/?rev=100&view=rev Author: floele Date: 2008-01-06 05:14:13 -0800 (Sun, 06 Jan 2008) Log Message: ----------- Added color test Added Paths: ----------- trunk/testing/unit-tests/csst/values/colors.csst Added: trunk/testing/unit-tests/csst/values/colors.csst =================================================================== --- trunk/testing/unit-tests/csst/values/colors.csst (rev 0) +++ trunk/testing/unit-tests/csst/values/colors.csst 2008-01-06 13:14:13 UTC (rev 100) @@ -0,0 +1,23 @@ +--TEST-- +Test color optimisation +--CSS-- +a { + foo:rgb(0,0,0); + bar:black; + baz:#ffaabb; + qux:#f00; + quux:blanchedalmond; + quuux:rgb(0,0,1); +} +--EXPECT-- +array ( + 'a' => + array ( + 'foo' => '#000', + 'bar' => '#000', + 'baz' => '#fab', + 'qux' => 'red', + 'quux' => '#ffebcd', + 'quuux' => '#000001', + ), +) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fl...@us...> - 2008-01-06 12:53:28
|
Revision: 99 http://csstidy.svn.sourceforge.net/csstidy/?rev=99&view=rev Author: floele Date: 2008-01-06 04:51:43 -0800 (Sun, 06 Jan 2008) Log Message: ----------- Unit test cleanup and more unit tests + bug fix for number optimisation Modified Paths: -------------- trunk/NEWS trunk/class.csstidy_optimise.php Added Paths: ----------- trunk/testing/unit-tests/csst/values/ trunk/testing/unit-tests/csst/values/number-float.csst trunk/testing/unit-tests/csst/values/number-leadingzero.csst trunk/testing/unit-tests/csst/values/number-missingunit.csst trunk/testing/unit-tests/csst/values/number-missingzero.csst trunk/testing/unit-tests/csst/values/number-signed.csst trunk/testing/unit-tests/csst/values/number-trailingzero.csst trunk/testing/unit-tests/csst/values/number-zero.csst Removed Paths: ------------- trunk/testing/auto-testing.php trunk/testing/base.css trunk/testing/css_results.php trunk/testing/fisubsilver.css Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2008-01-06 05:27:08 UTC (rev 98) +++ trunk/NEWS 2008-01-06 12:51:43 UTC (rev 99) @@ -20,3 +20,4 @@ - Fixed bug with non-functioning getenv in ASAPI - Fixed bug with bad hexadecimal syntax recovery - At-selectors optimized by removing unnecessary url() +- Fixed optimisation: 1.0 was not optimised to 1 Modified: trunk/class.csstidy_optimise.php =================================================================== --- trunk/class.csstidy_optimise.php 2008-01-06 05:27:08 UTC (rev 98) +++ trunk/class.csstidy_optimise.php 2008-01-06 12:51:43 UTC (rev 99) @@ -197,7 +197,7 @@ } $temp = $this->compress_numbers($this->sub_value); - if($temp != $this->sub_value) + if(strcasecmp($temp, $this->sub_value) !== 0) { if(strlen($temp) > strlen($this->sub_value)) { $this->parser->log('Fixed invalid number: Changed "'.$this->sub_value.'" to "'.$temp.'"','Warning'); Deleted: trunk/testing/auto-testing.php =================================================================== --- trunk/testing/auto-testing.php 2008-01-06 05:27:08 UTC (rev 98) +++ trunk/testing/auto-testing.php 2008-01-06 12:51:43 UTC (rev 99) @@ -1,53 +0,0 @@ -<?php -require('css_results.php'); -require('../class.csstidy.php'); -ini_set('display_errors','On'); - -$css = new csstidy(); - -$css->set_cfg('preserve_css',false); -$css_code = file_get_contents('fisubsilver.css'); - -$css->parse($css_code); - -if($css->css === $xhtml_result) { - echo '<div style="color:green">XHTML OK!</div>'; -} else { - echo '<div style="color:red">XHTML failed!</div>'; -} -flush(); - -$css_code = file_get_contents('base.css'); - -$css->parse($css_code); - -if($css->css === $ala_result) { - echo '<div style="color:green">ALA OK!</div>'; -} else { - echo '<div style="color:red">ALA failed!</div>'; -} -flush(); - -$css->set_cfg('remove_last_;',true); - -if($css->print->formatted() === $ala_html) { - echo '<div style="color:green">ALA HTML OK!</div>'; -} else { - echo '<div style="color:red">ALA HTML failed!</div>'; -} -flush(); - -$css->set_cfg('optimise_shorthands',false); -$css->set_cfg('merge_selectors',1); - -$css->parse($css_code); - -if($css->css === $ala_options_result) { - echo '<div style="color:green">ALA +options OK!</div>'; -} else { - echo '<div style="color:red">ALA +options failed!</div>'; -} -flush(); - - -?> \ No newline at end of file Deleted: trunk/testing/base.css =================================================================== --- trunk/testing/base.css 2008-01-06 05:27:08 UTC (rev 98) +++ trunk/testing/base.css 2008-01-06 12:51:43 UTC (rev 99) @@ -1,161 +0,0 @@ -* {margin: 0; padding: 0;} -body {font: 0.8125em Verdana, sans-serif; line-height: 1; color: #333; background: #FFF;} - -a {text-decoration: none;} -a img {border: none;} -a:link, a:visited {color: #555; border-bottom: 1px solid #555;} -html body a:hover {color: #000; background-color: #F4F2E4; - border-bottom: 1px solid #9A8E51;} -#masthead a, #ish a, #navbar a, #banners a, a.button, #main h1 a, .title a:link, .title a:visited, .byline a:link, .byline a:visited {border-bottom-width: 0;} -#main h1 a:hover, .title a:hover, .byline a:hover {border-bottom-width: 1px;} - -h2 {font: 1.5em Georgia, "Times New Roman", serif; letter-spacing: 1px;} -h3 {font: bold 1em Verdana, Arial, sans-serif; letter-spacing: 2px; - text-transform: uppercase;} -h4 {font: bold 1.1em Georgia, "Times New Roman", serif; letter-spacing: 1px;} - -ul, ol {list-style: none;} -blockquote, pre {padding: 0.25em 40px;} -blockquote {font: italic 1.05em Georgia, Times, serif; - background: url(/pix/quote_wh.gif) 10px 0.75em no-repeat; - margin: 0.25em 0;} -pre, code {font: 1.05em Courier, monospace;} -pre {line-height: 1.5em;} -pre strong {font-size: 1em; font-weight: bold;} - -pre code {font-size: 1em; line-height: 1.5em;} /* handle legacy articles until markup gets a scrubbing */ - -table {border-bottom: 3px solid #B2B2B2; margin: 0 0 2em;} -caption {padding: 0.75em; font: 1.5em Georgia, Times, serif; - border: 1px solid #B2B2B2; border-width: 1px 0 2px; - background: #EEE;} -th, td {padding: 0.5em 1em; - border: 1px solid #CCC; - border-width: 0 0 1px 1px;} -th.first, td.first, tbody th {border-left: none;} -thead th {text-transform: uppercase; text-align: left;} -tbody th {width: 20%;} -tfoot {display: none;} - -#masthead {position: absolute; z-index: 5; top: 0; left: 22px;} -#masthead a {display: block; background: #81817C; width: 156px;} -#masthead a:hover {background: #000;} -#ish {position: relative; z-index: 10; border-top: 1px solid #666; - font: bold 10px Arial, sans-serif; letter-spacing: 1px;} -#ish a:link, #ish a:visited {position: absolute; top: -33px; left: 150px; - width: 65px; height: 52px; padding-top: 13px; text-align: center; - background: url(/pix/ishbug.gif) top left no-repeat; - color: #FFF;} -#ish a:hover {background-position: bottom right;} -#ish a em {display: block; margin-top: -0.2em; - font: 2.33em Georgia, Times, serif; letter-spacing: 0;} - -#content .ishinfo {font: 0.9em Verdana, sans-serif; - text-transform: uppercase; letter-spacing: 0.33em;} -#content .ishinfo b {font: 1.2em Georgia, Times, serif; letter-spacing: 1px;} - -#navbar {height: 2.4em; - padding: 0 0 0 215px; - background: #FBFAF4; - border-top: 5px solid #333; - font: 18px Georgia, Times, serif; overflow: hidden; - min-width: 750px;} -#navbar li {float: left; padding: 0 23px 0 13px; margin-right: 5px; - background: url(/pix/diamond-black.gif) 100% 66% no-repeat;} -#navbar li a {display: block; padding: 0.75em 0 0.25em; - text-transform: uppercase; color: #000;} -#navbar #feed {background: none;} -#navbar a:hover, - .articles #navbar #articles a, - .topics #navbar #topics a, - .about #navbar #about a, - .contact #navbar #contact a, - .contribute #navbar #contribute a, - .feed #navbar #feed a { - background: url(/pix/navbarlinkbg.gif) top left repeat-x; color: #555; -} - -#main {float: left; font-size: 0.88em; - width: 750px; padding: 1.5em 0 1.5em 210px; - background: url(/pix/threecolbg.gif) 794px 0 repeat-y;} -#main p {text-align: left; line-height: 1.8em; - margin: 0 0 1em;} - -.column {float: left;} - -#content {width: 540px; padding: 0 25px 0 20px;} -#content .title {font: 1.8em Georgia, Times, serif; margin-bottom: 0.5em;} -.title {text-transform: none; letter-spacing: 1px;} -.title a:link, .title a:visited {color: #333;} -.title a:hover {color: #000;} -.byline {font: italic 1.1em Times, serif; letter-spacing: 1px; margin: 0 0 1.5em;} -.byline a:link, .byline a:visited {font: bold 0.85em Verdana, sans-serif; - text-transform: uppercase; letter-spacing: 2px; - margin-left: 0.25em;} - -#secondary {width: 215px;} -#secondary .title {margin-bottom: 0.25em;} - -#choice {border-top: 1px solid #D9D9D9; - padding: 1.5em 20px;} -#choice h3 {color: #333; font: 0.9em Verdana, sans-serif; - text-transform: uppercase; letter-spacing: 0.33em;} -#choice .info {font-style: italic; font-size: 0.9em; - color: #666;} - -#sidebar {width: 140px; padding-left: 15px;} -#sidebar h3 {font: 1.5em Georgia, Times, serif; letter-spacing: 0; text-transform: none; - margin-bottom: 0.25em; color: #333;} - -#search {width: 80px;} -#search, #submit {vertical-align: bottom;} - -#sidebar div {border-bottom: 1px dashed #B2B2B2; padding: 10px 0.5em;} -#sidebar div.first {padding-top: 0;} -#sidebar li {padding: 0.5em 0 0.5em;} -#sidebar li a:link, #sidebar li a:visited {padding-left: 12px; - background: url(/pix/diamond-gray.gif) 0 0.4em no-repeat;} -#sidebar p {font-size: 0.85em; margin-top: 0.25em;} - -#lucre, #lucre p {margin: 0.5em 0 0;} -#lucre p {text-align: center;} -#lucre p.ads {text-align: left; line-height: 1.5;} -#lucre p a:link, #lucre p a:visited {color: #666;} -#lucre p a:hover {color: #000; border-bottom-width: 1px;} - -#sidebar #colophon {border-bottom-width: 0;} -#colophon p {text-transform: uppercase; letter-spacing: 0.25em; text-align: right; - width: 121px; margin: 0 auto; color: #666;} -#colophon img {background: #333;} -#colophon a:hover img {background: #555;} - -#topiclist a, #lucre a, #colophon a {border-bottom-width: 0;} - -#footer {clear: both; border: 1px solid #666; border-width: 1px 0; - margin-bottom: 3em; font-size: 0.85em; - background: #FBFAF4 url(/pix/pixelstoprose.gif) 20px 50% no-repeat;} -#footer p {margin-left: 200px; padding: 1em 20px; border-left: 1px solid #666; - background: #FFF;} -#footer a:link, #footer a:visited {border-bottom-width: 0;} -#footer a:hover {border-bottom-width: 1px;} - -.issn {font: 0.9em Verdana, sans-serif; text-transform: uppercase; letter-spacing: 0.33em;} -.issn b {font: 1.2em Georgia, Times, serif; letter-spacing: 1px;} - -#footer .copyright {padding-left: 25px; background: url(/pix/diamond-gray.gif) 10px 50% no-repeat;} - -#search, input[type="text"], input[type="password"], textarea { background: #FBFAF4; - border: 2px solid; border-color: #999 #D9D9D9 #D9D9D9 #999;} - -/* IE5.x/Win hacks */ - -#main {width: 960px; voice-family: "\"}\""; voice-family: inherit; width: 750px;} -#content {width: 585px; voice-family: "\"}\""; voice-family: inherit; width: 540px;} -#sidebar {width: 155px; voice-family: "\"}\""; voice-family: inherit; width: 140px;} -#ish a:link, #ish a:visited {height: 65px; voice-family: "\"}\""; voice-family: inherit; height: 52px;} - -/* IE5/Mac hacks */ -/*\*//*/ -#navbar {padding-top: 0.75em; height: 1.66em;} -#navbar li a {display: inline;} -/**/ Deleted: trunk/testing/css_results.php =================================================================== --- trunk/testing/css_results.php 2008-01-06 05:27:08 UTC (rev 98) +++ trunk/testing/css_results.php 2008-01-06 12:51:43 UTC (rev 99) @@ -1,993 +0,0 @@ -<?php -$xhtml_result = array ( 41 => array ( '.float-l' => array ( 'float' => 'left', ), '.form-suggest' => array ( 'height' => '200px', 'background' => '#DEE2D0', 'vertical-align' => 'top', ), '.hide' => array ( 'display' => 'none', ), '.form-input textarea' => array ( 'font-size' => '11px', 'width' => '350px', ), '.form-label' => array ( 'font-size' => '10px', 'font-weight' => '700', 'line-height' => '25px', 'padding-right' => '10px', 'text-align' => 'right', 'width' => '100px', 'color' => '#39738F', ), '.font-9' => array ( 'font-size' => '9px', ), '.form-topic' => array ( 'font-weight' => '700', ), '.form-error' => array ( 'color' => 'red', ), '.space-10' => array ( 'clear' => 'both', 'font-size' => '10px', 'height' => '10px', 'line-height' => '10px', ), '.suggest-success' => array ( 'color' => 'green', 'padding-left' => '10px', 'font-size' => '11px', 'font-weight' => '700', ), '.top' => array ( 'vertical-align' => 'top', ), 'table td' => array ( 'padding' => '3px', ), 'a:link,a:active,a:visited,a.postlink' => array ( 'color' => '#069', 'text-decoration' => 'none', ), 'a.but,a.but:hover,a.but:visited' => array ( 'color' => '#000', 'text-decoration' => 'none', ), 'a.topictitle:visited' => array ( 'color' => '#5493B4', ), 'body' => array ( 'color' => '#000', 'font' => '11px Verdana,Arial,Helvetica,sans-serif', 'overflow' => 'auto', 'margin' => '0 10px 10px', 'padding' => '0', ), 'font,th,td,p' => array ( 'font' => '12px Verdana,Arial,Helvetica,sans-serif', ), 'hr' => array ( 'border' => '0 solid #FFF', 'border-top-width' => '1px', 'height' => '0', ), 'img' => array ( 'border' => '0 solid', ), 'input' => array ( 'font' => '11px Verdana,Arial,Helvetica,sans-serif', ), 'input.button,input.liteoption,.fakebut' => array ( 'background' => '#FAFAFA', 'border' => '1px solid #000', 'font-size' => '11px', ), 'input.catbutton' => array ( 'background' => '#FAFAFA', 'border' => '1px solid #000', 'font-size' => '10px', ), 'input.mainoption' => array ( 'background' => '#FAFAFA', 'border' => '1px solid #000', 'font-size' => '11px', 'font-weight' => '700', ), 'input.post,textarea.post' => array ( 'background' => '#FFF', 'border' => '1px solid #000', 'font' => '11px Verdana,Arial,Helvetica,sans-serif', 'padding-bottom' => '2px', 'padding-left' => '2px', ), 'select' => array ( 'background' => '#FFF', 'font' => '11px Verdana,Arial,Helvetica,sans-serif', ), 'td' => array ( 'vertical-align' => 'middle', ), 'td.cat' => array ( 'background-color' => '#C2C6BA', 'font-weight' => '700', 'height' => '20px', 'letter-spacing' => '1px', 'text-indent' => '4px', ), 'td.genmed,.genmed' => array ( 'font-size' => '11px', ), 'td.rowpic' => array ( 'background' => '#C2C6BA', ), 'th' => array ( 'background-color' => '#FADD31', 'background-image' => 'url(images/cellpic3.gif)', 'background-repeat' => 'repeat-x', 'color' => '#68685E', 'font-size' => '11px', 'font-weight' => '700', 'line-height' => '16px', 'height' => '16px', 'padding-left' => '8px', 'padding-right' => '8px', 'text-align' => 'center', 'white-space' => 'nowrap', ), '.admin,a.admin,a.admin:visited' => array ( 'color' => '#FFA34F', ), '.bodyline' => array ( 'background' => '#FFF', 'border' => '1px solid #98AAB1', ), '.center' => array ( 'text-align' => 'center', ), '.code' => array ( 'background' => '#FAFAFA', 'border' => '1px solid #D1D7DC', 'color' => '#060', 'font' => '12px Courier,"Courier New",sans-serif', 'padding' => '5px', ), '.errorline' => array ( 'background' => '#E5E6E2', 'border' => '1px solid #8F8B8B', 'color' => '#D92A2A', ), '.explaintitle' => array ( 'color' => '#5C81B1', 'font-size' => '11px', 'font-weight' => '700', ), '.forumline' => array ( 'background' => '#FFF', ), '.h1-font' => array ( 'color' => '#069', 'display' => 'inline', 'font' => 'bold 13px Verdana, Arial, Helvetica, sans-serif', 'text-decoration' => 'none', 'margin' => '0', ), '.h2-font' => array ( 'display' => 'inline', 'font-family' => 'Verdana, Arial, Helvetica, sans-serif', 'font-size' => '11px', ), '.height1' => array ( 'height' => '1px', ), '.height22' => array ( 'height' => '22px', ), '.height25' => array ( 'height' => '25px', ), '.height28' => array ( 'height' => '28px', ), '.height30' => array ( 'height' => '30px', ), '.height40' => array ( 'height' => '40px', ), '.helpline' => array ( 'border' => '0 solid', 'font-size' => '10px', ), '.imgfolder' => array ( 'margin' => '1px 4px', ), '.imgspace' => array ( 'margin-left' => '1px', 'margin-right' => '2px', ), '.imgtopic,.imgicon' => array ( 'margin-left' => '3px', ), '.maintitle,h1,h2' => array ( 'color' => '#5C81B1', 'font' => 'bold 20px/120% "Trebuchet MS",Verdana,Arial,Helvetica,sans-serif', 'text-decoration' => 'none', ), '.maxwidth' => array ( 'width' => '100%', ), '.mod,a.mod,a.mod:visited' => array ( 'color' => '#060', ), '.nowrap' => array ( 'white-space' => 'nowrap', ), '.postbody' => array ( 'font-size' => '12px', 'line-height' => '125%', ), '.postdetails' => array ( 'color' => '#00396A', 'font-size' => '10px', ), '.quote' => array ( 'background' => '#F3F3EF', 'border' => '1px solid #C2C6BA', 'color' => '#069', 'font-size' => '11px', 'line-height' => '125%', ), '.right' => array ( 'text-align' => 'right', ), '.row1' => array ( 'background' => '#F0F0EB', ), '.row3' => array ( 'background' => '#DBDBD4', ), '.subtitle,h2' => array ( 'font' => 'bold 18px/180% "Trebuchet MS",Verdana,Arial,Helvetica,sans-serif', 'text-decoration' => 'none', ), '.topictitle' => array ( 'color' => '#000', 'font-size' => '11px', 'font-weight' => '700', ), '.image-hspace' => array ( 'margin-right' => '3px', ), '.clear' => array ( 'clear' => 'both', ), '.form-input input,.gensmall' => array ( 'font-size' => '10px', ), '.inline,form' => array ( 'display' => 'inline', ), 'a:hover,a.admin:hover,a.mod:hover,a.topictitle:hover' => array ( 'color' => '#DD6900', ), 'table,.left' => array ( 'text-align' => 'left', ), 'td.spacerow,.row2,.helpline' => array ( 'background' => '#E5E6E2', ), '.admin,.mod,.name,.nav' => array ( 'font-size' => '11px', 'font-weight' => '700', ), '.postbody a,.underline' => array ( 'text-decoration' => 'underline', ), ), ); - -$ala_result = array ( 41 => array ( '*' => array ( 'margin' => '0', 'padding' => '0', ), 'body' => array ( 'font' => '0.8125em Verdana, sans-serif', 'line-height' => '1', 'color' => '#333', 'background' => '#FFF', ), 'a' => array ( 'text-decoration' => 'none', ), 'a img' => array ( 'border' => 'none', ), 'a:link,a:visited' => array ( 'color' => '#555', 'border-bottom' => '1px solid #555', ), 'html body a:hover' => array ( 'color' => '#000', 'background-color' => '#F4F2E4', 'border-bottom' => '1px solid #9A8E51', ), 'h2' => array ( 'font' => '1.5em Georgia, "Times New Roman", serif', 'letter-spacing' => '1px', ), 'h3' => array ( 'font' => 'bold 1em Verdana, Arial, sans-serif', 'letter-spacing' => '2px', 'text-transform' => 'uppercase', ), 'h4' => array ( 'font' => 'bold 1.1em Georgia, "Times New Roman", serif', 'letter-spacing' => '1px', ), 'ul,ol' => array ( 'list-style' => 'none', ), 'blockquote,pre' => array ( 'padding' => '0.25em 40px', ), 'blockquote' => array ( 'font' => 'italic 1.05em Georgia, Times, serif', 'background' => 'url(/pix/quote_wh.gif) 10px 0.75em no-repeat', 'margin' => '0.25em 0', ), 'pre,code' => array ( 'font' => '1.05em Courier, monospace', ), 'pre' => array ( 'line-height' => '1.5em', ), 'pre strong' => array ( 'font-size' => '1em', 'font-weight' => '700', ), 'pre code' => array ( 'font-size' => '1em', 'line-height' => '1.5em', ), 'table' => array ( 'border-bottom' => '3px solid #B2B2B2', 'margin' => '0 0 2em', ), 'caption' => array ( 'font' => '1.5em Georgia, Times, serif', 'border' => '1px solid #B2B2B2', 'background' => '#EEE', 'border-width' => '1px 0 2px', 'padding' => '0.75em', ), 'th,td' => array ( 'border' => '1px solid #CCC', 'border-width' => '0 0 1px 1px', 'padding' => '0.5em 1em', ), 'th.first,td.first,tbody th' => array ( 'border-left' => 'none', ), 'thead th' => array ( 'text-transform' => 'uppercase', 'text-align' => 'left', ), 'tbody th' => array ( 'width' => '20%', ), 'tfoot' => array ( 'display' => 'none', ), '#masthead' => array ( 'position' => 'absolute', 'z-index' => '5', 'top' => '0', 'left' => '22px', ), '#masthead a' => array ( 'display' => 'block', 'background' => '#81817C', 'width' => '156px', ), '#masthead a:hover' => array ( 'background' => '#000', ), '#ish' => array ( 'position' => 'relative', 'z-index' => '10', 'border-top' => '1px solid #666', 'font' => 'bold 10px Arial, sans-serif', 'letter-spacing' => '1px', ), '#ish a:link,#ish a:visited' => array ( 'position' => 'absolute', 'top' => '-33px', 'left' => '150px', 'width' => '65px', 'padding-top' => '13px', 'text-align' => 'center', 'background' => 'url(/pix/ishbug.gif) top left no-repeat', 'color' => '#FFF', 'voice-family' => 'inherit', 'height' => '52px', ), '#ish a:hover' => array ( 'background-position' => 'bottom right', ), '#ish a em' => array ( 'display' => 'block', 'margin-top' => '-0.2em', 'font' => '2.33em Georgia, Times, serif', 'letter-spacing' => '0', ), '#navbar' => array ( 'height' => '2.4em', 'background' => '#FBFAF4', 'border-top' => '5px solid #333', 'font' => '18px Georgia, Times, serif', 'overflow' => 'hidden', 'min-width' => '750px', 'padding' => '0 0 0 215px', ), '#navbar li' => array ( 'float' => 'left', 'margin-right' => '5px', 'background' => 'url(/pix/diamond-black.gif) 100% 66% no-repeat', 'padding' => '0 23px 0 13px', ), '#navbar li a' => array ( 'display' => 'block', 'text-transform' => 'uppercase', 'color' => '#000', 'padding' => '0.75em 0 0.25em', ), '#navbar #feed' => array ( 'background' => 'none', ), '#navbar a:hover,.articles #navbar #articles a,.topics #navbar #topics a,.about #navbar #about a,.contact #navbar #contact a,.contribute #navbar #contribute a,.feed #navbar #feed a' => array ( 'background' => 'url(/pix/navbarlinkbg.gif) top left repeat-x', 'color' => '#555', ), '#main' => array ( 'float' => 'left', 'font-size' => '0.88em', 'background' => 'url(/pix/threecolbg.gif) 794px 0 repeat-y', 'voice-family' => 'inherit', 'width' => '750px', 'padding' => '1.5em 0 1.5em 210px', ), '#main p' => array ( 'text-align' => 'left', 'line-height' => '1.8em', 'margin' => '0 0 1em', ), '.column' => array ( 'float' => 'left', ), '#content' => array ( 'voice-family' => 'inherit', 'width' => '540px', 'padding' => '0 25px 0 20px', ), '#content .title' => array ( 'font' => '1.8em Georgia, Times, serif', 'margin-bottom' => '0.5em', ), '.title' => array ( 'text-transform' => 'none', 'letter-spacing' => '1px', ), '.title a:link,.title a:visited' => array ( 'color' => '#333', ), '.title a:hover' => array ( 'color' => '#000', ), '.byline' => array ( 'font' => 'italic 1.1em Times, serif', 'letter-spacing' => '1px', 'margin' => '0 0 1.5em', ), '.byline a:link,.byline a:visited' => array ( 'font' => 'bold 0.85em Verdana, sans-serif', 'text-transform' => 'uppercase', 'letter-spacing' => '2px', 'margin-left' => '0.25em', ), '#secondary' => array ( 'width' => '215px', ), '#secondary .title' => array ( 'margin-bottom' => '0.25em', ), '#choice' => array ( 'border-top' => '1px solid #D9D9D9', 'padding' => '1.5em 20px', ), '#choice h3' => array ( 'color' => '#333', 'font' => '0.9em Verdana, sans-serif', 'text-transform' => 'uppercase', 'letter-spacing' => '0.33em', ), '#choice .info' => array ( 'font-style' => 'italic', 'font-size' => '0.9em', 'color' => '#666', ), '#sidebar' => array ( 'padding-left' => '15px', 'voice-family' => 'inherit', 'width' => '140px', ), '#sidebar h3' => array ( 'font' => '1.5em Georgia, Times, serif', 'letter-spacing' => '0', 'text-transform' => 'none', 'margin-bottom' => '0.25em', 'color' => '#333', ), '#search' => array ( 'width' => '80px', ), '#search,#submit' => array ( 'vertical-align' => 'bottom', ), '#sidebar div' => array ( 'border-bottom' => '1px dashed #B2B2B2', 'padding' => '10px 0.5em', ), '#sidebar div.first' => array ( 'padding-top' => '0', ), '#sidebar li' => array ( 'padding' => '0.5em 0', ), '#sidebar li a:link,#sidebar li a:visited' => array ( 'padding-left' => '12px', 'background' => 'url(/pix/diamond-gray.gif) 0 0.4em no-repeat', ), '#sidebar p' => array ( 'font-size' => '0.85em', 'margin-top' => '0.25em', ), '#lucre,#lucre p' => array ( 'margin' => '0.5em 0 0', ), '#lucre p' => array ( 'text-align' => 'center', ), '#lucre p.ads' => array ( 'text-align' => 'left', 'line-height' => '1.5', ), '#lucre p a:link,#lucre p a:visited' => array ( 'color' => '#666', ), '#lucre p a:hover' => array ( 'color' => '#000', 'border-bottom-width' => '1px', ), '#colophon p' => array ( 'text-transform' => 'uppercase', 'letter-spacing' => '0.25em', 'text-align' => 'right', 'width' => '121px', 'color' => '#666', 'margin' => '0 auto', ), '#colophon img' => array ( 'background' => '#333', ), '#colophon a:hover img' => array ( 'background' => '#555', ), '#footer' => array ( 'clear' => 'both', 'border' => '1px solid #666', 'margin-bottom' => '3em', 'font-size' => '0.85em', 'background' => '#FBFAF4 url(/pix/pixelstoprose.gif) 20px 50% no-repeat', 'border-width' => '1px 0', ), '#footer p' => array ( 'margin-left' => '200px', 'border-left' => '1px solid #666', 'background' => '#FFF', 'padding' => '1em 20px', ), '#footer .copyright' => array ( 'padding-left' => '25px', 'background' => 'url(/pix/diamond-gray.gif) 10px 50% no-repeat', ), '#search,input[type="text"],input[type="password"],textarea' => array ( 'background' => '#FBFAF4', 'border' => '2px solid', 'border-color' => '#999 #D9D9D9 #D9D9D9 #999', ), '#masthead a,#ish a,#navbar a,#banners a,a.button,#main h1 a,.title a:link,.title a:visited,.byline a:link,.byline a:visited,#sidebar #colophon,#topiclist a,#lucre a,#colophon a,#footer a:link,#footer a:visited' => array ( 'border-bottom-width' => '0', ), '#main h1 a:hover,.title a:hover,.byline a:hover,#footer a:hover' => array ( 'border-bottom-width' => '1px', ), '#content .ishinfo,.issn' => array ( 'font' => '0.9em Verdana, sans-serif', 'text-transform' => 'uppercase', 'letter-spacing' => '0.33em', ), '#content .ishinfo b,.issn b' => array ( 'font' => '1.2em Georgia, Times, serif', 'letter-spacing' => '1px', ), ), ); - -$ala_options_result = array ( - 41 => - array ( - '*' => - array ( - 'margin' => '0', - 'padding' => '0', - ), - 'body' => - array ( - 'font' => '0.8125em Verdana, sans-serif', - 'line-height' => '1', - 'color' => '#333', - 'background' => '#FFF', - ), - 'a' => - array ( - 'text-decoration' => 'none', - ), - 'a img' => - array ( - 'border' => 'none', - ), - 'a:link' => - array ( - 'color' => '#555', - 'border-bottom' => '1px solid #555', - ), - 'a:visited' => - array ( - 'color' => '#555', - 'border-bottom' => '1px solid #555', - ), - 'html body a:hover' => - array ( - 'color' => '#000', - 'background-color' => '#F4F2E4', - 'border-bottom' => '1px solid #9A8E51', - ), - '#masthead a' => - array ( - 'border-bottom-width' => '0', - 'display' => 'block', - 'background' => '#81817C', - 'width' => '156px', - ), - '#ish a' => - array ( - 'border-bottom-width' => '0', - ), - '#navbar a' => - array ( - 'border-bottom-width' => '0', - ), - '#banners a' => - array ( - 'border-bottom-width' => '0', - ), - 'a.button' => - array ( - 'border-bottom-width' => '0', - ), - '#main h1 a' => - array ( - 'border-bottom-width' => '0', - ), - '.title a:link' => - array ( - 'border-bottom-width' => '0', - 'color' => '#333', - ), - '.title a:visited' => - array ( - 'border-bottom-width' => '0', - 'color' => '#333', - ), - '.byline a:link' => - array ( - 'border-bottom-width' => '0', - 'font' => 'bold 0.85em Verdana, sans-serif', - 'text-transform' => 'uppercase', - 'letter-spacing' => '2px', - 'margin-left' => '0.25em', - ), - '.byline a:visited' => - array ( - 'border-bottom-width' => '0', - 'font' => 'bold 0.85em Verdana, sans-serif', - 'text-transform' => 'uppercase', - 'letter-spacing' => '2px', - 'margin-left' => '0.25em', - ), - '#main h1 a:hover' => - array ( - 'border-bottom-width' => '1px', - ), - '.title a:hover' => - array ( - 'border-bottom-width' => '1px', - 'color' => '#000', - ), - '.byline a:hover' => - array ( - 'border-bottom-width' => '1px', - ), - 'h2' => - array ( - 'font' => '1.5em Georgia, "Times New Roman", serif', - 'letter-spacing' => '1px', - ), - 'h3' => - array ( - 'font' => 'bold 1em Verdana, Arial, sans-serif', - 'letter-spacing' => '2px', - 'text-transform' => 'uppercase', - ), - 'h4' => - array ( - 'font' => 'bold 1.1em Georgia, "Times New Roman", serif', - 'letter-spacing' => '1px', - ), - 'ul' => - array ( - 'list-style' => 'none', - ), - 'ol' => - array ( - 'list-style' => 'none', - ), - 'blockquote' => - array ( - 'padding' => '0.25em 40px', - 'font' => 'italic 1.05em Georgia, Times, serif', - 'background' => 'url(/pix/quote_wh.gif) 10px 0.75em no-repeat', - 'margin' => '0.25em 0', - ), - 'pre' => - array ( - 'padding' => '0.25em 40px', - 'font' => '1.05em Courier, monospace', - 'line-height' => '1.5em', - ), - 'code' => - array ( - 'font' => '1.05em Courier, monospace', - ), - 'pre strong' => - array ( - 'font-size' => '1em', - 'font-weight' => '700', - ), - 'pre code' => - array ( - 'font-size' => '1em', - 'line-height' => '1.5em', - ), - 'table' => - array ( - 'border-bottom' => '3px solid #B2B2B2', - 'margin' => '0 0 2em', - ), - 'caption' => - array ( - 'padding' => '0.75em', - 'font' => '1.5em Georgia, Times, serif', - 'border' => '1px solid #B2B2B2', - 'border-width' => '1px 0 2px', - 'background' => '#EEE', - ), - 'th' => - array ( - 'padding' => '0.5em 1em', - 'border' => '1px solid #CCC', - 'border-width' => '0 0 1px 1px', - ), - 'td' => - array ( - 'padding' => '0.5em 1em', - 'border' => '1px solid #CCC', - 'border-width' => '0 0 1px 1px', - ), - 'th.first' => - array ( - 'border-left' => 'none', - ), - 'td.first' => - array ( - 'border-left' => 'none', - ), - 'tbody th' => - array ( - 'border-left' => 'none', - 'width' => '20%', - ), - 'thead th' => - array ( - 'text-transform' => 'uppercase', - 'text-align' => 'left', - ), - 'tfoot' => - array ( - 'display' => 'none', - ), - '#masthead' => - array ( - 'position' => 'absolute', - 'z-index' => '5', - 'top' => '0', - 'left' => '22px', - ), - '#masthead a:hover' => - array ( - 'background' => '#000', - ), - '#ish' => - array ( - 'position' => 'relative', - 'z-index' => '10', - 'border-top' => '1px solid #666', - 'font' => 'bold 10px Arial, sans-serif', - 'letter-spacing' => '1px', - ), - '#ish a:link' => - array ( - 'position' => 'absolute', - 'top' => '-33px', - 'left' => '150px', - 'width' => '65px', - 'padding-top' => '13px', - 'text-align' => 'center', - 'background' => 'url(/pix/ishbug.gif) top left no-repeat', - 'color' => '#FFF', - 'voice-family' => 'inherit', - 'height' => '52px', - ), - '#ish a:visited' => - array ( - 'position' => 'absolute', - 'top' => '-33px', - 'left' => '150px', - 'width' => '65px', - 'padding-top' => '13px', - 'text-align' => 'center', - 'background' => 'url(/pix/ishbug.gif) top left no-repeat', - 'color' => '#FFF', - 'voice-family' => 'inherit', - 'height' => '52px', - ), - '#ish a:hover' => - array ( - 'background-position' => 'bottom right', - ), - '#ish a em' => - array ( - 'display' => 'block', - 'margin-top' => '-0.2em', - 'font' => '2.33em Georgia, Times, serif', - 'letter-spacing' => '0', - ), - '#content .ishinfo' => - array ( - 'font' => '0.9em Verdana, sans-serif', - 'text-transform' => 'uppercase', - 'letter-spacing' => '0.33em', - ), - '#content .ishinfo b' => - array ( - 'font' => '1.2em Georgia, Times, serif', - 'letter-spacing' => '1px', - ), - '#navbar' => - array ( - 'height' => '2.4em', - 'padding' => '0 0 0 215px', - 'background' => '#FBFAF4', - 'border-top' => '5px solid #333', - 'font' => '18px Georgia, Times, serif', - 'overflow' => 'hidden', - 'min-width' => '750px', - ), - '#navbar li' => - array ( - 'float' => 'left', - 'padding' => '0 23px 0 13px', - 'margin-right' => '5px', - 'background' => 'url(/pix/diamond-black.gif) 100% 66% no-repeat', - ), - '#navbar li a' => - array ( - 'display' => 'block', - 'padding' => '0.75em 0 0.25em', - 'text-transform' => 'uppercase', - 'color' => '#000', - ), - '#navbar #feed' => - array ( - 'background' => 'none', - ), - '#navbar a:hover' => - array ( - 'background' => 'url(/pix/navbarlinkbg.gif) top left repeat-x', - 'color' => '#555', - ), - '.articles #navbar #articles a' => - array ( - 'background' => 'url(/pix/navbarlinkbg.gif) top left repeat-x', - 'color' => '#555', - ), - '.topics #navbar #topics a' => - array ( - 'background' => 'url(/pix/navbarlinkbg.gif) top left repeat-x', - 'color' => '#555', - ), - '.about #navbar #about a' => - array ( - 'background' => 'url(/pix/navbarlinkbg.gif) top left repeat-x', - 'color' => '#555', - ), - '.contact #navbar #contact a' => - array ( - 'background' => 'url(/pix/navbarlinkbg.gif) top left repeat-x', - 'color' => '#555', - ), - '.contribute #navbar #contribute a' => - array ( - 'background' => 'url(/pix/navbarlinkbg.gif) top left repeat-x', - 'color' => '#555', - ), - '.feed #navbar #feed a' => - array ( - 'background' => 'url(/pix/navbarlinkbg.gif) top left repeat-x', - 'color' => '#555', - ), - '#main' => - array ( - 'float' => 'left', - 'font-size' => '0.88em', - 'padding' => '1.5em 0 1.5em 210px', - 'background' => 'url(/pix/threecolbg.gif) 794px 0 repeat-y', - 'voice-family' => 'inherit', - 'width' => '750px', - ), - '#main p' => - array ( - 'text-align' => 'left', - 'line-height' => '1.8em', - 'margin' => '0 0 1em', - ), - '.column' => - array ( - 'float' => 'left', - ), - '#content' => - array ( - 'padding' => '0 25px 0 20px', - 'voice-family' => 'inherit', - 'width' => '540px', - ), - '#content .title' => - array ( - 'font' => '1.8em Georgia, Times, serif', - 'margin-bottom' => '0.5em', - ), - '.title' => - array ( - 'text-transform' => 'none', - 'letter-spacing' => '1px', - ), - '.byline' => - array ( - 'font' => 'italic 1.1em Times, serif', - 'letter-spacing' => '1px', - 'margin' => '0 0 1.5em', - ), - '#secondary' => - array ( - 'width' => '215px', - ), - '#secondary .title' => - array ( - 'margin-bottom' => '0.25em', - ), - '#choice' => - array ( - 'border-top' => '1px solid #D9D9D9', - 'padding' => '1.5em 20px', - ), - '#choice h3' => - array ( - 'color' => '#333', - 'font' => '0.9em Verdana, sans-serif', - 'text-transform' => 'uppercase', - 'letter-spacing' => '0.33em', - ), - '#choice .info' => - array ( - 'font-style' => 'italic', - 'font-size' => '0.9em', - 'color' => '#666', - ), - '#sidebar' => - array ( - 'padding-left' => '15px', - 'voice-family' => 'inherit', - 'width' => '140px', - ), - '#sidebar h3' => - array ( - 'font' => '1.5em Georgia, Times, serif', - 'letter-spacing' => '0', - 'text-transform' => 'none', - 'margin-bottom' => '0.25em', - 'color' => '#333', - ), - '#search' => - array ( - 'width' => '80px', - 'vertical-align' => 'bottom', - 'background' => '#FBFAF4', - 'border' => '2px solid', - 'border-color' => '#999 #D9D9D9 #D9D9D9 #999', - ), - '#submit' => - array ( - 'vertical-align' => 'bottom', - ), - '#sidebar div' => - array ( - 'border-bottom' => '1px dashed #B2B2B2', - 'padding' => '10px 0.5em', - ), - '#sidebar div.first' => - array ( - 'padding-top' => '0', - ), - '#sidebar li' => - array ( - 'padding' => '0.5em 0', - ), - '#sidebar li a:link' => - array ( - 'padding-left' => '12px', - 'background' => 'url(/pix/diamond-gray.gif) 0 0.4em no-repeat', - ), - '#sidebar li a:visited' => - array ( - 'padding-left' => '12px', - 'background' => 'url(/pix/diamond-gray.gif) 0 0.4em no-repeat', - ), - '#sidebar p' => - array ( - 'font-size' => '0.85em', - 'margin-top' => '0.25em', - ), - '#lucre' => - array ( - 'margin' => '0.5em 0 0', - ), - '#lucre p' => - array ( - 'margin' => '0.5em 0 0', - 'text-align' => 'center', - ), - '#lucre p.ads' => - array ( - 'text-align' => 'left', - 'line-height' => '1.5', - ), - '#lucre p a:link' => - array ( - 'color' => '#666', - ), - '#lucre p a:visited' => - array ( - 'color' => '#666', - ), - '#lucre p a:hover' => - array ( - 'color' => '#000', - 'border-bottom-width' => '1px', - ), - '#sidebar #colophon' => - array ( - 'border-bottom-width' => '0', - ), - '#colophon p' => - array ( - 'text-transform' => 'uppercase', - 'letter-spacing' => '0.25em', - 'text-align' => 'right', - 'width' => '121px', - 'margin' => '0 auto', - 'color' => '#666', - ), - '#colophon img' => - array ( - 'background' => '#333', - ), - '#colophon a:hover img' => - array ( - 'background' => '#555', - ), - '#topiclist a' => - array ( - 'border-bottom-width' => '0', - ), - '#lucre a' => - array ( - 'border-bottom-width' => '0', - ), - '#colophon a' => - array ( - 'border-bottom-width' => '0', - ), - '#footer' => - array ( - 'clear' => 'both', - 'border' => '1px solid #666', - 'border-width' => '1px 0', - 'margin-bottom' => '3em', - 'font-size' => '0.85em', - 'background' => '#FBFAF4 url(/pix/pixelstoprose.gif) 20px 50% no-repeat', - ), - '#footer p' => - array ( - 'margin-left' => '200px', - 'padding' => '1em 20px', - 'border-left' => '1px solid #666', - 'background' => '#FFF', - ), - '#footer a:link' => - array ( - 'border-bottom-width' => '0', - ), - '#footer a:visited' => - array ( - 'border-bottom-width' => '0', - ), - '#footer a:hover' => - array ( - 'border-bottom-width' => '1px', - ), - '.issn' => - array ( - 'font' => '0.9em Verdana, sans-serif', - 'text-transform' => 'uppercase', - 'letter-spacing' => '0.33em', - ), - '.issn b' => - array ( - 'font' => '1.2em Georgia, Times, serif', - 'letter-spacing' => '1px', - ), - '#footer .copyright' => - array ( - 'padding-left' => '25px', - 'background' => 'url(/pix/diamond-gray.gif) 10px 50% no-repeat', - ), - 'input[type="text"]' => - array ( - 'background' => '#FBFAF4', - 'border' => '2px solid', - 'border-color' => '#999 #D9D9D9 #D9D9D9 #999', - ), - 'input[type="password"]' => - array ( - 'background' => '#FBFAF4', - 'border' => '2px solid', - 'border-color' => '#999 #D9D9D9 #D9D9D9 #999', - ), - 'textarea' => - array ( - 'background' => '#FBFAF4', - 'border' => '2px solid', - 'border-color' => '#999 #D9D9D9 #D9D9D9 #999', - ), - ), -); - -$ala_html = '<span class="selector">*</span> <span class="format">{</span> -<span class="property">margin:</span><span class="value">0</span><span class="format">;</span> -<span class="property">padding:</span><span class="value">0</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">body</span> <span class="format">{</span> -<span class="property">font:</span><span class="value">0.8125em Verdana, sans-serif</span><span class="format">;</span> -<span class="property">line-height:</span><span class="value">1</span><span class="format">;</span> -<span class="property">color:</span><span class="value">#333</span><span class="format">;</span> -<span class="property">background:</span><span class="value">#FFF</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">a</span> <span class="format">{</span> -<span class="property">text-decoration:</span><span class="value">none</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">a img</span> <span class="format">{</span> -<span class="property">border:</span><span class="value">none</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">a:link,a:visited</span> <span class="format">{</span> -<span class="property">color:</span><span class="value">#555</span><span class="format">;</span> -<span class="property">border-bottom:</span><span class="value">1px solid #555</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">html body a:hover</span> <span class="format">{</span> -<span class="property">color:</span><span class="value">#000</span><span class="format">;</span> -<span class="property">background-color:</span><span class="value">#F4F2E4</span><span class="format">;</span> -<span class="property">border-bottom:</span><span class="value">1px solid #9A8E51</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">h2</span> <span class="format">{</span> -<span class="property">font:</span><span class="value">1.5em Georgia, "Times New Roman", serif</span><span class="format">;</span> -<span class="property">letter-spacing:</span><span class="value">1px</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">h3</span> <span class="format">{</span> -<span class="property">font:</span><span class="value">bold 1em Verdana, Arial, sans-serif</span><span class="format">;</span> -<span class="property">letter-spacing:</span><span class="value">2px</span><span class="format">;</span> -<span class="property">text-transform:</span><span class="value">uppercase</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">h4</span> <span class="format">{</span> -<span class="property">font:</span><span class="value">bold 1.1em Georgia, "Times New Roman", serif</span><span class="format">;</span> -<span class="property">letter-spacing:</span><span class="value">1px</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">ul,ol</span> <span class="format">{</span> -<span class="property">list-style:</span><span class="value">none</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">blockquote,pre</span> <span class="format">{</span> -<span class="property">padding:</span><span class="value">0.25em 40px</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">blockquote</span> <span class="format">{</span> -<span class="property">font:</span><span class="value">italic 1.05em Georgia, Times, serif</span><span class="format">;</span> -<span class="property">background:</span><span class="value">url(/pix/quote_wh.gif) 10px 0.75em no-repeat</span><span class="format">;</span> -<span class="property">margin:</span><span class="value">0.25em 0</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">pre,code</span> <span class="format">{</span> -<span class="property">font:</span><span class="value">1.05em Courier, monospace</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">pre</span> <span class="format">{</span> -<span class="property">line-height:</span><span class="value">1.5em</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">pre strong</span> <span class="format">{</span> -<span class="property">font-size:</span><span class="value">1em</span><span class="format">;</span> -<span class="property">font-weight:</span><span class="value">700</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">pre code</span> <span class="format">{</span> -<span class="property">font-size:</span><span class="value">1em</span><span class="format">;</span> -<span class="property">line-height:</span><span class="value">1.5em</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">table</span> <span class="format">{</span> -<span class="property">border-bottom:</span><span class="value">3px solid #B2B2B2</span><span class="format">;</span> -<span class="property">margin:</span><span class="value">0 0 2em</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">caption</span> <span class="format">{</span> -<span class="property">font:</span><span class="value">1.5em Georgia, Times, serif</span><span class="format">;</span> -<span class="property">border:</span><span class="value">1px solid #B2B2B2</span><span class="format">;</span> -<span class="property">background:</span><span class="value">#EEE</span><span class="format">;</span> -<span class="property">border-width:</span><span class="value">1px 0 2px</span><span class="format">;</span> -<span class="property">padding:</span><span class="value">0.75em</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">th,td</span> <span class="format">{</span> -<span class="property">border:</span><span class="value">1px solid #CCC</span><span class="format">;</span> -<span class="property">border-width:</span><span class="value">0 0 1px 1px</span><span class="format">;</span> -<span class="property">padding:</span><span class="value">0.5em 1em</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">th.first,td.first,tbody th</span> <span class="format">{</span> -<span class="property">border-left:</span><span class="value">none</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">thead th</span> <span class="format">{</span> -<span class="property">text-transform:</span><span class="value">uppercase</span><span class="format">;</span> -<span class="property">text-align:</span><span class="value">left</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">tbody th</span> <span class="format">{</span> -<span class="property">width:</span><span class="value">20%</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">tfoot</span> <span class="format">{</span> -<span class="property">display:</span><span class="value">none</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">#masthead</span> <span class="format">{</span> -<span class="property">position:</span><span class="value">absolute</span><span class="format">;</span> -<span class="property">z-index:</span><span class="value">5</span><span class="format">;</span> -<span class="property">top:</span><span class="value">0</span><span class="format">;</span> -<span class="property">left:</span><span class="value">22px</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">#masthead a</span> <span class="format">{</span> -<span class="property">display:</span><span class="value">block</span><span class="format">;</span> -<span class="property">background:</span><span class="value">#81817C</span><span class="format">;</span> -<span class="property">width:</span><span class="value">156px</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">#masthead a:hover</span> <span class="format">{</span> -<span class="property">background:</span><span class="value">#000</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">#ish</span> <span class="format">{</span> -<span class="property">position:</span><span class="value">relative</span><span class="format">;</span> -<span class="property">z-index:</span><span class="value">10</span><span class="format">;</span> -<span class="property">border-top:</span><span class="value">1px solid #666</span><span class="format">;</span> -<span class="property">font:</span><span class="value">bold 10px Arial, sans-serif</span><span class="format">;</span> -<span class="property">letter-spacing:</span><span class="value">1px</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">#ish a:link,#ish a:visited</span> <span class="format">{</span> -<span class="property">position:</span><span class="value">absolute</span><span class="format">;</span> -<span class="property">top:</span><span class="value">-33px</span><span class="format">;</span> -<span class="property">left:</span><span class="value">150px</span><span class="format">;</span> -<span class="property">width:</span><span class="value">65px</span><span class="format">;</span> -<span class="property">padding-top:</span><span class="value">13px</span><span class="format">;</span> -<span class="property">text-align:</span><span class="value">center</span><span class="format">;</span> -<span class="property">background:</span><span class="value">url(/pix/ishbug.gif) top left no-repeat</span><span class="format">;</span> -<span class="property">color:</span><span class="value">#FFF</span><span class="format">;</span> -<span class="property">voice-family:</span><span class="value">inherit</span><span class="format">;</span> -<span class="property">height:</span><span class="value">52px</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">#ish a:hover</span> <span class="format">{</span> -<span class="property">background-position:</span><span class="value">bottom right</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">#ish a em</span> <span class="format">{</span> -<span class="property">display:</span><span class="value">block</span><span class="format">;</span> -<span class="property">margin-top:</span><span class="value">-0.2em</span><span class="format">;</span> -<span class="property">font:</span><span class="value">2.33em Georgia, Times, serif</span><span class="format">;</span> -<span class="property">letter-spacing:</span><span class="value">0</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">#navbar</span> <span class="format">{</span> -<span class="property">height:</span><span class="value">2.4em</span><span class="format">;</span> -<span class="property">background:</span><span class="value">#FBFAF4</span><span class="format">;</span> -<span class="property">border-top:</span><span class="value">5px solid #333</span><span class="format">;</span> -<span class="property">font:</span><span class="value">18px Georgia, Times, serif</span><span class="format">;</span> -<span class="property">overflow:</span><span class="value">hidden</span><span class="format">;</span> -<span class="property">min-width:</span><span class="value">750px</span><span class="format">;</span> -<span class="property">padding:</span><span class="value">0 0 0 215px</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">#navbar li</span> <span class="format">{</span> -<span class="property">float:</span><span class="value">left</span><span class="format">;</span> -<span class="property">margin-right:</span><span class="value">5px</span><span class="format">;</span> -<span class="property">background:</span><span class="value">url(/pix/diamond-black.gif) 100% 66% no-repeat</span><span class="format">;</span> -<span class="property">padding:</span><span class="value">0 23px 0 13px</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">#navbar li a</span> <span class="format">{</span> -<span class="property">display:</span><span class="value">block</span><span class="format">;</span> -<span class="property">text-transform:</span><span class="value">uppercase</span><span class="format">;</span> -<span class="property">color:</span><span class="value">#000</span><span class="format">;</span> -<span class="property">padding:</span><span class="value">0.75em 0 0.25em</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">#navbar #feed</span> <span class="format">{</span> -<span class="property">background:</span><span class="value">none</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">#navbar a:hover,.articles #navbar #articles a,.topics #navbar #topics a,.about #navbar #about a,.contact #navbar #contact a,.contribute #navbar #contribute a,.feed #navbar #feed a</span> <span class="format">{</span> -<span class="property">background:</span><span class="value">url(/pix/navbarlinkbg.gif) top left repeat-x</span><span class="format">;</span> -<span class="property">color:</span><span class="value">#555</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">#main</span> <span class="format">{</span> -<span class="property">float:</span><span class="value">left</span><span class="format">;</span> -<span class="property">font-size:</span><span class="value">0.88em</span><span class="format">;</span> -<span class="property">background:</span><span class="value">url(/pix/threecolbg.gif) 794px 0 repeat-y</span><span class="format">;</span> -<span class="property">voice-family:</span><span class="value">inherit</span><span class="format">;</span> -<span class="property">width:</span><span class="value">750px</span><span class="format">;</span> -<span class="property">padding:</span><span class="value">1.5em 0 1.5em 210px</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">#main p</span> <span class="format">{</span> -<span class="property">text-align:</span><span class="value">left</span><span class="format">;</span> -<span class="property">line-height:</span><span class="value">1.8em</span><span class="format">;</span> -<span class="property">margin:</span><span class="value">0 0 1em</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">.column</span> <span class="format">{</span> -<span class="property">float:</span><span class="value">left</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">#content</span> <span class="format">{</span> -<span class="property">voice-family:</span><span class="value">inherit</span><span class="format">;</span> -<span class="property">width:</span><span class="value">540px</span><span class="format">;</span> -<span class="property">padding:</span><span class="value">0 25px 0 20px</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">#content .title</span> <span class="format">{</span> -<span class="property">font:</span><span class="value">1.8em Georgia, Times, serif</span><span class="format">;</span> -<span class="property">margin-bottom:</span><span class="value">0.5em</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">.title</span> <span class="format">{</span> -<span class="property">text-transform:</span><span class="value">none</span><span class="format">;</span> -<span class="property">letter-spacing:</span><span class="value">1px</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">.title a:link,.title a:visited</span> <span class="format">{</span> -<span class="property">color:</span><span class="value">#333</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">.title a:hover</span> <span class="format">{</span> -<span class="property">color:</span><span class="value">#000</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">.byline</span> <span class="format">{</span> -<span class="property">font:</span><span class="value">italic 1.1em Times, serif</span><span class="format">;</span> -<span class="property">letter-spacing:</span><span class="value">1px</span><span class="format">;</span> -<span class="property">margin:</span><span class="value">0 0 1.5em</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">.byline a:link,.byline a:visited</span> <span class="format">{</span> -<span class="property">font:</span><span class="value">bold 0.85em Verdana, sans-serif</span><span class="format">;</span> -<span class="property">text-transform:</span><span class="value">uppercase</span><span class="format">;</span> -<span class="property">letter-spacing:</span><span class="value">2px</span><span class="format">;</span> -<span class="property">margin-left:</span><span class="value">0.25em</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">#secondary</span> <span class="format">{</span> -<span class="property">width:</span><span class="value">215px</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">#secondary .title</span> <span class="format">{</span> -<span class="property">margin-bottom:</span><span class="value">0.25em</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">#choice</span> <span class="format">{</span> -<span class="property">border-top:</span><span class="value">1px solid #D9D9D9</span><span class="format">;</span> -<span class="property">padding:</span><span class="value">1.5em 20px</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">#choice h3</span> <span class="format">{</span> -<span class="property">color:</span><span class="value">#333</span><span class="format">;</span> -<span class="property">font:</span><span class="value">0.9em Verdana, sans-serif</span><span class="format">;</span> -<span class="property">text-transform:</span><span class="value">uppercase</span><span class="format">;</span> -<span class="property">letter-spacing:</span><span class="value">0.33em</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">#choice .info</span> <span class="format">{</span> -<span class="property">font-style:</span><span class="value">italic</span><span class="format">;</span> -<span class="property">font-size:</span><span class="value">0.9em</span><span class="format">;</span> -<span class="property">color:</span><span class="value">#666</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">#sidebar</span> <span class="format">{</span> -<span class="property">padding-left:</span><span class="value">15px</span><span class="format">;</span> -<span class="property">voice-family:</span><span class="value">inherit</span><span class="format">;</span> -<span class="property">width:</span><span class="value">140px</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">#sidebar h3</span> <span class="format">{</span> -<span class="property">font:</span><span class="value">1.5em Georgia, Times, serif</span><span class="format">;</span> -<span class="property">letter-spacing:</span><span class="value">0</span><span class="format">;</span> -<span class="property">text-transform:</span><span class="value">none</span><span class="format">;</span> -<span class="property">margin-bottom:</span><span class="value">0.25em</span><span class="format">;</span> -<span class="property">color:</span><span class="value">#333</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">#search</span> <span class="format">{</span> -<span class="property">width:</span><span class="value">80px</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">#search,#submit</span> <span class="format">{</span> -<span class="property">vertical-align:</span><span class="value">bottom</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">#sidebar div</span> <span class="format">{</span> -<span class="property">border-bottom:</span><span class="value">1px dashed #B2B2B2</span><span class="format">;</span> -<span class="property">padding:</span><span class="value">10px 0.5em</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">#sidebar div.first</span> <span class="format">{</span> -<span class="property">padding-top:</span><span class="value">0</span><span class="format"></span> -<span class="format">}</span> - -<span class="selector">#sidebar li</span> <span class="format">{</span> -<span class="property">padding:</span><span class="value">0.5em 0</span><span class="format"></span> -<span class="format">}</span> - -<span cl... [truncated message content] |
From: <edw...@us...> - 2008-01-06 05:27:11
|
Revision: 98 http://csstidy.svn.sourceforge.net/csstidy/?rev=98&view=rev Author: edwardzyang Date: 2008-01-05 21:27:08 -0800 (Sat, 05 Jan 2008) Log Message: ----------- - Add discard_invalid_selectors cfg and functionality; this fixes some of the duplicate combinator problems - Minor comment formatting changes - SETTINGS and FULLEXPECT support added to csst tests Modified Paths: -------------- trunk/NEWS trunk/class.csstidy.php trunk/class.csstidy_optimise.php trunk/class.csstidy_print.php trunk/data.inc.php trunk/testing/unit-tests/class.csstidy_csst.php trunk/testing/unit-tests/test.csst.php Added Paths: ----------- trunk/testing/unit-tests/csst/selectors/errors/ trunk/testing/unit-tests/csst/selectors/errors/dangling-combinator.csst trunk/testing/unit-tests/csst/selectors/errors/duplicate-combinator.csst trunk/testing/unit-tests/csst/selectors/merge-optimization.csst trunk/testing/unit-tests/csst/selectors/merge-preserve.csst Removed Paths: ------------- trunk/testing/unit-tests/csst/selectors/grouping-optimization.csst Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2008-01-06 00:26:07 UTC (rev 97) +++ trunk/NEWS 2008-01-06 05:27:08 UTC (rev 98) @@ -11,6 +11,8 @@ ! cssparsed.css created, contains just the CSS for formatted CSS output ! New CSS 3 units "ch" and "turn" added ! Unit tests added, requires Text_Diff (PEAR) and SimpleTest +! Some invalid selectors are now removed during optimization, this can + be turned off by setting 'discard_invalid_selectors' to false - Added localizations for css_optimiser.php - Fixed bug with cookie setting for custom templates - Minor security problem in css_optimiser.php fixed Modified: trunk/class.csstidy.php =================================================================== --- trunk/class.csstidy.php 2008-01-06 00:26:07 UTC (rev 97) +++ trunk/class.csstidy.php 2008-01-06 05:27:08 UTC (rev 98) @@ -8,9 +8,9 @@ * * This file is part of CSSTidy. * - * CSSTidy is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * CSSTidy is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * CSSTidy is distributed in the hope that it will be useful, @@ -24,7 +24,7 @@ * @license http://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License * @package csstidy * @author Florian Schmitz (floele at gmail dot com) 2005-2007 - * @author Brett Zamir (brettz9 at yahoo dot com) 2007 + * @author Brett Zamir (brettz9 at yahoo dot com) 2007 */ /** @@ -64,7 +64,7 @@ class csstidy { /** - * Saves the parsed CSS + * Saves the parsed CSS. This array is empty if preserve_css is on. * @var array * @access public */ @@ -267,6 +267,7 @@ $this->settings['sort_properties'] = false; $this->settings['sort_selectors'] = false; $this->settings['merge_selectors'] = 2; + $this->settings['discard_invalid_selectors'] = true; $this->settings['discard_invalid_properties'] = false; $this->settings['css_level'] = 'CSS2.1'; $this->settings['preserve_css'] = false; @@ -917,7 +918,8 @@ $this->print->_reset(); - setlocale(LC_ALL, $old); // Set locale back to original setting + setlocale(LC_ALL, $old); // Set locale back to original setting + return !(empty($this->css) && empty($this->import) && empty($this->charset) && empty($this->tokens) && empty($this->namespace)); } Modified: trunk/class.csstidy_optimise.php =================================================================== --- trunk/class.csstidy_optimise.php 2008-01-06 00:26:07 UTC (rev 97) +++ trunk/class.csstidy_optimise.php 2008-01-06 05:27:08 UTC (rev 98) @@ -9,9 +9,9 @@ * * This file is part of CSSTidy. * - * CSSTidy is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * CSSTidy is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * CSSTidy is distributed in the hope that it will be useful, @@ -25,7 +25,7 @@ * @license http://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License * @package csstidy * @author Florian Schmitz (floele at gmail dot com) 2005-2007 - * @author Brett Zamir (brettz9 at yahoo dot com) 2007 + * @author Brett Zamir (brettz9 at yahoo dot com) 2007 */ /** @@ -75,6 +75,13 @@ $this->merge_selectors($this->css[$medium]); } } + + if ($this->parser->get_cfg('discard_invalid_selectors')) { + foreach ($this->css as $medium => $value) + { + $this->discard_invalid_selectors($this->css[$medium]); + } + } if ($this->parser->get_cfg('optimise_shorthands') > 0) { @@ -486,6 +493,30 @@ } $array = $css; } + + /** + * Removes invalid selectors and their corresponding rule-sets as + * defined by 4.1.7 in REC-CSS2. This is a very rudimentary check + * and should be replaced by a full-blown parsing algorithm or + * regular expression + * @version 1.4 + */ + function discard_invalid_selectors(&$array) { + $invalid = array('+' => true, '~' => true, ',' => true, '>' => true); + foreach ($array as $selector => $decls) { + $ok = true; + $selectors = array_map('trim', explode(',', $selector)); + foreach ($selectors as $s) { + $simple_selectors = preg_split('/\s*[+>~\s]\s*/', $s); + foreach ($simple_selectors as $ss) { + if ($ss === '') $ok = false; + // could also check $ss for internal structure, + // but that probably would be too slow + } + } + if (!$ok) unset($array[$selector]); + } + } /** * Dissolves properties like padding:10px 10px 10px to padding-top:10px;padding-bottom:10px;... Modified: trunk/class.csstidy_print.php =================================================================== --- trunk/class.csstidy_print.php 2008-01-06 00:26:07 UTC (rev 97) +++ trunk/class.csstidy_print.php 2008-01-06 05:27:08 UTC (rev 98) @@ -9,9 +9,9 @@ * * This file is part of CSSTidy. * - * CSSTidy is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or + * CSSTidy is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * CSSTidy is distributed in the hope that it will be useful, @@ -25,7 +25,7 @@ * @license http://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License * @package csstidy * @author Florian Schmitz (floele at gmail dot com) 2005-2007 - * @author Brett Zamir (brettz9 at yahoo dot com) 2007 + * @author Brett Zamir (brettz9 at yahoo dot com) 2007 */ /** Modified: trunk/data.inc.php =================================================================== --- trunk/data.inc.php 2008-01-06 00:26:07 UTC (rev 97) +++ trunk/data.inc.php 2008-01-06 05:27:08 UTC (rev 98) @@ -22,7 +22,7 @@ * @license http://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License * @package csstidy * @author Florian Schmitz (floele at gmail dot com) 2005-2007 - * @author Brett Zamir (brettz9 at yahoo dot com) 2007 + * @author Brett Zamir (brettz9 at yahoo dot com) 2007 */ define('AT_START', 1); Modified: trunk/testing/unit-tests/class.csstidy_csst.php =================================================================== --- trunk/testing/unit-tests/class.csstidy_csst.php 2008-01-06 00:26:07 UTC (rev 97) +++ trunk/testing/unit-tests/class.csstidy_csst.php 2008-01-06 05:27:08 UTC (rev 98) @@ -13,11 +13,14 @@ /** CSS for test to parse */ var $css = ''; + /** Settings for csstidy */ + var $settings = array(); + /** Expected var_export() output of $css->css[41] (no at block) */ var $expect = ''; - /** Expected var_export() output of $css->css (with at block) */ - var $fullexpect = ''; + /** Boolean whether or not to use $css->css instead for $expect */ + var $fullexpect = false; /** Actual result */ var $actual; @@ -28,7 +31,7 @@ function load($filename) { $this->filename = $filename; $fh = fopen($filename, 'r'); - $state = null; + $state = ''; while (($line = fgets($fh)) !== false) { $line = rtrim($line, "\n\r"); // normalize newlines if (substr($line, 0, 2) == '--') { @@ -40,16 +43,20 @@ switch ($state) { case '--TEST--': $this->test = trim($line); - continue; + break; case '--CSS--': $this->css .= $line . "\n"; - continue; + break; + case '--FULLEXPECT--': + $this->fullexpect = true; // no break! case '--EXPECT--': $this->expect .= $line . "\n"; - continue; - case '--FULLEXPECT--': - $this->fullexpect .= $line . "\n"; - continue; + break; + case '--SETTINGS--': + list($n, $v) = array_map('trim',explode('=', $line, 2)); + $v = eval("return $v;"); + $this->settings[$n] = $v; + break; } } $this->expect = trim($this->expect, "\n"); // trim trailing/leading newlines @@ -59,8 +66,15 @@ function test($filename) { $this->load($filename); $css = new csstidy(); + $css->set_cfg($this->settings); $css->parse($this->css); - $this->actual = var_export($css->css[41], true); + if ($this->fullexpect) { + $this->actual = var_export($css->css, true); + } elseif (isset($css->css[41])) { + $this->actual = var_export($css->css[41], true); + } else { + $this->actual = 'Key 41 does not exist'; + } return $this->expect === $this->actual; } Added: trunk/testing/unit-tests/csst/selectors/errors/dangling-combinator.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/errors/dangling-combinator.csst (rev 0) +++ trunk/testing/unit-tests/csst/selectors/errors/dangling-combinator.csst 2008-01-06 05:27:08 UTC (rev 98) @@ -0,0 +1,9 @@ +--TEST-- +Dangling combinator selector +--CSS-- ++ b {display: inherit;} +b > {font-family: inherit;} +<b>asdf</b> {font-size: inherit;} +--EXPECT-- +array ( +) Property changes on: trunk/testing/unit-tests/csst/selectors/errors/dangling-combinator.csst ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/testing/unit-tests/csst/selectors/errors/duplicate-combinator.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/errors/duplicate-combinator.csst (rev 0) +++ trunk/testing/unit-tests/csst/selectors/errors/duplicate-combinator.csst 2008-01-06 05:27:08 UTC (rev 98) @@ -0,0 +1,7 @@ +--TEST-- +Duplicate combinator selector +--CSS-- +div + + b {display: inherit;} +--EXPECT-- +array ( +) Property changes on: trunk/testing/unit-tests/csst/selectors/errors/duplicate-combinator.csst ___________________________________________________________________ Name: svn:eol-style + native Deleted: trunk/testing/unit-tests/csst/selectors/grouping-optimization.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/grouping-optimization.csst 2008-01-06 00:26:07 UTC (rev 97) +++ trunk/testing/unit-tests/csst/selectors/grouping-optimization.csst 2008-01-06 05:27:08 UTC (rev 98) @@ -1,13 +0,0 @@ ---TEST-- -Group selectors optimization ---CSS-- -h1 {display: inherit;} -h2 {display: inherit;} -h3 {display: inherit;} ---EXPECT-- -array ( - 'h1,h2,h3' => - array ( - 'display' => 'inherit', - ), -) Copied: trunk/testing/unit-tests/csst/selectors/merge-optimization.csst (from rev 96, trunk/testing/unit-tests/csst/selectors/grouping-optimization.csst) =================================================================== --- trunk/testing/unit-tests/csst/selectors/merge-optimization.csst (rev 0) +++ trunk/testing/unit-tests/csst/selectors/merge-optimization.csst 2008-01-06 05:27:08 UTC (rev 98) @@ -0,0 +1,13 @@ +--TEST-- +Merge selectors optimization +--CSS-- +h1 {display: inherit;} +h2 {display: inherit;} +h3 {display: inherit;} +--EXPECT-- +array ( + 'h1,h2,h3' => + array ( + 'display' => 'inherit', + ), +) Added: trunk/testing/unit-tests/csst/selectors/merge-preserve.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/merge-preserve.csst (rev 0) +++ trunk/testing/unit-tests/csst/selectors/merge-preserve.csst 2008-01-06 05:27:08 UTC (rev 98) @@ -0,0 +1,23 @@ +--TEST-- +Merge selectors optimization off +--SETTINGS-- +merge_selectors = 0 +--CSS-- +h1 {display: inherit;} +h2 {display: inherit;} +h3 {display: inherit;} +--EXPECT-- +array ( + 'h1' => + array ( + 'display' => 'inherit', + ), + 'h2' => + array ( + 'display' => 'inherit', + ), + 'h3' => + array ( + 'display' => 'inherit', + ), +) Property changes on: trunk/testing/unit-tests/csst/selectors/merge-preserve.csst ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/testing/unit-tests/test.csst.php =================================================================== --- trunk/testing/unit-tests/test.csst.php 2008-01-06 00:26:07 UTC (rev 97) +++ trunk/testing/unit-tests/test.csst.php 2008-01-06 05:27:08 UTC (rev 98) @@ -8,8 +8,8 @@ class csstidy_test_csst extends csstidy_harness { function testAll() { - foreach (globr(dirname(__FILE__) . '/csst', '*.csst') as $filename) { - //$filename = ''; + $files = globr(dirname(__FILE__) . '/csst', '*.csst'); + foreach ($files as $filename) { $expectation = new csstidy_csst(); $result = $this->assert($expectation, $filename, '%s'); // this is necessary because SimpleTest doesn't support This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <edw...@us...> - 2008-01-06 00:26:11
|
Revision: 97 http://csstidy.svn.sourceforge.net/csstidy/?rev=97&view=rev Author: edwardzyang Date: 2008-01-05 16:26:07 -0800 (Sat, 05 Jan 2008) Log Message: ----------- Minor formatting changes: - Compress extended if/else statement to indicate chaining - Remove trailing ?>, it's not necessary in PHP! - Add a custom harness for all unit tests Modified Paths: -------------- trunk/class.csstidy.php trunk/class.csstidy_optimise.php trunk/class.csstidy_print.php trunk/testing/unit-tests/test.csst.php trunk/testing/unit-tests.php Added Paths: ----------- trunk/testing/unit-tests/class.csstidy_harness.php Modified: trunk/class.csstidy.php =================================================================== --- trunk/class.csstidy.php 2008-01-05 21:11:16 UTC (rev 96) +++ trunk/class.csstidy.php 2008-01-06 00:26:07 UTC (rev 97) @@ -556,7 +556,7 @@ * @version 1.1 */ function parse($string) { - // Temporarily set locale to en_US in order to handle floats properly + // Temporarily set locale to en_US in order to handle floats properly $old = setlocale(LC_ALL, 0); setlocale(LC_ALL, 'en_US'); @@ -618,13 +618,10 @@ case 'is': if(csstidy::is_token($string,$i)) { - if($string{$i} === '/' && @$string{$i+1} === '*' && trim($this->selector) == '') - { + if($string{$i} === '/' && @$string{$i+1} === '*' && trim($this->selector) == '') { $this->status = 'ic'; ++$i; $this->from = 'is'; - } - elseif($string{$i} === '@' && trim($this->selector) == '') - { + } elseif($string{$i} === '@' && trim($this->selector) == '') { // Check for at-rule $this->invalid_at = true; foreach($at_rules as $name => $type) @@ -652,45 +649,34 @@ } $this->log('Invalid @-rule: '.$invalid_at_name.' (removed)','Warning'); } - } - elseif(($string{$i} === '"' || $string{$i} === "'")) - { + } elseif(($string{$i} === '"' || $string{$i} === "'")) { $this->cur_string = $string{$i}; $this->status = 'instr'; $this->str_char = $string{$i}; $this->from = 'is'; - } - elseif($this->invalid_at && $string{$i} === ';') - { + } elseif($this->invalid_at && $string{$i} === ';') { $this->invalid_at = false; $this->status = 'is'; - } - elseif($string{$i} === '{') - { + } elseif($string{$i} === '{') { $this->status = 'ip'; $this->_add_token(SEL_START, $this->selector); $this->added = false; - } - elseif($string{$i} === '}') - { + } elseif($string{$i} === '}') { $this->_add_token(AT_END, $this->at); $this->at = ''; $this->selector = ''; $this->sel_separate = array(); - } - elseif($string{$i} === ',') - { + } elseif($string{$i} === ',') { $this->selector = trim($this->selector).','; $this->sel_separate[] = strlen($this->selector); - } - elseif($string{$i} === '\\') - { + } elseif($string{$i} === '\\') { $this->selector .= $this->_unicode($string,$i); - } - // remove unnecessary universal selector, FS#147 - else if(!($string{$i} === '*' && @in_array($string{$i+1}, array('.', '#', '[', ':')))) { + } elseif($string{$i} === '*' && @in_array($string{$i+1}, array('.', '#', '[', ':'))) { + // remove unnecessary universal selector, FS#147 + } else { $this->selector .= $string{$i}; } + } else { @@ -1102,4 +1088,3 @@ } -?> Modified: trunk/class.csstidy_optimise.php =================================================================== --- trunk/class.csstidy_optimise.php 2008-01-05 21:11:16 UTC (rev 96) +++ trunk/class.csstidy_optimise.php 2008-01-06 00:26:07 UTC (rev 97) @@ -809,4 +809,3 @@ return $input_css; } } -?> \ No newline at end of file Modified: trunk/class.csstidy_print.php =================================================================== --- trunk/class.csstidy_print.php 2008-01-05 21:11:16 UTC (rev 96) +++ trunk/class.csstidy_print.php 2008-01-06 00:26:07 UTC (rev 97) @@ -404,4 +404,3 @@ } } } -?> \ No newline at end of file Added: trunk/testing/unit-tests/class.csstidy_harness.php =================================================================== --- trunk/testing/unit-tests/class.csstidy_harness.php (rev 0) +++ trunk/testing/unit-tests/class.csstidy_harness.php 2008-01-06 00:26:07 UTC (rev 97) @@ -0,0 +1,14 @@ +<?php + +class csstidy_harness extends UnitTestCase +{ + function getTests() { + // __onlytest makes only one test get triggered + foreach (get_class_methods(get_class($this)) as $method) { + if (strtolower(substr($method, 0, 10)) == '__onlytest') { + return array($method); + } + } + return parent::getTests(); + } +} \ No newline at end of file Property changes on: trunk/testing/unit-tests/class.csstidy_harness.php ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/testing/unit-tests/test.csst.php =================================================================== --- trunk/testing/unit-tests/test.csst.php 2008-01-05 21:11:16 UTC (rev 96) +++ trunk/testing/unit-tests/test.csst.php 2008-01-06 00:26:07 UTC (rev 97) @@ -5,10 +5,11 @@ /** * Performs the csst tests in csst/ folder */ -class csstidy_test_csst extends UnitTestCase +class csstidy_test_csst extends csstidy_harness { function testAll() { foreach (globr(dirname(__FILE__) . '/csst', '*.csst') as $filename) { + //$filename = ''; $expectation = new csstidy_csst(); $result = $this->assert($expectation, $filename, '%s'); // this is necessary because SimpleTest doesn't support Modified: trunk/testing/unit-tests.php =================================================================== --- trunk/testing/unit-tests.php 2008-01-05 21:11:16 UTC (rev 96) +++ trunk/testing/unit-tests.php 2008-01-06 00:26:07 UTC (rev 97) @@ -19,6 +19,7 @@ require_once $simpletest_location . 'unit_tester.php'; require_once $simpletest_location . 'reporter.php'; require_once 'unit-tests/class.csstidy_reporter.php'; +require_once 'unit-tests/class.csstidy_harness.php'; require_once 'unit-tests.inc'; // Test files This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <edw...@us...> - 2008-01-05 21:11:18
|
Revision: 96 http://csstidy.svn.sourceforge.net/csstidy/?rev=96&view=rev Author: edwardzyang Date: 2008-01-05 13:11:16 -0800 (Sat, 05 Jan 2008) Log Message: ----------- Finish the rest of the "normal" selectors. Added Paths: ----------- trunk/testing/unit-tests/csst/selectors/chain.csst trunk/testing/unit-tests/csst/selectors/combinator-compressed.csst trunk/testing/unit-tests/csst/selectors/grouping-optimization.csst trunk/testing/unit-tests/csst/selectors/grouping.csst trunk/testing/unit-tests/csst/selectors/pseudo-elements.csst trunk/testing/unit-tests/csst/selectors/simple.csst trunk/testing/unit-tests/csst/selectors/universal-optimization.csst trunk/testing/unit-tests/csst/selectors/universal-shorthand.csst Added: trunk/testing/unit-tests/csst/selectors/chain.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/chain.csst (rev 0) +++ trunk/testing/unit-tests/csst/selectors/chain.csst 2008-01-05 21:11:16 UTC (rev 96) @@ -0,0 +1,11 @@ +--TEST-- +Chained selector +--CSS-- +a * > div[attr="value"].class + div#id:hover {display: inherit;} +--EXPECT-- +array ( + 'a * > div[attr="value"].class + div#id:hover' => + array ( + 'display' => 'inherit', + ), +) Property changes on: trunk/testing/unit-tests/csst/selectors/chain.csst ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/testing/unit-tests/csst/selectors/combinator-compressed.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/combinator-compressed.csst (rev 0) +++ trunk/testing/unit-tests/csst/selectors/combinator-compressed.csst 2008-01-05 21:11:16 UTC (rev 96) @@ -0,0 +1,11 @@ +--TEST-- +Combinator selector +--CSS-- +a>b {display: inherit;} +--EXPECT-- +array ( + 'a>b' => + array ( + 'display' => 'inherit', + ), +) Property changes on: trunk/testing/unit-tests/csst/selectors/combinator-compressed.csst ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/testing/unit-tests/csst/selectors/grouping-optimization.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/grouping-optimization.csst (rev 0) +++ trunk/testing/unit-tests/csst/selectors/grouping-optimization.csst 2008-01-05 21:11:16 UTC (rev 96) @@ -0,0 +1,13 @@ +--TEST-- +Group selectors optimization +--CSS-- +h1 {display: inherit;} +h2 {display: inherit;} +h3 {display: inherit;} +--EXPECT-- +array ( + 'h1,h2,h3' => + array ( + 'display' => 'inherit', + ), +) Property changes on: trunk/testing/unit-tests/csst/selectors/grouping-optimization.csst ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/testing/unit-tests/csst/selectors/grouping.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/grouping.csst (rev 0) +++ trunk/testing/unit-tests/csst/selectors/grouping.csst 2008-01-05 21:11:16 UTC (rev 96) @@ -0,0 +1,11 @@ +--TEST-- +Grouped selectors +--CSS-- +h1,h2,h3 {display: inherit;} +--EXPECT-- +array ( + 'h1,h2,h3' => + array ( + 'display' => 'inherit', + ), +) Property changes on: trunk/testing/unit-tests/csst/selectors/grouping.csst ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/testing/unit-tests/csst/selectors/pseudo-elements.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/pseudo-elements.csst (rev 0) +++ trunk/testing/unit-tests/csst/selectors/pseudo-elements.csst 2008-01-05 21:11:16 UTC (rev 96) @@ -0,0 +1,26 @@ +--TEST-- +Pseudo elements selectors +--CSS-- +P:first-line { display: inherit; } +P:first-letter { font-size: inherit; } +H1:before { font-family: inherit; } +H1:after { font-weight: inherit; } +--EXPECT-- +array ( + 'P:first-line' => + array ( + 'display' => 'inherit', + ), + 'P:first-letter' => + array ( + 'font-size' => 'inherit', + ), + 'H1:before' => + array ( + 'font-family' => 'inherit', + ), + 'H1:after' => + array ( + 'font-weight' => 'inherit', + ), +) \ No newline at end of file Property changes on: trunk/testing/unit-tests/csst/selectors/pseudo-elements.csst ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/testing/unit-tests/csst/selectors/simple.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/simple.csst (rev 0) +++ trunk/testing/unit-tests/csst/selectors/simple.csst 2008-01-05 21:11:16 UTC (rev 96) @@ -0,0 +1,11 @@ +--TEST-- +Simple selector +--CSS-- +a[foo="bar"].class#id:hover {display: inherit;} +--EXPECT-- +array ( + 'a[foo="bar"].class#id:hover' => + array ( + 'display' => 'inherit', + ), +) Property changes on: trunk/testing/unit-tests/csst/selectors/simple.csst ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/testing/unit-tests/csst/selectors/universal-optimization.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/universal-optimization.csst (rev 0) +++ trunk/testing/unit-tests/csst/selectors/universal-optimization.csst 2008-01-05 21:11:16 UTC (rev 96) @@ -0,0 +1,11 @@ +--TEST-- +Universal selector optimization +--CSS-- +*.foo {display: inherit;} +--EXPECT-- +array ( + '.foo' => + array ( + 'display' => 'inherit', + ), +) \ No newline at end of file Property changes on: trunk/testing/unit-tests/csst/selectors/universal-optimization.csst ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/testing/unit-tests/csst/selectors/universal-shorthand.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/universal-shorthand.csst (rev 0) +++ trunk/testing/unit-tests/csst/selectors/universal-shorthand.csst 2008-01-05 21:11:16 UTC (rev 96) @@ -0,0 +1,11 @@ +--TEST-- +Universal selector shorthand +--CSS-- +.foo {display: inherit;} +--EXPECT-- +array ( + '.foo' => + array ( + 'display' => 'inherit', + ), +) \ No newline at end of file Property changes on: trunk/testing/unit-tests/csst/selectors/universal-shorthand.csst ___________________________________________________________________ Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <edw...@us...> - 2008-01-05 21:08:40
|
Revision: 95 http://csstidy.svn.sourceforge.net/csstidy/?rev=95&view=rev Author: edwardzyang Date: 2008-01-05 13:08:34 -0800 (Sat, 05 Jan 2008) Log Message: ----------- Finish the "correct" selector cases; use inherit which is safer Modified Paths: -------------- trunk/testing/unit-tests/csst/selectors/active.csst trunk/testing/unit-tests/csst/selectors/adjacent.csst trunk/testing/unit-tests/csst/selectors/attribute-begins.csst trunk/testing/unit-tests/csst/selectors/attribute-contains.csst trunk/testing/unit-tests/csst/selectors/attribute-equals.csst trunk/testing/unit-tests/csst/selectors/attribute-set.csst trunk/testing/unit-tests/csst/selectors/child.csst trunk/testing/unit-tests/csst/selectors/class.csst trunk/testing/unit-tests/csst/selectors/descendant.csst trunk/testing/unit-tests/csst/selectors/first-child.csst trunk/testing/unit-tests/csst/selectors/focus.csst trunk/testing/unit-tests/csst/selectors/hover.csst trunk/testing/unit-tests/csst/selectors/id.csst trunk/testing/unit-tests/csst/selectors/lang.csst trunk/testing/unit-tests/csst/selectors/link.csst trunk/testing/unit-tests/csst/selectors/type.csst trunk/testing/unit-tests/csst/selectors/universal.csst trunk/testing/unit-tests/csst/selectors/visited.csst Modified: trunk/testing/unit-tests/csst/selectors/active.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/active.csst 2008-01-05 20:54:13 UTC (rev 94) +++ trunk/testing/unit-tests/csst/selectors/active.csst 2008-01-05 21:08:34 UTC (rev 95) @@ -1,11 +1,11 @@ --TEST-- Dynamic active selector --CSS-- -a:active {display: none;} +a:active {display: inherit;} --EXPECT-- array ( 'a:active' => array ( - 'display' => 'none', + 'display' => 'inherit', ), ) Modified: trunk/testing/unit-tests/csst/selectors/adjacent.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/adjacent.csst 2008-01-05 20:54:13 UTC (rev 94) +++ trunk/testing/unit-tests/csst/selectors/adjacent.csst 2008-01-05 21:08:34 UTC (rev 95) @@ -1,11 +1,11 @@ --TEST-- Adjacent selector --CSS-- -a + b {display: none;} +a + b {display: inherit;} --EXPECT-- array ( 'a + b' => array ( - 'display' => 'none', + 'display' => 'inherit', ), ) Modified: trunk/testing/unit-tests/csst/selectors/attribute-begins.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/attribute-begins.csst 2008-01-05 20:54:13 UTC (rev 94) +++ trunk/testing/unit-tests/csst/selectors/attribute-begins.csst 2008-01-05 21:08:34 UTC (rev 95) @@ -1,11 +1,11 @@ --TEST-- Begins hyphen-separated attribute list selector --CSS-- -a[foo|="en"] {display: none;} +a[foo|="en"] {display: inherit;} --EXPECT-- array ( 'a[foo|="en"]' => array ( - 'display' => 'none', + 'display' => 'inherit', ), ) Modified: trunk/testing/unit-tests/csst/selectors/attribute-contains.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/attribute-contains.csst 2008-01-05 20:54:13 UTC (rev 94) +++ trunk/testing/unit-tests/csst/selectors/attribute-contains.csst 2008-01-05 21:08:34 UTC (rev 95) @@ -1,11 +1,11 @@ --TEST-- Contained in space-separated attribute list selector --CSS-- -a[foo~="warning"] {display: none;} +a[foo~="warning"] {display: inherit;} --EXPECT-- array ( 'a[foo~="warning"]' => array ( - 'display' => 'none', + 'display' => 'inherit', ), ) Modified: trunk/testing/unit-tests/csst/selectors/attribute-equals.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/attribute-equals.csst 2008-01-05 20:54:13 UTC (rev 94) +++ trunk/testing/unit-tests/csst/selectors/attribute-equals.csst 2008-01-05 21:08:34 UTC (rev 95) @@ -1,11 +1,11 @@ --TEST-- Attribute equals selector --CSS-- -a[foo="warning"] {display: none;} +a[foo="warning"] {display: inherit;} --EXPECT-- array ( 'a[foo="warning"]' => array ( - 'display' => 'none', + 'display' => 'inherit', ), ) Modified: trunk/testing/unit-tests/csst/selectors/attribute-set.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/attribute-set.csst 2008-01-05 20:54:13 UTC (rev 94) +++ trunk/testing/unit-tests/csst/selectors/attribute-set.csst 2008-01-05 21:08:34 UTC (rev 95) @@ -1,11 +1,11 @@ --TEST-- Attribute selector --CSS-- -a[foo] {display: none;} +a[foo] {display: inherit;} --EXPECT-- array ( 'a[foo]' => array ( - 'display' => 'none', + 'display' => 'inherit', ), ) Modified: trunk/testing/unit-tests/csst/selectors/child.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/child.csst 2008-01-05 20:54:13 UTC (rev 94) +++ trunk/testing/unit-tests/csst/selectors/child.csst 2008-01-05 21:08:34 UTC (rev 95) @@ -1,11 +1,11 @@ --TEST-- Child selector --CSS-- -table > tr {display: none;} +table > tr {display: inherit;} --EXPECT-- array ( 'table > tr' => array ( - 'display' => 'none', + 'display' => 'inherit', ), ) Modified: trunk/testing/unit-tests/csst/selectors/class.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/class.csst 2008-01-05 20:54:13 UTC (rev 94) +++ trunk/testing/unit-tests/csst/selectors/class.csst 2008-01-05 21:08:34 UTC (rev 95) @@ -1,11 +1,11 @@ --TEST-- Class selector --CSS-- -a.foo {display: none;} +a.foo {display: inherit;} --EXPECT-- array ( 'a.foo' => array ( - 'display' => 'none', + 'display' => 'inherit', ), ) Modified: trunk/testing/unit-tests/csst/selectors/descendant.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/descendant.csst 2008-01-05 20:54:13 UTC (rev 94) +++ trunk/testing/unit-tests/csst/selectors/descendant.csst 2008-01-05 21:08:34 UTC (rev 95) @@ -1,11 +1,11 @@ --TEST-- Descendant selector --CSS-- -table tr {display: none;} +table tr {display: inherit;} --EXPECT-- array ( 'table tr' => array ( - 'display' => 'none', + 'display' => 'inherit', ), ) Modified: trunk/testing/unit-tests/csst/selectors/first-child.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/first-child.csst 2008-01-05 20:54:13 UTC (rev 94) +++ trunk/testing/unit-tests/csst/selectors/first-child.csst 2008-01-05 21:08:34 UTC (rev 95) @@ -1,11 +1,11 @@ --TEST-- First child selector --CSS-- -p:first-child {display: none;} +p:first-child {display: inherit;} --EXPECT-- array ( 'p:first-child' => array ( - 'display' => 'none', + 'display' => 'inherit', ), ) Modified: trunk/testing/unit-tests/csst/selectors/focus.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/focus.csst 2008-01-05 20:54:13 UTC (rev 94) +++ trunk/testing/unit-tests/csst/selectors/focus.csst 2008-01-05 21:08:34 UTC (rev 95) @@ -1,11 +1,11 @@ --TEST-- Dynamic focus selector --CSS-- -a:focus {display: none;} +a:focus {display: inherit;} --EXPECT-- array ( 'a:focus' => array ( - 'display' => 'none', + 'display' => 'inherit', ), ) Modified: trunk/testing/unit-tests/csst/selectors/hover.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/hover.csst 2008-01-05 20:54:13 UTC (rev 94) +++ trunk/testing/unit-tests/csst/selectors/hover.csst 2008-01-05 21:08:34 UTC (rev 95) @@ -1,11 +1,11 @@ --TEST-- Dynamic hover selector --CSS-- -a:hover {display: none;} +a:hover {display: inherit;} --EXPECT-- array ( 'a:hover' => array ( - 'display' => 'none', + 'display' => 'inherit', ), ) Modified: trunk/testing/unit-tests/csst/selectors/id.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/id.csst 2008-01-05 20:54:13 UTC (rev 94) +++ trunk/testing/unit-tests/csst/selectors/id.csst 2008-01-05 21:08:34 UTC (rev 95) @@ -1,11 +1,11 @@ --TEST-- ID selector --CSS-- -a#foo {display: none;} +a#foo {display: inherit;} --EXPECT-- array ( 'a#foo' => array ( - 'display' => 'none', + 'display' => 'inherit', ), ) Modified: trunk/testing/unit-tests/csst/selectors/lang.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/lang.csst 2008-01-05 20:54:13 UTC (rev 94) +++ trunk/testing/unit-tests/csst/selectors/lang.csst 2008-01-05 21:08:34 UTC (rev 95) @@ -1,11 +1,11 @@ --TEST-- Language selector --CSS-- -div:lang(en) {display: none;} +div:lang(en) {display: inherit;} --EXPECT-- array ( 'div:lang(en)' => array ( - 'display' => 'none', + 'display' => 'inherit', ), ) Modified: trunk/testing/unit-tests/csst/selectors/link.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/link.csst 2008-01-05 20:54:13 UTC (rev 94) +++ trunk/testing/unit-tests/csst/selectors/link.csst 2008-01-05 21:08:34 UTC (rev 95) @@ -1,11 +1,11 @@ --TEST-- Not-visited link selector --CSS-- -a:link {display: none;} +a:link {display: inherit;} --EXPECT-- array ( 'a:link' => array ( - 'display' => 'none', + 'display' => 'inherit', ), ) Modified: trunk/testing/unit-tests/csst/selectors/type.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/type.csst 2008-01-05 20:54:13 UTC (rev 94) +++ trunk/testing/unit-tests/csst/selectors/type.csst 2008-01-05 21:08:34 UTC (rev 95) @@ -1,11 +1,11 @@ --TEST-- Type selector --CSS-- -a {display: none;} +a {display: inherit;} --EXPECT-- array ( 'a' => array ( - 'display' => 'none', + 'display' => 'inherit', ), ) Modified: trunk/testing/unit-tests/csst/selectors/universal.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/universal.csst 2008-01-05 20:54:13 UTC (rev 94) +++ trunk/testing/unit-tests/csst/selectors/universal.csst 2008-01-05 21:08:34 UTC (rev 95) @@ -1,11 +1,11 @@ --TEST-- Universal selector --CSS-- -* {display: none;} +* {display: inherit;} --EXPECT-- array ( '*' => array ( - 'display' => 'none', + 'display' => 'inherit', ), ) \ No newline at end of file Modified: trunk/testing/unit-tests/csst/selectors/visited.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/visited.csst 2008-01-05 20:54:13 UTC (rev 94) +++ trunk/testing/unit-tests/csst/selectors/visited.csst 2008-01-05 21:08:34 UTC (rev 95) @@ -1,11 +1,11 @@ --TEST-- Visited link selector --CSS-- -a:visited {display: none;} +a:visited {display: inherit;} --EXPECT-- array ( 'a:visited' => array ( - 'display' => 'none', + 'display' => 'inherit', ), ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <edw...@us...> - 2008-01-05 20:54:14
|
Revision: 94 http://csstidy.svn.sourceforge.net/csstidy/?rev=94&view=rev Author: edwardzyang Date: 2008-01-05 12:54:13 -0800 (Sat, 05 Jan 2008) Log Message: ----------- Add all basic selectors, set svn:eol-style=native for rest Modified Paths: -------------- trunk/testing/unit-tests/csst/selectors/active.csst trunk/testing/unit-tests/csst/selectors/child.csst trunk/testing/unit-tests/csst/selectors/descendant.csst trunk/testing/unit-tests/csst/selectors/first-child.csst trunk/testing/unit-tests/csst/selectors/focus.csst trunk/testing/unit-tests/csst/selectors/hover.csst trunk/testing/unit-tests/csst/selectors/lang.csst trunk/testing/unit-tests/csst/selectors/link.csst trunk/testing/unit-tests/csst/selectors/type.csst trunk/testing/unit-tests/csst/selectors/universal.csst trunk/testing/unit-tests/csst/selectors/visited.csst Added Paths: ----------- trunk/testing/unit-tests/csst/selectors/adjacent.csst trunk/testing/unit-tests/csst/selectors/attribute-begins.csst trunk/testing/unit-tests/csst/selectors/attribute-contains.csst trunk/testing/unit-tests/csst/selectors/attribute-equals.csst trunk/testing/unit-tests/csst/selectors/attribute-set.csst trunk/testing/unit-tests/csst/selectors/class.csst trunk/testing/unit-tests/csst/selectors/id.csst Property Changed: ---------------- trunk/testing/unit-tests/csst/selectors/active.csst trunk/testing/unit-tests/csst/selectors/child.csst trunk/testing/unit-tests/csst/selectors/descendant.csst trunk/testing/unit-tests/csst/selectors/first-child.csst trunk/testing/unit-tests/csst/selectors/focus.csst trunk/testing/unit-tests/csst/selectors/hover.csst trunk/testing/unit-tests/csst/selectors/lang.csst trunk/testing/unit-tests/csst/selectors/link.csst trunk/testing/unit-tests/csst/selectors/type.csst trunk/testing/unit-tests/csst/selectors/universal.csst trunk/testing/unit-tests/csst/selectors/visited.csst Modified: trunk/testing/unit-tests/csst/selectors/active.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/active.csst 2008-01-05 20:44:47 UTC (rev 93) +++ trunk/testing/unit-tests/csst/selectors/active.csst 2008-01-05 20:54:13 UTC (rev 94) @@ -1,11 +1,11 @@ ---TEST-- -Dynamic active selector ---CSS-- -a:active {display: none;} ---EXPECT-- -array ( - 'a:active' => - array ( - 'display' => 'none', - ), -) +--TEST-- +Dynamic active selector +--CSS-- +a:active {display: none;} +--EXPECT-- +array ( + 'a:active' => + array ( + 'display' => 'none', + ), +) Property changes on: trunk/testing/unit-tests/csst/selectors/active.csst ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/testing/unit-tests/csst/selectors/adjacent.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/adjacent.csst (rev 0) +++ trunk/testing/unit-tests/csst/selectors/adjacent.csst 2008-01-05 20:54:13 UTC (rev 94) @@ -0,0 +1,11 @@ +--TEST-- +Adjacent selector +--CSS-- +a + b {display: none;} +--EXPECT-- +array ( + 'a + b' => + array ( + 'display' => 'none', + ), +) Property changes on: trunk/testing/unit-tests/csst/selectors/adjacent.csst ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/testing/unit-tests/csst/selectors/attribute-begins.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/attribute-begins.csst (rev 0) +++ trunk/testing/unit-tests/csst/selectors/attribute-begins.csst 2008-01-05 20:54:13 UTC (rev 94) @@ -0,0 +1,11 @@ +--TEST-- +Begins hyphen-separated attribute list selector +--CSS-- +a[foo|="en"] {display: none;} +--EXPECT-- +array ( + 'a[foo|="en"]' => + array ( + 'display' => 'none', + ), +) Property changes on: trunk/testing/unit-tests/csst/selectors/attribute-begins.csst ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/testing/unit-tests/csst/selectors/attribute-contains.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/attribute-contains.csst (rev 0) +++ trunk/testing/unit-tests/csst/selectors/attribute-contains.csst 2008-01-05 20:54:13 UTC (rev 94) @@ -0,0 +1,11 @@ +--TEST-- +Contained in space-separated attribute list selector +--CSS-- +a[foo~="warning"] {display: none;} +--EXPECT-- +array ( + 'a[foo~="warning"]' => + array ( + 'display' => 'none', + ), +) Property changes on: trunk/testing/unit-tests/csst/selectors/attribute-contains.csst ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/testing/unit-tests/csst/selectors/attribute-equals.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/attribute-equals.csst (rev 0) +++ trunk/testing/unit-tests/csst/selectors/attribute-equals.csst 2008-01-05 20:54:13 UTC (rev 94) @@ -0,0 +1,11 @@ +--TEST-- +Attribute equals selector +--CSS-- +a[foo="warning"] {display: none;} +--EXPECT-- +array ( + 'a[foo="warning"]' => + array ( + 'display' => 'none', + ), +) Property changes on: trunk/testing/unit-tests/csst/selectors/attribute-equals.csst ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/testing/unit-tests/csst/selectors/attribute-set.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/attribute-set.csst (rev 0) +++ trunk/testing/unit-tests/csst/selectors/attribute-set.csst 2008-01-05 20:54:13 UTC (rev 94) @@ -0,0 +1,11 @@ +--TEST-- +Attribute selector +--CSS-- +a[foo] {display: none;} +--EXPECT-- +array ( + 'a[foo]' => + array ( + 'display' => 'none', + ), +) Property changes on: trunk/testing/unit-tests/csst/selectors/attribute-set.csst ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/testing/unit-tests/csst/selectors/child.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/child.csst 2008-01-05 20:44:47 UTC (rev 93) +++ trunk/testing/unit-tests/csst/selectors/child.csst 2008-01-05 20:54:13 UTC (rev 94) @@ -1,11 +1,11 @@ ---TEST-- -Child selector ---CSS-- -table > tr {display: none;} ---EXPECT-- -array ( - 'table > tr' => - array ( - 'display' => 'none', - ), -) +--TEST-- +Child selector +--CSS-- +table > tr {display: none;} +--EXPECT-- +array ( + 'table > tr' => + array ( + 'display' => 'none', + ), +) Property changes on: trunk/testing/unit-tests/csst/selectors/child.csst ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/testing/unit-tests/csst/selectors/class.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/class.csst (rev 0) +++ trunk/testing/unit-tests/csst/selectors/class.csst 2008-01-05 20:54:13 UTC (rev 94) @@ -0,0 +1,11 @@ +--TEST-- +Class selector +--CSS-- +a.foo {display: none;} +--EXPECT-- +array ( + 'a.foo' => + array ( + 'display' => 'none', + ), +) Property changes on: trunk/testing/unit-tests/csst/selectors/class.csst ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/testing/unit-tests/csst/selectors/descendant.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/descendant.csst 2008-01-05 20:44:47 UTC (rev 93) +++ trunk/testing/unit-tests/csst/selectors/descendant.csst 2008-01-05 20:54:13 UTC (rev 94) @@ -1,11 +1,11 @@ ---TEST-- -Descendant selector ---CSS-- -table tr {display: none;} ---EXPECT-- -array ( - 'table tr' => - array ( - 'display' => 'none', - ), -) +--TEST-- +Descendant selector +--CSS-- +table tr {display: none;} +--EXPECT-- +array ( + 'table tr' => + array ( + 'display' => 'none', + ), +) Property changes on: trunk/testing/unit-tests/csst/selectors/descendant.csst ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/testing/unit-tests/csst/selectors/first-child.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/first-child.csst 2008-01-05 20:44:47 UTC (rev 93) +++ trunk/testing/unit-tests/csst/selectors/first-child.csst 2008-01-05 20:54:13 UTC (rev 94) @@ -1,11 +1,11 @@ ---TEST-- -First child selector ---CSS-- -p:first-child {display: none;} ---EXPECT-- -array ( - 'p:first-child' => - array ( - 'display' => 'none', - ), -) +--TEST-- +First child selector +--CSS-- +p:first-child {display: none;} +--EXPECT-- +array ( + 'p:first-child' => + array ( + 'display' => 'none', + ), +) Property changes on: trunk/testing/unit-tests/csst/selectors/first-child.csst ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/testing/unit-tests/csst/selectors/focus.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/focus.csst 2008-01-05 20:44:47 UTC (rev 93) +++ trunk/testing/unit-tests/csst/selectors/focus.csst 2008-01-05 20:54:13 UTC (rev 94) @@ -1,11 +1,11 @@ ---TEST-- -Dynamic focus selector ---CSS-- -a:focus {display: none;} ---EXPECT-- -array ( - 'a:focus' => - array ( - 'display' => 'none', - ), -) +--TEST-- +Dynamic focus selector +--CSS-- +a:focus {display: none;} +--EXPECT-- +array ( + 'a:focus' => + array ( + 'display' => 'none', + ), +) Property changes on: trunk/testing/unit-tests/csst/selectors/focus.csst ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/testing/unit-tests/csst/selectors/hover.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/hover.csst 2008-01-05 20:44:47 UTC (rev 93) +++ trunk/testing/unit-tests/csst/selectors/hover.csst 2008-01-05 20:54:13 UTC (rev 94) @@ -1,11 +1,11 @@ ---TEST-- -Dynamic hover selector ---CSS-- -a:hover {display: none;} ---EXPECT-- -array ( - 'a:hover' => - array ( - 'display' => 'none', - ), -) +--TEST-- +Dynamic hover selector +--CSS-- +a:hover {display: none;} +--EXPECT-- +array ( + 'a:hover' => + array ( + 'display' => 'none', + ), +) Property changes on: trunk/testing/unit-tests/csst/selectors/hover.csst ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/testing/unit-tests/csst/selectors/id.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/id.csst (rev 0) +++ trunk/testing/unit-tests/csst/selectors/id.csst 2008-01-05 20:54:13 UTC (rev 94) @@ -0,0 +1,11 @@ +--TEST-- +ID selector +--CSS-- +a#foo {display: none;} +--EXPECT-- +array ( + 'a#foo' => + array ( + 'display' => 'none', + ), +) Property changes on: trunk/testing/unit-tests/csst/selectors/id.csst ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/testing/unit-tests/csst/selectors/lang.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/lang.csst 2008-01-05 20:44:47 UTC (rev 93) +++ trunk/testing/unit-tests/csst/selectors/lang.csst 2008-01-05 20:54:13 UTC (rev 94) @@ -1,11 +1,11 @@ ---TEST-- -Language selector ---CSS-- -div:lang(en) {display: none;} ---EXPECT-- -array ( - 'div:lang(en)' => - array ( - 'display' => 'none', - ), -) +--TEST-- +Language selector +--CSS-- +div:lang(en) {display: none;} +--EXPECT-- +array ( + 'div:lang(en)' => + array ( + 'display' => 'none', + ), +) Property changes on: trunk/testing/unit-tests/csst/selectors/lang.csst ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/testing/unit-tests/csst/selectors/link.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/link.csst 2008-01-05 20:44:47 UTC (rev 93) +++ trunk/testing/unit-tests/csst/selectors/link.csst 2008-01-05 20:54:13 UTC (rev 94) @@ -1,11 +1,11 @@ ---TEST-- -Not-visited link selector ---CSS-- -a:link {display: none;} ---EXPECT-- -array ( - 'a:link' => - array ( - 'display' => 'none', - ), -) +--TEST-- +Not-visited link selector +--CSS-- +a:link {display: none;} +--EXPECT-- +array ( + 'a:link' => + array ( + 'display' => 'none', + ), +) Property changes on: trunk/testing/unit-tests/csst/selectors/link.csst ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/testing/unit-tests/csst/selectors/type.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/type.csst 2008-01-05 20:44:47 UTC (rev 93) +++ trunk/testing/unit-tests/csst/selectors/type.csst 2008-01-05 20:54:13 UTC (rev 94) @@ -1,11 +1,11 @@ ---TEST-- -Type selector ---CSS-- -a {display: none;} ---EXPECT-- -array ( - 'a' => - array ( - 'display' => 'none', - ), -) +--TEST-- +Type selector +--CSS-- +a {display: none;} +--EXPECT-- +array ( + 'a' => + array ( + 'display' => 'none', + ), +) Property changes on: trunk/testing/unit-tests/csst/selectors/type.csst ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/testing/unit-tests/csst/selectors/universal.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/universal.csst 2008-01-05 20:44:47 UTC (rev 93) +++ trunk/testing/unit-tests/csst/selectors/universal.csst 2008-01-05 20:54:13 UTC (rev 94) @@ -1,11 +1,11 @@ ---TEST-- -Universal selector ---CSS-- -* {display: none;} ---EXPECT-- -array ( - '*' => - array ( - 'display' => 'none', - ), +--TEST-- +Universal selector +--CSS-- +* {display: none;} +--EXPECT-- +array ( + '*' => + array ( + 'display' => 'none', + ), ) \ No newline at end of file Property changes on: trunk/testing/unit-tests/csst/selectors/universal.csst ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/testing/unit-tests/csst/selectors/visited.csst =================================================================== --- trunk/testing/unit-tests/csst/selectors/visited.csst 2008-01-05 20:44:47 UTC (rev 93) +++ trunk/testing/unit-tests/csst/selectors/visited.csst 2008-01-05 20:54:13 UTC (rev 94) @@ -1,11 +1,11 @@ ---TEST-- -Visited link selector ---CSS-- -a:visited {display: none;} ---EXPECT-- -array ( - 'a:visited' => - array ( - 'display' => 'none', - ), -) +--TEST-- +Visited link selector +--CSS-- +a:visited {display: none;} +--EXPECT-- +array ( + 'a:visited' => + array ( + 'display' => 'none', + ), +) Property changes on: trunk/testing/unit-tests/csst/selectors/visited.csst ___________________________________________________________________ Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <edw...@us...> - 2008-01-05 20:44:49
|
Revision: 93 http://csstidy.svn.sourceforge.net/csstidy/?rev=93&view=rev Author: edwardzyang Date: 2008-01-05 12:44:47 -0800 (Sat, 05 Jan 2008) Log Message: ----------- Make unit tests use SimpleTest, integrate in the framework. We have a custom reporter. Modified Paths: -------------- trunk/testing/unit-tests.inc trunk/testing/unit-tests.php Added Paths: ----------- trunk/testing/unit-tests/_files.php trunk/testing/unit-tests/class.Text_Diff_Renderer_parallel.php trunk/testing/unit-tests/class.csstidy_csst.php trunk/testing/unit-tests/class.csstidy_reporter.php trunk/testing/unit-tests/csst/README trunk/testing/unit-tests/test.csst.php Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Name: svn:ignore - temp *.bak + temp *.bak test-settings.php Added: trunk/testing/unit-tests/_files.php =================================================================== --- trunk/testing/unit-tests/_files.php (rev 0) +++ trunk/testing/unit-tests/_files.php 2008-01-05 20:44:47 UTC (rev 93) @@ -0,0 +1,4 @@ +<?php + +$test_files = array(); +$test_files[] = 'test.csst.php'; Property changes on: trunk/testing/unit-tests/_files.php ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/testing/unit-tests/class.Text_Diff_Renderer_parallel.php =================================================================== --- trunk/testing/unit-tests/class.Text_Diff_Renderer_parallel.php (rev 0) +++ trunk/testing/unit-tests/class.Text_Diff_Renderer_parallel.php 2008-01-05 20:44:47 UTC (rev 93) @@ -0,0 +1,30 @@ +<?php + +class Text_Diff_Renderer_parallel extends Text_Diff_Renderer +{ + var $original = 'Original'; + var $final = 'Final'; + var $_leading_context_lines = 10000; + var $_trailing_context_lines = 10000; + function _blockHeader() {} + function _startDiff() { + return '<table class="diff"><thead><tr><th>'. $this->original .'</th><th>'. $this->final .'</th></tr></thead><tbody>'; + } + function _endDiff() { + return '</tbody></table>'; + } + function _context($lines) { + return '<tr><td><pre>'. htmlspecialchars(implode("\n", $lines)) .'</pre></td> + <td><pre>'. htmlspecialchars(implode("\n", $lines)) .'</pre></td></tr>'; + } + function _added($lines) { + return '<tr><td> </td><td class="added"><pre>'. htmlspecialchars(implode("\n", $lines)) .'</pre></td></tr>'; + } + function _deleted($lines) { + return '<tr><td class="deleted"><pre>'. htmlspecialchars(implode("\n", $lines)) .'</pre></td><td> </td></tr>'; + } + function _changed($orig, $final) { + return '<tr class="changed"><td><pre>'. htmlspecialchars(implode("\n", $orig)) .'</pre></td> + <td><pre>'. htmlspecialchars(implode("\n", $final)) .'</pre></td></tr>'; + } +} Property changes on: trunk/testing/unit-tests/class.Text_Diff_Renderer_parallel.php ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/testing/unit-tests/class.csstidy_csst.php =================================================================== --- trunk/testing/unit-tests/class.csstidy_csst.php (rev 0) +++ trunk/testing/unit-tests/class.csstidy_csst.php 2008-01-05 20:44:47 UTC (rev 93) @@ -0,0 +1,84 @@ +<?php + +require_once 'class.Text_Diff_Renderer_parallel.php'; + +class csstidy_csst extends SimpleExpectation +{ + /** Filename of test */ + var $filename; + + /** Test name */ + var $test; + + /** CSS for test to parse */ + var $css = ''; + + /** Expected var_export() output of $css->css[41] (no at block) */ + var $expect = ''; + + /** Expected var_export() output of $css->css (with at block) */ + var $fullexpect = ''; + + /** Actual result */ + var $actual; + + /** + * Loads this class from a file + */ + function load($filename) { + $this->filename = $filename; + $fh = fopen($filename, 'r'); + $state = null; + while (($line = fgets($fh)) !== false) { + $line = rtrim($line, "\n\r"); // normalize newlines + if (substr($line, 0, 2) == '--') { + // detected section + $state = $line; + continue; + } + if ($state === null) continue; + switch ($state) { + case '--TEST--': + $this->test = trim($line); + continue; + case '--CSS--': + $this->css .= $line . "\n"; + continue; + case '--EXPECT--': + $this->expect .= $line . "\n"; + continue; + case '--FULLEXPECT--': + $this->fullexpect .= $line . "\n"; + continue; + } + } + $this->expect = trim($this->expect, "\n"); // trim trailing/leading newlines + fclose($fh); + } + + function test($filename) { + $this->load($filename); + $css = new csstidy(); + $css->parse($this->css); + $this->actual = var_export($css->css[41], true); + return $this->expect === $this->actual; + } + + function testMessage() { + $message = $this->test . ' test at '. htmlspecialchars($this->filename); + return $message; + } + + /** + * Renders the test + */ + function render() { + $message = '<pre>'. htmlspecialchars($this->css) .'</pre>'; + $diff = new Text_Diff('auto', array(explode("\n", $this->expect), explode("\n", $this->actual))); + $renderer = new Text_Diff_Renderer_parallel(); + $renderer->original = 'Expected'; + $renderer->final = 'Actual'; + $message .= $renderer->render($diff); + return $message; + } +} Property changes on: trunk/testing/unit-tests/class.csstidy_csst.php ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/testing/unit-tests/class.csstidy_reporter.php =================================================================== --- trunk/testing/unit-tests/class.csstidy_reporter.php (rev 0) +++ trunk/testing/unit-tests/class.csstidy_reporter.php 2008-01-05 20:44:47 UTC (rev 93) @@ -0,0 +1,18 @@ +<?php + +class csstidy_reporter extends HTMLReporter +{ + + function _getCss() { + $css = parent::_getCss(); + $css .= ' +.diff {margin-bottom: 1em;} +.diff th {width:50%;} +.diff pre {margin:0; padding:0; background:none;} +.diff .changed, .diff .deleted, .diff .added {background: #FF5;} + '; + return $css; + } + +} + Property changes on: trunk/testing/unit-tests/class.csstidy_reporter.php ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/testing/unit-tests/csst/README =================================================================== --- trunk/testing/unit-tests/csst/README (rev 0) +++ trunk/testing/unit-tests/csst/README 2008-01-05 20:44:47 UTC (rev 93) @@ -0,0 +1,22 @@ +CSST + +These test are for CSSTidy's parsing algorithms. They take this form: + +--TEST-- +Test name +--CSS-- +CSS to parse +--EXPECT-- +var_export() representation of csstidy->css[41] + +Note carefully that EXPECT is for csstidy->css[41], not csstidy->css. This +is because, by default, all declarations are placed inside the +DEFAULT_AT section. For tests that need to make use of at selectors, use + +--FULLEXPECT-- +var_export() representation of csstidy->css + +...instead. + +See also: class.csstidy_csst.php (the implementation of these tests) and +test.csst.php (the caller stub for SimpleTest) Property changes on: trunk/testing/unit-tests/csst/README ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/testing/unit-tests/test.csst.php =================================================================== --- trunk/testing/unit-tests/test.csst.php (rev 0) +++ trunk/testing/unit-tests/test.csst.php 2008-01-05 20:44:47 UTC (rev 93) @@ -0,0 +1,19 @@ +<?php + +require_once 'class.csstidy_csst.php'; + +/** + * Performs the csst tests in csst/ folder + */ +class csstidy_test_csst extends UnitTestCase +{ + function testAll() { + foreach (globr(dirname(__FILE__) . '/csst', '*.csst') as $filename) { + $expectation = new csstidy_csst(); + $result = $this->assert($expectation, $filename, '%s'); + // this is necessary because SimpleTest doesn't support + // HTML messages; this probably should be in the reporter + if (!$result) echo $expectation->render(); + } + } +} Property changes on: trunk/testing/unit-tests/test.csst.php ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/testing/unit-tests.inc =================================================================== --- trunk/testing/unit-tests.inc 2008-01-05 19:28:57 UTC (rev 92) +++ trunk/testing/unit-tests.inc 2008-01-05 20:44:47 UTC (rev 93) @@ -1,7 +1,7 @@ <?php /**@file - * Utility functions and classes for unit testing + * Utility functions for unit testing */ function globr($sDir, $sPattern, $nFlags = NULL) { @@ -33,119 +33,3 @@ } return $aDirs; } - -class csstidy_test_csst -{ - /** Filename of test */ - var $filename; - - /** Test name */ - var $test; - - /** CSS for test to parse */ - var $css = ''; - - /** Expected var_export() output of $css->css[41] (no at block) */ - var $expect = ''; - - /** Expected var_export() output of $css->css (with at block) */ - var $fullexpect = ''; - - /** Actual result */ - var $actual; - - /** - * Loads this class from a file - */ - function load($filename) { - $this->filename = $filename; - $fh = fopen($filename, 'r'); - $state = null; - while (($line = fgets($fh)) !== false) { - $line = rtrim($line, "\n\r"); // normalize newlines - if (substr($line, 0, 2) == '--') { - // detected section - $state = $line; - continue; - } - if ($state === null) continue; - switch ($state) { - case '--TEST--': - $this->test = trim($line); - continue; - case '--CSS--': - $this->css .= $line . "\n"; - continue; - case '--EXPECT--': - $this->expect .= $line . "\n"; - continue; - case '--FULLEXPECT--': - $this->fullexpect .= $line . "\n"; - continue; - } - } - $this->expect = trim($this->expect, "\n"); // trim trailing/leading newlines - fclose($fh); - } - - /** - * Runs test - * @return TRUE if success - */ - function run() { - $css = new csstidy(); - $css->parse($this->css); - $this->actual = var_export($css->css[41], true); - return $this->expect === $this->actual; - } - - /** - * Renders the test - */ - function render() { - if ($this->actual === null) $this->run(); - $heading = '<strong>'. htmlspecialchars($this->test) .'</strong> test (<tt>'. htmlspecialchars($this->filename) .'</tt>)'; - if ($this->expect === $this->actual) { - return; - // comment the above return to show passes - echo "<div><span style=\"color:green;\">Passed:</span> $heading</div>"; - return; - } - echo "<div><span style=\"color:red;\">Failed:</span> $heading</div>"; - echo '<pre>'. htmlspecialchars($this->css) .'</pre>'; - $diff = new Text_Diff('auto', array(explode("\n", $this->expect), explode("\n", $this->actual))); - $renderer = new Text_Diff_Renderer_parallel(); - $renderer->original = 'Expected'; - $renderer->final = 'Actual'; - echo $renderer->render($diff); - } -} - -class Text_Diff_Renderer_parallel extends Text_Diff_Renderer -{ - var $original = 'Original'; - var $final = 'Final'; - var $_leading_context_lines = 10000; - var $_trailing_context_lines = 10000; - function _blockHeader() {} - function _startDiff() { - return '<table class="diff"><thead><tr><th>'. $this->original .'</th><th>'. $this->final .'</th></tr></thead><tbody>'; - } - function _endDiff() { - return '</tbody></table>'; - } - function _context($lines) { - return '<tr><td><pre>'. htmlspecialchars(implode("\n", $lines)) .'</pre></td> - <td><pre>'. htmlspecialchars(implode("\n", $lines)) .'</pre></td></tr>'; - } - function _added($lines) { - return '<tr><td> </td><td class="added"><pre>'. htmlspecialchars(implode("\n", $lines)) .'</pre></td></tr>'; - } - function _deleted($lines) { - return '<tr><td class="deleted"><pre>'. htmlspecialchars(implode("\n", $lines)) .'</pre></td><td> </td></tr>'; - } - function _changed($orig, $final) { - return '<tr class="changed"><td><pre>'. htmlspecialchars(implode("\n", $orig)) .'</pre></td> - <td><pre>'. htmlspecialchars(implode("\n", $final)) .'</pre></td></tr>'; - } -} Modified: trunk/testing/unit-tests.php =================================================================== --- trunk/testing/unit-tests.php 2008-01-05 19:28:57 UTC (rev 92) +++ trunk/testing/unit-tests.php 2008-01-05 20:44:47 UTC (rev 93) @@ -8,59 +8,32 @@ error_reporting(E_ALL); -require_once '../class.csstidy.php'; - +// Configuration $simpletest_location = 'simpletest/'; if (file_exists('../test-settings.php')) include_once '../test-settings.php'; -// PEAR +// Includes +require_once '../class.csstidy.php'; require_once 'Text/Diff.php'; require_once 'Text/Diff/Renderer.php'; - require_once $simpletest_location . 'unit_tester.php'; require_once $simpletest_location . 'reporter.php'; -// require_once $simpletest_location . 'mock_objects.php'; // we don't need it yet - +require_once 'unit-tests/class.csstidy_reporter.php'; require_once 'unit-tests.inc'; -chdir(dirname(__FILE__)); -$passed_tests = 0; -$failed_tests = 0; +// Test files +$test_files = array(); +require 'unit-tests/_files.php'; -?> -<html> -<title>CSSTidy unit tests</title> -<style type="text/css"> -.box {color:white; font-weight:bold; padding: 8px; margin-top: 1em;} -.diff {margin-bottom: 1em;} -.diff th {width:50%;} -.diff pre {margin:0; padding:0;} -.diff .changed, .diff .deleted, .diff .added {background: #FF5;} -del {background: red; color: white; font-weight: bold;} -ins {background: green; color: white; font-weight: bold;} -</style> -<body> -<h1>CSSTidy unit tests</h1> -<?php - -// allow only one directory deep, I guess otherwise, we need a recursive glob -foreach (globr('unit-tests/csst', '*.csst') as $filename) { - $test = new csstidy_test_csst(); - $test->load($filename); - if (!$test->run()) $failed_tests++; - else $passed_tests++; - $test->render(); +// Setup test files +$test = new GroupTest('CSSTidy unit tests'); +foreach ($test_files as $test_file) { + require_once "unit-tests/$test_file"; + list($x, $class_suffix) = explode('.', $test_file); + $test->addTestClass("csstidy_test_$class_suffix"); } -// output test results -if (!$failed_tests) { - echo '<div style="background:green;" class="box">'; -} else { - echo '<div style="background:red;" class="box">'; -} +if (SimpleReporter::inCli()) $reporter = new TextReporter(); +else $reporter = new csstidy_reporter('UTF-8'); -echo $passed_tests .' tests passed, ' . $failed_tests .' tests failed</div>' - -?> -</body> -</html> \ No newline at end of file +$test->run($reporter); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <edw...@us...> - 2008-01-05 19:28:58
|
Revision: 92 http://csstidy.svn.sourceforge.net/csstidy/?rev=92&view=rev Author: edwardzyang Date: 2008-01-05 11:28:57 -0800 (Sat, 05 Jan 2008) Log Message: ----------- Reorganize unit tests directory. We will put all unit test classes inside unit-tests.php Modified Paths: -------------- trunk/testing/unit-tests.php Added Paths: ----------- trunk/testing/unit-tests/csst/ trunk/testing/unit-tests/csst/selectors/ Removed Paths: ------------- trunk/testing/unit-tests/selectors/ Copied: trunk/testing/unit-tests/csst/selectors (from rev 90, trunk/testing/unit-tests/selectors) Modified: trunk/testing/unit-tests.php =================================================================== --- trunk/testing/unit-tests.php 2008-01-05 18:56:00 UTC (rev 91) +++ trunk/testing/unit-tests.php 2008-01-05 19:28:57 UTC (rev 92) @@ -8,12 +8,19 @@ error_reporting(E_ALL); -require('../class.csstidy.php'); +require_once '../class.csstidy.php'; -// require PEAR class Text_Diff for nice fail messages +$simpletest_location = 'simpletest/'; +if (file_exists('../test-settings.php')) include_once '../test-settings.php'; + +// PEAR require_once 'Text/Diff.php'; require_once 'Text/Diff/Renderer.php'; +require_once $simpletest_location . 'unit_tester.php'; +require_once $simpletest_location . 'reporter.php'; +// require_once $simpletest_location . 'mock_objects.php'; // we don't need it yet + require_once 'unit-tests.inc'; chdir(dirname(__FILE__)); @@ -37,7 +44,7 @@ <?php // allow only one directory deep, I guess otherwise, we need a recursive glob -foreach (globr('unit-tests', '*.csst') as $filename) { +foreach (globr('unit-tests/csst', '*.csst') as $filename) { $test = new csstidy_test_csst(); $test->load($filename); if (!$test->run()) $failed_tests++; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <edw...@us...> - 2008-01-05 18:56:11
|
Revision: 91 http://csstidy.svn.sourceforge.net/csstidy/?rev=91&view=rev Author: edwardzyang Date: 2008-01-05 10:56:00 -0800 (Sat, 05 Jan 2008) Log Message: ----------- - Added Changelog, and documented all of the changes made by brettz9 and _sined since the last 1.3 release - Marked COPYING, NEWS and README svn:eol-style=native Modified Paths: -------------- trunk/README Added Paths: ----------- trunk/NEWS Property Changed: ---------------- trunk/COPYING trunk/README Property changes on: trunk/COPYING ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/NEWS =================================================================== --- trunk/NEWS (rev 0) +++ trunk/NEWS 2008-01-05 18:56:00 UTC (rev 91) @@ -0,0 +1,20 @@ +Changelog + +1.4, unknown release date +# CSSTidy is now licensed under LGPL! +! csstidy->set_cfg now accept a single parameter, an associative array, to + set all configuration options +! Templates can now be loaded via set_cfg using the 'template' config + parameter +! csstidy_print->formatted_page added, returns a full XHTML page based + off of csstidy_print->formatted +! cssparsed.css created, contains just the CSS for formatted CSS output +! New CSS 3 units "ch" and "turn" added +! Unit tests added, requires Text_Diff (PEAR) and SimpleTest +- Added localizations for css_optimiser.php +- Fixed bug with cookie setting for custom templates +- Minor security problem in css_optimiser.php fixed +- Fixed bug with float handling in exotic locales +- Fixed bug with non-functioning getenv in ASAPI +- Fixed bug with bad hexadecimal syntax recovery +- At-selectors optimized by removing unnecessary url() Property changes on: trunk/NEWS ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/README =================================================================== --- trunk/README 2008-01-05 06:51:27 UTC (rev 90) +++ trunk/README 2008-01-05 18:56:00 UTC (rev 91) @@ -1,28 +1,28 @@ -CSSTidy - -Changelog: http://csstidy.svn.sourceforge.net/viewvc/csstidy/trunk/ - -css_optimiser.php is the web-interface, css_parser.php contains the PHP class (CSSTidy). - -This class represents a CSS parser which reads CSS code and saves it in an array. -In opposite to most other CSS parsers, it does not use regular expressions and -thus has full CSS2 support and a higher reliability. The downside of not using regular expressions -is a lower speed though. -Additional to that it applies some optimisations and fixes to the CSS code. -An online version should be available here: http://cdburnerxp.se/cssparse/css_optimiser.php - - - Copyright 2005, 2006, 2007 Florian Schmitz - - CSSTidy is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - CSSTidy is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License +CSSTidy + +Changelog: http://csstidy.svn.sourceforge.net/viewvc/csstidy/trunk/ + +css_optimiser.php is the web-interface, css_parser.php contains the PHP class (CSSTidy). + +This class represents a CSS parser which reads CSS code and saves it in an array. +In opposite to most other CSS parsers, it does not use regular expressions and +thus has full CSS2 support and a higher reliability. The downside of not using regular expressions +is a lower speed though. +Additional to that it applies some optimisations and fixes to the CSS code. +An online version should be available here: http://cdburnerxp.se/cssparse/css_optimiser.php + + + Copyright 2005, 2006, 2007 Florian Schmitz + + CSSTidy is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + CSSTidy is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. \ No newline at end of file Property changes on: trunk/README ___________________________________________________________________ Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <edw...@us...> - 2008-01-05 06:51:31
|
Revision: 90 http://csstidy.svn.sourceforge.net/csstidy/?rev=90&view=rev Author: edwardzyang Date: 2008-01-04 22:51:27 -0800 (Fri, 04 Jan 2008) Log Message: ----------- Add unit testing to CSS Tidy and tests for selectors, needs Text_Diff to work Added Paths: ----------- trunk/testing/unit-tests/ trunk/testing/unit-tests/selectors/ trunk/testing/unit-tests/selectors/active.csst trunk/testing/unit-tests/selectors/child.csst trunk/testing/unit-tests/selectors/descendant.csst trunk/testing/unit-tests/selectors/first-child.csst trunk/testing/unit-tests/selectors/focus.csst trunk/testing/unit-tests/selectors/hover.csst trunk/testing/unit-tests/selectors/lang.csst trunk/testing/unit-tests/selectors/link.csst trunk/testing/unit-tests/selectors/type.csst trunk/testing/unit-tests/selectors/universal.csst trunk/testing/unit-tests/selectors/visited.csst trunk/testing/unit-tests.inc trunk/testing/unit-tests.php Added: trunk/testing/unit-tests/selectors/active.csst =================================================================== --- trunk/testing/unit-tests/selectors/active.csst (rev 0) +++ trunk/testing/unit-tests/selectors/active.csst 2008-01-05 06:51:27 UTC (rev 90) @@ -0,0 +1,11 @@ +--TEST-- +Dynamic active selector +--CSS-- +a:active {display: none;} +--EXPECT-- +array ( + 'a:active' => + array ( + 'display' => 'none', + ), +) Added: trunk/testing/unit-tests/selectors/child.csst =================================================================== --- trunk/testing/unit-tests/selectors/child.csst (rev 0) +++ trunk/testing/unit-tests/selectors/child.csst 2008-01-05 06:51:27 UTC (rev 90) @@ -0,0 +1,11 @@ +--TEST-- +Child selector +--CSS-- +table > tr {display: none;} +--EXPECT-- +array ( + 'table > tr' => + array ( + 'display' => 'none', + ), +) Added: trunk/testing/unit-tests/selectors/descendant.csst =================================================================== --- trunk/testing/unit-tests/selectors/descendant.csst (rev 0) +++ trunk/testing/unit-tests/selectors/descendant.csst 2008-01-05 06:51:27 UTC (rev 90) @@ -0,0 +1,11 @@ +--TEST-- +Descendant selector +--CSS-- +table tr {display: none;} +--EXPECT-- +array ( + 'table tr' => + array ( + 'display' => 'none', + ), +) Added: trunk/testing/unit-tests/selectors/first-child.csst =================================================================== --- trunk/testing/unit-tests/selectors/first-child.csst (rev 0) +++ trunk/testing/unit-tests/selectors/first-child.csst 2008-01-05 06:51:27 UTC (rev 90) @@ -0,0 +1,11 @@ +--TEST-- +First child selector +--CSS-- +p:first-child {display: none;} +--EXPECT-- +array ( + 'p:first-child' => + array ( + 'display' => 'none', + ), +) Added: trunk/testing/unit-tests/selectors/focus.csst =================================================================== --- trunk/testing/unit-tests/selectors/focus.csst (rev 0) +++ trunk/testing/unit-tests/selectors/focus.csst 2008-01-05 06:51:27 UTC (rev 90) @@ -0,0 +1,11 @@ +--TEST-- +Dynamic focus selector +--CSS-- +a:focus {display: none;} +--EXPECT-- +array ( + 'a:focus' => + array ( + 'display' => 'none', + ), +) Added: trunk/testing/unit-tests/selectors/hover.csst =================================================================== --- trunk/testing/unit-tests/selectors/hover.csst (rev 0) +++ trunk/testing/unit-tests/selectors/hover.csst 2008-01-05 06:51:27 UTC (rev 90) @@ -0,0 +1,11 @@ +--TEST-- +Dynamic hover selector +--CSS-- +a:hover {display: none;} +--EXPECT-- +array ( + 'a:hover' => + array ( + 'display' => 'none', + ), +) Added: trunk/testing/unit-tests/selectors/lang.csst =================================================================== --- trunk/testing/unit-tests/selectors/lang.csst (rev 0) +++ trunk/testing/unit-tests/selectors/lang.csst 2008-01-05 06:51:27 UTC (rev 90) @@ -0,0 +1,11 @@ +--TEST-- +Language selector +--CSS-- +div:lang(en) {display: none;} +--EXPECT-- +array ( + 'div:lang(en)' => + array ( + 'display' => 'none', + ), +) Added: trunk/testing/unit-tests/selectors/link.csst =================================================================== --- trunk/testing/unit-tests/selectors/link.csst (rev 0) +++ trunk/testing/unit-tests/selectors/link.csst 2008-01-05 06:51:27 UTC (rev 90) @@ -0,0 +1,11 @@ +--TEST-- +Not-visited link selector +--CSS-- +a:link {display: none;} +--EXPECT-- +array ( + 'a:link' => + array ( + 'display' => 'none', + ), +) Added: trunk/testing/unit-tests/selectors/type.csst =================================================================== --- trunk/testing/unit-tests/selectors/type.csst (rev 0) +++ trunk/testing/unit-tests/selectors/type.csst 2008-01-05 06:51:27 UTC (rev 90) @@ -0,0 +1,11 @@ +--TEST-- +Type selector +--CSS-- +a {display: none;} +--EXPECT-- +array ( + 'a' => + array ( + 'display' => 'none', + ), +) Added: trunk/testing/unit-tests/selectors/universal.csst =================================================================== --- trunk/testing/unit-tests/selectors/universal.csst (rev 0) +++ trunk/testing/unit-tests/selectors/universal.csst 2008-01-05 06:51:27 UTC (rev 90) @@ -0,0 +1,11 @@ +--TEST-- +Universal selector +--CSS-- +* {display: none;} +--EXPECT-- +array ( + '*' => + array ( + 'display' => 'none', + ), +) \ No newline at end of file Added: trunk/testing/unit-tests/selectors/visited.csst =================================================================== --- trunk/testing/unit-tests/selectors/visited.csst (rev 0) +++ trunk/testing/unit-tests/selectors/visited.csst 2008-01-05 06:51:27 UTC (rev 90) @@ -0,0 +1,11 @@ +--TEST-- +Visited link selector +--CSS-- +a:visited {display: none;} +--EXPECT-- +array ( + 'a:visited' => + array ( + 'display' => 'none', + ), +) Added: trunk/testing/unit-tests.inc =================================================================== --- trunk/testing/unit-tests.inc (rev 0) +++ trunk/testing/unit-tests.inc 2008-01-05 06:51:27 UTC (rev 90) @@ -0,0 +1,151 @@ +<?php + +/**@file + * Utility functions and classes for unit testing + */ + +function globr($sDir, $sPattern, $nFlags = NULL) { + $aFiles = glob("$sDir/$sPattern", $nFlags); + $files = getDir($sDir); + if (is_array($files)) { + foreach( $files as $file ) { + $aSubFiles = globr($file, $sPattern, $nFlags); + $aFiles = array_merge($aFiles,$aSubFiles); + } + } + return $aFiles; +} + +function getDir($sDir) { + $i=0; + $aDirs = array(); + if(is_dir($sDir)) { + if($rContents = opendir($sDir)) { + while($sNode = readdir($rContents)) { + if(is_dir($sDir.'/'.$sNode )) { + if($sNode !="." && $sNode !="..") { + $aDirs[$i] = $sDir.'/'.$sNode ; + $i++; + } + } + } + } + } + return $aDirs; +} + +class csstidy_test_csst +{ + /** Filename of test */ + var $filename; + + /** Test name */ + var $test; + + /** CSS for test to parse */ + var $css = ''; + + /** Expected var_export() output of $css->css[41] (no at block) */ + var $expect = ''; + + /** Expected var_export() output of $css->css (with at block) */ + var $fullexpect = ''; + + /** Actual result */ + var $actual; + + /** + * Loads this class from a file + */ + function load($filename) { + $this->filename = $filename; + $fh = fopen($filename, 'r'); + $state = null; + while (($line = fgets($fh)) !== false) { + $line = rtrim($line, "\n\r"); // normalize newlines + if (substr($line, 0, 2) == '--') { + // detected section + $state = $line; + continue; + } + if ($state === null) continue; + switch ($state) { + case '--TEST--': + $this->test = trim($line); + continue; + case '--CSS--': + $this->css .= $line . "\n"; + continue; + case '--EXPECT--': + $this->expect .= $line . "\n"; + continue; + case '--FULLEXPECT--': + $this->fullexpect .= $line . "\n"; + continue; + } + } + $this->expect = trim($this->expect, "\n"); // trim trailing/leading newlines + fclose($fh); + } + + /** + * Runs test + * @return TRUE if success + */ + function run() { + $css = new csstidy(); + $css->parse($this->css); + $this->actual = var_export($css->css[41], true); + return $this->expect === $this->actual; + } + + /** + * Renders the test + */ + function render() { + if ($this->actual === null) $this->run(); + $heading = '<strong>'. htmlspecialchars($this->test) .'</strong> test (<tt>'. htmlspecialchars($this->filename) .'</tt>)'; + if ($this->expect === $this->actual) { + return; + // comment the above return to show passes + echo "<div><span style=\"color:green;\">Passed:</span> $heading</div>"; + return; + } + echo "<div><span style=\"color:red;\">Failed:</span> $heading</div>"; + echo '<pre>'. htmlspecialchars($this->css) .'</pre>'; + $diff = new Text_Diff('auto', array(explode("\n", $this->expect), explode("\n", $this->actual))); + $renderer = new Text_Diff_Renderer_parallel(); + $renderer->original = 'Expected'; + $renderer->final = 'Actual'; + echo $renderer->render($diff); + } +} + +class Text_Diff_Renderer_parallel extends Text_Diff_Renderer +{ + var $original = 'Original'; + var $final = 'Final'; + var $_leading_context_lines = 10000; + var $_trailing_context_lines = 10000; + function _blockHeader() {} + function _startDiff() { + return '<table class="diff"><thead><tr><th>'. $this->original .'</th><th>'. $this->final .'</th></tr></thead><tbody>'; + } + function _endDiff() { + return '</tbody></table>'; + } + function _context($lines) { + return '<tr><td><pre>'. htmlspecialchars(implode("\n", $lines)) .'</pre></td> + <td><pre>'. htmlspecialchars(implode("\n", $lines)) .'</pre></td></tr>'; + } + function _added($lines) { + return '<tr><td> </td><td class="added"><pre>'. htmlspecialchars(implode("\n", $lines)) .'</pre></td></tr>'; + } + function _deleted($lines) { + return '<tr><td class="deleted"><pre>'. htmlspecialchars(implode("\n", $lines)) .'</pre></td><td> </td></tr>'; + } + function _changed($orig, $final) { + return '<tr class="changed"><td><pre>'. htmlspecialchars(implode("\n", $orig)) .'</pre></td> + <td><pre>'. htmlspecialchars(implode("\n", $final)) .'</pre></td></tr>'; + } +} Property changes on: trunk/testing/unit-tests.inc ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/testing/unit-tests.php =================================================================== --- trunk/testing/unit-tests.php (rev 0) +++ trunk/testing/unit-tests.php 2008-01-05 06:51:27 UTC (rev 90) @@ -0,0 +1,59 @@ +<?php + +/**@file + * Script for unit testing, allows for more fine grained error reporting + * when things go wrong. + * @author Edward Z. Yang <ad...@ht...> + */ + +error_reporting(E_ALL); + +require('../class.csstidy.php'); + +// require PEAR class Text_Diff for nice fail messages +require_once 'Text/Diff.php'; +require_once 'Text/Diff/Renderer.php'; + +require_once 'unit-tests.inc'; + +chdir(dirname(__FILE__)); +$passed_tests = 0; +$failed_tests = 0; + +?> +<html> +<title>CSSTidy unit tests</title> +<style type="text/css"> +.box {color:white; font-weight:bold; padding: 8px; margin-top: 1em;} +.diff {margin-bottom: 1em;} +.diff th {width:50%;} +.diff pre {margin:0; padding:0;} +.diff .changed, .diff .deleted, .diff .added {background: #FF5;} +del {background: red; color: white; font-weight: bold;} +ins {background: green; color: white; font-weight: bold;} +</style> +<body> +<h1>CSSTidy unit tests</h1> +<?php + +// allow only one directory deep, I guess otherwise, we need a recursive glob +foreach (globr('unit-tests', '*.csst') as $filename) { + $test = new csstidy_test_csst(); + $test->load($filename); + if (!$test->run()) $failed_tests++; + else $passed_tests++; + $test->render(); +} + +// output test results +if (!$failed_tests) { + echo '<div style="background:green;" class="box">'; +} else { + echo '<div style="background:red;" class="box">'; +} + +echo $passed_tests .' tests passed, ' . $failed_tests .' tests failed</div>' + +?> +</body> +</html> \ No newline at end of file Property changes on: trunk/testing/unit-tests.php ___________________________________________________________________ Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <edw...@us...> - 2007-12-17 22:27:13
|
Revision: 89 http://csstidy.svn.sourceforge.net/csstidy/?rev=89&view=rev Author: edwardzyang Date: 2007-12-17 14:27:06 -0800 (Mon, 17 Dec 2007) Log Message: ----------- Add a continue to bad hexadecimal code correction, otherwise value is clipped to zero. Modified Paths: -------------- trunk/class.csstidy_optimise.php Modified: trunk/class.csstidy_optimise.php =================================================================== --- trunk/class.csstidy_optimise.php 2007-12-13 12:59:52 UTC (rev 88) +++ trunk/class.csstidy_optimise.php 2007-12-17 22:27:06 UTC (rev 89) @@ -396,6 +396,7 @@ if (in_array($this->property, $color_values)) { $temp[$l] = '#'.$temp[$l]; + continue; } if (floatval($temp[$l]) == 0) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2007-12-13 13:00:02
|
Revision: 88 http://csstidy.svn.sourceforge.net/csstidy/?rev=88&view=rev Author: brettz9 Date: 2007-12-13 04:59:52 -0800 (Thu, 13 Dec 2007) Log Message: ----------- Modified Paths: -------------- trunk/class.csstidy_print.php Modified: trunk/class.csstidy_print.php =================================================================== --- trunk/class.csstidy_print.php 2007-09-22 05:59:40 UTC (rev 87) +++ trunk/class.csstidy_print.php 2007-12-13 12:59:52 UTC (rev 88) @@ -193,11 +193,19 @@ if (!empty($this->import)) { for ($i = 0, $size = count($this->import); $i < $size; $i ++) { + if(substr($this->import[$i], 0, 4) === 'url(' && substr($this->import[$i], -1, 1) === ')') { + $this->import[$i] = '\''.substr($this->import[$i], 4, -1).'\''; + $this->parser->log('Optimised @import : Removed "url("','Information'); + } $output .= $template[0].'@import '.$template[5].$this->import[$i].$template[6]; } } if (!empty($this->namespace)) { + if(substr($this->namespace, 0, 4) === 'url(' && substr($this->namespace, -1, 1) === ')') { + $this->namespace = '\''.substr($this->namespace, 4, -1).'\''; + $this->parser->log('Optimised @namespace : Removed "url("','Information'); + } $output .= $template[0].'@namespace '.$template[5].$this->namespace.$template[6]; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fl...@us...> - 2007-09-22 05:59:53
|
Revision: 87 http://csstidy.svn.sourceforge.net/csstidy/?rev=87&view=rev Author: floele Date: 2007-09-21 22:59:40 -0700 (Fri, 21 Sep 2007) Log Message: ----------- Allow empty CSS output (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=443492) Modified Paths: -------------- trunk-cpp/csstidy/print_css.cpp Modified: trunk-cpp/csstidy/print_css.cpp =================================================================== --- trunk-cpp/csstidy/print_css.cpp 2007-08-24 22:09:59 UTC (rev 86) +++ trunk-cpp/csstidy/print_css.cpp 2007-09-22 05:59:40 UTC (rev 87) @@ -79,8 +79,7 @@ { if(css.empty() && charset == "" && namesp == "" && import.empty() && csstokens.empty()) { - if(!settings["silent"]) cout << "Invalid CSS!" << endl; - return; + if(!settings["silent"]) cout << "Warning: empty CSS output!" << endl; } ofstream file_output; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2007-08-24 22:10:16
|
Revision: 86 http://csstidy.svn.sourceforge.net/csstidy/?rev=86&view=rev Author: brettz9 Date: 2007-08-24 15:09:59 -0700 (Fri, 24 Aug 2007) Log Message: ----------- Just add sined's clarification to one comment... Modified Paths: -------------- trunk/class.csstidy.php Modified: trunk/class.csstidy.php =================================================================== --- trunk/class.csstidy.php 2007-08-24 18:02:27 UTC (rev 85) +++ trunk/class.csstidy.php 2007-08-24 22:09:59 UTC (rev 86) @@ -893,7 +893,7 @@ $this->status = $this->from; if (!preg_match('|[' . implode('', $GLOBALS['csstidy']['whitespace']) . ']|uis', $this->cur_string) && $this->property !== 'content') { if ($this->str_char === '"' || $this->str_char === '\'') { - // Temporarily disable this optimization to avoid problems with @charset rule, quote propertie... + // Temporarily disable this optimization to avoid problems with @charset rule, quote properties, and some attribute selectors... //$this->cur_string = substr($this->cur_string, 1, -1); } else if (strlen($this->cur_string) > 3 && ($this->cur_string[1] === '"' || $this->cur_string[1] === '\'')) /* () */ { $this->cur_string = $this->cur_string[0] . substr($this->cur_string, 2, -2) . substr($this->cur_string, -1); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <si...@us...> - 2007-08-24 18:02:36
|
Revision: 85 http://csstidy.svn.sourceforge.net/csstidy/?rev=85&view=rev Author: sined_ Date: 2007-08-24 11:02:27 -0700 (Fri, 24 Aug 2007) Log Message: ----------- Temporarily disable this optimization to avoid problems with @charset rule, quote propertie and some of attribute selectors?\226?\128?\166 Modified Paths: -------------- trunk/class.csstidy.php Modified: trunk/class.csstidy.php =================================================================== --- trunk/class.csstidy.php 2007-08-24 17:49:07 UTC (rev 84) +++ trunk/class.csstidy.php 2007-08-24 18:02:27 UTC (rev 85) @@ -432,7 +432,7 @@ $i--; } - if($add != '\\' || !$this->get_cfg('remove_bslash') || strpos($tokens, $string{$i+1}) !== false) { + if($add !== '\\' || !$this->get_cfg('remove_bslash') || strpos($tokens, $string{$i+1}) !== false) { return $add; } @@ -792,7 +792,7 @@ $this->status = 'ip'; } } - elseif($string{$i} != '}') + elseif($string{$i} !== '}') { $this->sub_value .= $string{$i}; } @@ -891,9 +891,10 @@ if($string{$i} == $this->str_char && !csstidy::escaped($string,$i) && !$this->str_in_str) { $this->status = $this->from; - if (!preg_match('|[' . implode('', $GLOBALS['csstidy']['whitespace']) . ']|uis', $this->cur_string) && $this->property != 'content') { + if (!preg_match('|[' . implode('', $GLOBALS['csstidy']['whitespace']) . ']|uis', $this->cur_string) && $this->property !== 'content') { if ($this->str_char === '"' || $this->str_char === '\'') { - $this->cur_string = substr($this->cur_string, 1, -1); + // Temporarily disable this optimization to avoid problems with @charset rule, quote propertie... + //$this->cur_string = substr($this->cur_string, 1, -1); } else if (strlen($this->cur_string) > 3 && ($this->cur_string[1] === '"' || $this->cur_string[1] === '\'')) /* () */ { $this->cur_string = $this->cur_string[0] . substr($this->cur_string, 2, -2) . substr($this->cur_string, -1); } @@ -979,7 +980,7 @@ */ function escaped(&$string,$pos) { - return !(@($string{$pos-1} != '\\') || csstidy::escaped($string,$pos-1)); + return !(@($string{$pos-1} !== '\\') || csstidy::escaped($string,$pos-1)); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <si...@us...> - 2007-08-24 17:49:19
|
Revision: 84 http://csstidy.svn.sourceforge.net/csstidy/?rev=84&view=rev Author: sined_ Date: 2007-08-24 10:49:07 -0700 (Fri, 24 Aug 2007) Log Message: ----------- Added new CSS 3 units (?\226?\128?\156ch?\226?\128?\157 and ?\226?\128?\156turn?\226?\128?\157). http://www.w3.org/TR/css3-values/#relative0 Remplaced colors are now in lowercase (better for Gziped CSS). Modified Paths: -------------- trunk-cpp/csstidy/cssopt.cpp Modified: trunk-cpp/csstidy/cssopt.cpp =================================================================== --- trunk-cpp/csstidy/cssopt.cpp 2007-08-24 17:45:10 UTC (rev 83) +++ trunk-cpp/csstidy/cssopt.cpp 2007-08-24 17:49:07 UTC (rev 84) @@ -80,7 +80,7 @@ string compress_numbers(string subvalue, string property) { string units[] = {"in", "cm", "mm", "pt", "pc", "px", "rem", "%", "ex", "gd", "em", "vw", "vh", - "vm", "deg", "grad", "rad", "ms", "s", "khz", "hz" }; // sync for loop + "vm", "ch", "deg", "grad", "rad", "turn", "ms", "s", "khz", "hz" }; // sync for loop vector<string> temp; if(property == "font") @@ -208,9 +208,9 @@ string temp = strtolower(color); /* color name -> hex code */ if(temp == "black") return "#000"; - if(temp == "fuchsia") return "#F0F"; - if(temp == "white") return "#FFF"; - if(temp == "yellow") return "#FF0"; + if(temp == "fuchsia") return "#f0f"; + if(temp == "white") return "#fff"; + if(temp == "yellow") return "#ff0"; /* hex code -> color name */ if(temp == "#800000") return "maroon"; if(temp == "#ffa500") return "orange"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <si...@us...> - 2007-08-24 17:45:18
|
Revision: 83 http://csstidy.svn.sourceforge.net/csstidy/?rev=83&view=rev Author: sined_ Date: 2007-08-24 10:45:10 -0700 (Fri, 24 Aug 2007) Log Message: ----------- Added new CSS 3 units (?\226?\128?\156ch?\226?\128?\157 and ?\226?\128?\156turn?\226?\128?\157). http://www.w3.org/TR/css3-values/#relative0 Modified Paths: -------------- trunk/data.inc.php Modified: trunk/data.inc.php =================================================================== --- trunk/data.inc.php 2007-08-24 17:37:56 UTC (rev 82) +++ trunk/data.inc.php 2007-08-24 17:45:10 UTC (rev 83) @@ -57,7 +57,7 @@ * @global array $GLOBALS['csstidy']['units'] * @version 1.0 */ -$GLOBALS['csstidy']['units'] = array('in','cm','mm','pt','pc','px','rem','em','%','ex','gd','vw','vh','vm','deg','grad','rad','ms','s','khz','hz'); +$GLOBALS['csstidy']['units'] = array('in','cm','mm','pt','pc','px','rem','em','%','ex','gd','vw','vh','vm','ch','deg','grad','rad','turn','ms','s','khz','hz'); /** * Available at-rules This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <si...@us...> - 2007-08-24 17:38:07
|
Revision: 82 http://csstidy.svn.sourceforge.net/csstidy/?rev=82&view=rev Author: sined_ Date: 2007-08-24 10:37:56 -0700 (Fri, 24 Aug 2007) Log Message: ----------- The function 'getenv' does not work if the Server API is ASAPI (Internet Information Services). Modified Paths: -------------- trunk/lang.inc.php Modified: trunk/lang.inc.php =================================================================== --- trunk/lang.inc.php 2007-08-11 22:31:54 UTC (rev 81) +++ trunk/lang.inc.php 2007-08-24 17:37:56 UTC (rev 82) @@ -30,7 +30,7 @@ if(isset($_GET['lang'])) { $l = $_GET['lang']; } else { - $l = getenv('HTTP_ACCEPT_LANGUAGE'); + $l = $_SERVER['HTTP_ACCEPT_LANGUAGE']; $l = strtolower(substr($l,0,2)); } $l = ($l === 'de' || $l === 'fr' || $l === 'zh') ? $l : 'en'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2007-08-11 22:31:58
|
Revision: 81 http://csstidy.svn.sourceforge.net/csstidy/?rev=81&view=rev Author: brettz9 Date: 2007-08-11 15:31:54 -0700 (Sat, 11 Aug 2007) Log Message: ----------- Temporarily set locale to en_US to avoid float problem (bug and solution provided by Gabriel Rousseau) Modified Paths: -------------- trunk/class.csstidy.php Modified: trunk/class.csstidy.php =================================================================== --- trunk/class.csstidy.php 2007-08-03 20:22:09 UTC (rev 80) +++ trunk/class.csstidy.php 2007-08-11 22:31:54 UTC (rev 81) @@ -556,6 +556,10 @@ * @version 1.1 */ function parse($string) { + // Temporarily set locale to en_US in order to handle floats properly + $old = setlocale(LC_ALL, 0); + setlocale(LC_ALL, 'en_US'); + // PHP bug? Settings need to be refreshed in PHP4 $this->print = new csstidy_print($this); $this->optimise = new csstidy_optimise($this); @@ -926,6 +930,7 @@ $this->print->_reset(); + setlocale(LC_ALL, $old); // Set locale back to original setting return !(empty($this->css) && empty($this->import) && empty($this->charset) && empty($this->tokens) && empty($this->namespace)); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2007-08-03 20:22:14
|
Revision: 80 http://csstidy.svn.sourceforge.net/csstidy/?rev=80&view=rev Author: brettz9 Date: 2007-08-03 13:22:09 -0700 (Fri, 03 Aug 2007) Log Message: ----------- Per Flo's emailed consensus, added change to LGPL (2.1), and updated copyright notices to 2007 Modified Paths: -------------- trunk-cpp/COPYING trunk-cpp/NEWS Modified: trunk-cpp/COPYING =================================================================== --- trunk-cpp/COPYING 2007-08-03 20:21:01 UTC (rev 79) +++ trunk-cpp/COPYING 2007-08-03 20:22:09 UTC (rev 80) @@ -1,340 +1,177 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 +GNU LESSER GENERAL PUBLIC LICENSE - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. +Version 2.1, February 1999 - Preamble +Copyright (C) 1991, 1999 Free Software Foundation, Inc. +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +Everyone is permitted to copy and distribute verbatim copies +of this license document, but changing it is not allowed. - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. +Preamble - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. +The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. +This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below. - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. +When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things. - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. +To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it. - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. +For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION +We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". +To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. +Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license. - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. +Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs. -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. +When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library. - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: +We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances. - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. +For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License. - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. +In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system. - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. +Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library. -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. +The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: +0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you". - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, +A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables. - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, +The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".) - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) +"Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. +1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library. - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. +You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. +2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. + * a) The modified work must itself be a software library. + * b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change. + * c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License. + * d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful. -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. + (For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.) -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. +Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library. - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. +In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. +3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. +Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. - NO WARRANTY +This option is useful when you wish to copy part of the code of the Library into a program that is not a library. - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. +4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange. - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. +If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code. - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs +5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License. - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. +However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables. - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. +When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> +If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.) - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. +Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. +6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things: + * a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.) + * b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with. + * c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. + * d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. + * e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. -Also add information on how to contact you by electronic and paper mail. +For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: +It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. +7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things: -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. + * a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above. + * b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: +8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. +9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it. - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice +10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. +11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. + +12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. + +13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. + +14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. + +NO WARRANTY + +15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +END OF TERMS AND CONDITIONS +How to Apply These Terms to Your New Libraries + +If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that everyone can redistribute and change. You can do so by permitting redistribution under these terms (or, alternatively, under the terms of the ordinary General Public License). + +To apply these terms, attach the following notices to the library. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. + +one line to give the library's name and an idea of what it does. +Copyright (C) year name of author + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the library, if necessary. Here is a sample; alter the names: + +Yoyodyne, Inc., hereby disclaims all copyright interest in +the library `Frob' (a library for tweaking knobs) written +by James Random Hacker. + +signature of Ty Coon, 1 April 1990 +Ty Coon, President of Vice Modified: trunk-cpp/NEWS =================================================================== --- trunk-cpp/NEWS 2007-08-03 20:21:01 UTC (rev 79) +++ trunk-cpp/NEWS 2007-08-03 20:22:09 UTC (rev 80) @@ -1,6 +1,6 @@ CSSTidy NEWS -- history of user-visible changes. 2006-05-19 -Please send CSSTidy bug reports to http://cdburnerxp.se/bugs/index.php?tasks=all&project=2 +Please send CSSTidy bug reports to http://sourceforge.net/tracker/?atid=771415&group_id=148404 Version 1.3 * SCons support added This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2007-08-03 20:21:05
|
Revision: 79 http://csstidy.svn.sourceforge.net/csstidy/?rev=79&view=rev Author: brettz9 Date: 2007-08-03 13:21:01 -0700 (Fri, 03 Aug 2007) Log Message: ----------- Per Flo's emailed consensus, added change to LGPL (2.1), authorship for myself, and updated copyright notices to 2007 Modified Paths: -------------- trunk-cpp/csstidy/background.cpp trunk-cpp/csstidy/background.hpp trunk-cpp/csstidy/conversions.cpp trunk-cpp/csstidy/conversions.hpp trunk-cpp/csstidy/cssopt.cpp trunk-cpp/csstidy/cssopt.hpp trunk-cpp/csstidy/csspp_globals.hpp trunk-cpp/csstidy/csstidy.cpp trunk-cpp/csstidy/csstidy.hpp trunk-cpp/csstidy/datastruct.hpp trunk-cpp/csstidy/file_functions.cpp trunk-cpp/csstidy/file_functions.hpp trunk-cpp/csstidy/important.cpp trunk-cpp/csstidy/important.hpp trunk-cpp/csstidy/main.cpp trunk-cpp/csstidy/misc.cpp trunk-cpp/csstidy/misc.hpp trunk-cpp/csstidy/parse_css.cpp trunk-cpp/csstidy/parse_css.hpp trunk-cpp/csstidy/prepare.cpp trunk-cpp/csstidy/prepare.hpp trunk-cpp/csstidy/print_css.cpp trunk-cpp/csstidy/trim.cpp trunk-cpp/csstidy/trim.hpp trunk-cpp/csstidy/umap.hpp trunk-cpp/csstidy/win32_resource.rc Modified: trunk-cpp/csstidy/background.cpp =================================================================== --- trunk-cpp/csstidy/background.cpp 2007-08-03 20:18:13 UTC (rev 78) +++ trunk-cpp/csstidy/background.cpp 2007-08-03 20:21:01 UTC (rev 79) @@ -1,20 +1,21 @@ /* + * Copyright 2005, 2006, 2007 Florian Schmitz + * * This file is part of CSSTidy. * - * CSSTidy is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * CSSTidy is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. * - * CSSTidy is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with CSSTidy; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ + * CSSTidy is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ #include "csspp_globals.hpp" using namespace std; Modified: trunk-cpp/csstidy/background.hpp =================================================================== --- trunk-cpp/csstidy/background.hpp 2007-08-03 20:18:13 UTC (rev 78) +++ trunk-cpp/csstidy/background.hpp 2007-08-03 20:21:01 UTC (rev 79) @@ -1,20 +1,21 @@ /* + * Copyright 2005, 2006, 2007 Florian Schmitz + * * This file is part of CSSTidy. * - * CSSTidy is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * CSSTidy is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. * - * CSSTidy is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with CSSTidy; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ + * CSSTidy is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ #ifndef HEADER_CSS_BACKGROUND #define HEADER_CSS_BACKGROUND Modified: trunk-cpp/csstidy/conversions.cpp =================================================================== --- trunk-cpp/csstidy/conversions.cpp 2007-08-03 20:18:13 UTC (rev 78) +++ trunk-cpp/csstidy/conversions.cpp 2007-08-03 20:21:01 UTC (rev 79) @@ -1,20 +1,21 @@ /* + * Copyright 2005, 2006, 2007 Florian Schmitz + * * This file is part of CSSTidy. * - * CSSTidy is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * CSSTidy is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. * - * CSSTidy is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with CSSTidy; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ + * CSSTidy is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ #include "csspp_globals.hpp" Modified: trunk-cpp/csstidy/conversions.hpp =================================================================== --- trunk-cpp/csstidy/conversions.hpp 2007-08-03 20:18:13 UTC (rev 78) +++ trunk-cpp/csstidy/conversions.hpp 2007-08-03 20:21:01 UTC (rev 79) @@ -1,20 +1,21 @@ /* + * Copyright 2005, 2006, 2007 Florian Schmitz + * * This file is part of CSSTidy. * - * CSSTidy is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * CSSTidy is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. * - * CSSTidy is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with CSSTidy; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ + * CSSTidy is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ #ifndef HEADER_CSS_CONVERT #define HEADER_CSS_CONVERT Modified: trunk-cpp/csstidy/cssopt.cpp =================================================================== --- trunk-cpp/csstidy/cssopt.cpp 2007-08-03 20:18:13 UTC (rev 78) +++ trunk-cpp/csstidy/cssopt.cpp 2007-08-03 20:21:01 UTC (rev 79) @@ -1,20 +1,21 @@ /* + * Copyright 2005, 2006, 2007 Florian Schmitz + * * This file is part of CSSTidy. * - * CSSTidy is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * CSSTidy is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. * - * CSSTidy is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with CSSTidy; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ + * CSSTidy is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ #include "csspp_globals.hpp" using namespace std; Modified: trunk-cpp/csstidy/cssopt.hpp =================================================================== --- trunk-cpp/csstidy/cssopt.hpp 2007-08-03 20:18:13 UTC (rev 78) +++ trunk-cpp/csstidy/cssopt.hpp 2007-08-03 20:21:01 UTC (rev 79) @@ -1,20 +1,21 @@ /* + * Copyright 2005, 2006, 2007 Florian Schmitz + * * This file is part of CSSTidy. * - * CSSTidy is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * CSSTidy is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. * - * CSSTidy is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with CSSTidy; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ + * CSSTidy is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ #ifndef HEADER_CSS_OPT #define HEADER_CSS_OPT Modified: trunk-cpp/csstidy/csspp_globals.hpp =================================================================== --- trunk-cpp/csstidy/csspp_globals.hpp 2007-08-03 20:18:13 UTC (rev 78) +++ trunk-cpp/csstidy/csspp_globals.hpp 2007-08-03 20:21:01 UTC (rev 79) @@ -1,20 +1,21 @@ /* + * Copyright 2005, 2006, 2007 Florian Schmitz + * * This file is part of CSSTidy. * - * CSSTidy is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * CSSTidy is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. * - * CSSTidy is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with CSSTidy; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ + * CSSTidy is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ #define CSSTIDY_VERSION "1.3" #include <cstdlib> Modified: trunk-cpp/csstidy/csstidy.cpp =================================================================== --- trunk-cpp/csstidy/csstidy.cpp 2007-08-03 20:18:13 UTC (rev 78) +++ trunk-cpp/csstidy/csstidy.cpp 2007-08-03 20:21:01 UTC (rev 79) @@ -1,20 +1,21 @@ /* + * Copyright 2005, 2006, 2007 Florian Schmitz + * * This file is part of CSSTidy. * - * CSSTidy is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * CSSTidy is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. * - * CSSTidy is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with CSSTidy; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ + * CSSTidy is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ #include "csspp_globals.hpp" extern map< string, vector<string> > shorthands; Modified: trunk-cpp/csstidy/csstidy.hpp =================================================================== --- trunk-cpp/csstidy/csstidy.hpp 2007-08-03 20:18:13 UTC (rev 78) +++ trunk-cpp/csstidy/csstidy.hpp 2007-08-03 20:21:01 UTC (rev 79) @@ -1,20 +1,21 @@ /* + * Copyright 2005, 2006, 2007 Florian Schmitz + * * This file is part of CSSTidy. * - * CSSTidy is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * CSSTidy is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. * - * CSSTidy is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with CSSTidy; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ + * CSSTidy is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ #ifndef HEADER_CSSTIDY #define HEADER_CSSTIDY Modified: trunk-cpp/csstidy/datastruct.hpp =================================================================== --- trunk-cpp/csstidy/datastruct.hpp 2007-08-03 20:18:13 UTC (rev 78) +++ trunk-cpp/csstidy/datastruct.hpp 2007-08-03 20:21:01 UTC (rev 79) @@ -1,20 +1,21 @@ /* + * Copyright 2005, 2006, 2007 Florian Schmitz + * * This file is part of CSSTidy. * - * CSSTidy is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * CSSTidy is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. * - * CSSTidy is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with CSSTidy; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ + * CSSTidy is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ using namespace std; #ifndef HEADER_CSS_STRUCT Modified: trunk-cpp/csstidy/file_functions.cpp =================================================================== --- trunk-cpp/csstidy/file_functions.cpp 2007-08-03 20:18:13 UTC (rev 78) +++ trunk-cpp/csstidy/file_functions.cpp 2007-08-03 20:21:01 UTC (rev 79) @@ -1,20 +1,21 @@ /* + * Copyright 2005, 2006, 2007 Florian Schmitz + * * This file is part of CSSTidy. * - * CSSTidy is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * CSSTidy is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. * - * CSSTidy is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with CSSTidy; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ + * CSSTidy is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ #include "csspp_globals.hpp" using namespace std; Modified: trunk-cpp/csstidy/file_functions.hpp =================================================================== --- trunk-cpp/csstidy/file_functions.hpp 2007-08-03 20:18:13 UTC (rev 78) +++ trunk-cpp/csstidy/file_functions.hpp 2007-08-03 20:21:01 UTC (rev 79) @@ -1,20 +1,21 @@ /* + * Copyright 2005, 2006, 2007 Florian Schmitz + * * This file is part of CSSTidy. * - * CSSTidy is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * CSSTidy is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. * - * CSSTidy is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with CSSTidy; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ + * CSSTidy is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ #ifndef HEADER_CSS_FILE #define HEADER_CSS_FILE Modified: trunk-cpp/csstidy/important.cpp =================================================================== --- trunk-cpp/csstidy/important.cpp 2007-08-03 20:18:13 UTC (rev 78) +++ trunk-cpp/csstidy/important.cpp 2007-08-03 20:21:01 UTC (rev 79) @@ -1,20 +1,21 @@ /* + * Copyright 2005, 2006, 2007 Florian Schmitz + * * This file is part of CSSTidy. * - * CSSTidy is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * CSSTidy is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. * - * CSSTidy is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with CSSTidy; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ + * CSSTidy is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ #include "csspp_globals.hpp" using namespace std; Modified: trunk-cpp/csstidy/important.hpp =================================================================== --- trunk-cpp/csstidy/important.hpp 2007-08-03 20:18:13 UTC (rev 78) +++ trunk-cpp/csstidy/important.hpp 2007-08-03 20:21:01 UTC (rev 79) @@ -1,20 +1,21 @@ /* + * Copyright 2005, 2006, 2007 Florian Schmitz + * * This file is part of CSSTidy. * - * CSSTidy is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * CSSTidy is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. * - * CSSTidy is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with CSSTidy; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ + * CSSTidy is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ #ifndef HEADER_CSS_IMPORTANT #define HEADER_CSS_IMPORTANT Modified: trunk-cpp/csstidy/main.cpp =================================================================== --- trunk-cpp/csstidy/main.cpp 2007-08-03 20:18:13 UTC (rev 78) +++ trunk-cpp/csstidy/main.cpp 2007-08-03 20:21:01 UTC (rev 79) @@ -1,20 +1,21 @@ /* + * Copyright 2005, 2006, 2007 Florian Schmitz + * * This file is part of CSSTidy. * - * CSSTidy is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * CSSTidy is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. * - * CSSTidy is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with CSSTidy; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ + * CSSTidy is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ using namespace std; Modified: trunk-cpp/csstidy/misc.cpp =================================================================== --- trunk-cpp/csstidy/misc.cpp 2007-08-03 20:18:13 UTC (rev 78) +++ trunk-cpp/csstidy/misc.cpp 2007-08-03 20:21:01 UTC (rev 79) @@ -1,20 +1,21 @@ /* + * Copyright 2005, 2006, 2007 Florian Schmitz + * * This file is part of CSSTidy. * - * CSSTidy is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * CSSTidy is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. * - * CSSTidy is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with CSSTidy; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ + * CSSTidy is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ #include "csspp_globals.hpp" Modified: trunk-cpp/csstidy/misc.hpp =================================================================== --- trunk-cpp/csstidy/misc.hpp 2007-08-03 20:18:13 UTC (rev 78) +++ trunk-cpp/csstidy/misc.hpp 2007-08-03 20:21:01 UTC (rev 79) @@ -1,20 +1,21 @@ /* + * Copyright 2005, 2006, 2007 Florian Schmitz + * * This file is part of CSSTidy. * - * CSSTidy is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * CSSTidy is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. * - * CSSTidy is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with CSSTidy; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ + * CSSTidy is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ #ifndef HEADER_CSS_MISC #define HEADER_CSS_MISC Modified: trunk-cpp/csstidy/parse_css.cpp =================================================================== --- trunk-cpp/csstidy/parse_css.cpp 2007-08-03 20:18:13 UTC (rev 78) +++ trunk-cpp/csstidy/parse_css.cpp 2007-08-03 20:21:01 UTC (rev 79) @@ -1,20 +1,21 @@ /* + * Copyright 2005, 2006, 2007 Florian Schmitz + * * This file is part of CSSTidy. * - * CSSTidy is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * CSSTidy is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. * - * CSSTidy is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with CSSTidy; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ + * CSSTidy is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ #include "csspp_globals.hpp" Modified: trunk-cpp/csstidy/parse_css.hpp =================================================================== --- trunk-cpp/csstidy/parse_css.hpp 2007-08-03 20:18:13 UTC (rev 78) +++ trunk-cpp/csstidy/parse_css.hpp 2007-08-03 20:21:01 UTC (rev 79) @@ -1,20 +1,21 @@ /* + * Copyright 2005, 2006, 2007 Florian Schmitz + * * This file is part of CSSTidy. * - * CSSTidy is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * CSSTidy is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. * - * CSSTidy is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with CSSTidy; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ + * CSSTidy is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ #ifndef HEADER_CSS_PARSE #define HEADER_CSS_PARSE Modified: trunk-cpp/csstidy/prepare.cpp =================================================================== --- trunk-cpp/csstidy/prepare.cpp 2007-08-03 20:18:13 UTC (rev 78) +++ trunk-cpp/csstidy/prepare.cpp 2007-08-03 20:21:01 UTC (rev 79) @@ -1,20 +1,21 @@ /* + * Copyright 2005, 2006, 2007 Florian Schmitz + * * This file is part of CSSTidy. * - * CSSTidy is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * CSSTidy is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. * - * CSSTidy is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with CSSTidy; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ + * CSSTidy is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ #include "csspp_globals.hpp" Modified: trunk-cpp/csstidy/prepare.hpp =================================================================== --- trunk-cpp/csstidy/prepare.hpp 2007-08-03 20:18:13 UTC (rev 78) +++ trunk-cpp/csstidy/prepare.hpp 2007-08-03 20:21:01 UTC (rev 79) @@ -1,20 +1,21 @@ /* + * Copyright 2005, 2006, 2007 Florian Schmitz + * * This file is part of CSSTidy. * - * CSSTidy is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * CSSTidy is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. * - * CSSTidy is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with CSSTidy; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ + * CSSTidy is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ #ifndef HEADER_CSS_PREPARE #define HEADER_CSS_PREPARE Modified: trunk-cpp/csstidy/print_css.cpp =================================================================== --- trunk-cpp/csstidy/print_css.cpp 2007-08-03 20:18:13 UTC (rev 78) +++ trunk-cpp/csstidy/print_css.cpp 2007-08-03 20:21:01 UTC (rev 79) @@ -1,20 +1,21 @@ /* + * Copyright 2005, 2006, 2007 Florian Schmitz + * * This file is part of CSSTidy. * - * CSSTidy is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * CSSTidy is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. * - * CSSTidy is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with CSSTidy; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ + * CSSTidy is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ #include "csspp_globals.hpp" Modified: trunk-cpp/csstidy/trim.cpp =================================================================== --- trunk-cpp/csstidy/trim.cpp 2007-08-03 20:18:13 UTC (rev 78) +++ trunk-cpp/csstidy/trim.cpp 2007-08-03 20:21:01 UTC (rev 79) @@ -1,20 +1,21 @@ /* + * Copyright 2005, 2006, 2007 Florian Schmitz + * * This file is part of CSSTidy. * - * CSSTidy is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * CSSTidy is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. * - * CSSTidy is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with CSSTidy; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ + * CSSTidy is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ #include "csspp_globals.hpp" using namespace std; Modified: trunk-cpp/csstidy/trim.hpp =================================================================== --- trunk-cpp/csstidy/trim.hpp 2007-08-03 20:18:13 UTC (rev 78) +++ trunk-cpp/csstidy/trim.hpp 2007-08-03 20:21:01 UTC (rev 79) @@ -1,20 +1,21 @@ /* + * Copyright 2005, 2006, 2007 Florian Schmitz + * * This file is part of CSSTidy. * - * CSSTidy is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * CSSTidy is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. * - * CSSTidy is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with CSSTidy; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ + * CSSTidy is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ #ifndef HEADER_CSS_TRIM #define HEADER_CSS_TRIM Modified: trunk-cpp/csstidy/umap.hpp =================================================================== --- trunk-cpp/csstidy/umap.hpp 2007-08-03 20:18:13 UTC (rev 78) +++ trunk-cpp/csstidy/umap.hpp 2007-08-03 20:21:01 UTC (rev 79) @@ -1,20 +1,21 @@ /* + * Copyright 2005, 2006, 2007 Florian Schmitz + * * This file is part of CSSTidy. * - * CSSTidy is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * CSSTidy is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. * - * CSSTidy is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with CSSTidy; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ + * CSSTidy is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ #include <cstdlib> #include <iostream> Modified: trunk-cpp/csstidy/win32_resource.rc =================================================================== --- trunk-cpp/csstidy/win32_resource.rc 2007-08-03 20:18:13 UTC (rev 78) +++ trunk-cpp/csstidy/win32_resource.rc 2007-08-03 20:21:01 UTC (rev 79) @@ -25,7 +25,7 @@ VALUE "FileDescription", "CSSTidy command line executable" VALUE "FileVersion", "1, 0, 0, 1" VALUE "InternalName", "csstidy.exe" - VALUE "LegalCopyright", "Copyright (C) 2005-2006 by Florian Schmitz under the GPL" + VALUE "LegalCopyright", "Copyright (C) 2005-2007 by Florian Schmitz under the LGPL" VALUE "OriginalFilename", "csstidy.exe" VALUE "ProductName", " CSSTidy" VALUE "ProductVersion", "1, 0, 0, 1" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |