[sword-cvs] sword/include osisosis.h,NONE,1.1 Makefile.am,1.28,1.29 swbuf.h,1.29,1.30

sword@www.crosswire.org sword@www.crosswire.org
Sat, 13 Mar 2004 20:39:56 -0700


Update of /cvs/core/sword/include
In directory www:/tmp/cvs-serv28641/include

Modified Files:
	Makefile.am swbuf.h 
Added Files:
	osisosis.h 
Log Message:
Updated to basic osis 2.5 support


--- NEW FILE: osisosis.h ---
/******************************************************************************
 *
 * $Id: osisosis.h,v 1.1 2004/03/14 03:39:54 scribe Exp $
 *
 * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
 *	CrossWire Bible Society
 *	P. O. Box 2528
 *	Tempe, AZ  85280-2528
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License as published by the
 * Free Software Foundation version 2.
 *
 * This program is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * General Public License for more details.
 *
 */

#ifndef OSISOSIS_H
#define OSISOSIS_H

#include <swbasicfilter.h>
#include <utilxml.h>

SWORD_NAMESPACE_START

/** this filter converts internal OSIS text to public OSIS text
 */
class SWDLLEXPORT OSISOSIS : public SWBasicFilter {
private:
protected:
	class MyUserData : public BasicFilterUserData {
	public:
		bool osisQToTick;
		bool inBold;
		SWBuf lastTransChange;
		SWBuf w;
		SWBuf fn;
		XMLTag startTag;
		MyUserData(const SWModule *module, const SWKey *key);
	};
	virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
		return new MyUserData(module, key);
	}
	virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
public:
	OSISOSIS();
};

SWORD_NAMESPACE_END
#endif

Index: Makefile.am
===================================================================
RCS file: /cvs/core/sword/include/Makefile.am,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- Makefile.am	21 Jan 2004 09:11:11 -0000	1.28
+++ Makefile.am	14 Mar 2004 03:39:54 -0000	1.29
@@ -43,6 +43,7 @@
 pkginclude_HEADERS += $(swincludedir)/osismorph.h
 pkginclude_HEADERS += $(swincludedir)/osisplain.h
 pkginclude_HEADERS += $(swincludedir)/osisrtf.h
+pkginclude_HEADERS += $(swincludedir)/osisosis.h
 pkginclude_HEADERS += $(swincludedir)/osisstrongs.h
 pkginclude_HEADERS += $(swincludedir)/osisfootnotes.h   
 pkginclude_HEADERS += $(swincludedir)/osislemma.h   

Index: swbuf.h
===================================================================
RCS file: /cvs/core/sword/include/swbuf.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- swbuf.h	29 Feb 2004 23:26:17 -0000	1.29
+++ swbuf.h	14 Mar 2004 03:39:54 -0000	1.30
@@ -206,6 +206,7 @@
 	inline SWBuf &operator --(int) { operator -=(1); return *this; }
 
 	inline SWBuf &operator <<(int n) { n = (n<length())?n:(length()-1); memmove(buf, buf+n, length()-n); (*this)-=n; return *this; }
+	inline SWBuf &operator >>(int n) { setSize(length()+n); memmove(buf+n, buf, length()-n); return *this; }
 	inline SWBuf operator +(const SWBuf &other) const {
 		SWBuf retVal = buf;
 		retVal += other;