0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add an extra formatting option to the grabber.

Browse source 
Also cleaned up the source of the grabber slightly. Used the new
formatting at some places.
This commit is contained in:
Mark de Wever 2009-03-07 21:31:40 +00:00
parent 9fd000afd0
commit 05b2176f94
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/gui/widgets/canvas.cpp
View file

@ -211,7 +211,7 @@ tline::tline(const config& cfg) :
* @* bold bold font
* @* italic italic font
* @* underline underlined font
* Since SDL has problems combining these
* @-Since SDL has problems combining these
* styles only one can be picked. Once SDL
* will allow multiple options, this type
* will be transformed to a comma separated
@ -228,8 +228,9 @@ tline::tline(const config& cfg) :
* @* top aligned at the top
* @* bottom aligned at the bottom
* @* center centered
* When nothing is set or an another value
* as in the list the item is centred.
* @-When nothing is set or an another
* value as in the list the item is
* centred.
*
* h_align Horizontal alignment; how an item is
* aligned horizontal in the available

17
utils/wiki_grabber.py
View file

@ -87,6 +87,15 @@ if __name__ == "__main__":
for j in range(len(res[i])):
sys.stderr.write("Line " + str(i) + " match " + str(j) + " : " + res[i][j] + "\n")
def format(data):
"""Formats the data for the wiki.
@* -> \n* needed in a list.
@- -> \n needed to add text after a list."""
data = re.sub(r'@\*', "\n*", data)
data = re.sub(r'@\-', "\n", data)
return data
def create_config_table(data):
"""Creates a table for data in a config table.
@ -115,7 +124,7 @@ if __name__ == "__main__":
result += "| mandatory\n"
else:
result += "| " + res[i][2] + "\n"
result += "| " + re.sub(r'@\*', "\n*", res[i][3]) + "\n"
result += "| " + format(res[i][3]) + "\n"
result += "|}"
return result
@ -144,7 +153,7 @@ if __name__ == "__main__":
result += "|-\n"
result += "| " + res[i][0] + "\n"
result += "| " + res[i][1] + "\n"
result += "| " + re.sub(r'@\*', "\n*", res[i][2]) + "\n"
result += "| " + format(res[i][2]) + "\n"
result += "|}"
return result
@ -168,7 +177,7 @@ if __name__ == "__main__":
for i in range(len(res)):
result += "|-\n"
result += "| <span id=\"" + res[i][0] + "\">" + res[i][0] + "</span>\n"
result += "| " + re.sub(r'@\*', "\n*", res[i][1]) + "\n"
result += "| " + format(res[i][1]) + "\n"
result += "|}"
return result
@ -192,7 +201,7 @@ if __name__ == "__main__":
for i in range(len(res)):
result += "|-\n"
result += "| " + res[i][0] + "\n"
result += "| " + re.sub(r'@\*', "\n*", res[i][1]) + "\n"
result += "| " + format(res[i][1]) + "\n"
result += "|}"
return result