reordered output

git-svn-id: https://www.crosswire.org/svn/sword-tools/trunk@509 07627401-56e2-0310-80f4-f8cd0041bdcd

1 files changed, 11 insertions, 9 deletions

diff --git a/modules/conf/confmaker.pl b/modules/conf/confmaker.pl
index ef76fe1..2d25165 100755
--- a/modules/conf/confmaker.pl
+++ b/modules/conf/confmaker.pl
@@ -103,9 +103,6 @@ $manager->setGlobalOption("Greek Accents", "Off");
 
 my $hs = HTML::Strip->new();
 my $doc_text = new Sword::SWBuf($hs->parse($doc->toString()));
-#my $clean_doc_text = $hs->parse( $doc->toString());
-#$doc_text->append($clean_doc_text);
-
 
 ## obtain name, type and language
 
@@ -146,10 +143,14 @@ my %doc_filters = ( 'title' => "OSISHeadings",
              'note'  => "OSISFootnotes",
              'reference' => "OSISScripref",
              'gloss' => "OSISGlosses",
-             'lemma' => "OSISStrongs",
+             'lemma' => "OSISLemma",
+             'strong' => "OSISStrongs",
              'morph' => "OSISMorph",
              'q'  => "OSISRedLetterWords",
              'rdg' => 'OSISVariants',
+             'enum' => 'OSISEnum',
+             'xlit' => 'OSISXlit'
+             
             );
 
             
@@ -204,6 +205,10 @@ else {print  "ModDrv=zUnknown\n"}
 print "CompressType=ZIP\n";
 print "BlockType=BOOK\n";
 
+print  "Encoding=UTF-8\n";
+print  "SourceType=OSIS\n";
+print  "SwordVersionDate=".`date +"%F"`;
+
 print  "Lang=".$doc_lang."\n";
 
 foreach (@doc_features) {
@@ -245,10 +250,7 @@ if ($doc_has_feature{'p'}) {
    print "Feature=".$doc_feature{'p'}."\n"
    }
 
-print  "Encoding=UTF-8\n";
-print  "SourceType=OSIS\n";
 print  "LCSH=".$doc_type.".".I18N::LangTags::List::name($doc_lang)."\n";
-print  "SwordVersionDate=".`date +"%F"`;
 
 if (@inputFile>0) {
    foreach(@inputFile) {
@@ -256,9 +258,9 @@ if (@inputFile>0) {
       }
    }
 elsif (!$makefile){
-   print "Version=1.0\n";
-   print "History=1.0 First release\n";
    print "DistributionLicense=copyrighted. Do not distribute\n";   
    print "Description=".$doc_name." Bible in ".$doc_lang_name."\n";
    print "About=".$doc_name." Bible in ".$doc_lang_name."\n";
+   print "Version=1.0\n";
+   print "History=1.0 First release\n";
 }