7 жил өмнө · d997db7fa7
--- a/.gitattributes
+++ b/.gitattributes
@@ -3458,6 +3458,8 @@ packages/fcl-xml/Makefile.fpc svneol=native#text/plain
 
				 packages/fcl-xml/Makefile.fpc.fpcmake svneol=native#text/plain
			
 
				 packages/fcl-xml/buildfclxml.lpi svneol=native#text/plain
			
 
				 packages/fcl-xml/buildfclxml.pp svneol=native#text/plain
			
 
				+packages/fcl-xml/examples/test.html svneol=native#text/html
			
 
				+packages/fcl-xml/examples/testhtml.pp svneol=native#text/plain
			
 
				 packages/fcl-xml/fpmake.pp svneol=native#text/plain
			
 
				 packages/fcl-xml/src/README.txt svneol=native#text/plain
			
 
				 packages/fcl-xml/src/dom.pp svneol=native#text/plain
			
--- a/packages/fcl-xml/examples/test.html
+++ b/packages/fcl-xml/examples/test.html
@@ -0,0 +1,6 @@
 
				+<html><head>
			
 
				+<script>
			
 
				+   document.write('<title>Banner<\/title>');
			
 
				+</script>
			
 
				+</head>
			
 
				+</html>
			
--- a/packages/fcl-xml/examples/testhtml.pp
+++ b/packages/fcl-xml/examples/testhtml.pp
@@ -0,0 +1,19 @@
 
				+program testhtml;
			
 
				+{
			
 
				+  simple demo to demonstrate rewriting a HTML file
			
 
				+}
			
 
				+uses sysutils, dom_html,sax_html, XMLWrite;
			
 
				+
			
 
				+Var
			
 
				+  H : THTMLDocument;
			
 
				+
			
 
				+begin
			
 
				+  if ParamCount<>2 then
			
 
				+    begin
			
 
				+    Writeln('Usage: ',ExtractFileName(Paramstr(0)),' inputfile outputfile');
			
 
				+    Halt(1);
			
 
				+    end;
			
 
				+  ReadHTMLFile(H,ParamStr(1));
			
 
				+  WriteXMLFile(H,Paramstr(2));
			
 
				+end.
			
 
				+
			
--- a/packages/fcl-xml/src/sax_html.pp
+++ b/packages/fcl-xml/src/sax_html.pp
@@ -553,16 +553,17 @@ begin
 
				           AutoClose(TagName);
			
 
				           namePush(TagName);
			
 
				           DoStartElement('', TagName, '', Attr);
			
 
				-          if not (efSubelementContent in HTMLElementProps[FStack[FNesting-1]].Flags) then begin
			
 
				-            DoEndElement('', TagName, '');
			
 
				-            NamePop;
			
 
				-          end;
			
 
				           if FStack[FNesting-1] in [etScript,etStyle] then
			
 
				           begin
			
 
				             NewContext := scScript;
			
 
				             FScriptEndTag := '</' + HTMLElementProps[FStack[FNesting-1]].Name;
			
 
				             FScriptEndMatchPos := 1;
			
 
				           end;
			
 
				+          if (efSubcontent*HTMLElementProps[FStack[FNesting-1]].Flags=[]) then begin
			
 
				+            // do not push empty elements, don't wait for AutoClose
			
 
				+            DoEndElement('', TagName, '');
			
 
				+            NamePop;
			
 
				+          end;
			
 
				         end;
			
 
				         if Assigned(Attr) then
			
 
				           Attr.Free;
			
@@ -574,8 +575,8 @@ begin
 
				     scScript:
			
 
				       begin
			
 
				         DoCharacters(PSAXChar(TokenText), 0, Length(TokenText));
			
 
				-        DoEndElement('', HTMLElementProps[FStack[FNesting-1]].Name, '');
			
 
				-        namePop;
			
 
				+        DoEndElement('', Copy(FScriptEndTag, 3), '');
			
 
				+        NamePop;
			
 
				         FScriptEndTag := '';
			
 
				       end;
			
 
				   end;