@@ -111,33 +111,31 @@ int cmdServeTest(string[] args)
111
111
112
112
int setupGeneratorInput (ref string [] args, out GeneratorSettings gensettings, out Package pack)
113
113
{
114
+ gensettings = new GeneratorSettings;
115
+ auto docsettings = new DdoxSettings;
116
+
114
117
string [] macrofiles;
115
118
string [] overridemacrofiles;
116
- NavigationType navtype = NavigationType.ModuleTree;
117
- string [] pack_order;
118
119
string sitemapurl = " http://127.0.0.1/" ;
119
- MethodStyle file_name_style = MethodStyle.unaltered;
120
- SortMode modsort = SortMode.protectionName;
121
- SortMode declsort = SortMode.protectionInheritanceName;
122
120
bool lowercasenames;
123
121
bool hyphenate;
124
- bool singlepageenum;
125
122
getopt(args,
126
123
// config.passThrough,
127
- " decl-sort" , &declsort ,
128
- " file-name-style" , &file_name_style ,
124
+ " decl-sort" , &docsettings.declSort ,
125
+ " file-name-style" , &gensettings.fileNameStyle ,
129
126
" hyphenate" , &hyphenate,
130
127
" lowercase-names" , &lowercasenames,
131
- " module-sort" , &modsort ,
132
- " navigation-type" , &navtype ,
128
+ " module-sort" , &docsettings.moduleSort ,
129
+ " navigation-type" , &gensettings.navigationType ,
133
130
" override-macros" , &overridemacrofiles,
134
- " package-order" , &pack_order ,
131
+ " package-order" , &docsettings.packageOrder ,
135
132
" sitemap-url" , &sitemapurl,
136
133
" std-macros" , ¯ofiles,
137
- " enum-member-pages" , &singlepageenum ,
134
+ " enum-member-pages" , &gensettings.enumMemberPages ,
138
135
);
136
+ gensettings.siteUrl = URL (sitemapurl);
139
137
140
- if (lowercasenames) file_name_style = MethodStyle.lowerCase;
138
+ if (lowercasenames) gensettings.fileNameStyle = MethodStyle.lowerCase;
141
139
142
140
if ( args.length < 3 ){
143
141
showUsage(args);
@@ -149,17 +147,8 @@ int setupGeneratorInput(ref string[] args, out GeneratorSettings gensettings, ou
149
147
if (hyphenate) enableHyphenation();
150
148
151
149
// parse the json output file
152
- auto docsettings = new DdoxSettings;
153
- docsettings.packageOrder = pack_order;
154
- docsettings.moduleSort = modsort;
155
- docsettings.declSort = declsort;
156
150
pack = parseDocFile(args[2 ], docsettings);
157
151
158
- gensettings = new GeneratorSettings;
159
- gensettings.siteUrl = URL (sitemapurl);
160
- gensettings.navigationType = navtype;
161
- gensettings.fileNameStyle = file_name_style;
162
- gensettings.enumMemberPages = singlepageenum;
163
152
return 0 ;
164
153
}
165
154
0 commit comments