cross referencing with cxref

2002-02-18T17:18:12Z

I have added an option to make webcpp able to produce
pages that cxref
(http://www.gedanken.demon.co.uk/cxref/) can use for
crosslinked source display.
cxref needs an anchor for each line that has the form
<a name="lineXX" />
This mode can be switched on by the option
-x, --cxref-anchors
The corresponding patch for cxref that uses webcpp to
htmlize sourcecode will be sent to the maintainer.

--- snip ---

diff -ru webcpp-0.6.5-orig/webcpp/gangbanger.cpp
webcpp-0.6.5-src/webcpp/gangbanger.cpp
--- webcpp-0.6.5-orig/webcpp/gangbanger.cpp Thu Jan 3 13:49:42 2002
+++ webcpp-0.6.5-src/webcpp/gangbanger.cpp Thu Feb 14 22:48:15 2002
@@ -30,6 +30,7 @@

made = false;
margin = false;
+ lineAnchors = false;
redir_I = false;
redir_O = false;
cssfile = "";
@@ -106,6 +107,10 @@
if(redir_I) {getline(cin,buffer);}
else {getline(fIO.ifile,buffer);}
buffer = buffer + "";
+
+ if(lineAnchors) {
+ mkLineAnchor();
+ }

if(margin) {
mkMargin();
diff -ru webcpp-0.6.5-orig/webcpp/hashbanger.cpp
webcpp-0.6.5-src/webcpp/hashbanger.cpp
--- webcpp-0.6.5-orig/webcpp/hashbanger.cpp Thu Jan 3 13:49:42 2002
+++ webcpp-0.6.5-src/webcpp/hashbanger.cpp Thu Feb 14 22:49:09 2002
@@ -35,6 +35,7 @@

made = false;
margin = false;
+ lineAnchors = false;
redir_I = false;
redir_O = false;
csson = false;
@@ -213,6 +214,9 @@
else {getline(fIO.ifile,buffer);}
buffer = buffer + "";

+ if(lineAnchors) {
+ mkLineAnchor();
+ }
if(margin) {
mkMargin();
}
diff -ru webcpp-0.6.5-orig/webcpp/headbanger.cpp
webcpp-0.6.5-src/webcpp/headbanger.cpp
--- webcpp-0.6.5-orig/webcpp/headbanger.cpp Thu Jan 3 13:49:42 2002
+++ webcpp-0.6.5-src/webcpp/headbanger.cpp Thu Feb 14 22:49:33 2002
@@ -32,6 +32,7 @@
instring = false;

margin = false;
+ lineAnchors = false;
redir_I = false;
redir_O = false;
made = false;
@@ -54,6 +55,9 @@

if(filetype <= 3) {

+ if(lineAnchors) {
+ mkLineAnchor();
+ }
if(margin) {
mkMargin();
}
@@ -167,6 +171,7 @@
else fIO.ofile << buffer << endl;
while(buffer.find("*/",0) == -1) {

+ if(lineAnchors) {mkLineAnchor();}
if(margin) {mkMargin();}
if(redir_I) {getline(cin, buffer);}
else getline(fIO.ifile, buffer);
diff -ru webcpp-0.6.5-orig/webcpp/help.cpp
webcpp-0.6.5-src/webcpp/help.cpp
--- webcpp-0.6.5-orig/webcpp/help.cpp Thu Jan 3 13:49:42 2002
+++ webcpp-0.6.5-src/webcpp/help.cpp Thu Feb 14 22:44:38 2002
@@ -41,6 +41,7 @@
-t=<extension> Forces the syntax highligting
type.\n\ \n\ -l,--line-numbers Print the line numbers in the
left margin.\n\ + -x,--cxref-anchors Add anchors like <a
name=\&quot;line123\&quot; /> to each line \n\ -s,--set-colours Set the colours manually.\n\ -m,--made-with Show made with webcpp footer.\n\ -h,--hyperlink Create hyperlinks to #include
files (C/C++).\n\ diff -ru webcpp-0.6.5-orig/webcpp/main.cpp
webcpp-0.6.5-src/webcpp/main.cpp
--- webcpp-0.6.5-orig/webcpp/main.cpp Thu Jan 3 13:49:42 2002
+++ webcpp-0.6.5-src/webcpp/main.cpp Thu Feb 14 22:57:37 2002
@@ -139,6 +139,8 @@
Source->ColourOf.setAllColours();
} else if (arg == "--line-numbers" || arg == "-l") {
Source->toggleMargin();
+ } else if (arg == "--cxref-anchors" || arg == "-x") {
+ Source->toggleLineAnchors();
} else help.helpme();
}
}
diff -ru webcpp-0.6.5-orig/webcpp/style.cpp
webcpp-0.6.5-src/webcpp/style.cpp
--- webcpp-0.6.5-orig/webcpp/style.cpp Thu Jan 3 13:49:42 2002
+++ webcpp-0.6.5-src/webcpp/style.cpp Thu Feb 14 22:57:06 2002
@@ -387,6 +387,21 @@
else {fIO.ofile << space << fntag << lncnt << cltag;}

}
//---------------------------------------------------------------------------
+// turn line anchors for cxref on/off
-----------------------------------------
+void Style::toggleLineAnchors() {lineAnchors =
!lineAnchors;}
+//-----------------------------------------------------------------------------
+// prints a line anchor for use with cxref
------------------------------------
+void Style::mkLineAnchor() {
+
+ string space = "";
+ string astart = "<a name=\&quot;line";
+ string aend = "\&quot; />";
+
+ if(redir_O) {cout << astart << lncnt << aend; }
+ else {fIO.ofile << astart << lncnt << aend; }
+
+}
+//-----------------------------------------------------------------------------
int Style::getLineCount() {return lncnt;} // get the
current line number
//-----------------------------------------------------------------------------
// write initial html tags
----------------------------------------------------
diff -ru webcpp-0.6.5-orig/webcpp/style.h
webcpp-0.6.5-src/webcpp/style.h
--- webcpp-0.6.5-orig/webcpp/style.h Thu Jan 3 13:49:42 2002
+++ webcpp-0.6.5-src/webcpp/style.h Thu Feb 14 22:46:52 2002
@@ -59,7 +59,9 @@

int getLineCount();
void mkMargin();
+ void mkLineAnchor();
void toggleMargin();
+ void toggleLineAnchors();
void toggleIswitch();
void toggleOswitch();
bool isIstd();
@@ -96,6 +98,7 @@
bool incomment;

bool margin;
+ bool lineAnchors; // used to switch <a name="line123" /> on
bool redir_I;
bool redir_O;
string cssfile;

wrong line count in classic c comment

2002-02-18T14:43:54Z

The line count for multiline classic c comments is
wrong -- the last line gets lost in numbering ...
The problem occurs in headbanger.cpp and is very easy
to patch:

--- headbanger-orig.cpp Mon Feb 18 15:21:40 2002
+++ headbanger.cpp Mon Feb 18 15:22:41 2002
@@ -162,11 +162,10 @@
if(ccmnt_f != -1) buffer.insert(ccmnt_f +2,cltag);

else {
- lncnt++;
if(redir_O) {cout << buffer << endl;}
else fIO.ofile << buffer << endl;
while(buffer.find("*/",0) == -1) {
-
+ lncnt++;
if(margin) {mkMargin();}
if(redir_I) {getline(cin, buffer);}
else getline(fIO.ifile, buffer);
@@ -175,7 +174,6 @@
if(ccmnt_f != -1) {buffer.insert(ccmnt_f +2,cltag);}
else if (redir_O) {cout << buffer << endl;}
else fIO.ofile << buffer << endl;
- lncnt++;
}
}
}

Recent changes to patches

cross referencing with cxref

wrong line count in classic c comment