[sword-cvs] sword/src/modules/filters osisrtf.cpp,1.2,1.3

[sword@www.crosswire.org]

Update of /usr/local/cvsroot/sword/src/modules/filters
In directory www:/tmp/cvs-serv21223

Modified Files:
	osisrtf.cpp 
Log Message:
cosmetic corrections


Index: osisrtf.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/src/modules/filters/osisrtf.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** osisrtf.cpp	26 Feb 2003 19:32:30 -0000	1.2
--- osisrtf.cpp	6 Apr 2003 07:27:13 -0000	1.3
***************
*** 55,59 ****
  	pos2 = userData["w"].find("\"", pos1) - 1;
  	tagData = userData["w"].substr(pos1, pos2-pos1);
!   buf.appendFormatted(" {\\fs15 <%s>}", tagData.c_str() );
        }
        pos1 = userData["w"].find("gloss=\"", 0);
--- 55,59 ----
  	pos2 = userData["w"].find("\"", pos1) - 1;
  	tagData = userData["w"].substr(pos1, pos2-pos1);
!         buf.appendFormatted(" {\\fs15 <%s>}", tagData.c_str() );
        }
        pos1 = userData["w"].find("gloss=\"", 0);
***************
*** 62,66 ****
  	pos2 = userData["w"].find("\"", pos1) - 1;
  	tagData = userData["w"].substr(pos1, pos2-pos1);
!   buf.appendFormatted(" {\\fs15 <%s>}", tagData.c_str() );
        }
        pos1 = userData["w"].find("lemma=\"", 0);
--- 62,66 ----
  	pos2 = userData["w"].find("\"", pos1) - 1;
  	tagData = userData["w"].substr(pos1, pos2-pos1);
!         buf.appendFormatted(" {\\fs15 <%s>}", tagData.c_str() );
        }
        pos1 = userData["w"].find("lemma=\"", 0);
***************
*** 69,73 ****
  	pos2 = userData["w"].find("\"", pos1) - 1;
  	tagData = userData["w"].substr(pos1, pos2-pos1);
!   buf.appendFormatted(" {\\fs15 <%s>}", tagData.c_str() );
        }
        pos1 = userData["w"].find("morph=\"", 0);
--- 69,73 ----
  	pos2 = userData["w"].find("\"", pos1) - 1;
  	tagData = userData["w"].substr(pos1, pos2-pos1);
!         buf.appendFormatted(" {\\fs15 <%s>}", tagData.c_str() );
        }
        pos1 = userData["w"].find("morph=\"", 0);
***************
*** 76,80 ****
  	pos2 = userData["w"].find("\"", pos1) - 1;
  	tagData = userData["w"].substr(pos1, pos2-pos1);
!   buf.appendFormatted(" {\\fs15 <%s>}", tagData.c_str() );
        }
        pos1 = userData["w"].find("POS=\"", 0);
--- 76,80 ----
  	pos2 = userData["w"].find("\"", pos1) - 1;
  	tagData = userData["w"].substr(pos1, pos2-pos1);
!         buf.appendFormatted(" {\\fs15 <%s>}", tagData.c_str() );
        }
        pos1 = userData["w"].find("POS=\"", 0);
***************
*** 83,100 ****
  	pos2 = userData["w"].find("\"", pos1) - 1;
  	tagData = userData["w"].substr(pos1, pos2-pos1);
!   buf.appendFormatted(" {\\fs15 <%s>}", tagData.c_str() );
        }
!       
        buf += "}";
      }
!     
      //p
      else if (!strncmp(token, "p", 1)) {
!       buf += "{\\par\\par ";
      }
      else if (!strncmp(token, "/p", 2)) {
!       buf += "}";
      }
!     
      //reference
      else if (!strncmp(token, "reference", 8)) {
--- 83,100 ----
  	pos2 = userData["w"].find("\"", pos1) - 1;
  	tagData = userData["w"].substr(pos1, pos2-pos1);
!         buf.appendFormatted(" {\\fs15 <%s>}", tagData.c_str() );
        }
! 
        buf += "}";
      }
! 
      //p
      else if (!strncmp(token, "p", 1)) {
!       buf += "{\\par ";
      }
      else if (!strncmp(token, "/p", 2)) {
!       buf += "\\par}";
      }
! 
      //reference
      else if (!strncmp(token, "reference", 8)) {
***************
*** 104,114 ****
        buf += "</a>}";
      }
!     
      //line
      else if (!strncmp(token, "line", 4)) {
!       buf += "{\\par ";
      }
      else if (!strncmp(token, "/line", 5)) {
!       buf += "}";
      }
  
--- 104,114 ----
        buf += "</a>}";
      }
! 
      //line
      else if (!strncmp(token, "line", 4)) {
!       buf += "{";
      }
      else if (!strncmp(token, "/line", 5)) {
!       buf += "\\par}";
      }
  
***************
*** 118,124 ****
      }
      else if (!strncmp(token, "/note", 5)) {
!       buf += " ) }";
      }
!     
      //title
      else if (!strncmp(token, "title", 5)) {
--- 118,124 ----
      }
      else if (!strncmp(token, "/note", 5)) {
!       buf += ")} ";
      }
! 
      //title
      else if (!strncmp(token, "title", 5)) {
***************
*** 170,174 ****
      else {
        return false;  // we still didn't handle token
! 		}
    }
    return true;
--- 170,174 ----
      else {
        return false;  // we still didn't handle token
!     }
    }
    return true;