From 4a53eca27cb5f59a8d66141b9de6b0eee4c11690 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Sun, 12 Dec 1999 13:03:50 +0000 Subject: [PATCH] - Updated HTML test outputs - Fixed taht f....g problem with C++ and includes, Daniel --- HTMLparser.c | 1 + include/libxml/parser.h | 7 +- parser.h | 7 +- result/HTML/Down.html | 4 +- result/HTML/fp40.htm | 94 ++--- result/HTML/liclose.html | 10 +- result/HTML/reg1.html | 4 +- result/HTML/reg2.html | 4 +- result/HTML/reg3.html | 4 +- result/HTML/reg4.html | 4 +- result/HTML/test2.html | 16 +- result/HTML/test3.html | 88 ++--- result/HTML/wired.html | 730 ++++++++------------------------------- 13 files changed, 208 insertions(+), 765 deletions(-) diff --git a/HTMLparser.c b/HTMLparser.c index 3f4c16cb..c2177c82 100644 --- a/HTMLparser.c +++ b/HTMLparser.c @@ -1931,6 +1931,7 @@ htmlParseAttribute(htmlParserCtxtPtr ctxt, xmlChar **value) { SKIP_BLANKS; val = htmlParseAttValue(ctxt); } else { + /* TODO : some attribute must have values, some may not */ if ((ctxt->sax != NULL) && (ctxt->sax->error != NULL)) ctxt->sax->error(ctxt->userData, "Specification mandate value for attribute %s\n", name); diff --git a/include/libxml/parser.h b/include/libxml/parser.h index 437302cc..8a6443cc 100644 --- a/include/libxml/parser.h +++ b/include/libxml/parser.h @@ -12,6 +12,8 @@ #include "tree.h" #include "valid.h" #include "xmlIO.h" +#include "entities.h" + #ifdef __cplusplus extern "C" { @@ -170,8 +172,6 @@ typedef xmlSAXLocator *xmlSAXLocatorPtr; * of the input generate data or structure informations. */ -#include "entities.h" - typedef xmlParserInputPtr (*resolveEntitySAXFunc) (void *ctx, const xmlChar *publicId, const xmlChar *systemId); typedef void (*internalSubsetSAXFunc) (void *ctx, const xmlChar *name, @@ -265,8 +265,6 @@ extern xmlSAXHandler htmlDefaultSAXHandler; extern int xmlSubstituteEntitiesDefaultValue; -#include "entities.h" -#include "xml-error.h" /** * Cleanup @@ -381,6 +379,7 @@ xmlParserInputPtr xmlLoadExternalEntity (const char *URL, const char *ID, xmlParserInputPtr context); + #ifdef __cplusplus } #endif diff --git a/parser.h b/parser.h index 437302cc..8a6443cc 100644 --- a/parser.h +++ b/parser.h @@ -12,6 +12,8 @@ #include "tree.h" #include "valid.h" #include "xmlIO.h" +#include "entities.h" + #ifdef __cplusplus extern "C" { @@ -170,8 +172,6 @@ typedef xmlSAXLocator *xmlSAXLocatorPtr; * of the input generate data or structure informations. */ -#include "entities.h" - typedef xmlParserInputPtr (*resolveEntitySAXFunc) (void *ctx, const xmlChar *publicId, const xmlChar *systemId); typedef void (*internalSubsetSAXFunc) (void *ctx, const xmlChar *name, @@ -265,8 +265,6 @@ extern xmlSAXHandler htmlDefaultSAXHandler; extern int xmlSubstituteEntitiesDefaultValue; -#include "entities.h" -#include "xml-error.h" /** * Cleanup @@ -381,6 +379,7 @@ xmlParserInputPtr xmlLoadExternalEntity (const char *URL, const char *ID, xmlParserInputPtr context); + #ifdef __cplusplus } #endif diff --git a/result/HTML/Down.html b/result/HTML/Down.html index fc30521a..2eb3e8bd 100644 --- a/result/HTML/Down.html +++ b/result/HTML/Down.html @@ -1,8 +1,6 @@ - -This service is temporary down - +This service is temporary down

Sorry, this service is temporary down

We are doing our best to get it back on-line, diff --git a/result/HTML/fp40.htm b/result/HTML/fp40.htm index 939107e8..cdff5763 100644 --- a/result/HTML/fp40.htm +++ b/result/HTML/fp40.htm @@ -7,12 +7,8 @@ -

-Microsoft FrontPage 2000 Server Extensions, UNIX -

- -© Copyright Microsoft Corporation, 1999  - +

Microsoft FrontPage 2000 Server Extensions, UNIX

+© Copyright Microsoft Corporation, 1999 

The FrontPage Server Extensions are a set of programs on the Web server that support:

@@ -27,9 +23,7 @@ Resources for More Information

 

-

-Release Notes -

+

Release Notes

This section provides complementary or late-breaking information to supplement the Microsoft FrontPage Server Extensions documentation.

@@ -39,49 +33,29 @@ information to supplement the Microsoft FrontPage Server Extensions documentatio
Uploading files into executable folders

-

- -Top of Page - -

-

-Apache 1.3.4 Support -

+

Top of Page

+

Apache 1.3.4 Support

You need to take some special steps to run the FrontPage Server Extensions with Apache 1.3.4. FrontPage Server Extensions expect to find all resource directives in the main server configuration file, usually http.conf. To prevent the server extensions from using any secondary configuration files (access.conf, srm.conf), add the following lines to http.conf:

 -
- +
ResourceConfig /dev/null 
-AccessConfig /dev/null -
+AccessConfig /dev/null

If you have some settings stored in secondary configuration files, move them to http.conf.

You must stop and restart the web server for your changes to http.conf to take effect.

-

- -Top of Section - -

-

-Upgrading from previous version of FrontPage Server Extensions -

+

Top of Section

+

Upgrading from previous version of FrontPage Server Extensions

Custom entries in frontpage.cnf are not migrated to FrontPage 2000.

When you install FrontPage 2000 Server Extensions, a new frontpage.cnf file is created in the /usr/local/frontpage/version4.0 directory. Any custom settings stored in a previous-version frontpage.cnf are not used. However, you can copy your custom settings from the previous-version frontpage.cnf file after you install the FrontPage 2000 Server Extensions.

Do not overwrite the FrontPage 2000 frontpage.cnf file with a frontpage.cnf file from an earlier version of the FrontPage Server Extensions.

-

- -Top of Section - -

-

-Uploading files into executable folders -

+

Top of Section

+

Uploading files into executable folders

After upgrading to FrontPage 2000, FrontPage authors will not be able to upload files into executable folders. For security reasons, the default setting on FrontPage 2000 webs does not allow authors to upload executable files into executable folders in a FrontPage web. This @@ -90,15 +64,9 @@ or a virus.

To allow FrontPage authors to upload executables, set the NoExecutableCgiUpload configuration variable to zero (0). For information about FrontPage Server Extension configuration variables, see the FrontPage 2000 Server Extensions Resource Kit at http://officeupdate.microsoft.com/frontpage/wpp/serk/.

-

- -Top of Section - -

+

Top of Section

-

-Resources for More Information -

+

Resources for More Information

This section lists sources of more information about the FrontPage Server Extensions.

@@ -108,14 +76,8 @@ FrontPage Server Extensions.


Knowledge Base

-

- -Top of Page - -

-

-Server Extensions Resource Kit -

+

Top of Page

+

Server Extensions Resource Kit

The FrontPage 2000 Server Extensions include a full set of documentation: the Server Extensions Resource Kit. This is an HTML document installed on the server machine (by default) in /usr/local/frontpage/version4.0/serk. To view the Server Extensions Resource @@ -124,24 +86,12 @@ Kit, open /usr/local/frontpage/version4.0/serk/default.htm in your Web browser.< administering the FrontPage Server Extensions along with an overview of the Server Extensions, a detailed discussion of Server Extensions security on UNIX and Windows, troubleshooting information, and a full set of appendixes.

-

- -Top of Section - -

-

-Server Extensions Resource Kit Update -

+

Top of Section

+

Server Extensions Resource Kit Update

For updated information about installing, setting up, and administrating the FrontPage Server Extensions, see the Server Extensions Resource Kit Update at: http://officeupdate.microsoft.com/frontpage/wpp/serk/.

-

- -Top of Section - -

-

-Microsoft Knowledge Base -

+

Top of Section

+

Microsoft Knowledge Base

For further technical information on FrontPage, please consult Support Online. Use Support Online to easily search Microsoft Product Support Services' collection of resources including technical articles from Microsoft's extensive Knowledge Base, FAQs, troubleshooters to find @@ -149,11 +99,7 @@ fast, accurate answers. You can also customize the site to control your search u keywords or the site's natural language search engine, which uses normal everyday language for answering inquiries, so you can write your question in your own words. To begin, go to http://support.microsoft.com/support/.

-

- -Top of Section - -

+

Top of Section

 

 diff --git a/result/HTML/liclose.html b/result/HTML/liclose.html index 912fedff..b8a464ee 100644 --- a/result/HTML/liclose.html +++ b/result/HTML/liclose.html @@ -1,14 +1,10 @@ - - - - - diff --git a/result/HTML/reg1.html b/result/HTML/reg1.html index cdcf127a..176d01f1 100644 --- a/result/HTML/reg1.html +++ b/result/HTML/reg1.html @@ -1,8 +1,6 @@ - -Regression test 1 - +Regression test 1

Regression test 1

diff --git a/result/HTML/reg2.html b/result/HTML/reg2.html index ffab4e44..fff29f44 100644 --- a/result/HTML/reg2.html +++ b/result/HTML/reg2.html @@ -1,8 +1,6 @@ - -Regression test 2 - +Regression test 2

Regression test 2

diff --git a/result/HTML/reg3.html b/result/HTML/reg3.html index 31dd9b84..f631634d 100644 --- a/result/HTML/reg3.html +++ b/result/HTML/reg3.html @@ -1,8 +1,6 @@ - -Regression test 3 - +Regression test 3

Regression test 3

diff --git a/result/HTML/reg4.html b/result/HTML/reg4.html index 499a6e18..e17bca9a 100644 --- a/result/HTML/reg4.html +++ b/result/HTML/reg4.html @@ -1,8 +1,6 @@ - -Regression test 4 - +Regression test 4

Regression test 4

diff --git a/result/HTML/test2.html b/result/HTML/test2.html index 809c0632..d8f9522e 100644 --- a/result/HTML/test2.html +++ b/result/HTML/test2.html @@ -1,17 +1,10 @@ - -Linux Today - +Linux Today

- - - +
- -Atipa Linux solutions. Your reliable cluster, server, and workstation solution. Win a Free Celeron Linux Workstation! - -
+ - -
Atipa Linux solutions. Your reliable cluster, server, and workstation solution. Win a Free Celeron Linux Workstation! Linux Today Logo
@@ -19,8 +12,7 @@ linux.com partner

+ [ headlines | features | diff --git a/result/HTML/test3.html b/result/HTML/test3.html index 901294f4..7f730c5f 100644 --- a/result/HTML/test3.html +++ b/result/HTML/test3.html @@ -1,11 +1,7 @@ - - - - -

Component Package diagram ProblemDomain

- + +

Component Package diagram ProblemDomain

@@ -13,9 +9,7 @@ Stereotype problem domain
Alias Problem Domain
-
-Note -
+
Note
The Problem Domain package is the model behind the Human
Interface, thats stores and manipulates the Family Tree.
@@ -24,65 +18,39 @@

-
-

Class HumanInterface.FamilyFrame -

-
-
-

Class ProblemDomain.Birth -

-
-
-

Class ProblemDomain.Death -

-
-
-

Class ProblemDomain.Divorce -

-
-
-

Class ProblemDomain.Family -

-
-
-

Class ProblemDomain.Individual -

-
-
-

Class ProblemDomain.LifeEvent -

-
-
-

Class ProblemDomain.Marriage -

-
-
-

Class ProblemDomain.Note -

-
+

Class HumanInterface.FamilyFrame +

+

Class ProblemDomain.Birth +

+

Class ProblemDomain.Death +

+

Class ProblemDomain.Divorce +

+

Class ProblemDomain.Family +

+

Class ProblemDomain.Individual +

+

Class ProblemDomain.LifeEvent +

+

Class ProblemDomain.Marriage +

+

Class ProblemDomain.Note +

-

-Links -

- - - diff --git a/result/HTML/wired.html b/result/HTML/wired.html index e460a450..05bc16d3 100644 --- a/result/HTML/wired.html +++ b/result/HTML/wired.html @@ -1,26 +1,15 @@ - -Top Stories News from Wired News - +Top Stories News from Wired News - +
+ +
- - - -
- - - - - + + - - - - -
- - - -
-
+ + -
-		 - -True to the Original - -
+
+True to the Original + + - - - + + + - -
- - -
- - - - - - - - - +
   updated 10:15 a.m.  15.Oct.99.PDT - -
- - - - - - - + + + +
- - - - - + + - - - -
- - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - + - - - - - - + + - - - - - - - - - + + - - - - - - - - - + + + - - - - - - + + - - - + - +
- +

SECTIONS - -
- -Business - -
- -Culture - -
- -Technology - -
- -Politics - -
- -WIRE SERVICE NEWS - -
- -Top Headlines - -
- -Sports - -
- -Finance - -
- - -FREE DELIVERY - - -
- - - + + + + + + + + + + - - - - - - - - - + +
-
+
Business
Culture
Technology
Politics
WIRE SERVICE NEWS
Top Headlines
Sports
Finance
FREE DELIVERY
+ - - -
  - - - -
-
- - -STOCKS - - -
-Get Quote: -
-
+
STOCKS
Get Quote:
  -
-
+
Financial Services
@@ -290,47 +155,18 @@ internet.com Index Fund GetSmart's MortgageFinder -
- -Today's Summary - -
- +
Today's Summary
Wired Index | All Indexes - -
- -Portfolios - -
- -FIND A BOOK - -
- - - + + + - - - - - - +
-
+
Portfolios
FIND A BOOK
+ - - - + - - - + - -
- - - - - - -
+ +
-
-

+

Powered by barnesandnoble.com
-

-
-
- -WIRED - MAGAZINE - -
- +

WIRED + MAGAZINE

- -Wired Magazine - +Wired Magazine
Issue 7.11 - -
- -Subscribe to Wired.
Special offer! - -
- -HOTWIRED - -
- +
Subscribe to Wired.
Special offer!
HOTWIRED
Frontdoor
Webmonkey @@ -444,37 +242,22 @@ Issue 7.11
Suck.com
- -
- -HOTBOT - -
- +
HOTBOT
Search
Shopping
- -
+

Wired News staff

- -Contact us - +Contact us

@@ -486,8 +269,7 @@ or PointCast
-
@@ -498,57 +280,33 @@ or PointCast

- - -Nomad's Land - - +Nomad's Land

- - -Homeless, but ID'd, in Seattle - - +Homeless, but ID'd, in Seattle
8:15 a.m. The city council approves a plan to track the homeless by a numbering system, saying it'll improve services. The implications worry privacy advocates, naturally. By Craig Bicknell.
- - -in Politics - - +in Politics
- + - + - + - +
  - -HITS & MISC. - -HITS & MISC.
 
- - -Calendar of E-Vents - - +Calendar of E-Vents
Ongoing goings-on.

- - -Rants Raves - - +Rants Raves
Readers on Apple's G4 ... AOL's passwords ... MS vs. Linux. @@ -560,92 +318,56 @@ or PointCast
  - -CURRENT HOO-HA - -CURRENT HOO-HA
 
- - -MP3 Rocks the Web - - +MP3 Rocks the Web
Download the sound.
-Sponsored by -Musicmaker - +Sponsored by Musicmaker

- - -The Wireless World - - +The Wireless World
Networking gets unplugged.
-Sponsored by -Ericsson - +Sponsored by Ericsson

- - -Digital Hollywood - - +Digital Hollywood
The buzz of tech.

- - -IPO Outlook - - +IPO Outlook
Deals in the pipeline.
-Sponsored by -Sun - +Sponsored by Sun

- - -E-Biz - - +E-Biz
Business unusual.
-Sponsored by -IBM - +Sponsored by IBM

- - -Med-Tech Center - - +Med-Tech Center
From the bleeding edge.
@@ -653,11 +375,7 @@ or PointCast

- - -The Linux Effect - - +The Linux Effect
Not just for geeks. @@ -665,69 +383,41 @@ or PointCast

- - -Executive Summary - - +Executive Summary
CEOs, COOs, CIOs unite.
-Sponsored by -Vignette - +Sponsored by Vignette

- - -Making the Grade - - +Making the Grade
Reading, writing, and ROM.
-Sponsored by -U of Phoenix - +Sponsored by U of Phoenix

- - -Infostructure - - +Infostructure
An IS/IT resource
Sponsored by -Sprint - +wired.com&BANNER=Sprint" style="text-decoration:none">Sprint

- - -Y2K Watch - - +Y2K Watch
Tick... Tick... Tick...

- - - -More Hoo-Ha - - - +More Hoo-Ha
 
 @@ -741,20 +431,14 @@ wired.com&BANNER=Sprint" style="text-decoration:none">
  - -MEANWHILE... - -MEANWHILE...
 
- -Führer Furor - +Führer Furor

@@ -773,255 +457,127 @@ Contruction workers in Berlin opened an old wound in the German psyche this week  
- - -Other Top Stories - - +Other Top Stories

- - -Wall Street Keeps Reeling - - +Wall Street Keeps Reeling
10:15 a.m. The Dow and Nasdaq suffer sizeable losses during the first half of Friday trading. Why? Wholesale prices are the highest this decade, and Greenspan is concerned about stock prices.
- - -in Reuters - - +in Reuters

- - -The Market's Madness - - +The Market's Madness
9:10 a.m. The bulls and the bears are in the midst of a Battle Royale, and all this turbulence is not a healthy thing. So say the experts.
- - -in Reuters - - +in Reuters

- - -'Want a Loan? What's Your Race?' - - +'Want a Loan? What's Your Race?'
3:00 a.m. The Federal Reserve is in the middle of changing banking regulations to let banks collect data on the race, sex, religion, and national origin of their customers. By Declan McCullagh.
- - -in Politics - - +in Politics

- - -Music Regs: A Bagful of Noise - - +Music Regs: A Bagful of Noise
3:00 a.m. The struggle to come up with a digital music standard that would minimize download piracy is pushing right up against the holiday gift-giving season. By Jennifer Sullivan.
- - -in Business - - +in Business

- - -Can't Beat 'Em? Green 'Em - - +Can't Beat 'Em? Green 'Em
3:00 a.m. High-tech companies are notoriously environmentally unfriendly, and a growing number of "Greenies" are trying to change things from the inside ... with varying results. By Chris Gaither.
- - -in Technology - - +in Technology

- - -Y2K Cloud Over MS Office - - +Y2K Cloud Over MS Office
3:00 a.m. Windows NT sales remain strong, but corporate clients are wary of upgrading to MS Office 2000. Analysts say that means strong, but not stunning, Microsoft earnings.
- - -in Business - - +in Business

Med-Tech
- - -Biochips for Custom Chemo - - +Biochips for Custom Chemo
3:00 a.m. Different cancer patients need different medicine, but doctors can rarely determine the best match. New biochip technology promises chemotherapy tailored to a tumor's genetic make-up. By Kristen Philipkoski.
- - -in Technology - - +in Technology

- - -High Stakes in Priceline Suit - - +High Stakes in Priceline Suit
3:00 a.m. It's not just another round of Redmond-bashing. A Priceline.com lawsuit against Microsoft's Expedia.com may have a big impact on how Net companies protect their business models. By Joanna Glasner.
- - -in Business - - +in Business

- - -Biodiversity Merges Online - - +Biodiversity Merges Online
3:00 a.m. The far-flung databases on global biodiversity get together to form one monster database. Soon the red-eyed tree frog will be eyeing those Swedish lingonberries. From the Environment News Service.
- - -in Technology - - +in Technology


- - -Elsewhere Today - - +Elsewhere Today

- - -FCC: Hands-Off on Broadband - - +FCC: Hands-Off on Broadband
- -The Industry Standard - +The Industry Standard

- - -White House Lashes Out on Treaty - - +White House Lashes Out on Treaty
Lycos

- - -Steve Jobs at 44 - - +Steve Jobs at 44
- -Time - +Time

- - -Computers May Run on Gas - - +Computers May Run on Gas
ZDNN

- - -Much Is Free in the Wired World - - +Much Is Free in the Wired World
The New York Times (Registration Required)

- - -Melissa: I'm Baaaack - - +Melissa: I'm Baaaack
- -USA Today - +USA Today

- - -Domain Owners Surrender Privacy - - +Domain Owners Surrender Privacy
MSNBC

- - -Dividing to Conquer in VC Game - - +Dividing to Conquer in VC Game
- -The Washington Post - +The Washington Post

- - -The Red Hat Diaries - - +The Red Hat Diaries
Salon

- - -Screensaver to Predict Climate - - +Screensaver to Predict Climate
BBC News
@@ -1039,8 +595,7 @@ Contruction workers in Berlin opened an old wound in the German psyche this week

-

- +

Send us feedback  |  Work at Wired Digital @@ -1050,8 +605,7 @@ Contruction workers in Berlin opened an old wound in the German psyche this week About Wired Digital  |  Our Privacy Policy - -

+

Copyright © 1994-99 Wired Digital Inc. All rights reserved. @@ -1066,9 +620,7 @@ Contruction workers in Berlin opened an old wound in the German psyche this week

- -