2011-05-27 23:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* examples/hbdoc2/gentxt.prg
  * examples/hbdoc2/genxml.prg
  * examples/hbdoc2/genhtml.prg
    ! removed extra dot before extension in filename references. 
      it also caused bad links in .html output. Reported by Claudia.
This commit is contained in:
Viktor Szakats
2011-05-27 21:43:25 +00:00
parent 20b5875721
commit 52952d0073
4 changed files with 13 additions and 6 deletions

View File

@@ -16,6 +16,13 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-05-27 23:42 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* examples/hbdoc2/gentxt.prg
* examples/hbdoc2/genxml.prg
* examples/hbdoc2/genhtml.prg
! removed extra dot before extension in filename references.
it also caused bad links in .html output. Reported by Claudia.
2011-05-27 19:04 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/include/hbapicdp.h
* harbour/src/codepage/Makefile

View File

@@ -143,7 +143,7 @@ METHOD BeginSection( cSection, cFilename ) CLASS GenerateHTML
If cFilename == ::cFilename
::OpenTag( "a", "name", cSection ):Append( cSection, "h" + HB_NTOS( ::Depth + 2 ) ):CloseTag( "a" )//:Newline()
ELSE
::OpenTag( "a", "href", cFilename + "." + ::cExtension + "#" + cSection ):Append( cSection, "h" + HB_NTOS( ::Depth + 2 ) ):CloseTag( "a" )//:Newline()
::OpenTag( "a", "href", cFilename + ::cExtension + "#" + cSection ):Append( cSection, "h" + HB_NTOS( ::Depth + 2 ) ):CloseTag( "a" )//:Newline()
ENDIF
ELSE
::OpenTag( "a", "name", cSection ):Append( cSection, "h" + HB_NTOS( ::Depth + 2 ) ):CloseTag( "a" )//:Newline()
@@ -160,12 +160,12 @@ HB_SYMBOL_UNUSED( cFilename )
METHOD AddReference( oEntry, cReference, cSubReference ) CLASS GenerateHTML
IF HB_IsObject( oEntry ) .AND. oEntry:ClassName == "ENTRY"
::OpenTag( "a", "href", ::TargetFilename + "." + ::cExtension + "#" + oEntry:Filename ):Append( oEntry:Name ):CloseTag( "a" ):Append( oEntry:OneLiner ):Newline()
::OpenTag( "a", "href", ::TargetFilename + ::cExtension + "#" + oEntry:Filename ):Append( oEntry:Name ):CloseTag( "a" ):Append( oEntry:OneLiner ):Newline()
ELSE
IF cSubReference == NIL
::OpenTag( "a", "href", cReference + "." + ::cExtension /* + "#" + oEntry:Filename */ ):Append( oEntry ):CloseTag( "a" ):Newline()
::OpenTag( "a", "href", cReference + ::cExtension /* + "#" + oEntry:Filename */ ):Append( oEntry ):CloseTag( "a" ):Newline()
ELSE
::OpenTag( "a", "href", cReference + "." + ::cExtension + "#" + cSubReference ):Append( oEntry ):CloseTag( "a" ):Newline()
::OpenTag( "a", "href", cReference + ::cExtension + "#" + cSubReference ):Append( oEntry ):CloseTag( "a" ):Newline()
ENDIF
ENDIF
RETURN self

View File

@@ -104,7 +104,7 @@ METHOD NewIndex( cFolder, cFilename, cTitle ) CLASS GenerateText
METHOD BeginSection( cSection, cFilename ) CLASS GenerateText
IF ::Depth == 0
::WriteEntry( "", cSection + " (see " + cFilename + "." + ::cExtension + "):", .F. )
::WriteEntry( "", cSection + " (see " + cFilename + ::cExtension + "):", .F. )
ELSE
::WriteEntry( "", cSection + ":", .F. )
ENDIF

View File

@@ -90,7 +90,7 @@ METHOD NewIndex( cFolder, cFilename, cTitle ) CLASS GenerateXML
METHOD BeginSection( cSection, cFilename ) CLASS GenerateXML
IF ::Depth == 0
FWrite( ::nHandle, Replicate( Chr(9), ::Depth ) + [<Section name="] + cSection + [" file="] + cFilename + "." + ::cExtension + [">] + hb_eol() )
FWrite( ::nHandle, Replicate( Chr(9), ::Depth ) + [<Section name="] + cSection + [" file="] + cFilename + ::cExtension + [">] + hb_eol() )
ELSE
FWrite( ::nHandle, Replicate( Chr(9), ::Depth ) + [<Section name="] + cSection + [">] + hb_eol() )
ENDIF