mirror of https://github.com/CGAL/cgal
more fixes
This commit is contained in:
parent
e7ba44e1a4
commit
dcf8e551cf
|
|
@ -591,12 +591,6 @@ main( int argc, char **argv) {
|
|||
|
||||
assert_file_write( *index_stream, macroX( "\\lciIndexFilename"));
|
||||
delete index_stream;
|
||||
|
||||
if (macroIsTrue("\\lciIfMultipleParts")) {
|
||||
*contents_stream << "<!-- End last part's contents table -->" << endl;
|
||||
*contents_stream << "</TABLE></TD></TABLE>" << endl;
|
||||
}
|
||||
|
||||
|
||||
if ( ! noheader_switch)
|
||||
copy_and_filter_config_file( macroX( "\\lciTocFooter"),
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
cc_index_link.C
|
||||
=============================================================
|
||||
Project : Tools for the CC manual writing task around cc_manual_index.sty.
|
||||
Function :add links in HTML-index
|
||||
System : bison, flex, C++ (g++)
|
||||
Author : 2003 Lutz Kettner, Renata Krysta
|
||||
Function :adds links in HTML-index (combines manual.ind with HREF)
|
||||
System : C++ (g++)
|
||||
Author : 2003 Renata Krysta
|
||||
Revision : $Revision$
|
||||
Date : $Date$
|
||||
|
||||
|
|
@ -16,7 +16,6 @@
|
|||
#include <stdio.h>
|
||||
#include <iostream.h>
|
||||
#include <fstream.h>
|
||||
#include <string.h>
|
||||
|
||||
|
||||
typedef struct Lines{
|
||||
|
|
@ -56,6 +55,7 @@ char* search(pList list, int number) {
|
|||
return list->text;
|
||||
} else list=list->next;
|
||||
}
|
||||
return '\0';
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -64,7 +64,10 @@ char* search(pList list, int number) {
|
|||
/* ------------------------------------------------------- */
|
||||
|
||||
main( int argc, char **argv) {
|
||||
if (argc < 5) {
|
||||
// argv[1] is a file with sorted index entries and their numbers
|
||||
// argv[2] is a file with links and their numbers
|
||||
// argv[3] is an output file
|
||||
if (argc < 4) {
|
||||
cerr << "*** Error: program needs an additional parameter"<<'\n';
|
||||
exit(1);
|
||||
}
|
||||
|
|
@ -93,8 +96,8 @@ main( int argc, char **argv) {
|
|||
cerr<<"*** Error: cannot open file "<< file_name2 <<'\n';
|
||||
|
||||
|
||||
char ch;
|
||||
|
||||
char ch;
|
||||
char* out_link;
|
||||
char name_link[300];
|
||||
|
||||
bool end_name;
|
||||
|
|
@ -103,7 +106,7 @@ main( int argc, char **argv) {
|
|||
if (in_file2.get(ch)) {
|
||||
if (ch=='?') {
|
||||
if (in_file2.get(ch)) {
|
||||
if (ch=='?') {
|
||||
if (ch=='?') { // if index entry
|
||||
end_name=0;
|
||||
char tmp[300]="";
|
||||
bool page = 0;
|
||||
|
|
@ -129,19 +132,22 @@ main( int argc, char **argv) {
|
|||
}
|
||||
}
|
||||
|
||||
if (page) {
|
||||
if (page) { //if link
|
||||
in_file2 >> number;
|
||||
out_file <<"<A "<<search(list,number)<<">" <<tmp
|
||||
<< "</A> ";
|
||||
while (in_file2.get(ch) && ch!='<') {
|
||||
if (ch=='|') {
|
||||
in_file2 >> number;
|
||||
out_file << "<A "<< search(list,number)<<">"
|
||||
// << "<img SRC=\""<< argv[4] << "/index_arrow.gif\" ALT=\"reference\" WIDTH=\"14\" HEIGHT=\"12\" VALIGN=BOTTOM BORDER=0></A> ";
|
||||
<< "<img SRC=\"./index_arrow.gif\" ALT=\"reference\" WIDTH=\"14\" HEIGHT=\"12\" VALIGN=BOTTOM BORDER=0></A> ";
|
||||
}
|
||||
}
|
||||
out_file << ch;
|
||||
out_link = search(list,number);
|
||||
if (out_link) {
|
||||
out_file <<"<A "<< out_link <<">" <<tmp << "</A> ";
|
||||
} else out_file << tmp;
|
||||
while (in_file2.get(ch) && ch!='<') {
|
||||
if (ch=='|') {
|
||||
in_file2 >> number;
|
||||
if (out_link) {
|
||||
out_file << "<A "<< search(list,number)<<">"
|
||||
<< "<img SRC=\"" << "gif/index_arrow.gif\" ALT=\"reference\" WIDTH=\"14\" HEIGHT=\"12\" VALIGN=BOTTOM BORDER=0></A> ";
|
||||
}
|
||||
}
|
||||
}
|
||||
out_file << ch;
|
||||
} else out_file << name_link;
|
||||
|
||||
} else out_file << ch;
|
||||
|
|
|
|||
|
|
@ -394,9 +394,9 @@ end
|
|||
if ( $?DEBUG) echo "# Converting the index."
|
||||
|
||||
makeindex -s ${config_html}/html_index.mst ${new_tmp_path}/manual.hidx
|
||||
cc_index_link ${new_tmp_path}/HREF ${new_tmp_path}/manual.ind ${new_tmp_path}/cc_index ${config_gif}
|
||||
cat ${new_tmp_path}/cc_index_header ${new_tmp_path}/cc_index ${new_tmp_path}/cc_index_footer > ${out_path}/manual_index.html
|
||||
|
||||
cc_index_link ${new_tmp_path}/HREF ${new_tmp_path}/manual.ind ${new_tmp_path}/cc_index
|
||||
\cat ${new_tmp_path}/cc_index_header ${new_tmp_path}/cc_index ${new_tmp_path}/cc_index_footer > ${out_path}/manual_index.html
|
||||
\cat ${config_gif}/index_arrow.gif > ${out_path}/gif/index_arrow.gif
|
||||
|
||||
# Copy the necessary images to the manual.
|
||||
# -------------------------------------------------------
|
||||
|
|
@ -602,8 +602,9 @@ foreach f ($in_files $ref_files)
|
|||
\cat ${new_tmp_path}/$f:h/HREF >> ${new_tmp_path}/HREF
|
||||
end
|
||||
makeindex -s ${config_html}/html_index.mst ${new_tmp_path}/manual.hidx
|
||||
cc_index_link ${new_tmp_path}/HREF ${new_tmp_path}/manual.ind ${new_tmp_path}/manual_index ${config_gif}
|
||||
cat ${new_tmp_path}/cc_index_header ${new_tmp_path}/manual_index ${new_tmp_path}/cc_index_footer > ${out_path}/manual_index.html
|
||||
cc_index_link ${new_tmp_path}/HREF ${new_tmp_path}/manual.ind ${new_tmp_path}/manual_index
|
||||
\cat ${new_tmp_path}/cc_index_header ${new_tmp_path}/manual_index ${new_tmp_path}/cc_index_footer > ${out_path}/manual_index.html
|
||||
\cat ${config_gif}/index_arrow.gif > ${out_path}/gif/index_arrow.gif
|
||||
|
||||
|
||||
# Copy the necessary images to the manual.
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ string template_class_name;
|
|||
// index
|
||||
// =======================================
|
||||
|
||||
int HREF_counter;
|
||||
int HREF_counter; // important for option -extended
|
||||
|
||||
|
||||
/* table size and font size constants */
|
||||
|
|
@ -913,7 +913,8 @@ void format_function( bool method, const char* signature,
|
|||
// ---------
|
||||
// index
|
||||
|
||||
if (!class_name.empty() && macroIsTrue( "\\ccIndex") &&
|
||||
if (!class_name.empty() && macroIsTrue( "\\ccIndex") &&
|
||||
macroIsTrue( "\\ccAutoIndex") &&
|
||||
!(macroIsTrue( "\\ccIsRefFunction") &&
|
||||
macroIsTrue( "\\ccIsFunctionTemplate"))) {
|
||||
char* formatted_function = convert_fontified_ascii_to_html(
|
||||
|
|
@ -935,15 +936,12 @@ void format_function( bool method, const char* signature,
|
|||
}
|
||||
if ( !normal_operator && !method && macroIsTrue( "\\lciIfHtmlIndex")
|
||||
&& macroIsTrue( "\\lciIfHtmlRefIndex") && macroIsTrue( "\\ccIndex")
|
||||
&& class_name.empty() && !(macroIsTrue( "\\ccIsRefFunction") &&
|
||||
&& macroIsTrue( "\\ccAutoIndex") && class_name.empty()
|
||||
&& !(macroIsTrue( "\\ccIsRefFunction") &&
|
||||
macroIsTrue( "\\ccIsFunctionTemplate"))) {
|
||||
|
||||
char* formatted_function = convert_fontified_ascii_to_html(
|
||||
function_name);
|
||||
|
||||
// Make only the function name a hyperlink. Types could be substituted
|
||||
// according the rules.
|
||||
|
||||
make_index(formatted_function,"","",signature,'f');
|
||||
|
||||
delete[] formatted_function;
|
||||
|
|
@ -959,7 +957,7 @@ void format_function( bool method, const char* signature,
|
|||
if ( conversion_operator)
|
||||
print_ascii_to_html_spc( *current_ostream, op_symbols);
|
||||
|
||||
char* tmp;
|
||||
char* full_parameter_list;
|
||||
|
||||
// handle function body or operation signature
|
||||
// first, estimate size
|
||||
|
|
@ -970,7 +968,7 @@ void format_function( bool method, const char* signature,
|
|||
if ( conversion_operator) {
|
||||
exp_size += estimate_html_size( op_symbols);
|
||||
} else if ( parameter_list) {
|
||||
tmp = strdup(parameter_list);
|
||||
full_parameter_list = strdup(parameter_list);
|
||||
n = separate_parameter_list( parameter_list);
|
||||
char* p = parameter_list;
|
||||
int m = n;
|
||||
|
|
@ -1041,13 +1039,18 @@ void format_function( bool method, const char* signature,
|
|||
print_ascii_to_html_spc( *current_ostream, postfix);
|
||||
}
|
||||
|
||||
// ---------
|
||||
// index
|
||||
|
||||
|
||||
if (((! failed) || (! (macroIsTrue("\\ccTagOperatorLayout")))) &&
|
||||
macroIsTrue( "\\ccIndex") && !(macroIsTrue( "\\ccIsRefFunction") &&
|
||||
macroIsTrue( "\\ccIndex") && macroIsTrue( "\\ccAutoIndex")
|
||||
&& !(macroIsTrue( "\\ccIsRefFunction") &&
|
||||
macroIsTrue( "\\ccIsFunctionTemplate"))) {
|
||||
p = parameter_list;
|
||||
|
||||
if (!method) {
|
||||
char* q = p;
|
||||
char* q = full_parameter_list;
|
||||
char* s = q;
|
||||
bool found = false;
|
||||
while ((m--) && !(found)) {
|
||||
|
|
@ -1090,7 +1093,7 @@ void format_function( bool method, const char* signature,
|
|||
make_index(op_symbols_for_index,token,"",signature,'f');
|
||||
}
|
||||
else {
|
||||
char* token = strtok(tmp, " \t");
|
||||
char* token = strtok(full_parameter_list, " \t");
|
||||
make_index(op_symbols_for_index,token,"",signature,'f');
|
||||
}
|
||||
}
|
||||
|
|
@ -1099,6 +1102,10 @@ void format_function( bool method, const char* signature,
|
|||
convert_fontified_ascii_to_html(class_name),"",
|
||||
signature,'f');
|
||||
}
|
||||
// end index
|
||||
// ----------
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1241,19 +1248,30 @@ void format_variable( const char* signature,
|
|||
}
|
||||
if ( macroIsTrue( "\\lciIfHtmlIndex") &&
|
||||
macroIsTrue( "\\lciIfHtmlRefIndex") &&
|
||||
macroIsTrue( "\\ccIndex")) {
|
||||
macroIsTrue( "\\ccIndex") && macroIsTrue( "\\ccAutoIndex")) {
|
||||
// index
|
||||
char p = (is_typedef ? 't' : 'v');
|
||||
make_index(formatted_var,"","",variable_name,p);
|
||||
}
|
||||
} else if ( macroIsTrue( "\\lciIfHtmlClassIndex") &&
|
||||
macroIsTrue( "\\lciIfHtmlIndex") && macroIsTrue( "\\ccIndex")) {
|
||||
macroIsTrue( "\\lciIfHtmlIndex") && macroIsTrue( "\\ccIndex")
|
||||
&& macroIsTrue( "\\ccAutoIndex")) {
|
||||
// index
|
||||
char p = (is_typedef ? 't' : 'v');
|
||||
make_index(string(variable_name),string(class_name),"",
|
||||
variable_name,p);
|
||||
|
||||
}
|
||||
|
||||
if ( !class_name.empty() && !macroIsTrue( "\\lciIfHtmlClassIndex") &&
|
||||
macroIsTrue( "\\lciIfHtmlIndex") && macroIsTrue( "\\ccIndex")
|
||||
&& macroIsTrue( "\\ccAutoIndex")) {
|
||||
// index
|
||||
char p = (is_typedef ? 't' : 'v');
|
||||
make_index(formatted_var,"","",variable_name,p);
|
||||
}
|
||||
|
||||
|
||||
if ( macroIsTrue( "\\lciIfHtmlLinks") ||
|
||||
macroIsTrue( "\\lciIfHtmlIndex")) {
|
||||
*current_ostream << "<A NAME=\""
|
||||
|
|
@ -1323,7 +1341,6 @@ void format_class_declaration( const char* signature) {
|
|||
|
||||
char* formatted_struct = convert_fontified_ascii_to_html( struct_name);
|
||||
two_cols_html_begin( *current_ostream);
|
||||
|
||||
if ( class_name.empty()) {
|
||||
if ( macroIsTrue( "\\lciIfHtmlLinks") && strlen(struct_name) > 1) {
|
||||
// generate a substitution rule for hyperlinking
|
||||
|
|
@ -1335,12 +1352,14 @@ void format_class_declaration( const char* signature) {
|
|||
filter_for_index_anchor( *anchor_stream, struct_name);
|
||||
*anchor_stream << "\", yytext); }" << endl;
|
||||
}
|
||||
if ( macroIsTrue( "\\lciIfHtmlIndex") && macroIsTrue( "\\ccIndex")) {
|
||||
if ( macroIsTrue( "\\lciIfHtmlIndex") && macroIsTrue( "\\ccIndex")
|
||||
&& macroIsTrue( "\\ccAutoIndex")) {
|
||||
// index
|
||||
make_index(formatted_struct,"","",struct_name,'s');
|
||||
}
|
||||
} else if ( macroIsTrue( "\\lciIfHtmlClassIndex") &&
|
||||
macroIsTrue( "\\lciIfHtmlIndex") && macroIsTrue( "\\ccIndex")) {
|
||||
macroIsTrue( "\\lciIfHtmlIndex") && macroIsTrue( "\\ccIndex")
|
||||
&& macroIsTrue( "\\ccAutoIndex")) {
|
||||
// index
|
||||
make_index(string(struct_name),string(class_name),"",
|
||||
struct_name,'s');
|
||||
|
|
@ -1385,7 +1404,7 @@ void format_struct( const char* signature) {
|
|||
char* formatted_struct = convert_fontified_ascii_to_html( struct_name);
|
||||
two_cols_html_begin( *current_ostream);
|
||||
|
||||
if ( class_name.empty()) {
|
||||
if ( class_name.empty() || (! macroIsTrue( "\\lciIfHtmlClassIndex"))) {
|
||||
if ( macroIsTrue( "\\lciIfHtmlLinks") && strlen(struct_name) > 1) {
|
||||
// generate a substitution rule for hyperlinking
|
||||
*anchor_stream << "[a-zA-Z0-9_]\"" << formatted_struct
|
||||
|
|
@ -1396,12 +1415,14 @@ void format_struct( const char* signature) {
|
|||
filter_for_index_anchor( *anchor_stream, struct_name);
|
||||
*anchor_stream << "\", yytext); }" << endl;
|
||||
}
|
||||
if ( macroIsTrue( "\\lciIfHtmlIndex") && macroIsTrue( "\\ccIndex")) {
|
||||
if ( macroIsTrue( "\\lciIfHtmlIndex") && macroIsTrue( "\\ccIndex")
|
||||
&& macroIsTrue( "\\ccAutoIndex")) {
|
||||
// index
|
||||
make_index(formatted_struct,"","",struct_name,'s');
|
||||
}
|
||||
} else if ( macroIsTrue( "\\lciIfHtmlClassIndex") &&
|
||||
macroIsTrue( "\\lciIfHtmlIndex") && macroIsTrue( "\\ccIndex")) {
|
||||
macroIsTrue( "\\lciIfHtmlIndex") && macroIsTrue( "\\ccIndex")
|
||||
&& macroIsTrue( "\\ccAutoIndex")) {
|
||||
// index
|
||||
make_index(string(struct_name),string(class_name),"",
|
||||
struct_name,'s');
|
||||
|
|
@ -1495,7 +1516,8 @@ void format_nested_type( const char* nested_type_name) {
|
|||
two_cols_html_begin( *current_ostream);
|
||||
|
||||
if ( macroIsTrue( "\\lciIfHtmlClassIndex") &&
|
||||
macroIsTrue( "\\lciIfHtmlIndex") && macroIsTrue( "\\ccIndex")) {
|
||||
macroIsTrue( "\\lciIfHtmlIndex") && macroIsTrue( "\\ccIndex")
|
||||
&& macroIsTrue( "\\ccAutoIndex")) {
|
||||
// index
|
||||
if ( ! template_class_name.empty())
|
||||
make_index(string(nested_type_name),string(class_name),"",
|
||||
|
|
@ -1544,8 +1566,7 @@ void format_enum( const char* signature) {
|
|||
char* formatted_enum = convert_fontified_ascii_to_html( enum_name);
|
||||
|
||||
two_cols_html_begin( *current_ostream);
|
||||
|
||||
if ( class_name.empty()) {
|
||||
if ( class_name.empty() || !(macroIsTrue( "\\lciIfHtmlClassIndex"))) {
|
||||
if ( macroIsTrue( "\\lciIfHtmlLinks") && strlen( enum_name) > 1) {
|
||||
// generate a substitution rule for hyperlinking
|
||||
*anchor_stream << "[a-zA-Z0-9_]\"" << formatted_enum
|
||||
|
|
@ -1556,7 +1577,8 @@ void format_enum( const char* signature) {
|
|||
filter_for_index_anchor( *anchor_stream, enum_name);
|
||||
*anchor_stream << "\", yytext); }" << endl;
|
||||
}
|
||||
if ( macroIsTrue( "\\lciIfHtmlIndex") && macroIsTrue( "\\ccIndex")) {
|
||||
if ( macroIsTrue( "\\lciIfHtmlIndex") && macroIsTrue( "\\ccIndex")
|
||||
&& macroIsTrue( "\\ccAutoIndex")) {
|
||||
// index
|
||||
char* k = strdup(formatted_enum);
|
||||
k = strtok(k,"=");
|
||||
|
|
@ -1567,7 +1589,8 @@ void format_enum( const char* signature) {
|
|||
delete[] k;
|
||||
}
|
||||
} else if ( macroIsTrue( "\\lciIfHtmlClassIndex") &&
|
||||
macroIsTrue( "\\lciIfHtmlIndex") && macroIsTrue( "\\ccIndex")) {
|
||||
macroIsTrue( "\\lciIfHtmlIndex") && macroIsTrue( "\\ccIndex")
|
||||
&& macroIsTrue( "\\ccAutoIndex")) {
|
||||
// index
|
||||
char* k = strdup(formatted_enum);
|
||||
k = strtok(k,"=");
|
||||
|
|
@ -1639,7 +1662,10 @@ void format_enum( const char* signature) {
|
|||
++p;
|
||||
print_ascii_to_html_spc( *current_ostream, p);
|
||||
|
||||
if ( class_name.empty()) {
|
||||
if ( (class_name.empty() ||
|
||||
!(macroIsTrue( "\\lciIfHtmlClassIndex"))) &&
|
||||
macroIsTrue( "\\ccIndex") &&
|
||||
macroIsTrue( "\\ccAutoIndex")) {
|
||||
if ( macroIsTrue( "\\lciIfHtmlIndex")) {
|
||||
// index: print enum tags with (possible) initializers
|
||||
char* k = strdup(p);
|
||||
|
|
@ -1675,7 +1701,8 @@ void format_enum( const char* signature) {
|
|||
}
|
||||
} else if ( macroIsTrue( "\\lciIfHtmlClassIndex") &&
|
||||
macroIsTrue( "\\lciIfHtmlIndex") &&
|
||||
macroIsTrue( "\\ccIndex")) {
|
||||
macroIsTrue( "\\ccIndex") &&
|
||||
macroIsTrue( "\\ccAutoIndex")) {
|
||||
// index: print enum tags with their (possible) initializers
|
||||
char* k = strdup(p);
|
||||
k = strtok(p,"=");
|
||||
|
|
|
|||
|
|
@ -32,69 +32,6 @@
|
|||
// ======================================================================
|
||||
|
||||
|
||||
// ======================================================================
|
||||
// Index keys and sorting
|
||||
// ======================================================================
|
||||
|
||||
// Sort keys for the index
|
||||
// ----------------------------------
|
||||
// The index is organized in a set of fixed topics.
|
||||
|
||||
// sort_keys are used to sort the index according to different sections.
|
||||
// A sort_key is followed by a 0 to indicate the section title.
|
||||
// A sort_key is followed by a 1 to indicate a normal entry.
|
||||
|
||||
|
||||
|
||||
const string sort_key_concept = "<!sort B";
|
||||
const string sort_key_class = "<!sort B";
|
||||
const string sort_key_struct = "<!sort B"; // structs like classes
|
||||
const string sort_key_nested_type = "<!sort B";
|
||||
const string sort_key_enum = "<!sort B";
|
||||
const string sort_key_enum_tags = "<!sort B";
|
||||
const string sort_key_typedef = "<!sort B";
|
||||
const string sort_key_macro = "<!sort B";
|
||||
const string sort_key_variable = "<!sort B";
|
||||
const string sort_key_function = "<!sort B";
|
||||
const string sort_key_member_function = "<!sort B";
|
||||
|
||||
|
||||
|
||||
const string& find_sort_key( string txt) {
|
||||
if ( txt.size() > 0)
|
||||
txt[0] = tolower( txt[0]);
|
||||
if ( txt == "concept")
|
||||
return sort_key_concept;
|
||||
if ( txt == "functionObjectConcept")
|
||||
return sort_key_concept;
|
||||
if ( txt == "class")
|
||||
return sort_key_class;
|
||||
if ( txt == "functionObjectClass")
|
||||
return sort_key_class;
|
||||
if ( txt == "struct")
|
||||
return sort_key_struct;
|
||||
if ( txt == "nested_type")
|
||||
return sort_key_nested_type;
|
||||
if ( txt == "enum")
|
||||
return sort_key_enum;
|
||||
if ( txt == "enum_tags")
|
||||
return sort_key_enum_tags;
|
||||
if ( txt == "typedef")
|
||||
return sort_key_typedef;
|
||||
if ( txt == "macro")
|
||||
return sort_key_macro;
|
||||
if ( txt == "variable")
|
||||
return sort_key_variable;
|
||||
if ( txt == "constant")
|
||||
return sort_key_variable;
|
||||
if ( txt == "function")
|
||||
return sort_key_function;
|
||||
if ( txt == "member_function")
|
||||
return sort_key_member_function;
|
||||
printErrorMessage( UnknownIndexCategoryError);
|
||||
return sort_key_class;
|
||||
}
|
||||
|
||||
static int index_anchor_counter = 0;
|
||||
|
||||
static int cross_link_anchor_counter = 0;
|
||||
|
|
@ -198,12 +135,7 @@ void handleChapter( const Buffer_list& T) {
|
|||
|
||||
// table of contents
|
||||
|
||||
if (macroIsTrue("\\lciIfMultipleParts"))
|
||||
*contents_stream << " <TR> <TD>"<< chapter_num <<" <A HREF=\""
|
||||
<< main_filename
|
||||
<< "\">" << chapter_title << "</A> </TD> </TR>" << endl;
|
||||
else
|
||||
*contents_stream << " <LI> <A HREF=\"" << main_filename
|
||||
*contents_stream << " <LI> <A HREF=\"" << main_filename
|
||||
<< "\">" << chapter_title << "</A>" << endl;
|
||||
}
|
||||
|
||||
|
|
@ -214,26 +146,31 @@ void handlePart( const Buffer_list& T) {
|
|||
|
||||
if (!part_title.empty()) // end previous part
|
||||
{
|
||||
*contents_stream << " </TABLE></TD><TD VALIGN=TOP> <TABLE>" << endl;
|
||||
*contents_stream << "</OL>" << endl;
|
||||
*contents_stream << "<!-- End of manual part -->" << endl;
|
||||
// chapter_num=0;
|
||||
}
|
||||
else
|
||||
{
|
||||
*contents_stream << "<TABLE WIDTH=100%><TD VALIGN=TOP><TABLE>" << endl;
|
||||
}
|
||||
|
||||
|
||||
part_title = string( text_block_to_string( T));
|
||||
|
||||
// add new part title to table of contents
|
||||
*contents_stream << "<!-- Start of new manual part -->" << endl;
|
||||
*contents_stream << "<TR> <TH ALIGN=LEFT VALIGN=TOP><H3>" << part_title << "</H3></TH> </TR>" << endl;
|
||||
*contents_stream << "<H3>" << part_title << "</H3>" << endl;
|
||||
if ( macroIsTrue( "\\lciIfNumberChaptersByPart") )
|
||||
chapter_num=0;
|
||||
*contents_stream << "<OL>" << endl;
|
||||
else
|
||||
*contents_stream << "<OL START=" << chapter_num+1 << ">" << endl;
|
||||
}
|
||||
|
||||
// ========================================================================
|
||||
// Index
|
||||
// ========================================================================
|
||||
|
||||
|
||||
string correct_name (string s) {
|
||||
// corrects index entries for HTML (with <> and </> commands) so that
|
||||
// the result is a correct command in HTML.
|
||||
// Example: ``<I> index'' is changed into ``<I> index </I>''.
|
||||
|
||||
string tab[20];
|
||||
string search_item;
|
||||
|
|
@ -279,13 +216,6 @@ string correct_name (string s) {
|
|||
if (!(tab[j]==""))
|
||||
correct_s += "</" + tab[j] + ">";
|
||||
}
|
||||
/* if (tab_item > 1) {
|
||||
cerr << endl;
|
||||
cerr << " ***Index Warning*** " << endl;
|
||||
cerr << "Your indexing text contains formatting commands in the "
|
||||
<< " interior. I'll do what I canwith this, but"
|
||||
<< " you may be in trouble" << endl;
|
||||
} */
|
||||
return correct_s;
|
||||
|
||||
}
|
||||
|
|
@ -294,6 +224,7 @@ string correct_name (string s) {
|
|||
void mainTextParse(string s,
|
||||
string& index_name,
|
||||
string& modifier) {
|
||||
// This function separates the normal entry and the modified entry from s.
|
||||
|
||||
remove_leading_spaces(s);
|
||||
size_t i = 0;
|
||||
|
|
@ -327,7 +258,7 @@ void OpenFileforIndex() {
|
|||
temp_current_filename = current_filename;
|
||||
|
||||
string WhichItem = macroX("\\lciWhichItem");
|
||||
if (WhichItem=="MainItem") {
|
||||
if (WhichItem=="MainItem" || WhichItem=="index") {
|
||||
new_main_filename = macroX("\\lciMainItemFile");
|
||||
}
|
||||
else {
|
||||
|
|
@ -364,6 +295,7 @@ void CloseFileforIndex() {
|
|||
|
||||
|
||||
string name_for_ordering(string s) {
|
||||
// index entry without HTML commands
|
||||
|
||||
string ord_s="";
|
||||
size_t i = 0;
|
||||
|
|
@ -380,6 +312,8 @@ string name_for_ordering(string s) {
|
|||
return ord_s;
|
||||
}
|
||||
|
||||
// list of modified entries
|
||||
|
||||
typedef struct Lines{
|
||||
string text;
|
||||
int number;
|
||||
|
|
@ -450,8 +384,7 @@ void handleIndex() {
|
|||
ord_sub_sub_index_name = name_for_ordering(sub_sub_index_name);
|
||||
ord_sub_sub_modifier = name_for_ordering(sub_sub_modifier);
|
||||
}
|
||||
|
||||
|
||||
|
||||
string sub_item="";
|
||||
string sub_sub_item="";
|
||||
|
||||
|
|
@ -518,24 +451,24 @@ void handleIndex2(string main_item, string sub_item, string sub_sub_item, int mo
|
|||
*index_stream <<"! " << sub_item;
|
||||
if (sub_sub_item!="") *index_stream <<"! " << sub_sub_item;
|
||||
}
|
||||
|
||||
switch (modifier) {
|
||||
case 0 :
|
||||
//"<A HREF=\"") + filename + "\">"
|
||||
*HREF_stream << HREF_counter << " HREF=\"" << current_filename
|
||||
<< "#Index_anchor_" << index_anchor_counter << "\""
|
||||
<< endl;
|
||||
break;
|
||||
case 1 :
|
||||
*HREF_stream << HREF_counter <<" HREF=\"" << current_filename
|
||||
<< "#Index_anchor_" << index_anchor_counter << "\""
|
||||
<< endl;
|
||||
break;
|
||||
case 2 :
|
||||
*HREF_stream << HREF_counter << " HREF=\"" << "#" << HREF_counter-2
|
||||
<< "\"" << endl;
|
||||
break;
|
||||
}
|
||||
if ( !macroIsTrue("\\lciIfSeeAlso")) {
|
||||
switch (modifier) {
|
||||
case 0 :
|
||||
*HREF_stream << HREF_counter << " HREF=\"" << current_filename
|
||||
<< "#Index_anchor_" << index_anchor_counter << "\""
|
||||
<< endl;
|
||||
break;
|
||||
case 1 :
|
||||
*HREF_stream << HREF_counter <<" HREF=\"" << current_filename
|
||||
<< "#Index_anchor_" << index_anchor_counter << "\""
|
||||
<< endl;
|
||||
break;
|
||||
case 2 :
|
||||
*HREF_stream << HREF_counter << " HREF=\"" << "#"
|
||||
<< HREF_counter-2 << "\"" << endl;
|
||||
break;
|
||||
}
|
||||
} else *current_ostream<<"NIE1"<<main_item<<endl;
|
||||
|
||||
|
||||
*index_stream << "}{"<< HREF_counter << "}" << endl;
|
||||
|
|
@ -672,21 +605,13 @@ void handleClassFile( const string& filename,
|
|||
open_html( *class_stream);
|
||||
// Make a hyperlink in the chapter to the class file.
|
||||
if ( main_stream != &cout) {
|
||||
if (macroIsTrue("\\lciIfMultipleParts"))
|
||||
*main_stream << "<TR> <TD> <UL><LI>" << formatted_reference
|
||||
<< ".</UL> </TD> </TR>\n" << endl;
|
||||
else
|
||||
*main_stream << "<UL><LI>\n" << formatted_reference
|
||||
<< ".</UL>\n" << endl;
|
||||
}
|
||||
|
||||
// table of contents
|
||||
if ( macroIsTrue( "\\lciIfHtmlClassToc"))
|
||||
if (macroIsTrue("\\lciIfMultipleParts"))
|
||||
*contents_stream << "<TR> <TD> <UL><LI> " << formatted_reference
|
||||
<< "</UL> </TD> </TR>" << endl;
|
||||
else
|
||||
*contents_stream << "<UL><LI> " << formatted_reference
|
||||
*contents_stream << "<UL><LI> " << formatted_reference
|
||||
<< "</UL> " << endl;
|
||||
|
||||
|
||||
|
|
@ -715,7 +640,6 @@ void handleClassFileEnd( void) {
|
|||
|
||||
void handleClassEnvironment() {
|
||||
string ref_scope_name = macroX("\\ccPureRefScope");
|
||||
// template_class_name = ref_scope_name + macroX("\\ccPureClassTemplateName");
|
||||
template_class_name = macroX("\\ccPureClassTemplateName");
|
||||
string formatted_template_class_name =
|
||||
convert_C_to_html( template_class_name);
|
||||
|
|
@ -734,14 +658,10 @@ void handleClassEnvironment() {
|
|||
handleClassFile( filename, contents);
|
||||
}
|
||||
|
||||
if ( macroIsTrue( "\\lciIfHtmlClassIndex") &&
|
||||
macroIsTrue( "\\lciIfHtmlIndex")) // Index.
|
||||
//*current_ostream << handleHtmlIndex( sort_key_class,
|
||||
// template_class_name,
|
||||
// formatted_template_class_name);
|
||||
|
||||
|
||||
handleIndex2(class_name +"@ ??? "+
|
||||
if ( macroIsTrue( "\\lciIfHtmlClassIndex") &&
|
||||
macroIsTrue( "\\lciIfHtmlIndex") && macroIsTrue( "\\ccIndex")
|
||||
&& macroIsTrue( "\\ccAutoIndex")) // Index.
|
||||
handleIndex2(class_name +"@ ??? "+
|
||||
convert_C_to_html(class_name),"","",0);
|
||||
|
||||
|
||||
|
|
@ -1034,19 +954,9 @@ three_column_layout( const string&, string param[], size_t n, size_t opt) {
|
|||
// ======================================================================
|
||||
string
|
||||
html_index( const string&, string param[], size_t n, size_t opt) {
|
||||
/* NParamCheck( 2, 0); // param[0] is index category, param[1] is text
|
||||
NParamCheck( 2, 0); // param[0] is index category, param[1] is text
|
||||
crop_string( param[0]);
|
||||
string key = find_sort_key( param[0]);
|
||||
string s = string( "\n\\lcRawHtml{<A NAME=\"Index_anchor_")
|
||||
+ int_to_string( index_anchor_counter) + "\"></A>}\n"
|
||||
"\\lciPushOutput{index}\\lcRawHtml{" + key + "1"
|
||||
+ filter_for_index_comment( param[1]) + "!><A HREF=\""
|
||||
+ current_filename + "#Index_anchor_"
|
||||
+ int_to_string( index_anchor_counter) + "\">}" + param[1]
|
||||
+ "\\lcRawHtml{</A><BR>\n}\\lciPopOutput";
|
||||
++index_anchor_counter;
|
||||
|
||||
return s;*/
|
||||
handleIndex2(param[1]+"@ ??? "+convert_C_to_html(param[1]),"","",0);
|
||||
return "";
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue