Merge pull request #10 from besser82/improvements

fixed malformated manpage
This commit is contained in:
Tiehuis 2014-12-14 14:39:18 +13:00
commit 723738c706
5 changed files with 31 additions and 17 deletions

View File

@ -3,7 +3,7 @@ CC ?= gcc
CFLAGS := -Wall -Wextra $(CFLAGS) CFLAGS := -Wall -Wextra $(CFLAGS)
LIBS = -lcurses LIBS = -lcurses
.PHONY: clean man man-nc .PHONY: clean man man-2048 man-2048nc
2048: src/2048.c 2048: src/2048.c
$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) src/2048.c -o 2048 $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) src/2048.c -o 2048
@ -16,10 +16,12 @@ all: 2048
clean: clean:
rm -f 2048 2048nc rm -f 2048 2048nc
man: man: man-2048 man-2048nc
man-2048:
rm -f man/2048.1 rm -f man/2048.1
$(ASCIIDOC) -d manpage -f manpage man/2048.1.txt $(ASCIIDOC) -d manpage -f manpage man/2048.1.txt
man-nc: man-2048nc:
rm -f man/2048nc.1 rm -f man/2048nc.1
$(ASCIIDOC) -d manpage -f manpage man/2048nc.1.txt $(ASCIIDOC) -d manpage -f manpage man/2048nc.1.txt

View File

@ -1,24 +1,35 @@
#2048-cli #2048-cli
A cli version of the game [2048](https://github.com/gabrielecirulli/2048) for your Linux A cli version of the game [2048](https://github.com/gabrielecirulli/2048)
terminal. for your Linux terminal.
#####2048_curses.c #####2048_curses.c
![Screenshot](http://i.imgur.com/QU7t5mH.png) ![Screenshot](http://i.imgur.com/QU7t5mH.png)
#####2048_no_curses.c #####2048_no_curses.c
![Screenshot](http://i.imgur.com/fwZEvdh.png) ![Screenshot](http://i.imgur.com/fwZEvdh.png)
## Installation ## Installation
This requires the ncurses library to link against during compilation. It is available This requires the ncurses library to link against during compilation.
in most package managers. The program creates and uses a file name `.hs2048g` in the It is available in most package managers. The program creates and uses
working directory. Any file with this name will be modified and replaced. a file name `.hs2048g` in the working directory. Any file with this
name will be modified and replaced.
You can easily install this on el >= 5 (CentOS, RedHat Enterprise Linux,
Scientific Linux, Oracle) and Fedora >= 19 using the package-manager:
sudo yum install 2048-cli[-nocurses]
For el you will need to have the
[EPEL-repository](https://fedoraproject.org/wiki/EPEL/FAQ#How_can_I_install_the_packages_from_the_EPEL_software_repository.3F)
enabled.
### Get ### Get
git clone https://github.com/Tiehuis/2048-cli.git git clone https://github.com/Tiehuis/2048-cli.git
make make
### Run ### Run
./2048 ./2048
## Options ## Options
-s <size> Set the grid border length -s <size> Set the grid border length
@ -28,4 +39,5 @@ working directory. Any file with this name will be modified and replaced.
-C Disables color support (ncurses version only) -C Disables color support (ncurses version only)
## License ## License
This code is licensed under the [MIT License](https://github.com/Tiehuis/2048-cli/blob/master/LICENSE). This code is licensed under the
[MIT License](https://github.com/Tiehuis/2048-cli/blob/master/LICENSE).

View File

@ -2,12 +2,12 @@
.\" Title: \e20\e4\e8 .\" Title: \e20\e4\e8
.\" Author: [see the "AUTHOR" section] .\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 12/05/2014 .\" Date: 12/13/2014
.\" Manual: \ \& .\" Manual: \ \&
.\" Source: \ \& .\" Source: \ \&
.\" Language: English .\" Language: English
.\" .\"
.TH "\E20\E4\E8" "1" "12/05/2014" "\ \&" "\ \&" .TH "\E20\E4\E8" "1" "12/13/2014" "\ \&" "\ \&"
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
.\" * Define some portability stuff .\" * Define some portability stuff
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
@ -70,7 +70,7 @@ Display usage information\&.
.RE .RE
.SH "CONTROLS" .SH "CONTROLS"
.PP .PP
\fBhjkl or *wasd\fR or \fBarrow keys\fR \fBhjkl\fR or \fBwasd\fR or \fBarrow keys\fR
.RS 4 .RS 4
Movement Movement
.RE .RE

View File

@ -36,7 +36,7 @@ OPTIONS
CONTROLS CONTROLS
-------- --------
*hjkl or *wasd* or *arrow keys*:: *hjkl* or *wasd* or *arrow keys*::
Movement Movement
*q*:: *q*::
Quit the game. Quit the game.

View File

@ -2,12 +2,12 @@
.\" Title: \e20\e4\e8nc .\" Title: \e20\e4\e8nc
.\" Author: [see the "AUTHOR" section] .\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
.\" Date: 12/05/2014 .\" Date: 12/13/2014
.\" Manual: \ \& .\" Manual: \ \&
.\" Source: \ \& .\" Source: \ \&
.\" Language: English .\" Language: English
.\" .\"
.TH "\E20\E4\E8NC" "1" "12/05/2014" "\ \&" "\ \&" .TH "\E20\E4\E8NC" "1" "12/13/2014" "\ \&" "\ \&"
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------
.\" * Define some portability stuff .\" * Define some portability stuff
.\" ----------------------------------------------------------------- .\" -----------------------------------------------------------------