Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

braille updates #41

Merged
merged 12 commits into from
May 3, 2018
Merged

braille updates #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2e7441f
braille: fail filter if any part of the pipeline fails
sthibaul Apr 25, 2018
d92f72a
braille: Avoid including user-provided string in printf format
sthibaul Apr 25, 2018
ddf7417
braille: Reject \0 characters too in BRF output
sthibaul Apr 25, 2018
204bf77
braille index: separate out BRF compatibility from transcription
sthibaul Apr 25, 2018
df3dd5a
braille index: eject page on conversion error
sthibaul Apr 25, 2018
e1a0800
braille: on bogus characters, emboss space instead of failing completely
sthibaul Apr 25, 2018
6639530
braille index: replace multibyte characters before replacing 1-byte c…
sthibaul Apr 25, 2018
d3f370a
braille: fix french translations
sthibaul Apr 25, 2018
4f270a8
braille: Add print&braille page number options
sthibaul Apr 26, 2018
3dd2964
braille index: Fix bash syntax
sthibaul Apr 30, 2018
63649cc
braille index: Use standard duplex cups option
sthibaul Apr 30, 2018
2bbbe52
Add news entries for pull request #41
sthibaul Apr 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,13 @@ CHANGES IN V1.20.4
is always utf-8 independently of the original locale, so we
need to force that. Thanks to Samuel Thibault for this patch
(Pull request #38).
- braille: Fix producing top and left page on generic
embosser. Thanks to Samuel Thibault for this patch (Pull
request #38).
- braille: Warn when no text translation was selected in case
the user didn't notice. Thanks to Samuel Thibault for this
patch (Pull request #37).
- braille: Strengthen error checking (Pull request #41).
- braille Index: Replace bogus characters with space (Pull request #41).
- braille: Add print and braille page number options (Pull request #41).
- braille Index: Use standard duplex cups option (Pull request #41).

CHANGES IN V1.20.3

Expand Down
54 changes: 1 addition & 53 deletions drv/generic-brf.drv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright (c) 2015, 2017 Samuel Thibault <samuel.thibault@ens-lyon.org>
// Copyright (c) 2015, 2017-2018 Samuel Thibault <samuel.thibault@ens-lyon.org>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -64,57 +64,5 @@ Option "SendSUB/Send Sub (^Z)" Boolean AnySetup 10
*Choice "True/Yes" ""
Choice "False/No" ""

Option "TopMargin/Top margin" PickOne AnySetup 10
Choice "0" ""
Choice "1" ""
*Choice "2" ""
Choice "3" ""
Choice "4" ""
Choice "5" ""
Choice "6" ""
Choice "7" ""
Choice "8" ""
Choice "9" ""
Choice "10" ""

Option "BottomMargin/Bottom margin" PickOne AnySetup 10
Choice "0" ""
Choice "1" ""
*Choice "2" ""
Choice "3" ""
Choice "4" ""
Choice "5" ""
Choice "6" ""
Choice "7" ""
Choice "8" ""
Choice "9" ""
Choice "10" ""

Option "LeftMargin/Left margin" PickOne AnySetup 10
Choice "0" ""
Choice "1" ""
*Choice "2" ""
Choice "3" ""
Choice "4" ""
Choice "5" ""
Choice "6" ""
Choice "7" ""
Choice "8" ""
Choice "9" ""
Choice "10" ""

Option "RightMargin/Right margin" PickOne AnySetup 10
Choice "0" ""
Choice "1" ""
*Choice "2" ""
Choice "3" ""
Choice "4" ""
Choice "5" ""
Choice "6" ""
Choice "7" ""
Choice "8" ""
Choice "9" ""
Choice "10" ""

ModelName "Braille embosser"
PCFileName "gen-brf.ppd"
54 changes: 1 addition & 53 deletions drv/generic-ubrl.drv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright (c) 2015, 2017 Samuel Thibault <samuel.thibault@ens-lyon.org>
// Copyright (c) 2015, 2017-2018 Samuel Thibault <samuel.thibault@ens-lyon.org>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -56,57 +56,5 @@ VariablePaperSize true
MinSize 1in 1in
MaxSize 9999in 9999in

Option "TopMargin/Top margin" PickOne AnySetup 10
Choice "0" ""
Choice "1" ""
*Choice "2" ""
Choice "3" ""
Choice "4" ""
Choice "5" ""
Choice "6" ""
Choice "7" ""
Choice "8" ""
Choice "9" ""
Choice "10" ""

Option "BottomMargin/Bottom margin" PickOne AnySetup 10
Choice "0" ""
Choice "1" ""
*Choice "2" ""
Choice "3" ""
Choice "4" ""
Choice "5" ""
Choice "6" ""
Choice "7" ""
Choice "8" ""
Choice "9" ""
Choice "10" ""

Option "LeftMargin/Left margin" PickOne AnySetup 10
Choice "0" ""
Choice "1" ""
*Choice "2" ""
Choice "3" ""
Choice "4" ""
Choice "5" ""
Choice "6" ""
Choice "7" ""
Choice "8" ""
Choice "9" ""
Choice "10" ""

Option "RightMargin/Right margin" PickOne AnySetup 10
Choice "0" ""
Choice "1" ""
*Choice "2" ""
Choice "3" ""
Choice "4" ""
Choice "5" ""
Choice "6" ""
Choice "7" ""
Choice "8" ""
Choice "9" ""
Choice "10" ""

ModelName "UBRL generator"
PCFileName "gen-ubrl.ppd"
39 changes: 30 additions & 9 deletions drv/indexv3.drv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright (c) 2015, 2017 Samuel Thibault <samuel.thibault@ens-lyon.org>
// Copyright (c) 2015, 2017-2018 Samuel Thibault <samuel.thibault@ens-lyon.org>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -64,10 +64,15 @@ Group "Index/Index support"

MaxSize 325mm 10m

Group "General/General"
Option "Duplex/Double-Sided Printing" PickOne AnySetup 10
Choice "DuplexNoTumble/Long Edge (Standard)" ""
*Choice "None/Off" ""

Group "Index"
Option "IndexFolding" PickOne AnySetup 10
Choice "SingleZ/Single-sided z-folding" ""
Choice "DoubleZ/Double-sided z-folding" ""
Option "ZFolding/Z-Folding" Boolean AnySetup 10
Choice "True/Yes" ""
*Choice "False/No" ""

Attribute "IndexPaperLength" "" In
}
Expand Down Expand Up @@ -95,10 +100,15 @@ Group "Index/Index support"

MaxSize 325mm 10m

Group "General/General"
Option "Duplex/Double-Sided Printing" PickOne AnySetup 10
Choice "DuplexNoTumble/Long Edge (Standard)" ""
*Choice "None/Off" ""

Group "Index"
Option "IndexFolding" PickOne AnySetup 10
Choice "SingleZ/Single-sided z-folding" ""
Choice "DoubleZ/Double-sided z-folding" ""
Option "ZFolding/Z-Folding" Boolean AnySetup 10
Choice "True/Yes" ""
*Choice "False/No" ""
}


Expand All @@ -111,6 +121,11 @@ Group "Index/Index support"

MaxSize 297mm 10m

Group "General/General"
Option "Duplex/Double-Sided Printing" PickOne AnySetup 10
Choice "DuplexNoTumble/Long Edge (Standard)" ""
*Choice "None/Off" ""

Attribute "IndexPaperLength" "" Mm
}

Expand All @@ -124,9 +139,15 @@ Group "Index/Index support"

MaxSize 297mm 10m

Group "General/General"
Option "Duplex/Double-Sided Printing" PickOne AnySetup 10
Choice "DuplexNoTumble/Long Edge (Standard)" ""
*Choice "None/Off" ""

Group "Index"
Option "IndexFolding" PickOne AnySetup 10
Choice "DoubleS/Double-sided saddle stitch 4 pages" ""
Option "SaddleStitch/Saddle Stitch 4 pages" Boolean AnySetup 10
Choice "True/Yes" ""
*Choice "False/No" ""

Attribute "IndexPaperLength" "" Mm
}
43 changes: 31 additions & 12 deletions drv/indexv4.drv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright (c) 2015, 2017 Samuel Thibault <samuel.thibault@ens-lyon.org>
// Copyright (c) 2015, 2017-2018 Samuel Thibault <samuel.thibault@ens-lyon.org>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -87,12 +87,21 @@ Group "Braille"

MaxSize 325mm 10m

Group "General/General"
Option "Duplex/Double-Sided Printing" PickOne AnySetup 10
Choice "DuplexNoTumble/Long Edge (Standard)" ""
*Choice "None/Off" ""

Group "Index"
Option "IndexFolding" PickOne AnySetup 10
Choice "SingleZ/Single-sided z-folding" ""
Choice "DoubleZ/Double-sided z-folding" ""
Choice "SingleSZ/Single-sided sideways z-folding" ""
Choice "DoubleSZ/Double-sided sideways z-folding" ""
Option "ZFolding/Z-Folding" Boolean AnySetup 10
Choice "True/Yes" ""
*Choice "False/No" ""

Option "Sideways/Sideways Folding" Boolean AnySetup 10
Choice "True/Yes" ""
*Choice "False/No" ""

UIConstraints "*ZFolding True *Sideways True"
}


Expand All @@ -116,10 +125,15 @@ Group "Braille"

MaxSize 297mm 10m

Group "General/General"
Option "Duplex/Double-Sided Printing" PickOne AnySetup 10
Choice "DuplexNoTumble/Long Edge (Standard)" ""
*Choice "None/Off" ""

Group "Index"
Option "IndexFolding" PickOne AnySetup 10
Choice "DoubleS/Double-sided saddle stitch 4 pages" ""
Choice "SingleS/Single-sided saddle stitch 4 pages" ""
Option "SaddleStitch/Saddle Stitch 4 pages" Boolean AnySetup 10
Choice "True/Yes" ""
*Choice "False/No" ""
}


Expand All @@ -132,8 +146,13 @@ Group "Braille"

MaxSize 297mm 10m

Group "General/General"
Option "Duplex/Double-Sided Printing" PickOne AnySetup 10
Choice "DuplexNoTumble/Long Edge (Standard)" ""
*Choice "None/Off" ""

Group "Index"
Option "IndexFolding" PickOne AnySetup 10
Choice "DoubleS/Double-sided saddle stitch 4 pages" ""
Choice "SingleS/Single-sided saddle stitch 4 pages" ""
Option "SaddleStitch/Saddle Stitch 4 pages" Boolean AnySetup 10
Choice "True/Yes" ""
*Choice "False/No" ""
}
64 changes: 41 additions & 23 deletions filter/braille/drivers/common/fr-braille.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ msgid "Braille embosser"
msgstr "Embosseuse braille"

msgid "A4 Tractor Feed"
msgstr "A4 Traction papier"
msgstr "A4 papier listing"

msgid "Yes"
msgstr "Oui"
Expand All @@ -41,7 +41,7 @@ msgid "Braille transcription"
msgstr "Transcription Braille"

msgid "None"
msgstr "Aucune"
msgstr "Aucun(e)"

msgid "Additional Braille transcription (2)"
msgstr "Transcription Braille additionnelle (2)"
Expand Down Expand Up @@ -115,6 +115,33 @@ msgstr "Marge graphique gauche"
msgid "Graphical right margin"
msgstr "Marge graphique droite"

msgid "Braille Page Number"
msgstr "Numéro de page braille"

msgid "Print Page Number"
msgstr "Numéro de page noir"

msgid "Top Margin"
msgstr "Marge en haut"

msgid "Bottom Margin"
msgstr "Marge en bas"

msgid "Top Inline"
msgstr "Intégré en haut"

msgid "Bottom Inline"
msgstr "Intégré en bas"

msgid "Print Page Separator"
msgstr "Montrer les séparations de pages"

msgid "Print Page Number in Separator"
msgstr "Indiquer le numéro de page dans la séparation"

msgid "Prefix Print Page Number with Braille Page Number"
msgstr "Préfixer le numéro de page noir avec le numéro de page braille"

msgid "Image conversion"
msgstr "Conversion d'image"

Expand Down Expand Up @@ -193,32 +220,23 @@ msgstr "11.03.2 ou supérieur"
msgid "12.01.3 or above"
msgstr "12.01.3 ou supérieur"

msgid "Page folding"
msgstr "Recto-Verso"

msgid "Single-sided"
msgstr "Recto seul"

msgid "Double-sided"
msgstr "Recto-Verso"

msgid "Single-sided z-folding"
msgstr "Recto seul, pliage Z"
msgid "Double-Sided Printing"
msgstr "Impression recto-verso"

msgid "Double-sided z-folding"
msgstr "Recto-Verso, pliage Z"
msgid "Off"
msgstr "Désactivé"

msgid "Single-sided sideways z-folding"
msgstr "Recto seul paysage, pliage Z"
msgid "Long Edge (Standard)"
msgstr "Bord long (standard)"

msgid "Double-sided sideways z-folding"
msgstr "Recto-Verso paysage, pliage Z"
msgid "Z-Folding"
msgstr "Pliage accordéon"

msgid "Double-sided saddle stitch 4 pages"
msgstr "Recto-Verso cahier 4 pages"
msgid "Sideways Folding"
msgstr "Pliage paysage"

msgid "Single-sided saddle stitch 4 pages"
msgstr "Recto cahier 4 pages"
msgid "Saddle Stich 4 pages"
msgstr "Cahier 4 pages"

msgid "Firmware Braille Table"
msgstr "Table Braille Firmware"
Expand Down
Loading