fenix
/
cpdf-source
mirror of https://github.com/johnwhitington/cpdf-source.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed #11 - parsing of negative page numbers in conjunction with 

odd/even etc.
This commit is contained in:
John Whitington 2014-09-30 15:43:46 +01:00
parent 5b7025b78d
commit 42ab3fe4c8
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cpdf.ml
View File

@ -283,6 +283,7 @@ let rec mk_numbers pdf endpage lexemes =
| [Pdfgenlex.LexName "reverse"] -> | [Pdfgenlex.LexName "reverse"] ->
rev (ilist 1 endpage) rev (ilist 1 endpage)
| toks -> | toks ->
flprint "Unknown tokens\n";
let ranges = splitat_commas toks in let ranges = splitat_commas toks in
if ranges = [toks] then raise PageSpecBadSyntax else if ranges = [toks] then raise PageSpecBadSyntax else
flatten (map (mk_numbers pdf endpage) ranges) flatten (map (mk_numbers pdf endpage) ranges)
@ -316,13 +317,21 @@ let parse_pagespec_inner endpage pdf spec =
| ['e'; 'p'; 'a'; 'c'; 's'; 'd'; 'n'; 'a'; 'l'] -> | ['e'; 'p'; 'a'; 'c'; 's'; 'd'; 'n'; 'a'; 'l'] ->
select_landscape pdf (ilist 1 endpage) select_landscape pdf (ilist 1 endpage)
| 't'::'i'::'a'::'r'::'t'::'r'::'o'::'p'::more -> | 't'::'i'::'a'::'r'::'t'::'r'::'o'::'p'::more ->
select_portrait pdf (mk_numbers pdf endpage (Pdfgenlex.lex_string (implode (rev more)))) select_portrait
pdf
(mk_numbers pdf endpage (map (fixup_negatives endpage) (Pdfgenlex.lex_string (implode (rev more)))))
| 'e'::'p'::'a'::'c'::'s'::'d'::'n'::'a'::'l'::more -> | 'e'::'p'::'a'::'c'::'s'::'d'::'n'::'a'::'l'::more ->
select_landscape pdf (mk_numbers pdf endpage (Pdfgenlex.lex_string (implode (rev more)))) select_landscape
pdf
(mk_numbers pdf endpage (map (fixup_negatives endpage) (Pdfgenlex.lex_string (implode (rev more)))))
| 'd'::'d'::'o'::more -> | 'd'::'d'::'o'::more ->
keep odd (mk_numbers pdf endpage (Pdfgenlex.lex_string (implode (rev more)))) keep
odd
(mk_numbers pdf endpage (map (fixup_negatives endpage) (Pdfgenlex.lex_string (implode (rev more)))))
| 'n'::'e'::'v'::'e'::more -> | 'n'::'e'::'v'::'e'::more ->
keep even (mk_numbers pdf endpage (Pdfgenlex.lex_string (implode (rev more)))) keep
even
(mk_numbers pdf endpage (map (fixup_negatives endpage) (Pdfgenlex.lex_string (implode (rev more)))))
| _ -> | _ ->
mk_numbers pdf endpage (map (fixup_negatives endpage) (Pdfgenlex.lex_string spec)) mk_numbers pdf endpage (map (fixup_negatives endpage) (Pdfgenlex.lex_string spec))
with with