+ Merged revisions 127,128

git-svn-id: branches/fixes_2_0@129 -

utils/fpdoc/dw_html.pp

@@ -548,7 +548,7 @@ begin
   El := Doc.CreateElement('meta');
   HeadEl.AppendChild(El);
   El['http-equiv'] := 'Content-Type';
-  El['content'] := 'text/html; charset=iso8859-1';
+  El['content'] := 'text/html; charset=iso-8859-1';
   TitleElement := Doc.CreateElement('title');
   HeadEl.AppendChild(TitleElement);
   El := Doc.CreateElement('link');
@@ -804,7 +804,8 @@ end;
 
 function THTMLWriter.CreateCode(Parent: TDOMNode): THTMLElement;
 begin
-  Result := CreateEl(CreateEl(Parent, 'tt'), 'nobr');
+  Result := CreateEl(CreateEl(Parent, 'tt'), 'span');
+  Result['class'] := 'code';
 end;
 
 function THTMLWriter.CreateWarning(Parent: TDOMNode): THTMLElement;

utils/fpdoc/fpde/frmmain.pp

@@ -464,7 +464,7 @@ end;
 Procedure TMainForm.FileNewClick(Sender : TFPGtkObject; Data : Pointer);
 
 Const
-  template = '<?xml version="1.0" encoding="ISO8859-1"?>'+LineEnding+
+  template = '<?xml version="1.0" encoding="ISO-8859-1"?>'+LineEnding+
              '<fpdoc-descriptions>'+LineEnding+
              '</fpdoc-descriptions>'+LineEnding;
 

utils/fpdoc/fpde/pgeditor.pp

@@ -379,7 +379,7 @@ end;
 Function TElementeditor.TestSave(S : String) : Boolean;
 
 Const
-  Head = '<?xml version="1.0" encoding="ISO8859-1"?><fpdoc-descriptions>';
+  Head = '<?xml version="1.0" encoding="ISO-8859-1"?><fpdoc-descriptions>';
   Tail = '</fpdoc-descriptions>';
   SErrorSaving = 'There is an error in the documentation nodes:'+LineEnding+
                  '%s'+LineEnding+

utils/fpdoc/fpdoc.css

@@ -53,6 +53,11 @@ h3, td.h3 {
   font-size: 12pt
 }
 
+/* source fragments */
+span.code {
+  white-space: nowrap
+}
+
 /* symbols in source fragments */
 span.sym {
   color: darkred

utils/fpdoc/makeskel.pp

@@ -329,7 +329,7 @@ begin
     Assign(f, OutputName);
     Rewrite(f);
 
-    WriteLn(f, '<?xml version="1.0" encoding="ISO8859-1"?>');
+    WriteLn(f, '<?xml version="1.0" encoding="ISO-8859-1"?>');
     WriteLn(f, '<fpdoc-descriptions>');
     WriteLn(f, '<package name="', PackageName, '">');