[sword-svn] r2835 - in trunk: cmake include lib/vcppmake/vc8
chrislit at crosswire.org
chrislit at crosswire.org
Sat Jun 29 00:19:08 MST 2013
Author: chrislit
Date: 2013-06-29 00:19:08 -0700 (Sat, 29 Jun 2013)
New Revision: 2835
Removed:
trunk/include/Greek2Greek.h
trunk/include/GreekChars.h
Modified:
trunk/cmake/sources.cmake
trunk/include/Makefile.am
trunk/lib/vcppmake/vc8/libsword.vcxproj
Log:
removed Greek2Greek.h/GreekChars.h since Greek2Greek.cpp hasn't been a part of the library since 2007
Modified: trunk/cmake/sources.cmake
===================================================================
--- trunk/cmake/sources.cmake 2013-06-29 06:56:43 UTC (rev 2834)
+++ trunk/cmake/sources.cmake 2013-06-29 07:19:08 UTC (rev 2835)
@@ -237,8 +237,6 @@
# Headers
SET(SWORD_INSTALL_HEADERS
- include/Greek2Greek.h
- include/GreekChars.h
include/canon.h
include/canon_abbrevs.h
include/cipherfil.h
Deleted: trunk/include/Greek2Greek.h
===================================================================
--- trunk/include/Greek2Greek.h 2013-06-29 06:56:43 UTC (rev 2834)
+++ trunk/include/Greek2Greek.h 2013-06-29 07:19:08 UTC (rev 2835)
@@ -1,120 +0,0 @@
-//*****************************************************************************
-// Author : William Dicks ***
-// Date Created: 10 February 1998 ***
-// Purpose : Interface for Greek to b-Greek conversion and vice versa ***
-// File Name : Greek2Greek.h ***
-// ***
-// Author info : ---------------------------------------------------------- ***
-// Address : 23 Tieroogpark ***
-// : Hoewe Str ***
-// : Elarduspark X3 ***
-// : 0181 ***
-// : South Africa ***
-// Home Tel: +27 (0)12 345 3166 ***
-// Cell No : +27 (0)82 577 4424 ***
-// e-mail : wd at isis.co.za ***
-// Church WWW : http://www.hatfield.co.za ***
-//*****************************************************************************
-
-/******************************************************************************
- *
- * Greek2Greek.h -
- *
- * $Id$
- *
- * Copyright 1998-2013 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 __GREEK2GREEK
-#define __GREEK2GREEK
-
-#include <defs.h>
-SWORD_NAMESPACE_START
-
-//*****************************************************************************
-// Used to convert a string created by using the Greek font supplied with the
-// Sword Project to a string that conforms to the b-Greek discussion list
-// method of transliteration.
-//*****************************************************************************
-unsigned char Greek2bGreek (unsigned char *sResult, unsigned char *sGreekText,
- int nMaxResultBuflen);
-
-//*****************************************************************************
-// Used to convert a string created by using the b-Greek method of
-// transliteration to a string that can be converted to a Greek-font readable
-// string.
-//*****************************************************************************
-unsigned char bGreek2Greek (unsigned char *sResult,
- unsigned char *sGreekText, int nMaxResultBuflen);
-
-//*****************************************************************************
-// Parse a Greek font created string and return the b-Greek equivalent
-//*****************************************************************************
-int ParseGreek (unsigned char *sResult,
- unsigned char *sGreekText, int nMaxResultBuflen);
-
-//*****************************************************************************
-// Parse a b-Greek string and return the Greek font equivalent
-//*****************************************************************************
-int ParsebGreek (unsigned char *sResult,
- unsigned char *sGreekText, int nMaxResultBuflen);
-
-//*****************************************************************************
-// Convert a unsigned character to a GREEK font unsigned character
-//*****************************************************************************
-unsigned char char2Font (unsigned char letter, // bGreek letter to convert to Font letter
- bool finalSigma, // Is it a final SIGMA
- bool iota, // TRUE = IOTA subscript; FALSE = No IOTA
- bool breathing, // TRUE = add breathing; FALSE = no breathing
- bool rough); // TRUE = rough breathing; False = smooth
-
-//*****************************************************************************
-// Convert a GREEK font unsigned character to a unsigned character
-//*****************************************************************************
-unsigned char Font2char (unsigned char letter, // bGreek letter to convert to Font letter
- bool & iota, // TRUE = IOTA subscript; FALSE = No IOTA
- bool & breathing, // TRUE = add breathing; FALSE = no breathing
- bool & rough); // TRUE = rough breathing; False = smooth
-
-
-//*****************************************************************************
-// Identify and return a bGreek letter from a special font char
-//*****************************************************************************
-bool getSpecialChar (unsigned char Font, unsigned char &letter);
-
-//*****************************************************************************
-// true if the font character is a special character; false it isn't
-//*****************************************************************************
-bool SpecialGreek (unsigned char Font);
-
-//*****************************************************************************
-// Return Greek font puntuation from bGreek punstuation
-//*****************************************************************************
-unsigned char getGreekPunct (unsigned char bGreek);
-
-//*****************************************************************************
-// Return bGreek puntuation from Greek font punstuation
-//*****************************************************************************
-unsigned char getbGreekPunct (unsigned char Greek);
-
-//*****************************************************************************
-// Is the character punctuation or a space: true it is, false it isn't
-//*****************************************************************************
-bool isPunctSpace (unsigned char c);
-
-SWORD_NAMESPACE_END
-
-#endif // __GREEK2GREEK
Deleted: trunk/include/GreekChars.h
===================================================================
--- trunk/include/GreekChars.h 2013-06-29 06:56:43 UTC (rev 2834)
+++ trunk/include/GreekChars.h 2013-06-29 07:19:08 UTC (rev 2835)
@@ -1,157 +0,0 @@
-//*****************************************************************************
-// Author : William Dicks ***
-// Date Created: 10 February 1998 ***
-// Purpose : Enumeration for Greek to b-Greek conversion and vice ***
-// : versa. ***
-// File Name : GreekChars.h ***
-// ***
-// Author info : ---------------------------------------------------------- ***
-// Address : 23 Tieroogpark ***
-// : Hoewe Str ***
-// : Elarduspark X3 ***
-// : 0181 ***
-// : South Africa ***
-// Home Tel: +27 (0)12 345 3166 ***
-// Cell No : +27 (0)82 577 4424 ***
-// e-mail : wd at isis.co.za ***
-// Church WWW : http://www.hatfield.co.za ***
-//*****************************************************************************
-
-/******************************************************************************
- *
- * GreekChars.h -
- *
- * $Id$
- *
- * Copyright 1998-2013 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 __GREEKCHARS_H
-#define __GREEKCHARS_H
-
-// This enum represents the values of the characters used for the
-// transliteration as used on the b-greek discussion list.
-
-#include <defs.h>
-SWORD_NAMESPACE_START
-
-enum bGreekChars
-{
- ALPHA = 65, // A
- BETA, // B
- CHI, // C
- DELTA, // D
- EPSILON, // E
- PHI, // F
- GAMMA, // G
- ETA, // H
- IOTA, // I
- // No J
- KAPPA = 75, // K
- LAMBDA, // L
- MU, // M
- NU, // N
- OMICRON, // O
- PI, // P
- THETA, // Q
- RHO, // R
- SIGMA, // S
- TAU, // T
- UPSILON, // U
- // No V
- OMEGA = 'W', // W
- XI, // X
- PSI, // Y
- ZETA, // Z
- ROUGH = 104, // h
- IOTA_SUB // i
-};
-
-// This enum represents the values of the characters ib the Greek.ttf font,
-// and the comments on the right are the corresponding bGreek equivalents.
-
-enum GreekFontChars
-{
- gALPHA = 'a', // A
- gBETA, // B
- gCHI, // C
- gDELTA, // D
- gEPSILON, // E
- gPHI, // F
- gGAMMA, // G
- gETA, // H
- gIOTA, // I
- gSIGMA_END, // j
- gKAPPA, // K
- gLAMBDA, // L
- gMU, // M
- gNU, // N
- gOMICRON, // O
- gPI, // P
- gTHETA, // Q
- gRHO, // R
- gSIGMA, // S
- gTAU, // T
- gUPSILON, // U
- // No V
- gOMEGA = 'w', // W
- gXI, // X
- gPSI, // Y
- gZETA, // Z
- gROUGH_ALPHA = 161, // hA
- gROUGH_EPSILON = 152, // hE
- gROUGH_ETA = 185, // hH
- gROUGH_IOTA = 131, // hH
- gROUGH_OMICRON = 208, // hH
- gROUGH_RHO = 183, // hR
- gROUGH_UPSILON = 216, // hU
- gROUGH_OMEGA = 230, // hW
- gIOTA_ALPHA = 'v', // Ai
- gIOTA_ETA = 'V', // Ei
- gIOTA_OMEGA = 'J', // Wi
- gNON_ROUGH_ALPHA = 162, // hA
- gNON_ROUGH_EPSILON = 153, // hE
- gNON_ROUGH_ETA = 186, // hH
- gNON_ROUGH_IOTA = 132, // hH
- gNON_ROUGH_OMICRON = 209, // hH
- gNON_ROUGH_RHO = 184, // hR
- gNON_ROUGH_UPSILON = 217, // hU
- gNON_ROUGH_OMEGA = 231 // hW
-};
-
-// English puntuation as used on bGreek
-
-enum bGreekPunct
-{
- COMMA = ',',
- STOP = '.',
- SEMI_COLON = ';',
- QUESTION = '?'
-};
-
-// English puntuation as used in the Greek font
-
-enum GreekPunct
-{
- gCOMMA = ',',
- gSTOP = '.',
- gSEMI_COLON = ':',
- gQUESTION = ';'
-};
-
-SWORD_NAMESPACE_END
-
-#endif // __GREEKCHARS_H
Modified: trunk/include/Makefile.am
===================================================================
--- trunk/include/Makefile.am 2013-06-29 06:56:43 UTC (rev 2834)
+++ trunk/include/Makefile.am 2013-06-29 07:19:08 UTC (rev 2835)
@@ -1,8 +1,6 @@
swincludedir = $(top_srcdir)/include
-pkginclude_HEADERS = $(swincludedir)/Greek2Greek.h
-pkginclude_HEADERS += $(swincludedir)/GreekChars.h
-pkginclude_HEADERS += $(swincludedir)/canon.h
+pkginclude_HEADERS = $(swincludedir)/canon.h
pkginclude_HEADERS += $(swincludedir)/canon_abbrevs.h
pkginclude_HEADERS += $(swincludedir)/cipherfil.h
pkginclude_HEADERS += $(swincludedir)/curlftpt.h
Modified: trunk/lib/vcppmake/vc8/libsword.vcxproj
===================================================================
--- trunk/lib/vcppmake/vc8/libsword.vcxproj 2013-06-29 06:56:43 UTC (rev 2834)
+++ trunk/lib/vcppmake/vc8/libsword.vcxproj 2013-06-29 07:19:08 UTC (rev 2835)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug with ICU|Win32">
@@ -453,8 +453,6 @@
<ClInclude Include="..\..\..\include\gbfwebif.h" />
<ClInclude Include="..\..\..\include\gbfwordjs.h" />
<ClInclude Include="..\..\..\include\gbfxhtml.h" />
- <ClInclude Include="..\..\..\include\Greek2Greek.h" />
- <ClInclude Include="..\..\..\include\GreekChars.h" />
<ClInclude Include="..\..\..\include\greeklexattribs.h" />
<ClInclude Include="..\..\..\include\hebrewmcim.h" />
<ClInclude Include="..\..\..\include\hrefcom.h" />
More information about the sword-cvs
mailing list